From git at git.openembedded.org Sun Mar 1 02:37:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 02:37:50 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: cups-filters: upgrade 1.26.2 -> 1.27.2 Message-ID: <158303027034.2819.12036990518414163887@git.openembedded.org> 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 786f03d cups-filters: upgrade 1.26.2 -> 1.27.2 786f03d is described below commit 786f03de96adf8740ffa9c40d15729d880d5d46a Author: Pierre-Jean Texier AuthorDate: Wed Feb 26 20:29:36 2020 +0000 cups-filters: upgrade 1.26.2 -> 1.27.2 See full changelog https://github.com/OpenPrinting/cups-filters/releases/tag/release-1-27-2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb | 4 ---- meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb b/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb deleted file mode 100644 index d76ef09..0000000 --- a/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -include cups-filters.inc - -SRC_URI[md5sum] = "970095596bf2b8cfe91ac91c0b51297a" -SRC_URI[sha256sum] = "0069aef1358522f1901a64749ec753d28a2d6a832758bce58ffcd722b28c0e66" diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb b/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb new file mode 100644 index 0000000..35c4a92 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb @@ -0,0 +1,4 @@ +include cups-filters.inc + +SRC_URI[md5sum] = "90ebcae31f2eabd802236408646b1dd9" +SRC_URI[sha256sum] = "174a2a5c919bf88c63ced692a2170add6c2cd70ff06c49bcea32e9cf56960492" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 06:27:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 06:27:18 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (786f03d -> 72e7786) Message-ID: <158304403859.27424.15358448335066014246@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 786f03d cups-filters: upgrade 1.26.2 -> 1.27.2 discard 13ac085 phoronix-test-suite: Add python3 to safe siggen deps discard 733af15 sysdig: Upgrade to 0.26.5 new ed798c7 sysdig: Upgrade to 0.26.5 new be2cf19 phoronix-test-suite: Add python3 to safe siggen deps new 72e7786 cups-filters: upgrade 1.26.2 -> 1.27.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 (786f03d) \ N -- N -- N refs/heads/master-next (72e7786) 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/sysdig/sysdig_git.bb | 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 Sun Mar 1 06:27:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 06:27:20 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: phoronix-test-suite: Add python3 to safe siggen deps In-Reply-To: <158304403859.27424.15358448335066014246@git.openembedded.org> References: <158304403859.27424.15358448335066014246@git.openembedded.org> Message-ID: <20200301062718.C5D75233484@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit be2cf1984951b7d74f275fa470260bc5cf8ee574 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 Sun Mar 1 06:27:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 06:27:21 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: cups-filters: upgrade 1.26.2 -> 1.27.2 In-Reply-To: <158304403859.27424.15358448335066014246@git.openembedded.org> References: <158304403859.27424.15358448335066014246@git.openembedded.org> Message-ID: <20200301062718.D0F73233486@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 72e77866bfcc708a53c9cdbcadc0b1ea97c8368c Author: Pierre-Jean Texier AuthorDate: Wed Feb 26 20:29:36 2020 +0000 cups-filters: upgrade 1.26.2 -> 1.27.2 See full changelog https://github.com/OpenPrinting/cups-filters/releases/tag/release-1-27-2 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb | 4 ---- meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb b/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb deleted file mode 100644 index d76ef09..0000000 --- a/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -include cups-filters.inc - -SRC_URI[md5sum] = "970095596bf2b8cfe91ac91c0b51297a" -SRC_URI[sha256sum] = "0069aef1358522f1901a64749ec753d28a2d6a832758bce58ffcd722b28c0e66" diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb b/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb new file mode 100644 index 0000000..35c4a92 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters_1.27.2.bb @@ -0,0 +1,4 @@ +include cups-filters.inc + +SRC_URI[md5sum] = "90ebcae31f2eabd802236408646b1dd9" +SRC_URI[sha256sum] = "174a2a5c919bf88c63ced692a2170add6c2cd70ff06c49bcea32e9cf56960492" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 06:27:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 06:27:19 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: sysdig: Upgrade to 0.26.5 In-Reply-To: <158304403859.27424.15358448335066014246@git.openembedded.org> References: <158304403859.27424.15358448335066014246@git.openembedded.org> Message-ID: <20200301062718.BB382233482@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ed798c764319d83ad9eb1b963bfc99b1fa1a791a 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 and mips arch, 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 | 48 +++++---- 5 files changed, 159 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..ce1a424 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -3,39 +3,49 @@ 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" +COMPATIBLE_HOST_mips = "null" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 10:40:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:36 +0000 Subject: [oe-commits] [openembedded-core] 01/06: glibc: Syscall fixes for mips/risc-v/mucroblaze In-Reply-To: <158305923526.3639.12901378394523153159@git.openembedded.org> References: <158305923526.3639.12901378394523153159@git.openembedded.org> Message-ID: <20200301104035.914C9233484@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 79b23077288dd557842f987e558262d7d8522e25 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 Sun Mar 1 10:40:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:35 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (3ef237f -> 49e7f3e) Message-ID: <158305923526.3639.12901378394523153159@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 3ef237f python3-scons: Fix license file collision new 79b2307 glibc: Syscall fixes for mips/risc-v/mucroblaze new ef68122 tcmode-default: Add wildcard to GLIBCVERSION new 2d51abf make: Drop mips glibc workaround new 19ef429 libarchive: support mbedtls in PACKAGECONFIG new 324f33b util-linux: upgrade 2.34 -> 2.35.1 new 49e7f3e wic/engine: dump the partition table in JSON format only 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/tcmode-default.inc | 2 +- meta/recipes-core/glibc/glibc-version.inc | 4 +- 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 +- meta/recipes-devtools/make/make_4.3.bb | 5 - .../libarchive/libarchive_3.4.2.bb | 1 + scripts/lib/wic/engine.py | 2 +- 9 files changed, 147 insertions(+), 49 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-libfdisk-script-accept-sector-size-ignore-unknown-he.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} (62%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 10:40:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:39 +0000 Subject: [oe-commits] [openembedded-core] 04/06: libarchive: support mbedtls in PACKAGECONFIG In-Reply-To: <158305923526.3639.12901378394523153159@git.openembedded.org> References: <158305923526.3639.12901378394523153159@git.openembedded.org> Message-ID: <20200301104035.B8F2423348A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 19ef429ffb7ccd7277da82c5487f3ab1ae2af994 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 Sun Mar 1 10:40:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:37 +0000 Subject: [oe-commits] [openembedded-core] 02/06: tcmode-default: Add wildcard to GLIBCVERSION In-Reply-To: <158305923526.3639.12901378394523153159@git.openembedded.org> References: <158305923526.3639.12901378394523153159@git.openembedded.org> Message-ID: <20200301104035.9E0C5233486@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ef681222a918030d726a79cf04111fb5d0b66355 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 Sun Mar 1 10:40:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:38 +0000 Subject: [oe-commits] [openembedded-core] 03/06: make: Drop mips glibc workaround In-Reply-To: <158305923526.3639.12901378394523153159@git.openembedded.org> References: <158305923526.3639.12901378394523153159@git.openembedded.org> Message-ID: <20200301104035.AA628233488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2d51abf53e063ce6328290de728b5870530aa86a Author: Richard Purdie AuthorDate: Sat Feb 29 16:19:46 2020 +0000 make: Drop mips glibc workaround This is no longer needed with the upgraded glibc version. 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 Sun Mar 1 10:40:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:41 +0000 Subject: [oe-commits] [openembedded-core] 06/06: wic/engine: dump the partition table in JSON format only In-Reply-To: <158305923526.3639.12901378394523153159@git.openembedded.org> References: <158305923526.3639.12901378394523153159@git.openembedded.org> Message-ID: <20200301104035.DBB4C23348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 49e7f3e8e3a775510d8b0e2826a06d000934706b 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. From git at git.openembedded.org Sun Mar 1 10:40:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:40 +0000 Subject: [oe-commits] [openembedded-core] 05/06: util-linux: upgrade 2.34 -> 2.35.1 In-Reply-To: <158305923526.3639.12901378394523153159@git.openembedded.org> References: <158305923526.3639.12901378394523153159@git.openembedded.org> Message-ID: <20200301104035.CBABA23348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 324f33ba5a77d498cfff81c6857c78ad13b27125 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 Sun Mar 1 10:40:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:46 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (13d2e35 -> 9308ee1) Message-ID: <158305924623.4049.3973367453895964120@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 13d2e35 wic/engine: dump the partition table in JSON format only discard bf17cc7 util-linux: upgrade 2.34 -> 2.35.1 discard 2a5c360 qemuarm64: Add -machine gic-version=3 with kvm discard ea6974f tcmode-default: Add wildcard to GLIBCVERSION discard b44d447 libarchive: support mbedtls in PACKAGECONFIG discard 83c610f ltp: Remove mips related open_posix_testsuite patch discard fae88d8 ltp: Update to 20200120 discard 6db27fc make: Drop mips glibc workaround discard 20521f8 glibc: Syscall fixes for mips/risc-v/mucroblaze discard a3da256 HACK: extra debug discard 6ced0c2 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 2916028 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 544cbe4 HACK: signing: Add extra test debug discard e2e29d5 glew/curl: specify exclusive package configs discard 6e542bc base.bbclass: extend PACKAGECONFIG for conflict package configs add 79b2307 glibc: Syscall fixes for mips/risc-v/mucroblaze add ef68122 tcmode-default: Add wildcard to GLIBCVERSION add 2d51abf make: Drop mips glibc workaround add 19ef429 libarchive: support mbedtls in PACKAGECONFIG add 324f33b util-linux: upgrade 2.34 -> 2.35.1 add 49e7f3e wic/engine: dump the partition table in JSON format only new f77752a base.bbclass: extend PACKAGECONFIG for conflict package configs new a28cf93 glew/curl: specify exclusive package configs new e8b4111 HACK: signing: Add extra test debug new af34052 sstatesig: Log timestamps for hashequiv in reprodubile builds new 06019d9 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 18f8847 HACK: extra debug new a4002d9 ltp: Update to 20200120 new d82f950 ltp: Remove mips related open_posix_testsuite patch new 9308ee1 qemuarm64: Add -machine gic-version=3 with kvm 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 (13d2e35) \ N -- N -- N refs/heads/master-next (9308ee1) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 10:40:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:49 +0000 Subject: [oe-commits] [openembedded-core] 03/09: HACK: signing: Add extra test debug In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.6EA3D23348C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e8b41117d4169f0dd6b0ca9201d780950da282b8 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 Mar 1 10:40:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:50 +0000 Subject: [oe-commits] [openembedded-core] 04/09: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.7829323348E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit af34052ac0395cbf703507009cb7386c4e5c5b5d 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 Sun Mar 1 10:40:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:47 +0000 Subject: [oe-commits] [openembedded-core] 01/09: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.5CD47233488@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f77752ac6a16da0e75122803f34650ee9c8e3a47 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 Mar 1 10:40:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:48 +0000 Subject: [oe-commits] [openembedded-core] 02/09: glew/curl: specify exclusive package configs In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.6658D23348A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a28cf93c64b2c17c62ca0579c43f2f590affc1c4 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 Mar 1 10:40:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:52 +0000 Subject: [oe-commits] [openembedded-core] 06/09: HACK: extra debug In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.8E391233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 18f884794b0fe9d6fb5e7e041f2308f8903354be 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 Mar 1 10:40:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:51 +0000 Subject: [oe-commits] [openembedded-core] 05/09: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.82022233490@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 06019d99398e7904f0344659ebc8f8d2c7a787e5 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 Mar 1 10:40:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:55 +0000 Subject: [oe-commits] [openembedded-core] 09/09: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.B1DF7233497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9308ee11433834f79d8c8b845467bbba4d81551d 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 Sun Mar 1 10:40:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:53 +0000 Subject: [oe-commits] [openembedded-core] 07/09: ltp: Update to 20200120 In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.99F32233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a4002d9b9e87c39e56f02ce4cddbe83d9116331c 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 Sun Mar 1 10:40:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 10:40:54 +0000 Subject: [oe-commits] [openembedded-core] 08/09: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158305924623.4049.3973367453895964120@git.openembedded.org> References: <158305924623.4049.3973367453895964120@git.openembedded.org> Message-ID: <20200301104046.A6166233495@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d82f9508c27ff5973d995a914bd794a00e437c4d 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 Sun Mar 1 14:44:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 14:44:17 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: sstatesig: Drop incorrect test within locked sigs handling Message-ID: <158307385727.27646.14041849095026230206@git.openembedded.org> 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 dce631e sstatesig: Drop incorrect test within locked sigs handling dce631e is described below commit dce631edee6e59c51f467854a1b2d5628afe5baf Author: Richard Purdie AuthorDate: Sun Mar 1 14:39:46 2020 +0000 sstatesig: Drop incorrect test within locked sigs handling I believe this condition was added in error and is resulting in the intermittent locked sigantures failure on the autobuilder, depending on the state of the unihash caches compared to the current recipe signatures. Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..ea7b6dc 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -195,7 +195,7 @@ class SignatureGeneratorOEBasicHashMixIn(object): self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) - if h != h_locked and h_locked != unihash: + if h != h_locked: self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 14:44:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 14:44:29 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: cooker: Reset unpon clientComplete Message-ID: <158307386960.28342.5436345209441641718@git.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 95c259d cooker: Reset unpon clientComplete 95c259d is described below commit 95c259dc252ce84a5cc9a01cbe132e3b38327aef Author: Richard Purdie AuthorDate: Sun Mar 1 10:54:55 2020 +0000 cooker: Reset unpon clientComplete If for example a tinfoil connection edits the datastore, a subsequent connection can be "corrupted" by those changes. By calling the cooker reset function at exit, the behaviour becomes the same as a newly setup server. This avoids problems in tests when BB_SERVER_TIMEOUT is set as the server is properly reset between connections. [YOCTO #13812] Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 2d937a4..2a17c67 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1665,6 +1665,7 @@ class BBCooker: self.command.reset() self.databuilder.reset() self.data = self.databuilder.data + self.reset() class CookerExit(bb.event.Event): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 15:23:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 15:23:50 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (95c259d -> 3c5bca4) Message-ID: <158307623009.13465.13634671198457627931@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 95c259d cooker: Reset unpon clientComplete new 3c5bca4 cooker: Reset parse status unpon clientComplete 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 (95c259d) \ N -- N -- N refs/heads/master-next (3c5bca4) 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: lib/bb/cooker.py | 3 ++- 1 file 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 Sun Mar 1 15:23:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 15:23:51 +0000 Subject: [oe-commits] [bitbake] 01/01: cooker: Reset parse status unpon clientComplete In-Reply-To: <158307623009.13465.13634671198457627931@git.openembedded.org> References: <158307623009.13465.13634671198457627931@git.openembedded.org> Message-ID: <20200301152350.46BB3233494@git.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 3c5bca4fce0f3026ce5166db00e885358c847390 Author: Richard Purdie AuthorDate: Sun Mar 1 10:54:55 2020 +0000 cooker: Reset parse status unpon clientComplete If for example a tinfoil connection edits the datastore, a subsequent connection can be "corrupted" by those changes. By setting the parse status of the caches as False at exit, the behaviour becomes the same as a newly setup server as a new data store is setup. This avoids problems in tests when BB_SERVER_TIMEOUT is set as the server is properly reset between connections. [YOCTO #13812] Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 2d937a4..bda6d1b 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1665,6 +1665,8 @@ class BBCooker: self.command.reset() self.databuilder.reset() self.data = self.databuilder.data + self.parsecache_valid = False + self.baseconfig_valid = False class CookerExit(bb.event.Event): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 17:49:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:49:24 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: sysklogd: upgrade 2.0.3 -> 2.1.1 Message-ID: <158308496408.10332.13114318499760765451@git.openembedded.org> 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 c162ca7 sysklogd: upgrade 2.0.3 -> 2.1.1 c162ca7 is described below commit c162ca7a1ce1a2d0214eed933f424d2bab631530 Author: Pierre-Jean Texier AuthorDate: Sun Mar 1 14:14:28 2020 +0100 sysklogd: upgrade 2.0.3 -> 2.1.1 License-Update: Relicensed under the BSD-3-Clause license since v2.1 Remove patches applied upstream. Since version v2.1, klogd was removed from the sysklogd project since syslogd performs logging of kernel messages. So, this patch remove klogd support. Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...pat-to-simplify-build-deps-and-really-fix.patch | 127 --------------------- .../0001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 ------- .../files/0002-include-sys-types.h-for-off_t.patch | 29 ----- meta/recipes-extended/sysklogd/files/sysklogd | 22 ---- meta/recipes-extended/sysklogd/sysklogd.inc | 16 +-- meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb | 3 - meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb | 3 + 7 files changed, 8 insertions(+), 236 deletions(-) diff --git a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch b/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch deleted file mode 100644 index 9ba7ecc..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 84d70e63fc105e3713943ed8c0bdd4e31a698226 Mon Sep 17 -00:00:00 2001 From: Joachim Nilsson Date: Thu, 16 Jan -2020 22:16:51 +0100 Subject: [PATCH] Drop libcompat to simplify build deps -and really fix - -The original idea with libcompat was to keep as few objects as -possible for linking with libsyslog. That in turn to prevent -a user of libsyslog from suddenly also getting strong binding -to symbols like strlcpy() from libsyslog, rather than their C -library of choice. - -However, this caused strlcpy.c to be built as both .o and .lo -files, which in turn caused really bizarre build problems due -to bad DAG dependency. - -This patch drops libcompat and instead marks all replacement APIs -as weak symbols, which a C library can override. - -Signed-off-by: Joachim Nilsson - -Upstream-Status: Backport -[https://github.com/troglobit/sysklogd/commit/84d70e63fc105e3713943ed8c0bdd4e31a698226] - -Signed-off-by: Changqing Li ---- - lib/pidfile.c | 8 +++++++- - lib/utimensat.c | 10 ++++++++-- - src/Makefile.am | 7 +------ - 3 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/lib/pidfile.c b/lib/pidfile.c -index 81f2315..25b1c04 100644 ---- a/lib/pidfile.c -+++ b/lib/pidfile.c -@@ -31,6 +31,9 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - -+#include -+#ifndef HAVE_PIDFILE -+ - #define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ - #include /* utimensat() */ - #include /* utimensat() on *BSD */ -@@ -54,7 +57,7 @@ const char *__pidfile_path = RUNSTATEDIR; - const char *__pidfile_name = NULL; - - int --pidfile(const char *basename) -+__pidfile(const char *basename) - { - int save_errno; - int atexit_already; -@@ -127,6 +130,9 @@ pidfile(const char *basename) - return (0); - } - -+weak_alias(__pidfile, pidfile); -+#endif /* HAVE_PIDFILE */ -+ - static void - pidfile_cleanup(void) - { -diff --git a/lib/utimensat.c b/lib/utimensat.c -index edf7e10..b68ce0e 100644 ---- a/lib/utimensat.c -+++ b/lib/utimensat.c -@@ -15,7 +15,8 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - --#include "config.h" -+#include -+#ifndef HAVE_UTIMENSAT - - #include - #ifdef HAVE_FCNTL_H -@@ -23,7 +24,8 @@ - #endif - #include /* lutimes(), utimes(), utimensat() */ - --int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) -+int -+__utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) - { - int ret = -1; - struct timeval tv[2]; -@@ -45,3 +47,7 @@ int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int - - return ret; - } -+ -+weak_alias(__utimensat, utimensat); -+ -+#endif /* HAVE_UTIMENSAT */ -diff --git a/src/Makefile.am b/src/Makefile.am -index 6e2a51c..1db88d3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -19,7 +19,6 @@ - bin_PROGRAMS = - sbin_PROGRAMS = syslogd - lib_LTLIBRARIES = libsyslog.la --noinst_LTLIBRARIES = libcompat.la - - if ENABLE_KLOGD - sbin_PROGRAMS += klogd -@@ -48,10 +47,6 @@ logger_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - logger_LDADD = $(LIBS) $(LIBOBJS) - logger_LDADD += libsyslog.la - --# Convenience library for libsyslog instead of linking with $(LTLIBOBJS), --# which would pull in pidfile() and other (strong) symbols as well. --libcompat_la_SOURCES = ../lib/strlcpy.c ../lib/strlcat.c -- - pkgconfigdir = $(libdir)/pkgconfig - pkgincludedir = $(includedir)/syslog - pkgconfig_DATA = libsyslog.pc -@@ -59,4 +54,4 @@ pkginclude_HEADERS = syslog.h - libsyslog_la_SOURCES = syslog.c syslog.h compat.h - libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 --libsyslog_la_LIBADD = libcompat.la -+libsyslog_la_LIBADD = $(LTLIBOJBS) --- -2.7.4 - diff --git a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch b/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch deleted file mode 100644 index b2d45c0..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:27:28 -0800 -Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS - -The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and -are not defined in any standard. Using them fails build on musl -libc, its better to avoid them - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/syslog.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/syslog.h b/src/syslog.h -index 4fb7627..120a18f 100644 ---- a/src/syslog.h -+++ b/src/syslog.h -@@ -221,7 +221,9 @@ struct syslog_data { - .log_mask = 0xff, \ - } - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - void openlog (const char *, int, int); - void closelog (void); - -@@ -245,7 +247,9 @@ void syslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, ...); - void vsyslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, va_list); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #else /* !__KERNEL__ */ - --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch b/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch deleted file mode 100644 index 799a7a4..0000000 --- a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:31:04 -0800 -Subject: [PATCH 2/2] include sys/types.h for off_t - -Fixes -error: unknown type name 'off_t' - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/compat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/compat.h b/src/compat.h -index a867636..1ef1bf0 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - /* - * The following macro is used to remove const cast-away warnings --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd index 4a4ca8a..2a356a6 100755 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ b/meta/recipes-extended/sysklogd/files/sysklogd @@ -18,9 +18,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin pidfile_syslogd=/var/run/syslogd.pid -pidfile_klogd=/var/run/klogd.pid binpath_syslogd=/usr/sbin/syslogd -binpath_klogd=/usr/sbin/klogd test -x $binpath || exit 0 @@ -112,28 +110,16 @@ case "$1" in create_xconsole start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Starting kernel log daemon..." - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; stop) log_begin_msg "Stopping system log daemon..." start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Stopping kernel log daemon..." - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - log_end_msg $? ;; reload|force-reload) log_begin_msg "Reloading system log daemon..." start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; restart) log_begin_msg "Restarting system log daemon..." @@ -142,12 +128,6 @@ case "$1" in waitpid $pid start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; reload-or-restart) if running @@ -160,8 +140,6 @@ case "$1" in status) status syslogd RETVAL=$? - status klogd - rval=$? [ $RETVAL -eq 0 ] && exit $rval exit $RETVAL ;; diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 8618c9f..2e3d983 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -1,27 +1,21 @@ SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements two system log daemons: syslogd, klogd" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" SECTION = "base" -LICENSE = "GPLv2+ & BSD" -LICENSE_syslogd = "BSD" -LICENSE_klogd = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ - file://src/klogd.c;beginline=2;endline=19;md5=4f5591d04cccbeb0352758ed4a9d7213 \ " inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ - file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ - file://0002-include-sys-types.h-for-off_t.patch \ - file://0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch \ file://sysklogd \ " S = "${WORKDIR}/git" -EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --with-klogd --without-logger" +EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" do_install_append () { install -d ${D}${sysconfdir} @@ -31,7 +25,7 @@ do_install_append () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "syslogd.service klogd.service" +SYSTEMD_SERVICE_${PN} = "syslogd.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb b/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb deleted file mode 100644 index 21f750f..0000000 --- a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb new file mode 100644 index 0000000..eb6b4ef --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb @@ -0,0 +1,3 @@ +require sysklogd.inc + +SRCREV = "24dafe9a27ac959ebeb89acd3ebd3d62cca4b755" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 17:51:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:15 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: mime-xdg.bbclass: Fix typo in comment Message-ID: <158308507503.10905.11999939404471241606@git.openembedded.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 d6fc008 mime-xdg.bbclass: Fix typo in comment d6fc008 is described below commit d6fc0081f53ebc5b12ffff917cf3c04c270a69f1 Author: Andreas M?ller AuthorDate: Sun Mar 1 18:23:19 2020 +0100 mime-xdg.bbclass: Fix typo in comment Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- meta/classes/mime-xdg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/mime-xdg.bbclass b/meta/classes/mime-xdg.bbclass index 63169e9..642a5b7 100644 --- a/meta/classes/mime-xdg.bbclass +++ b/meta/classes/mime-xdg.bbclass @@ -8,7 +8,7 @@ PACKAGE_WRITE_DEPS += "desktop-file-utils-native" DESKTOPDIR = "${datadir}/applications" # There are recipes out there installing their .desktop files as absolute -# symlinks. For us these are dangling and cannot be introspected for "MymeType" +# symlinks. For us these are dangling and cannot be introspected for "MimeType" # easily. By addding package-names to MIME_XDG_PACKAGES, packager can force # proper update-desktop-database handling. Note that all introspection is # skipped for MIME_XDG_PACKAGES not empty -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 17:51:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:20 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (c162ca7 -> 92c9cb5) Message-ID: <158308508059.11163.811532565049475261@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 c162ca7 sysklogd: upgrade 2.0.3 -> 2.1.1 discard dce631e sstatesig: Drop incorrect test within locked sigs handling discard 9308ee1 qemuarm64: Add -machine gic-version=3 with kvm discard d82f950 ltp: Remove mips related open_posix_testsuite patch discard a4002d9 ltp: Update to 20200120 discard 18f8847 HACK: extra debug discard 06019d9 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard af34052 sstatesig: Log timestamps for hashequiv in reprodubile builds discard e8b4111 HACK: signing: Add extra test debug discard a28cf93 glew/curl: specify exclusive package configs discard f77752a base.bbclass: extend PACKAGECONFIG for conflict package configs add d6fc008 mime-xdg.bbclass: Fix typo in comment new 87d348d base.bbclass: extend PACKAGECONFIG for conflict package configs new dccad37 glew/curl: specify exclusive package configs new 156b14e HACK: signing: Add extra test debug new f2c749b sstatesig: Log timestamps for hashequiv in reprodubile builds new 58526e0 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 5352310 HACK: extra debug new 3639837 ltp: Update to 20200120 new ec048ba ltp: Remove mips related open_posix_testsuite patch new 62c8e31 qemuarm64: Add -machine gic-version=3 with kvm new 93d6ec9 sstatesig: Drop incorrect test within locked sigs handling new 92c9cb5 sysklogd: upgrade 2.0.3 -> 2.1.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 (c162ca7) \ N -- N -- N refs/heads/master-next (92c9cb5) 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/mime-xdg.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 Sun Mar 1 17:51:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:23 +0000 Subject: [oe-commits] [openembedded-core] 03/11: HACK: signing: Add extra test debug In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175120.DA30923349B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 156b14e9a304849611a350e0edcae4eff12e67f9 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 Mar 1 17:51:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:21 +0000 Subject: [oe-commits] [openembedded-core] 01/11: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175120.BC40C233497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 87d348df0371fe70643d788d682a9962f4ec4aab 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 Mar 1 17:51:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:22 +0000 Subject: [oe-commits] [openembedded-core] 02/11: glew/curl: specify exclusive package configs In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175120.C78CF233499@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dccad373c9658e1e31bfce692e152b274e8459f1 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 Mar 1 17:51:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:24 +0000 Subject: [oe-commits] [openembedded-core] 04/11: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175120.EC8542334A1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f2c749bb418117b832204644b51883c897c575a1 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 Sun Mar 1 17:51:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:26 +0000 Subject: [oe-commits] [openembedded-core] 06/11: HACK: extra debug In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175121.18F562334A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5352310a958a9b44c72888bcb1e9d1553792835a 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 Mar 1 17:51:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:25 +0000 Subject: [oe-commits] [openembedded-core] 05/11: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175121.0A79E2334A3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 58526e03f26bca2af979f7ff1faf511ac6a941d5 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 Mar 1 17:51:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:29 +0000 Subject: [oe-commits] [openembedded-core] 09/11: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175121.574AD2334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 62c8e314b67c1169a0454530237ff1c4cb5c656f 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 Sun Mar 1 17:51:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:30 +0000 Subject: [oe-commits] [openembedded-core] 10/11: sstatesig: Drop incorrect test within locked sigs handling In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175121.644F4233497@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 93d6ec9904b867dc6fc137291b0245d4ca77dd54 Author: Richard Purdie AuthorDate: Sun Mar 1 14:39:46 2020 +0000 sstatesig: Drop incorrect test within locked sigs handling I believe this condition was added in error and is resulting in the intermittent locked sigantures failure on the autobuilder, depending on the state of the unihash caches compared to the current recipe signatures. Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..ea7b6dc 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -195,7 +195,7 @@ class SignatureGeneratorOEBasicHashMixIn(object): self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) - if h != h_locked and h_locked != unihash: + if h != h_locked: self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 1 17:51:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:28 +0000 Subject: [oe-commits] [openembedded-core] 08/11: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175121.43D8C233495@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ec048ba4125989d19b0cfbd7ad48737ff6810c39 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 Sun Mar 1 17:51:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:27 +0000 Subject: [oe-commits] [openembedded-core] 07/11: ltp: Update to 20200120 In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175121.2B58D2334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3639837053614ec17f7c53fc46c1ad1febc3ec0e 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 Sun Mar 1 17:51:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 01 Mar 2020 17:51:31 +0000 Subject: [oe-commits] [openembedded-core] 11/11: sysklogd: upgrade 2.0.3 -> 2.1.1 In-Reply-To: <158308508059.11163.811532565049475261@git.openembedded.org> References: <158308508059.11163.811532565049475261@git.openembedded.org> Message-ID: <20200301175121.74421233499@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 92c9cb5c9845c06f7c22bcfd2173f5142f15c58b Author: Pierre-Jean Texier AuthorDate: Sun Mar 1 14:14:28 2020 +0100 sysklogd: upgrade 2.0.3 -> 2.1.1 License-Update: Relicensed under the BSD-3-Clause license since v2.1 Remove patches applied upstream. Since version v2.1, klogd was removed from the sysklogd project since syslogd performs logging of kernel messages. So, this patch remove klogd support. Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...pat-to-simplify-build-deps-and-really-fix.patch | 127 --------------------- .../0001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 ------- .../files/0002-include-sys-types.h-for-off_t.patch | 29 ----- meta/recipes-extended/sysklogd/files/sysklogd | 22 ---- meta/recipes-extended/sysklogd/sysklogd.inc | 16 +-- meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb | 3 - meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb | 3 + 7 files changed, 8 insertions(+), 236 deletions(-) diff --git a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch b/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch deleted file mode 100644 index 9ba7ecc..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 84d70e63fc105e3713943ed8c0bdd4e31a698226 Mon Sep 17 -00:00:00 2001 From: Joachim Nilsson Date: Thu, 16 Jan -2020 22:16:51 +0100 Subject: [PATCH] Drop libcompat to simplify build deps -and really fix - -The original idea with libcompat was to keep as few objects as -possible for linking with libsyslog. That in turn to prevent -a user of libsyslog from suddenly also getting strong binding -to symbols like strlcpy() from libsyslog, rather than their C -library of choice. - -However, this caused strlcpy.c to be built as both .o and .lo -files, which in turn caused really bizarre build problems due -to bad DAG dependency. - -This patch drops libcompat and instead marks all replacement APIs -as weak symbols, which a C library can override. - -Signed-off-by: Joachim Nilsson - -Upstream-Status: Backport -[https://github.com/troglobit/sysklogd/commit/84d70e63fc105e3713943ed8c0bdd4e31a698226] - -Signed-off-by: Changqing Li ---- - lib/pidfile.c | 8 +++++++- - lib/utimensat.c | 10 ++++++++-- - src/Makefile.am | 7 +------ - 3 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/lib/pidfile.c b/lib/pidfile.c -index 81f2315..25b1c04 100644 ---- a/lib/pidfile.c -+++ b/lib/pidfile.c -@@ -31,6 +31,9 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - -+#include -+#ifndef HAVE_PIDFILE -+ - #define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ - #include /* utimensat() */ - #include /* utimensat() on *BSD */ -@@ -54,7 +57,7 @@ const char *__pidfile_path = RUNSTATEDIR; - const char *__pidfile_name = NULL; - - int --pidfile(const char *basename) -+__pidfile(const char *basename) - { - int save_errno; - int atexit_already; -@@ -127,6 +130,9 @@ pidfile(const char *basename) - return (0); - } - -+weak_alias(__pidfile, pidfile); -+#endif /* HAVE_PIDFILE */ -+ - static void - pidfile_cleanup(void) - { -diff --git a/lib/utimensat.c b/lib/utimensat.c -index edf7e10..b68ce0e 100644 ---- a/lib/utimensat.c -+++ b/lib/utimensat.c -@@ -15,7 +15,8 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - --#include "config.h" -+#include -+#ifndef HAVE_UTIMENSAT - - #include - #ifdef HAVE_FCNTL_H -@@ -23,7 +24,8 @@ - #endif - #include /* lutimes(), utimes(), utimensat() */ - --int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) -+int -+__utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) - { - int ret = -1; - struct timeval tv[2]; -@@ -45,3 +47,7 @@ int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int - - return ret; - } -+ -+weak_alias(__utimensat, utimensat); -+ -+#endif /* HAVE_UTIMENSAT */ -diff --git a/src/Makefile.am b/src/Makefile.am -index 6e2a51c..1db88d3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -19,7 +19,6 @@ - bin_PROGRAMS = - sbin_PROGRAMS = syslogd - lib_LTLIBRARIES = libsyslog.la --noinst_LTLIBRARIES = libcompat.la - - if ENABLE_KLOGD - sbin_PROGRAMS += klogd -@@ -48,10 +47,6 @@ logger_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - logger_LDADD = $(LIBS) $(LIBOBJS) - logger_LDADD += libsyslog.la - --# Convenience library for libsyslog instead of linking with $(LTLIBOBJS), --# which would pull in pidfile() and other (strong) symbols as well. --libcompat_la_SOURCES = ../lib/strlcpy.c ../lib/strlcat.c -- - pkgconfigdir = $(libdir)/pkgconfig - pkgincludedir = $(includedir)/syslog - pkgconfig_DATA = libsyslog.pc -@@ -59,4 +54,4 @@ pkginclude_HEADERS = syslog.h - libsyslog_la_SOURCES = syslog.c syslog.h compat.h - libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 --libsyslog_la_LIBADD = libcompat.la -+libsyslog_la_LIBADD = $(LTLIBOJBS) --- -2.7.4 - diff --git a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch b/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch deleted file mode 100644 index b2d45c0..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:27:28 -0800 -Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS - -The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and -are not defined in any standard. Using them fails build on musl -libc, its better to avoid them - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/syslog.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/syslog.h b/src/syslog.h -index 4fb7627..120a18f 100644 ---- a/src/syslog.h -+++ b/src/syslog.h -@@ -221,7 +221,9 @@ struct syslog_data { - .log_mask = 0xff, \ - } - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - void openlog (const char *, int, int); - void closelog (void); - -@@ -245,7 +247,9 @@ void syslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, ...); - void vsyslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, va_list); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #else /* !__KERNEL__ */ - --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch b/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch deleted file mode 100644 index 799a7a4..0000000 --- a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:31:04 -0800 -Subject: [PATCH 2/2] include sys/types.h for off_t - -Fixes -error: unknown type name 'off_t' - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/compat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/compat.h b/src/compat.h -index a867636..1ef1bf0 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - /* - * The following macro is used to remove const cast-away warnings --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd index 4a4ca8a..2a356a6 100755 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ b/meta/recipes-extended/sysklogd/files/sysklogd @@ -18,9 +18,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin pidfile_syslogd=/var/run/syslogd.pid -pidfile_klogd=/var/run/klogd.pid binpath_syslogd=/usr/sbin/syslogd -binpath_klogd=/usr/sbin/klogd test -x $binpath || exit 0 @@ -112,28 +110,16 @@ case "$1" in create_xconsole start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Starting kernel log daemon..." - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; stop) log_begin_msg "Stopping system log daemon..." start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Stopping kernel log daemon..." - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - log_end_msg $? ;; reload|force-reload) log_begin_msg "Reloading system log daemon..." start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; restart) log_begin_msg "Restarting system log daemon..." @@ -142,12 +128,6 @@ case "$1" in waitpid $pid start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; reload-or-restart) if running @@ -160,8 +140,6 @@ case "$1" in status) status syslogd RETVAL=$? - status klogd - rval=$? [ $RETVAL -eq 0 ] && exit $rval exit $RETVAL ;; diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 8618c9f..2e3d983 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -1,27 +1,21 @@ SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements two system log daemons: syslogd, klogd" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" SECTION = "base" -LICENSE = "GPLv2+ & BSD" -LICENSE_syslogd = "BSD" -LICENSE_klogd = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ - file://src/klogd.c;beginline=2;endline=19;md5=4f5591d04cccbeb0352758ed4a9d7213 \ " inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ - file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ - file://0002-include-sys-types.h-for-off_t.patch \ - file://0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch \ file://sysklogd \ " S = "${WORKDIR}/git" -EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --with-klogd --without-logger" +EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" do_install_append () { install -d ${D}${sysconfdir} @@ -31,7 +25,7 @@ do_install_append () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "syslogd.service klogd.service" +SYSTEMD_SERVICE_${PN} = "syslogd.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb b/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb deleted file mode 100644 index 21f750f..0000000 --- a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb new file mode 100644 index 0000000..eb6b4ef --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb @@ -0,0 +1,3 @@ +require sysklogd.inc + +SRCREV = "24dafe9a27ac959ebeb89acd3ebd3d62cca4b755" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 03:45:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 03:45:12 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (1a42deb -> 72e7786) Message-ID: <158312071223.20742.8396656838771494124@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 1a42deb meta-multimedia: use COMMON_LICENSE_DIR for license file location add 24d6260 python3-numpy: add from oe-core add af22a7a piglist: add from oe-core add ed798c7 sysdig: Upgrade to 0.26.5 add be2cf19 phoronix-test-suite: Add python3 to safe siggen deps add 72e7786 cups-filters: upgrade 1.26.2 -> 1.27.2 No new revisions were added by this update. Summary of changes: meta-oe/conf/layer.conf | 2 +- ...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 | 48 +++++---- ...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 ++++++++++++ .../recipes-printing/cups/cups-filters_1.26.2.bb | 4 - .../recipes-printing/cups/cups-filters_1.27.2.bb | 4 + ...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 + 15 files changed, 452 insertions(+), 151 deletions(-) create mode 100644 meta-oe/recipes-extended/sysdig/sysdig/0001-fix-build-with-LuaJIT-2.1-betas.patch delete mode 100644 meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch create mode 100644 meta-oe/recipes-extended/sysdig/sysdig/fix-uint64-const.patch 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 delete mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb create mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.27.2.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 Mon Mar 2 16:04:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:46 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (92c9cb5 -> 64903c7) Message-ID: <158316508663.19239.15527830041183284346@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 92c9cb5 sysklogd: upgrade 2.0.3 -> 2.1.1 discard 93d6ec9 sstatesig: Drop incorrect test within locked sigs handling new 5bed8ff sysklogd: upgrade 2.0.3 -> 2.1.1 new ce8137b test new f733230 wayland-protocols: upgrade 1.18 -> 1.20 new 5220dd4 enchant2: upgrade 2.2.7 -> 2.2.8 new 59f9d9f libsoup-2.4: upgrade 2.68.3 -> 2.68.4 new 5987d3c stress-ng: upgrade 0.11.00 -> 0.11.01 new fc9d169 wic/engine: lets display an error not a traceback new 64903c7 freetype: add pixmap to PACKAGECONFIG 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 (92c9cb5) \ N -- N -- N refs/heads/master-next (64903c7) 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/oe/sstatesig.py | 8 +++++++- meta/lib/oeqa/selftest/cases/signing.py | 3 +++ .../stress-ng/{stress-ng_0.11.00.bb => stress-ng_0.11.01.bb} | 4 ++-- meta/recipes-graphics/freetype/freetype_2.10.1.bb | 2 +- .../{wayland-protocols_1.18.bb => wayland-protocols_1.20.bb} | 4 ++-- .../enchant/{enchant2_2.2.7.bb => enchant2_2.2.8.bb} | 4 ++-- .../libsoup/{libsoup-2.4_2.68.3.bb => libsoup-2.4_2.68.4.bb} | 4 ++-- scripts/lib/wic/engine.py | 5 ++++- 8 files changed, 23 insertions(+), 11 deletions(-) rename meta/recipes-extended/stress-ng/{stress-ng_0.11.00.bb => stress-ng_0.11.01.bb} (83%) rename meta/recipes-graphics/wayland/{wayland-protocols_1.18.bb => wayland-protocols_1.20.bb} (86%) rename meta/recipes-support/enchant/{enchant2_2.2.7.bb => enchant2_2.2.8.bb} (85%) rename meta/recipes-support/libsoup/{libsoup-2.4_2.68.3.bb => libsoup-2.4_2.68.4.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:04:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:50 +0000 Subject: [oe-commits] [openembedded-core] 04/08: enchant2: upgrade 2.2.7 -> 2.2.8 In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.3B7622334F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5220dd4a7beb052911d76dea93b3d0a1ce998aca Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:52 2020 +0800 enchant2: upgrade 2.2.7 -> 2.2.8 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/enchant/{enchant2_2.2.7.bb => enchant2_2.2.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/enchant/enchant2_2.2.7.bb b/meta/recipes-support/enchant/enchant2_2.2.8.bb similarity index 85% rename from meta/recipes-support/enchant/enchant2_2.2.7.bb rename to meta/recipes-support/enchant/enchant2_2.2.8.bb index 03db5c7..4ddbe55 100644 --- a/meta/recipes-support/enchant/enchant2_2.2.7.bb +++ b/meta/recipes-support/enchant/enchant2_2.2.8.bb @@ -9,8 +9,8 @@ DEPENDS = "glib-2.0" inherit autotools pkgconfig SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[md5sum] = "8a6ea1bb143c64e0edf5e49c7e7cb984" -SRC_URI[sha256sum] = "1b22976135812b35cb5b8d21a53ad11d5e7c1426c93f51e7a314a2a42cab3a09" +SRC_URI[md5sum] = "c7b9d6a392ecb8758e499f783e8dc883" +SRC_URI[sha256sum] = "c7b5e2853f0dd0b1aafea2f9e071941affeec3a76df8e3f6d67a718c89293555" UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:04:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:49 +0000 Subject: [oe-commits] [openembedded-core] 03/08: wayland-protocols: upgrade 1.18 -> 1.20 In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.308F82334F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f7332307f02710351f3453dce3c687505dc77750 Author: Denys Dmytriyenko AuthorDate: Sun Mar 1 19:05:10 2020 -0500 wayland-protocols: upgrade 1.18 -> 1.20 wayland-protocols 1.20 is now available. This release is a brown paper bag release adding the missing README.md, GOVERNANCE.md and MEMBERS.md files to the tarball. Distributions that distribute one or more of these files should ignore the 1.19 release and move directly to 1.20. https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- .../wayland/{wayland-protocols_1.18.bb => wayland-protocols_1.20.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.18.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb similarity index 86% rename from meta/recipes-graphics/wayland/wayland-protocols_1.18.bb rename to meta/recipes-graphics/wayland/wayland-protocols_1.20.bb index c8bec66..3fb78f6 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.18.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "af38f22d8e233c2f2e00ddc8dcc94694" -SRC_URI[sha256sum] = "3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3" +SRC_URI[md5sum] = "b0836533a3f2dc6585b1dae00341157f" +SRC_URI[sha256sum] = "9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7" 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 Mon Mar 2 16:04:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:47 +0000 Subject: [oe-commits] [openembedded-core] 01/08: sysklogd: upgrade 2.0.3 -> 2.1.1 In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.0FF0D2334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5bed8ffcb1cf88f2c79ac8bda37e08ab1c32fc7b Author: Pierre-Jean Texier AuthorDate: Sun Mar 1 14:14:28 2020 +0100 sysklogd: upgrade 2.0.3 -> 2.1.1 License-Update: Relicensed under the BSD-3-Clause license since v2.1 Remove patches applied upstream. Since version v2.1, klogd was removed from the sysklogd project since syslogd performs logging of kernel messages. So, this patch remove klogd support. Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...pat-to-simplify-build-deps-and-really-fix.patch | 127 --------------------- .../0001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 ------- .../files/0002-include-sys-types.h-for-off_t.patch | 29 ----- meta/recipes-extended/sysklogd/files/sysklogd | 22 ---- meta/recipes-extended/sysklogd/sysklogd.inc | 16 +-- meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb | 3 - meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb | 3 + 7 files changed, 8 insertions(+), 236 deletions(-) diff --git a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch b/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch deleted file mode 100644 index 9ba7ecc..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 84d70e63fc105e3713943ed8c0bdd4e31a698226 Mon Sep 17 -00:00:00 2001 From: Joachim Nilsson Date: Thu, 16 Jan -2020 22:16:51 +0100 Subject: [PATCH] Drop libcompat to simplify build deps -and really fix - -The original idea with libcompat was to keep as few objects as -possible for linking with libsyslog. That in turn to prevent -a user of libsyslog from suddenly also getting strong binding -to symbols like strlcpy() from libsyslog, rather than their C -library of choice. - -However, this caused strlcpy.c to be built as both .o and .lo -files, which in turn caused really bizarre build problems due -to bad DAG dependency. - -This patch drops libcompat and instead marks all replacement APIs -as weak symbols, which a C library can override. - -Signed-off-by: Joachim Nilsson - -Upstream-Status: Backport -[https://github.com/troglobit/sysklogd/commit/84d70e63fc105e3713943ed8c0bdd4e31a698226] - -Signed-off-by: Changqing Li ---- - lib/pidfile.c | 8 +++++++- - lib/utimensat.c | 10 ++++++++-- - src/Makefile.am | 7 +------ - 3 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/lib/pidfile.c b/lib/pidfile.c -index 81f2315..25b1c04 100644 ---- a/lib/pidfile.c -+++ b/lib/pidfile.c -@@ -31,6 +31,9 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - -+#include -+#ifndef HAVE_PIDFILE -+ - #define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ - #include /* utimensat() */ - #include /* utimensat() on *BSD */ -@@ -54,7 +57,7 @@ const char *__pidfile_path = RUNSTATEDIR; - const char *__pidfile_name = NULL; - - int --pidfile(const char *basename) -+__pidfile(const char *basename) - { - int save_errno; - int atexit_already; -@@ -127,6 +130,9 @@ pidfile(const char *basename) - return (0); - } - -+weak_alias(__pidfile, pidfile); -+#endif /* HAVE_PIDFILE */ -+ - static void - pidfile_cleanup(void) - { -diff --git a/lib/utimensat.c b/lib/utimensat.c -index edf7e10..b68ce0e 100644 ---- a/lib/utimensat.c -+++ b/lib/utimensat.c -@@ -15,7 +15,8 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - --#include "config.h" -+#include -+#ifndef HAVE_UTIMENSAT - - #include - #ifdef HAVE_FCNTL_H -@@ -23,7 +24,8 @@ - #endif - #include /* lutimes(), utimes(), utimensat() */ - --int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) -+int -+__utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) - { - int ret = -1; - struct timeval tv[2]; -@@ -45,3 +47,7 @@ int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int - - return ret; - } -+ -+weak_alias(__utimensat, utimensat); -+ -+#endif /* HAVE_UTIMENSAT */ -diff --git a/src/Makefile.am b/src/Makefile.am -index 6e2a51c..1db88d3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -19,7 +19,6 @@ - bin_PROGRAMS = - sbin_PROGRAMS = syslogd - lib_LTLIBRARIES = libsyslog.la --noinst_LTLIBRARIES = libcompat.la - - if ENABLE_KLOGD - sbin_PROGRAMS += klogd -@@ -48,10 +47,6 @@ logger_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - logger_LDADD = $(LIBS) $(LIBOBJS) - logger_LDADD += libsyslog.la - --# Convenience library for libsyslog instead of linking with $(LTLIBOBJS), --# which would pull in pidfile() and other (strong) symbols as well. --libcompat_la_SOURCES = ../lib/strlcpy.c ../lib/strlcat.c -- - pkgconfigdir = $(libdir)/pkgconfig - pkgincludedir = $(includedir)/syslog - pkgconfig_DATA = libsyslog.pc -@@ -59,4 +54,4 @@ pkginclude_HEADERS = syslog.h - libsyslog_la_SOURCES = syslog.c syslog.h compat.h - libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 --libsyslog_la_LIBADD = libcompat.la -+libsyslog_la_LIBADD = $(LTLIBOJBS) --- -2.7.4 - diff --git a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch b/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch deleted file mode 100644 index b2d45c0..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:27:28 -0800 -Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS - -The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and -are not defined in any standard. Using them fails build on musl -libc, its better to avoid them - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/syslog.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/syslog.h b/src/syslog.h -index 4fb7627..120a18f 100644 ---- a/src/syslog.h -+++ b/src/syslog.h -@@ -221,7 +221,9 @@ struct syslog_data { - .log_mask = 0xff, \ - } - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - void openlog (const char *, int, int); - void closelog (void); - -@@ -245,7 +247,9 @@ void syslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, ...); - void vsyslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, va_list); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #else /* !__KERNEL__ */ - --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch b/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch deleted file mode 100644 index 799a7a4..0000000 --- a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:31:04 -0800 -Subject: [PATCH 2/2] include sys/types.h for off_t - -Fixes -error: unknown type name 'off_t' - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/compat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/compat.h b/src/compat.h -index a867636..1ef1bf0 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - /* - * The following macro is used to remove const cast-away warnings --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd index 4a4ca8a..2a356a6 100755 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ b/meta/recipes-extended/sysklogd/files/sysklogd @@ -18,9 +18,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin pidfile_syslogd=/var/run/syslogd.pid -pidfile_klogd=/var/run/klogd.pid binpath_syslogd=/usr/sbin/syslogd -binpath_klogd=/usr/sbin/klogd test -x $binpath || exit 0 @@ -112,28 +110,16 @@ case "$1" in create_xconsole start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Starting kernel log daemon..." - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; stop) log_begin_msg "Stopping system log daemon..." start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Stopping kernel log daemon..." - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - log_end_msg $? ;; reload|force-reload) log_begin_msg "Reloading system log daemon..." start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; restart) log_begin_msg "Restarting system log daemon..." @@ -142,12 +128,6 @@ case "$1" in waitpid $pid start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; reload-or-restart) if running @@ -160,8 +140,6 @@ case "$1" in status) status syslogd RETVAL=$? - status klogd - rval=$? [ $RETVAL -eq 0 ] && exit $rval exit $RETVAL ;; diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 8618c9f..2e3d983 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -1,27 +1,21 @@ SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements two system log daemons: syslogd, klogd" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" SECTION = "base" -LICENSE = "GPLv2+ & BSD" -LICENSE_syslogd = "BSD" -LICENSE_klogd = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ - file://src/klogd.c;beginline=2;endline=19;md5=4f5591d04cccbeb0352758ed4a9d7213 \ " inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ - file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ - file://0002-include-sys-types.h-for-off_t.patch \ - file://0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch \ file://sysklogd \ " S = "${WORKDIR}/git" -EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --with-klogd --without-logger" +EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" do_install_append () { install -d ${D}${sysconfdir} @@ -31,7 +25,7 @@ do_install_append () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "syslogd.service klogd.service" +SYSTEMD_SERVICE_${PN} = "syslogd.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb b/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb deleted file mode 100644 index 21f750f..0000000 --- a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb new file mode 100644 index 0000000..eb6b4ef --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb @@ -0,0 +1,3 @@ +require sysklogd.inc + +SRCREV = "24dafe9a27ac959ebeb89acd3ebd3d62cca4b755" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:04:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:48 +0000 Subject: [oe-commits] [openembedded-core] 02/08: test In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.23F6D2334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ce8137bb01fcfa83d9b2fbe0b53db3f6bd533282 Author: Richard Purdie AuthorDate: Mon Mar 2 15:52:25 2020 +0000 test Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..61f1931 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 156400c..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase): extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) ret2 = bitbake(test_recipe) found_warn2 = re.search(patt, ret2.output) extradebug += "\nFound %s\n\n" % str(found_warn2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:04:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:52 +0000 Subject: [oe-commits] [openembedded-core] 06/08: stress-ng: upgrade 0.11.00 -> 0.11.01 In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.53A7A23350B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5987d3c19888c1c5adb9b41e055cc850edc9ac76 Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:54 2020 +0800 stress-ng: upgrade 0.11.00 -> 0.11.01 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../stress-ng/{stress-ng_0.11.00.bb => stress-ng_0.11.01.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb index c8471eb..3486be1 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.01.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] = "781f8a0f8509a01793d815210086e78a" -SRC_URI[sha256sum] = "a41a6a4a7ea4e50aab7331e5594af7d1b3b6e5815751d137a78a6e166295294e" +SRC_URI[md5sum] = "a558fc7fb9d0a851afe6de09080b5401" +SRC_URI[sha256sum] = "9fe19548c87aa1a1b9b2be3b359ec2621b88bcb16998b77527549a7736f65494" 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 Mar 2 16:04:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:51 +0000 Subject: [oe-commits] [openembedded-core] 05/08: libsoup-2.4: upgrade 2.68.3 -> 2.68.4 In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.481FA2334FE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 59f9d9f756e46c017cfb586e01f207308ee22f6f Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:53 2020 +0800 libsoup-2.4: upgrade 2.68.3 -> 2.68.4 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../libsoup/{libsoup-2.4_2.68.3.bb => libsoup-2.4_2.68.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb similarity index 91% rename from meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb rename to meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb index e8bc7d6..6731b33 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb @@ -10,8 +10,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native libpsl" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[md5sum] = "29ee2ee7017945b64ede063b1396011c" -SRC_URI[sha256sum] = "534bb08e35b0ff3702f3adfde87d3441e27c12f9f5ec351f056fe04cba02bafb" +SRC_URI[md5sum] = "603f3a945cd6ecc1fda644d7853b3b81" +SRC_URI[sha256sum] = "2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294" CVE_PRODUCT = "libsoup" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:04:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:53 +0000 Subject: [oe-commits] [openembedded-core] 07/08: wic/engine: lets display an error not a traceback In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.6495F23350C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fc9d1697bdf16cfc9c824dff8fc806de7dc703ac Author: Armin Kuster AuthorDate: Sun Mar 1 21:39:56 2020 -0800 wic/engine: lets display an error not a traceback If the requested partition does not exist in this request "wic ls {path}:pnum" display a nice message not a trackback Also fix displaying the pnum and not "%s" Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 83c42c9..9ff4394 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -291,7 +291,7 @@ class Disk: def _get_part_image(self, pnum): if pnum not in self.partitions: - raise WicError("Partition %s is not in the image") + raise WicError("Partition %s is not in the image" % pnum) part = self.partitions[pnum] # check if fstype is supported for fstype in self.fstypes: @@ -314,6 +314,9 @@ class Disk: seek=self.partitions[pnum].start) def dir(self, pnum, path): + if pnum not in self.partitions: + raise WicError("Partition %s is not in the image" % pnum) + if self.partitions[pnum].fstype.startswith('ext'): return exec_cmd("{} {} -R 'ls -l {}'".format(self.debugfs, self._get_part_image(pnum), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:04:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:04:54 +0000 Subject: [oe-commits] [openembedded-core] 08/08: freetype: add pixmap to PACKAGECONFIG In-Reply-To: <158316508663.19239.15527830041183284346@git.openembedded.org> References: <158316508663.19239.15527830041183284346@git.openembedded.org> Message-ID: <20200302160447.7529423350E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 64903c74db037a1ffbfa4174d97d6e6fb0be3b16 Author: Matt Ranostay AuthorDate: Sun Mar 1 01:47:42 2020 +0200 freetype: add pixmap to PACKAGECONFIG Add pixmap to PACKAGECONFIG defaults to allow consumers to render color emojis without distro changes. Signed-off-by: Matt Ranostay Signed-off-by: Richard Purdie --- meta/recipes-graphics/freetype/freetype_2.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/freetype/freetype_2.10.1.bb b/meta/recipes-graphics/freetype/freetype_2.10.1.bb index b179a0e..d1c0930 100644 --- a/meta/recipes-graphics/freetype/freetype_2.10.1.bb +++ b/meta/recipes-graphics/freetype/freetype_2.10.1.bb @@ -27,7 +27,7 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix" CONFIGURE_SCRIPT = "${S}/configure" EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake" -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "zlib pixmap" PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" # harfbuzz results in a circular dependency so enabling is non-trivial -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:08:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:08:09 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: make: Use gziped sources Message-ID: <158316528920.28569.3476415551967881544@git.openembedded.org> 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 ccf2632 make: Use gziped sources ccf2632 is described below commit ccf2632debcb9dabfb5f4dfe7f763bcea6a1c6be Author: Adrian Bunk AuthorDate: Sun Mar 1 22:26:06 2020 +0200 make: Use gziped sources Building lzip-native just for being able to build make is not worth saving 1 MB download, especially since this creates a bottleneck for the whole build. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 2 +- meta/recipes-devtools/make/make_4.3.bb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 4142cf2..a0a72b6 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +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.lz \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.gz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index 70caf0a..cd0ecd4 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,7 +12,6 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" -SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" -SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" +SRC_URI[sha256sum] = "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" 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 Mar 2 16:16:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:16:56 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (d6fc008 -> 2497b28) Message-ID: <158316581663.9889.64794237063368148@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 d6fc008 mime-xdg.bbclass: Fix typo in comment new 62e2063 ltp: Update to 20200120 new 2497b28 ltp: Remove mips related open_posix_testsuite patch 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/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 +++--- ..._testsuite-mmap24-2-Relax-condition-a-bit.patch | 68 -------------- .../ltp/{ltp_20190930.bb => ltp_20200120.bb} | 10 +- 12 files changed, 79 insertions(+), 390 deletions(-) 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%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:16:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:16:57 +0000 Subject: [oe-commits] [openembedded-core] 01/02: ltp: Update to 20200120 In-Reply-To: <158316581663.9889.64794237063368148@git.openembedded.org> References: <158316581663.9889.64794237063368148@git.openembedded.org> Message-ID: <20200302161656.DF3D02334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 62e2063698477a13c55ae370451e52a2f1e18e45 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 Mon Mar 2 16:16:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:16:58 +0000 Subject: [oe-commits] [openembedded-core] 02/02: ltp: Remove mips related open_posix_testsuite patch In-Reply-To: <158316581663.9889.64794237063368148@git.openembedded.org> References: <158316581663.9889.64794237063368148@git.openembedded.org> Message-ID: <20200302161656.EEDB72334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2497b28b14bd70c0a4c94fc22a74ea62c527b410 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 Mon Mar 2 16:17:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:01 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ccf2632 -> ed094a8) Message-ID: <158316582195.10365.6237899360454524772@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 ccf2632 make: Use gziped sources discard 64903c7 freetype: add pixmap to PACKAGECONFIG discard fc9d169 wic/engine: lets display an error not a traceback discard 5987d3c stress-ng: upgrade 0.11.00 -> 0.11.01 discard 59f9d9f libsoup-2.4: upgrade 2.68.3 -> 2.68.4 discard 5220dd4 enchant2: upgrade 2.2.7 -> 2.2.8 discard f733230 wayland-protocols: upgrade 1.18 -> 1.20 discard ce8137b test discard 5bed8ff sysklogd: upgrade 2.0.3 -> 2.1.1 discard 62c8e31 qemuarm64: Add -machine gic-version=3 with kvm discard ec048ba ltp: Remove mips related open_posix_testsuite patch discard 3639837 ltp: Update to 20200120 discard 5352310 HACK: extra debug discard 58526e0 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard f2c749b sstatesig: Log timestamps for hashequiv in reprodubile builds discard 156b14e HACK: signing: Add extra test debug discard dccad37 glew/curl: specify exclusive package configs discard 87d348d base.bbclass: extend PACKAGECONFIG for conflict package configs add 62e2063 ltp: Update to 20200120 add 2497b28 ltp: Remove mips related open_posix_testsuite patch new 2c9d6fe base.bbclass: extend PACKAGECONFIG for conflict package configs new ff0d554 glew/curl: specify exclusive package configs new b5f6ade HACK: signing: Add extra test debug new 163b9cc sstatesig: Log timestamps for hashequiv in reprodubile builds new 1e3841a rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 40b3c2d HACK: extra debug new d4f6dea qemuarm64: Add -machine gic-version=3 with kvm new 0dff777 sysklogd: upgrade 2.0.3 -> 2.1.1 new 9925daf test new 2c463b6 wayland-protocols: upgrade 1.18 -> 1.20 new 50ea066 enchant2: upgrade 2.2.7 -> 2.2.8 new e973841 libsoup-2.4: upgrade 2.68.3 -> 2.68.4 new 3aa50bb stress-ng: upgrade 0.11.00 -> 0.11.01 new 8706a82 wic/engine: lets display an error not a traceback new bcc2d9b freetype: add pixmap to PACKAGECONFIG new ed094a8 make: Use gziped sources 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 (ccf2632) \ N -- N -- N refs/heads/master-next (ed094a8) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:04 +0000 Subject: [oe-commits] [openembedded-core] 03/16: HACK: signing: Add extra test debug In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.3663F2334F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5f6adea0801a33272ca087b40fc76240b654bc1 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 Mar 2 16:17:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:02 +0000 Subject: [oe-commits] [openembedded-core] 01/16: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.21DFC2334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2c9d6fe4c51373ffe67e20f451a0299616599c9e 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 Mar 2 16:17:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:05 +0000 Subject: [oe-commits] [openembedded-core] 04/16: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.412FA2334F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 163b9cc5d1f0091e3df04b66801f529b60445181 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 Mon Mar 2 16:17:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:03 +0000 Subject: [oe-commits] [openembedded-core] 02/16: glew/curl: specify exclusive package configs In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.2AC412334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ff0d554dc22116e6ed80c4d34b9bdc266da98f7c 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 Mar 2 16:17:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:07 +0000 Subject: [oe-commits] [openembedded-core] 06/16: HACK: extra debug In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.573C523350B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 40b3c2dd04041d62a7ca92cd4bb2afe602237c07 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 Mon Mar 2 16:17:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:08 +0000 Subject: [oe-commits] [openembedded-core] 07/16: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.60C7523350C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d4f6dea8bd2e3f04560343adaeb8b9b548e5c611 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 Mon Mar 2 16:17:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:11 +0000 Subject: [oe-commits] [openembedded-core] 10/16: wayland-protocols: upgrade 1.18 -> 1.20 In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.83569233510@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2c463b680cf2817196f1aaaa11d974440b490bc3 Author: Denys Dmytriyenko AuthorDate: Sun Mar 1 19:05:10 2020 -0500 wayland-protocols: upgrade 1.18 -> 1.20 wayland-protocols 1.20 is now available. This release is a brown paper bag release adding the missing README.md, GOVERNANCE.md and MEMBERS.md files to the tarball. Distributions that distribute one or more of these files should ignore the 1.19 release and move directly to 1.20. https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- .../wayland/{wayland-protocols_1.18.bb => wayland-protocols_1.20.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.18.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb similarity index 86% rename from meta/recipes-graphics/wayland/wayland-protocols_1.18.bb rename to meta/recipes-graphics/wayland/wayland-protocols_1.20.bb index c8bec66..3fb78f6 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.18.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "af38f22d8e233c2f2e00ddc8dcc94694" -SRC_URI[sha256sum] = "3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3" +SRC_URI[md5sum] = "b0836533a3f2dc6585b1dae00341157f" +SRC_URI[sha256sum] = "9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7" 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 Mon Mar 2 16:17:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:12 +0000 Subject: [oe-commits] [openembedded-core] 11/16: enchant2: upgrade 2.2.7 -> 2.2.8 In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.8C9A9233511@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 50ea06611faee42aeafe1b5d0a522ed7ba170d41 Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:52 2020 +0800 enchant2: upgrade 2.2.7 -> 2.2.8 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/enchant/{enchant2_2.2.7.bb => enchant2_2.2.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/enchant/enchant2_2.2.7.bb b/meta/recipes-support/enchant/enchant2_2.2.8.bb similarity index 85% rename from meta/recipes-support/enchant/enchant2_2.2.7.bb rename to meta/recipes-support/enchant/enchant2_2.2.8.bb index 03db5c7..4ddbe55 100644 --- a/meta/recipes-support/enchant/enchant2_2.2.7.bb +++ b/meta/recipes-support/enchant/enchant2_2.2.8.bb @@ -9,8 +9,8 @@ DEPENDS = "glib-2.0" inherit autotools pkgconfig SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[md5sum] = "8a6ea1bb143c64e0edf5e49c7e7cb984" -SRC_URI[sha256sum] = "1b22976135812b35cb5b8d21a53ad11d5e7c1426c93f51e7a314a2a42cab3a09" +SRC_URI[md5sum] = "c7b9d6a392ecb8758e499f783e8dc883" +SRC_URI[sha256sum] = "c7b5e2853f0dd0b1aafea2f9e071941affeec3a76df8e3f6d67a718c89293555" UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:14 +0000 Subject: [oe-commits] [openembedded-core] 13/16: stress-ng: upgrade 0.11.00 -> 0.11.01 In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.A33CE233513@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3aa50bb1c03fe313b56c355cde6e81832b54fc05 Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:54 2020 +0800 stress-ng: upgrade 0.11.00 -> 0.11.01 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../stress-ng/{stress-ng_0.11.00.bb => stress-ng_0.11.01.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb index c8471eb..3486be1 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.01.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] = "781f8a0f8509a01793d815210086e78a" -SRC_URI[sha256sum] = "a41a6a4a7ea4e50aab7331e5594af7d1b3b6e5815751d137a78a6e166295294e" +SRC_URI[md5sum] = "a558fc7fb9d0a851afe6de09080b5401" +SRC_URI[sha256sum] = "9fe19548c87aa1a1b9b2be3b359ec2621b88bcb16998b77527549a7736f65494" 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 Mar 2 16:17:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:13 +0000 Subject: [oe-commits] [openembedded-core] 12/16: libsoup-2.4: upgrade 2.68.3 -> 2.68.4 In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.994F8233512@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e97384137d6f578c5d415261cd755ac090e34fdd Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:53 2020 +0800 libsoup-2.4: upgrade 2.68.3 -> 2.68.4 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../libsoup/{libsoup-2.4_2.68.3.bb => libsoup-2.4_2.68.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb similarity index 91% rename from meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb rename to meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb index e8bc7d6..6731b33 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb @@ -10,8 +10,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native libpsl" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[md5sum] = "29ee2ee7017945b64ede063b1396011c" -SRC_URI[sha256sum] = "534bb08e35b0ff3702f3adfde87d3441e27c12f9f5ec351f056fe04cba02bafb" +SRC_URI[md5sum] = "603f3a945cd6ecc1fda644d7853b3b81" +SRC_URI[sha256sum] = "2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294" CVE_PRODUCT = "libsoup" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:09 +0000 Subject: [oe-commits] [openembedded-core] 08/16: sysklogd: upgrade 2.0.3 -> 2.1.1 In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.6DC2B23350E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0dff777670c4d37839ee19877600b984ce94459d Author: Pierre-Jean Texier AuthorDate: Sun Mar 1 14:14:28 2020 +0100 sysklogd: upgrade 2.0.3 -> 2.1.1 License-Update: Relicensed under the BSD-3-Clause license since v2.1 Remove patches applied upstream. Since version v2.1, klogd was removed from the sysklogd project since syslogd performs logging of kernel messages. So, this patch remove klogd support. Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...pat-to-simplify-build-deps-and-really-fix.patch | 127 --------------------- .../0001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 ------- .../files/0002-include-sys-types.h-for-off_t.patch | 29 ----- meta/recipes-extended/sysklogd/files/sysklogd | 22 ---- meta/recipes-extended/sysklogd/sysklogd.inc | 16 +-- meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb | 3 - meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb | 3 + 7 files changed, 8 insertions(+), 236 deletions(-) diff --git a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch b/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch deleted file mode 100644 index 9ba7ecc..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 84d70e63fc105e3713943ed8c0bdd4e31a698226 Mon Sep 17 -00:00:00 2001 From: Joachim Nilsson Date: Thu, 16 Jan -2020 22:16:51 +0100 Subject: [PATCH] Drop libcompat to simplify build deps -and really fix - -The original idea with libcompat was to keep as few objects as -possible for linking with libsyslog. That in turn to prevent -a user of libsyslog from suddenly also getting strong binding -to symbols like strlcpy() from libsyslog, rather than their C -library of choice. - -However, this caused strlcpy.c to be built as both .o and .lo -files, which in turn caused really bizarre build problems due -to bad DAG dependency. - -This patch drops libcompat and instead marks all replacement APIs -as weak symbols, which a C library can override. - -Signed-off-by: Joachim Nilsson - -Upstream-Status: Backport -[https://github.com/troglobit/sysklogd/commit/84d70e63fc105e3713943ed8c0bdd4e31a698226] - -Signed-off-by: Changqing Li ---- - lib/pidfile.c | 8 +++++++- - lib/utimensat.c | 10 ++++++++-- - src/Makefile.am | 7 +------ - 3 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/lib/pidfile.c b/lib/pidfile.c -index 81f2315..25b1c04 100644 ---- a/lib/pidfile.c -+++ b/lib/pidfile.c -@@ -31,6 +31,9 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - -+#include -+#ifndef HAVE_PIDFILE -+ - #define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ - #include /* utimensat() */ - #include /* utimensat() on *BSD */ -@@ -54,7 +57,7 @@ const char *__pidfile_path = RUNSTATEDIR; - const char *__pidfile_name = NULL; - - int --pidfile(const char *basename) -+__pidfile(const char *basename) - { - int save_errno; - int atexit_already; -@@ -127,6 +130,9 @@ pidfile(const char *basename) - return (0); - } - -+weak_alias(__pidfile, pidfile); -+#endif /* HAVE_PIDFILE */ -+ - static void - pidfile_cleanup(void) - { -diff --git a/lib/utimensat.c b/lib/utimensat.c -index edf7e10..b68ce0e 100644 ---- a/lib/utimensat.c -+++ b/lib/utimensat.c -@@ -15,7 +15,8 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - --#include "config.h" -+#include -+#ifndef HAVE_UTIMENSAT - - #include - #ifdef HAVE_FCNTL_H -@@ -23,7 +24,8 @@ - #endif - #include /* lutimes(), utimes(), utimensat() */ - --int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) -+int -+__utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) - { - int ret = -1; - struct timeval tv[2]; -@@ -45,3 +47,7 @@ int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int - - return ret; - } -+ -+weak_alias(__utimensat, utimensat); -+ -+#endif /* HAVE_UTIMENSAT */ -diff --git a/src/Makefile.am b/src/Makefile.am -index 6e2a51c..1db88d3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -19,7 +19,6 @@ - bin_PROGRAMS = - sbin_PROGRAMS = syslogd - lib_LTLIBRARIES = libsyslog.la --noinst_LTLIBRARIES = libcompat.la - - if ENABLE_KLOGD - sbin_PROGRAMS += klogd -@@ -48,10 +47,6 @@ logger_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - logger_LDADD = $(LIBS) $(LIBOBJS) - logger_LDADD += libsyslog.la - --# Convenience library for libsyslog instead of linking with $(LTLIBOBJS), --# which would pull in pidfile() and other (strong) symbols as well. --libcompat_la_SOURCES = ../lib/strlcpy.c ../lib/strlcat.c -- - pkgconfigdir = $(libdir)/pkgconfig - pkgincludedir = $(includedir)/syslog - pkgconfig_DATA = libsyslog.pc -@@ -59,4 +54,4 @@ pkginclude_HEADERS = syslog.h - libsyslog_la_SOURCES = syslog.c syslog.h compat.h - libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 --libsyslog_la_LIBADD = libcompat.la -+libsyslog_la_LIBADD = $(LTLIBOJBS) --- -2.7.4 - diff --git a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch b/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch deleted file mode 100644 index b2d45c0..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:27:28 -0800 -Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS - -The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and -are not defined in any standard. Using them fails build on musl -libc, its better to avoid them - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/syslog.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/syslog.h b/src/syslog.h -index 4fb7627..120a18f 100644 ---- a/src/syslog.h -+++ b/src/syslog.h -@@ -221,7 +221,9 @@ struct syslog_data { - .log_mask = 0xff, \ - } - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - void openlog (const char *, int, int); - void closelog (void); - -@@ -245,7 +247,9 @@ void syslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, ...); - void vsyslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, va_list); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #else /* !__KERNEL__ */ - --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch b/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch deleted file mode 100644 index 799a7a4..0000000 --- a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:31:04 -0800 -Subject: [PATCH 2/2] include sys/types.h for off_t - -Fixes -error: unknown type name 'off_t' - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/compat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/compat.h b/src/compat.h -index a867636..1ef1bf0 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - /* - * The following macro is used to remove const cast-away warnings --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd index 4a4ca8a..2a356a6 100755 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ b/meta/recipes-extended/sysklogd/files/sysklogd @@ -18,9 +18,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin pidfile_syslogd=/var/run/syslogd.pid -pidfile_klogd=/var/run/klogd.pid binpath_syslogd=/usr/sbin/syslogd -binpath_klogd=/usr/sbin/klogd test -x $binpath || exit 0 @@ -112,28 +110,16 @@ case "$1" in create_xconsole start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Starting kernel log daemon..." - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; stop) log_begin_msg "Stopping system log daemon..." start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Stopping kernel log daemon..." - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - log_end_msg $? ;; reload|force-reload) log_begin_msg "Reloading system log daemon..." start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; restart) log_begin_msg "Restarting system log daemon..." @@ -142,12 +128,6 @@ case "$1" in waitpid $pid start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; reload-or-restart) if running @@ -160,8 +140,6 @@ case "$1" in status) status syslogd RETVAL=$? - status klogd - rval=$? [ $RETVAL -eq 0 ] && exit $rval exit $RETVAL ;; diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 8618c9f..2e3d983 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -1,27 +1,21 @@ SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements two system log daemons: syslogd, klogd" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" SECTION = "base" -LICENSE = "GPLv2+ & BSD" -LICENSE_syslogd = "BSD" -LICENSE_klogd = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ - file://src/klogd.c;beginline=2;endline=19;md5=4f5591d04cccbeb0352758ed4a9d7213 \ " inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ - file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ - file://0002-include-sys-types.h-for-off_t.patch \ - file://0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch \ file://sysklogd \ " S = "${WORKDIR}/git" -EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --with-klogd --without-logger" +EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" do_install_append () { install -d ${D}${sysconfdir} @@ -31,7 +25,7 @@ do_install_append () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "syslogd.service klogd.service" +SYSTEMD_SERVICE_${PN} = "syslogd.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb b/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb deleted file mode 100644 index 21f750f..0000000 --- a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb new file mode 100644 index 0000000..eb6b4ef --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb @@ -0,0 +1,3 @@ +require sysklogd.inc + +SRCREV = "24dafe9a27ac959ebeb89acd3ebd3d62cca4b755" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:06 +0000 Subject: [oe-commits] [openembedded-core] 05/16: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.4DCB42334FE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1e3841ac965c560770c72398eba96e5447c7e84b 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 Mon Mar 2 16:17:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:15 +0000 Subject: [oe-commits] [openembedded-core] 14/16: wic/engine: lets display an error not a traceback In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.B51472334A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8706a82993e24a998a52243a4622e9c9b3e8bc96 Author: Armin Kuster AuthorDate: Sun Mar 1 21:39:56 2020 -0800 wic/engine: lets display an error not a traceback If the requested partition does not exist in this request "wic ls {path}:pnum" display a nice message not a trackback Also fix displaying the pnum and not "%s" Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 83c42c9..9ff4394 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -291,7 +291,7 @@ class Disk: def _get_part_image(self, pnum): if pnum not in self.partitions: - raise WicError("Partition %s is not in the image") + raise WicError("Partition %s is not in the image" % pnum) part = self.partitions[pnum] # check if fstype is supported for fstype in self.fstypes: @@ -314,6 +314,9 @@ class Disk: seek=self.partitions[pnum].start) def dir(self, pnum, path): + if pnum not in self.partitions: + raise WicError("Partition %s is not in the image" % pnum) + if self.partitions[pnum].fstype.startswith('ext'): return exec_cmd("{} {} -R 'ls -l {}'".format(self.debugfs, self._get_part_image(pnum), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:10 +0000 Subject: [oe-commits] [openembedded-core] 09/16: test In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.79FCD23350F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9925dafc28c2722b894fb0d7e785ec010d6dd419 Author: Richard Purdie AuthorDate: Mon Mar 2 15:52:25 2020 +0000 test Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..61f1931 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 156400c..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase): extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) ret2 = bitbake(test_recipe) found_warn2 = re.search(patt, ret2.output) extradebug += "\nFound %s\n\n" % str(found_warn2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:16 +0000 Subject: [oe-commits] [openembedded-core] 15/16: freetype: add pixmap to PACKAGECONFIG In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.BF2782334A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bcc2d9b784df02b4bf5998642e39a90d6198b048 Author: Matt Ranostay AuthorDate: Sun Mar 1 01:47:42 2020 +0200 freetype: add pixmap to PACKAGECONFIG Add pixmap to PACKAGECONFIG defaults to allow consumers to render color emojis without distro changes. Signed-off-by: Matt Ranostay Signed-off-by: Richard Purdie --- meta/recipes-graphics/freetype/freetype_2.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/freetype/freetype_2.10.1.bb b/meta/recipes-graphics/freetype/freetype_2.10.1.bb index b179a0e..d1c0930 100644 --- a/meta/recipes-graphics/freetype/freetype_2.10.1.bb +++ b/meta/recipes-graphics/freetype/freetype_2.10.1.bb @@ -27,7 +27,7 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix" CONFIGURE_SCRIPT = "${S}/configure" EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake" -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "zlib pixmap" PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" # harfbuzz results in a circular dependency so enabling is non-trivial -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:17 +0000 Subject: [oe-commits] [openembedded-core] 16/16: make: Use gziped sources In-Reply-To: <158316582195.10365.6237899360454524772@git.openembedded.org> References: <158316582195.10365.6237899360454524772@git.openembedded.org> Message-ID: <20200302161702.CD50E2334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ed094a84a570000372607da11ce7f05dfa8e389a Author: Adrian Bunk AuthorDate: Sun Mar 1 22:26:06 2020 +0200 make: Use gziped sources Building lzip-native just for being able to build make is not worth saving 1 MB download, especially since this creates a bottleneck for the whole build. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 2 +- meta/recipes-devtools/make/make_4.3.bb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 4142cf2..a0a72b6 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +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.lz \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.gz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index 70caf0a..cd0ecd4 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,7 +12,6 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" -SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" -SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" +SRC_URI[sha256sum] = "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" 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 Mar 2 16:17:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:30 +0000 Subject: [oe-commits] [bitbake] branch master updated (6a0b6dd -> e667591) Message-ID: <158316585040.11755.13210642964618201137@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 6a0b6dd lib/bb/utils.py: Preserve ownership of symlink new 47f0c84 fetch2: Limit shown checksums to sha256 new e667591 cooker: Reset parse status unpon clientComplete 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: lib/bb/cooker.py | 2 ++ lib/bb/fetch2/__init__.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:31 +0000 Subject: [oe-commits] [bitbake] 01/02: fetch2: Limit shown checksums to sha256 In-Reply-To: <158316585040.11755.13210642964618201137@git.openembedded.org> References: <158316585040.11755.13210642964618201137@git.openembedded.org> Message-ID: <20200302161730.8944C2334F4@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 47f0c849ed13ba554d9523b926d92405e8251702 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 Mon Mar 2 16:17:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:32 +0000 Subject: [oe-commits] [bitbake] 02/02: cooker: Reset parse status unpon clientComplete In-Reply-To: <158316585040.11755.13210642964618201137@git.openembedded.org> References: <158316585040.11755.13210642964618201137@git.openembedded.org> Message-ID: <20200302161730.951292334F6@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 e66759106e21da2b34a6cdec7aa681ad2204da54 Author: Richard Purdie AuthorDate: Sun Mar 1 10:54:55 2020 +0000 cooker: Reset parse status unpon clientComplete If for example a tinfoil connection edits the datastore, a subsequent connection can be "corrupted" by those changes. By setting the parse status of the caches as False at exit, the behaviour becomes the same as a newly setup server as a new data store is setup. This avoids problems in tests when BB_SERVER_TIMEOUT is set as the server is properly reset between connections. [YOCTO #13812] Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 2d937a4..bda6d1b 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1665,6 +1665,8 @@ class BBCooker: self.command.reset() self.databuilder.reset() self.data = self.databuilder.data + self.parsecache_valid = False + self.baseconfig_valid = False class CookerExit(bb.event.Event): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 16:17:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:35 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (3c5bca4 -> df2c9e0) Message-ID: <158316585519.12020.7275806398179228141@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 3c5bca4 cooker: Reset parse status unpon clientComplete discard a3e911e fetch2: Limit shown checksums to sha256 discard 77c6678 runqueue: Possible tid handling optimisation add 47f0c84 fetch2: Limit shown checksums to sha256 add e667591 cooker: Reset parse status unpon clientComplete new df2c9e0 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 (3c5bca4) \ N -- N -- N refs/heads/master-next (df2c9e0) 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 Mar 2 16:17:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 16:17:36 +0000 Subject: [oe-commits] [bitbake] 01/01: runqueue: Possible tid handling optimisation In-Reply-To: <158316585519.12020.7275806398179228141@git.openembedded.org> References: <158316585519.12020.7275806398179228141@git.openembedded.org> Message-ID: <20200302161735.538692334F4@git.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 df2c9e096836e91d2ba9c8815bb8590d846c9bc3 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. khem pushed a commit to branch master in repository meta-openembedded. The following commit(s) were added to refs/heads/master by this push: new 349dc74 Revert "python3-numpy: add from oe-core" 349dc74 is described below commit 349dc7483d2ee91532a31a9854f4a74b8b7a1ace Author: Khem Raj AuthorDate: Mon Mar 2 10:10:12 2020 -0800 Revert "python3-numpy: add from oe-core" This reverts commit 24d6260ea0ebe808939fdd0b396ef5f6cf355596. --- ...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 deletions(-) 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 deleted file mode 100644 index 98a9705..0000000 --- a/meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 deleted file mode 100644 index 9da6a2b..0000000 --- a/meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 8413434..0000000 --- a/meta-python/recipes-devtools/python-numpy/python-numpy.inc +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index d388e88..0000000 --- a/meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -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 Mon Mar 2 21:01:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:52 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (2497b28 -> 01d4043) Message-ID: <158318291247.18571.12726973576894298405@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 2497b28 ltp: Remove mips related open_posix_testsuite patch new c284573 sysklogd: upgrade 2.0.3 -> 2.1.1 new 7bd6646 wayland-protocols: upgrade 1.18 -> 1.20 new d9d3861 enchant2: upgrade 2.2.7 -> 2.2.8 new fc2479d libsoup-2.4: upgrade 2.68.3 -> 2.68.4 new 713837a stress-ng: upgrade 0.11.00 -> 0.11.01 new 15d1722 wic/engine: lets display an error not a traceback new 01d4043 freetype: add pixmap to PACKAGECONFIG 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: .../{stress-ng_0.11.00.bb => stress-ng_0.11.01.bb} | 4 +- ...pat-to-simplify-build-deps-and-really-fix.patch | 127 --------------------- .../0001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 ------- .../files/0002-include-sys-types.h-for-off_t.patch | 29 ----- meta/recipes-extended/sysklogd/files/sysklogd | 22 ---- meta/recipes-extended/sysklogd/sysklogd.inc | 16 +-- meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb | 3 - meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb | 3 + meta/recipes-graphics/freetype/freetype_2.10.1.bb | 2 +- ...protocols_1.18.bb => wayland-protocols_1.20.bb} | 4 +- .../{enchant2_2.2.7.bb => enchant2_2.2.8.bb} | 4 +- ...libsoup-2.4_2.68.3.bb => libsoup-2.4_2.68.4.bb} | 4 +- scripts/lib/wic/engine.py | 5 +- 13 files changed, 21 insertions(+), 246 deletions(-) rename meta/recipes-extended/stress-ng/{stress-ng_0.11.00.bb => stress-ng_0.11.01.bb} (83%) delete mode 100644 meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch delete mode 100644 meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch delete mode 100644 meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch delete mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb create mode 100644 meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb rename meta/recipes-graphics/wayland/{wayland-protocols_1.18.bb => wayland-protocols_1.20.bb} (86%) rename meta/recipes-support/enchant/{enchant2_2.2.7.bb => enchant2_2.2.8.bb} (85%) rename meta/recipes-support/libsoup/{libsoup-2.4_2.68.3.bb => libsoup-2.4_2.68.4.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:01:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:54 +0000 Subject: [oe-commits] [openembedded-core] 02/07: wayland-protocols: upgrade 1.18 -> 1.20 In-Reply-To: <158318291247.18571.12726973576894298405@git.openembedded.org> References: <158318291247.18571.12726973576894298405@git.openembedded.org> Message-ID: <20200302210152.F2AC82334FE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7bd664600cce0fba4e256c690078ef69e39be299 Author: Denys Dmytriyenko AuthorDate: Sun Mar 1 19:05:10 2020 -0500 wayland-protocols: upgrade 1.18 -> 1.20 wayland-protocols 1.20 is now available. This release is a brown paper bag release adding the missing README.md, GOVERNANCE.md and MEMBERS.md files to the tarball. Distributions that distribute one or more of these files should ignore the 1.19 release and move directly to 1.20. https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- .../wayland/{wayland-protocols_1.18.bb => wayland-protocols_1.20.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.18.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb similarity index 86% rename from meta/recipes-graphics/wayland/wayland-protocols_1.18.bb rename to meta/recipes-graphics/wayland/wayland-protocols_1.20.bb index c8bec66..3fb78f6 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.18.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.20.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "af38f22d8e233c2f2e00ddc8dcc94694" -SRC_URI[sha256sum] = "3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3" +SRC_URI[md5sum] = "b0836533a3f2dc6585b1dae00341157f" +SRC_URI[sha256sum] = "9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7" 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 Mon Mar 2 21:01:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:55 +0000 Subject: [oe-commits] [openembedded-core] 03/07: enchant2: upgrade 2.2.7 -> 2.2.8 In-Reply-To: <158318291247.18571.12726973576894298405@git.openembedded.org> References: <158318291247.18571.12726973576894298405@git.openembedded.org> Message-ID: <20200302210153.0F10D23350B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d9d386122f70b6692f614e526fe3168d674533bf Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:52 2020 +0800 enchant2: upgrade 2.2.7 -> 2.2.8 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/enchant/{enchant2_2.2.7.bb => enchant2_2.2.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/enchant/enchant2_2.2.7.bb b/meta/recipes-support/enchant/enchant2_2.2.8.bb similarity index 85% rename from meta/recipes-support/enchant/enchant2_2.2.7.bb rename to meta/recipes-support/enchant/enchant2_2.2.8.bb index 03db5c7..4ddbe55 100644 --- a/meta/recipes-support/enchant/enchant2_2.2.7.bb +++ b/meta/recipes-support/enchant/enchant2_2.2.8.bb @@ -9,8 +9,8 @@ DEPENDS = "glib-2.0" inherit autotools pkgconfig SRC_URI = "https://github.com/AbiWord/enchant/releases/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[md5sum] = "8a6ea1bb143c64e0edf5e49c7e7cb984" -SRC_URI[sha256sum] = "1b22976135812b35cb5b8d21a53ad11d5e7c1426c93f51e7a314a2a42cab3a09" +SRC_URI[md5sum] = "c7b9d6a392ecb8758e499f783e8dc883" +SRC_URI[sha256sum] = "c7b5e2853f0dd0b1aafea2f9e071941affeec3a76df8e3f6d67a718c89293555" UPSTREAM_CHECK_URI = "https://github.com/AbiWord/enchant/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:01:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:56 +0000 Subject: [oe-commits] [openembedded-core] 04/07: libsoup-2.4: upgrade 2.68.3 -> 2.68.4 In-Reply-To: <158318291247.18571.12726973576894298405@git.openembedded.org> References: <158318291247.18571.12726973576894298405@git.openembedded.org> Message-ID: <20200302210153.1CF8D23350C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit fc2479d488974c4af154f215f9de7e0e5b3b3c71 Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:53 2020 +0800 libsoup-2.4: upgrade 2.68.3 -> 2.68.4 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../libsoup/{libsoup-2.4_2.68.3.bb => libsoup-2.4_2.68.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb similarity index 91% rename from meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb rename to meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb index e8bc7d6..6731b33 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.68.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.68.4.bb @@ -10,8 +10,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native libpsl" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[md5sum] = "29ee2ee7017945b64ede063b1396011c" -SRC_URI[sha256sum] = "534bb08e35b0ff3702f3adfde87d3441e27c12f9f5ec351f056fe04cba02bafb" +SRC_URI[md5sum] = "603f3a945cd6ecc1fda644d7853b3b81" +SRC_URI[sha256sum] = "2d50b12922cc516ab6a7c35844d42f9c8a331668bbdf139232743d82582b3294" CVE_PRODUCT = "libsoup" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:01:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:53 +0000 Subject: [oe-commits] [openembedded-core] 01/07: sysklogd: upgrade 2.0.3 -> 2.1.1 In-Reply-To: <158318291247.18571.12726973576894298405@git.openembedded.org> References: <158318291247.18571.12726973576894298405@git.openembedded.org> Message-ID: <20200302210152.E54F72334F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c28457322eb6a141d0e8c66fc1c7eee681c0fe88 Author: Pierre-Jean Texier AuthorDate: Sun Mar 1 14:14:28 2020 +0100 sysklogd: upgrade 2.0.3 -> 2.1.1 License-Update: Relicensed under the BSD-3-Clause license since v2.1 Remove patches applied upstream. Since version v2.1, klogd was removed from the sysklogd project since syslogd performs logging of kernel messages. So, this patch remove klogd support. Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- ...pat-to-simplify-build-deps-and-really-fix.patch | 127 --------------------- .../0001-Remove-__BEGIN_DECLS-__END_DECLS.patch | 44 ------- .../files/0002-include-sys-types.h-for-off_t.patch | 29 ----- meta/recipes-extended/sysklogd/files/sysklogd | 22 ---- meta/recipes-extended/sysklogd/sysklogd.inc | 16 +-- meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb | 3 - meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb | 3 + 7 files changed, 8 insertions(+), 236 deletions(-) diff --git a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch b/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch deleted file mode 100644 index 9ba7ecc..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 84d70e63fc105e3713943ed8c0bdd4e31a698226 Mon Sep 17 -00:00:00 2001 From: Joachim Nilsson Date: Thu, 16 Jan -2020 22:16:51 +0100 Subject: [PATCH] Drop libcompat to simplify build deps -and really fix - -The original idea with libcompat was to keep as few objects as -possible for linking with libsyslog. That in turn to prevent -a user of libsyslog from suddenly also getting strong binding -to symbols like strlcpy() from libsyslog, rather than their C -library of choice. - -However, this caused strlcpy.c to be built as both .o and .lo -files, which in turn caused really bizarre build problems due -to bad DAG dependency. - -This patch drops libcompat and instead marks all replacement APIs -as weak symbols, which a C library can override. - -Signed-off-by: Joachim Nilsson - -Upstream-Status: Backport -[https://github.com/troglobit/sysklogd/commit/84d70e63fc105e3713943ed8c0bdd4e31a698226] - -Signed-off-by: Changqing Li ---- - lib/pidfile.c | 8 +++++++- - lib/utimensat.c | 10 ++++++++-- - src/Makefile.am | 7 +------ - 3 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/lib/pidfile.c b/lib/pidfile.c -index 81f2315..25b1c04 100644 ---- a/lib/pidfile.c -+++ b/lib/pidfile.c -@@ -31,6 +31,9 @@ - * POSSIBILITY OF SUCH DAMAGE. - */ - -+#include -+#ifndef HAVE_PIDFILE -+ - #define _GNU_SOURCE /* Needed with GLIBC to get asprintf() */ - #include /* utimensat() */ - #include /* utimensat() on *BSD */ -@@ -54,7 +57,7 @@ const char *__pidfile_path = RUNSTATEDIR; - const char *__pidfile_name = NULL; - - int --pidfile(const char *basename) -+__pidfile(const char *basename) - { - int save_errno; - int atexit_already; -@@ -127,6 +130,9 @@ pidfile(const char *basename) - return (0); - } - -+weak_alias(__pidfile, pidfile); -+#endif /* HAVE_PIDFILE */ -+ - static void - pidfile_cleanup(void) - { -diff --git a/lib/utimensat.c b/lib/utimensat.c -index edf7e10..b68ce0e 100644 ---- a/lib/utimensat.c -+++ b/lib/utimensat.c -@@ -15,7 +15,8 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - --#include "config.h" -+#include -+#ifndef HAVE_UTIMENSAT - - #include - #ifdef HAVE_FCNTL_H -@@ -23,7 +24,8 @@ - #endif - #include /* lutimes(), utimes(), utimensat() */ - --int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) -+int -+__utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int flags) - { - int ret = -1; - struct timeval tv[2]; -@@ -45,3 +47,7 @@ int utimensat(int dirfd, const char *pathname, const struct timespec ts[2], int - - return ret; - } -+ -+weak_alias(__utimensat, utimensat); -+ -+#endif /* HAVE_UTIMENSAT */ -diff --git a/src/Makefile.am b/src/Makefile.am -index 6e2a51c..1db88d3 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -19,7 +19,6 @@ - bin_PROGRAMS = - sbin_PROGRAMS = syslogd - lib_LTLIBRARIES = libsyslog.la --noinst_LTLIBRARIES = libcompat.la - - if ENABLE_KLOGD - sbin_PROGRAMS += klogd -@@ -48,10 +47,6 @@ logger_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - logger_LDADD = $(LIBS) $(LIBOBJS) - logger_LDADD += libsyslog.la - --# Convenience library for libsyslog instead of linking with $(LTLIBOBJS), --# which would pull in pidfile() and other (strong) symbols as well. --libcompat_la_SOURCES = ../lib/strlcpy.c ../lib/strlcat.c -- - pkgconfigdir = $(libdir)/pkgconfig - pkgincludedir = $(includedir)/syslog - pkgconfig_DATA = libsyslog.pc -@@ -59,4 +54,4 @@ pkginclude_HEADERS = syslog.h - libsyslog_la_SOURCES = syslog.c syslog.h compat.h - libsyslog_la_CPPFLAGS = $(AM_CPPFLAGS) -D_XOPEN_SOURCE=600 - libsyslog_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 --libsyslog_la_LIBADD = libcompat.la -+libsyslog_la_LIBADD = $(LTLIBOJBS) --- -2.7.4 - diff --git a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch b/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch deleted file mode 100644 index b2d45c0..0000000 --- a/meta/recipes-extended/sysklogd/files/0001-Remove-__BEGIN_DECLS-__END_DECLS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8c7995ac8da99eed55bf5410c558b1f0a74998d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:27:28 -0800 -Subject: [PATCH 1/2] Remove __BEGIN_DECLS/__END_DECLS - -The __BEGIN_DECLS and __END_DECLS are internal identifiers in glibc and -are not defined in any standard. Using them fails build on musl -libc, its better to avoid them - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/syslog.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/syslog.h b/src/syslog.h -index 4fb7627..120a18f 100644 ---- a/src/syslog.h -+++ b/src/syslog.h -@@ -221,7 +221,9 @@ struct syslog_data { - .log_mask = 0xff, \ - } - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - void openlog (const char *, int, int); - void closelog (void); - -@@ -245,7 +247,9 @@ void syslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, ...); - void vsyslogp_r (int, struct syslog_data *, const char *, const char *, - const char *, va_list); --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #else /* !__KERNEL__ */ - --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch b/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch deleted file mode 100644 index 799a7a4..0000000 --- a/meta/recipes-extended/sysklogd/files/0002-include-sys-types.h-for-off_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10cff4ba2d09b30f8f1967f910e8ab08447a8add Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 7 Dec 2019 10:31:04 -0800 -Subject: [PATCH 2/2] include sys/types.h for off_t - -Fixes -error: unknown type name 'off_t' - -Upstream-Status: Submitted [https://github.com/troglobit/sysklogd/pull/10] -Signed-off-by: Khem Raj ---- - src/compat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/compat.h b/src/compat.h -index a867636..1ef1bf0 100644 ---- a/src/compat.h -+++ b/src/compat.h -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - /* - * The following macro is used to remove const cast-away warnings --- -2.24.0 - diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd index 4a4ca8a..2a356a6 100755 --- a/meta/recipes-extended/sysklogd/files/sysklogd +++ b/meta/recipes-extended/sysklogd/files/sysklogd @@ -18,9 +18,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin pidfile_syslogd=/var/run/syslogd.pid -pidfile_klogd=/var/run/klogd.pid binpath_syslogd=/usr/sbin/syslogd -binpath_klogd=/usr/sbin/klogd test -x $binpath || exit 0 @@ -112,28 +110,16 @@ case "$1" in create_xconsole start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Starting kernel log daemon..." - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; stop) log_begin_msg "Stopping system log daemon..." start-stop-daemon --stop --quiet --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Stopping kernel log daemon..." - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - log_end_msg $? ;; reload|force-reload) log_begin_msg "Reloading system log daemon..." start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile_syslogd --name syslogd log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; restart) log_begin_msg "Restarting system log daemon..." @@ -142,12 +128,6 @@ case "$1" in waitpid $pid start-stop-daemon --start --quiet --pidfile $pidfile_syslogd --name syslogd --startas $binpath_syslogd -- $SYSLOGD log_end_msg $? - log_begin_msg "Reloading kernel log daemon..." - pid=`cat $pidfile_klogd 2> /dev/null` - start-stop-daemon --stop --quiet --retry 3 --exec $binpath_klogd --pidfile $pidfile_klogd - waitpid $pid - start-stop-daemon --start --quiet --pidfile $pidfile_klogd --name klogd --startas $binpath_klogd -- $KLOGD - log_end_msg $? ;; reload-or-restart) if running @@ -160,8 +140,6 @@ case "$1" in status) status syslogd RETVAL=$? - status klogd - rval=$? [ $RETVAL -eq 0 ] && exit $rval exit $RETVAL ;; diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 8618c9f..2e3d983 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -1,27 +1,21 @@ SUMMARY = "System Log Daemons" -DESCRIPTION = "The sysklogd package implements two system log daemons: syslogd, klogd" +DESCRIPTION = "The sysklogd package implements system log daemons: syslogd" HOMEPAGE = "http://www.infodrom.org/projects/sysklogd/" SECTION = "base" -LICENSE = "GPLv2+ & BSD" -LICENSE_syslogd = "BSD" -LICENSE_klogd = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b4be4b2549338526758ef479c040943 \ file://src/syslogd.c;beginline=2;endline=15;md5=a880fecbc04503f071c494a9c0dd4f97 \ - file://src/klogd.c;beginline=2;endline=19;md5=4f5591d04cccbeb0352758ed4a9d7213 \ " inherit update-rc.d update-alternatives systemd autotools SRC_URI = "git://github.com/troglobit/sysklogd.git;nobranch=1 \ - file://0001-Remove-__BEGIN_DECLS-__END_DECLS.patch \ - file://0002-include-sys-types.h-for-off_t.patch \ - file://0001-Drop-libcompat-to-simplify-build-deps-and-really-fix.patch \ file://sysklogd \ " S = "${WORKDIR}/git" -EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --with-klogd --without-logger" +EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger" do_install_append () { install -d ${D}${sysconfdir} @@ -31,7 +25,7 @@ do_install_append () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "syslogd.service klogd.service" +SYSTEMD_SERVICE_${PN} = "syslogd.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_NAME = "syslog" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb b/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb deleted file mode 100644 index 21f750f..0000000 --- a/meta/recipes-extended/sysklogd/sysklogd_2.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require sysklogd.inc - -SRCREV = "ad686ca86d977f9eac4cd0a0d0e9a5964a4621d3" diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb new file mode 100644 index 0000000..eb6b4ef --- /dev/null +++ b/meta/recipes-extended/sysklogd/sysklogd_2.1.1.bb @@ -0,0 +1,3 @@ +require sysklogd.inc + +SRCREV = "24dafe9a27ac959ebeb89acd3ebd3d62cca4b755" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:01:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:57 +0000 Subject: [oe-commits] [openembedded-core] 05/07: stress-ng: upgrade 0.11.00 -> 0.11.01 In-Reply-To: <158318291247.18571.12726973576894298405@git.openembedded.org> References: <158318291247.18571.12726973576894298405@git.openembedded.org> Message-ID: <20200302210153.2CAAC23350E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 713837a0a2d51b3a9aaf3d5aa053f9503f9c362d Author: Anuj Mittal AuthorDate: Mon Mar 2 12:45:54 2020 +0800 stress-ng: upgrade 0.11.00 -> 0.11.01 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../stress-ng/{stress-ng_0.11.00.bb => stress-ng_0.11.01.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb similarity index 83% rename from meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb index c8471eb..3486be1 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.11.00.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.01.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] = "781f8a0f8509a01793d815210086e78a" -SRC_URI[sha256sum] = "a41a6a4a7ea4e50aab7331e5594af7d1b3b6e5815751d137a78a6e166295294e" +SRC_URI[md5sum] = "a558fc7fb9d0a851afe6de09080b5401" +SRC_URI[sha256sum] = "9fe19548c87aa1a1b9b2be3b359ec2621b88bcb16998b77527549a7736f65494" 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 Mar 2 21:01:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:58 +0000 Subject: [oe-commits] [openembedded-core] 06/07: wic/engine: lets display an error not a traceback In-Reply-To: <158318291247.18571.12726973576894298405@git.openembedded.org> References: <158318291247.18571.12726973576894298405@git.openembedded.org> Message-ID: <20200302210153.3F43F23350F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 15d1722950a22649905cf8a5789d3cfe48a2a892 Author: Armin Kuster AuthorDate: Sun Mar 1 21:39:56 2020 -0800 wic/engine: lets display an error not a traceback If the requested partition does not exist in this request "wic ls {path}:pnum" display a nice message not a trackback Also fix displaying the pnum and not "%s" Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 83c42c9..9ff4394 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -291,7 +291,7 @@ class Disk: def _get_part_image(self, pnum): if pnum not in self.partitions: - raise WicError("Partition %s is not in the image") + raise WicError("Partition %s is not in the image" % pnum) part = self.partitions[pnum] # check if fstype is supported for fstype in self.fstypes: @@ -314,6 +314,9 @@ class Disk: seek=self.partitions[pnum].start) def dir(self, pnum, path): + if pnum not in self.partitions: + raise WicError("Partition %s is not in the image" % pnum) + if self.partitions[pnum].fstype.startswith('ext'): return exec_cmd("{} {} -R 'ls -l {}'".format(self.debugfs, self._get_part_image(pnum), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:01:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:01:59 +0000 Subject: [oe-commits] [openembedded-core] 07/07: freetype: add pixmap to PACKAGECONFIG In-Reply-To: <158318291247.18571.12726973576894298405@git.openembedded.org> References: <158318291247.18571.12726973576894298405@git.openembedded.org> Message-ID: <20200302210153.4EF7A233510@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 01d404302238b0ad570192118617083440d1d50a Author: Matt Ranostay AuthorDate: Sun Mar 1 01:47:42 2020 +0200 freetype: add pixmap to PACKAGECONFIG Add pixmap to PACKAGECONFIG defaults to allow consumers to render color emojis without distro changes. Signed-off-by: Matt Ranostay Signed-off-by: Richard Purdie --- meta/recipes-graphics/freetype/freetype_2.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/freetype/freetype_2.10.1.bb b/meta/recipes-graphics/freetype/freetype_2.10.1.bb index b179a0e..d1c0930 100644 --- a/meta/recipes-graphics/freetype/freetype_2.10.1.bb +++ b/meta/recipes-graphics/freetype/freetype_2.10.1.bb @@ -27,7 +27,7 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix" CONFIGURE_SCRIPT = "${S}/configure" EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake" -PACKAGECONFIG ??= "zlib" +PACKAGECONFIG ??= "zlib pixmap" PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" # harfbuzz results in a circular dependency so enabling is non-trivial -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:02:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:07 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ed094a8 -> dafd288) Message-ID: <158318292749.19203.11195822622661758051@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 ed094a8 make: Use gziped sources discard bcc2d9b freetype: add pixmap to PACKAGECONFIG discard 8706a82 wic/engine: lets display an error not a traceback discard 3aa50bb stress-ng: upgrade 0.11.00 -> 0.11.01 discard e973841 libsoup-2.4: upgrade 2.68.3 -> 2.68.4 discard 50ea066 enchant2: upgrade 2.2.7 -> 2.2.8 discard 2c463b6 wayland-protocols: upgrade 1.18 -> 1.20 discard 9925daf test discard 0dff777 sysklogd: upgrade 2.0.3 -> 2.1.1 discard d4f6dea qemuarm64: Add -machine gic-version=3 with kvm discard 40b3c2d HACK: extra debug discard 1e3841a rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 163b9cc sstatesig: Log timestamps for hashequiv in reprodubile builds discard b5f6ade HACK: signing: Add extra test debug discard ff0d554 glew/curl: specify exclusive package configs discard 2c9d6fe base.bbclass: extend PACKAGECONFIG for conflict package configs add c284573 sysklogd: upgrade 2.0.3 -> 2.1.1 add 7bd6646 wayland-protocols: upgrade 1.18 -> 1.20 add d9d3861 enchant2: upgrade 2.2.7 -> 2.2.8 add fc2479d libsoup-2.4: upgrade 2.68.3 -> 2.68.4 add 713837a stress-ng: upgrade 0.11.00 -> 0.11.01 add 15d1722 wic/engine: lets display an error not a traceback add 01d4043 freetype: add pixmap to PACKAGECONFIG new c8f59b5 base.bbclass: extend PACKAGECONFIG for conflict package configs new d4ab45a glew/curl: specify exclusive package configs new a91f531 HACK: signing: Add extra test debug new d59019e sstatesig: Log timestamps for hashequiv in reprodubile builds new fa19580 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 390377d HACK: extra debug new 4ae0b52 qemuarm64: Add -machine gic-version=3 with kvm new de98c14 test new e13de7f make: Use gziped sources new dafd288 psplash: update to latest git revision and clean up 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 (ed094a8) \ N -- N -- N refs/heads/master-next (dafd288) 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-core/psplash/files/psplash-start.service | 1 + meta/recipes-core/psplash/psplash_git.bb | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:02:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:08 +0000 Subject: [oe-commits] [openembedded-core] 01/10: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210207.BC7C92334F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c8f59b5e1c924c640be138e57ab702bb8814a8cc 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 Mar 2 21:02:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:10 +0000 Subject: [oe-commits] [openembedded-core] 03/10: HACK: signing: Add extra test debug In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210207.DA0B323350B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a91f531e008d0f20f6d075d3e0bf61c966c3448c 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 Mar 2 21:02:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:09 +0000 Subject: [oe-commits] [openembedded-core] 02/10: glew/curl: specify exclusive package configs In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210207.CB8A42334FE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d4ab45aca737fc2357c049a8a696840fe37f7a0e 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 Mar 2 21:02:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:11 +0000 Subject: [oe-commits] [openembedded-core] 04/10: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210207.EB67C23350C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d59019e12af53d5d41b9303ebdbfc1dd0e13181c 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 Mon Mar 2 21:02:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:13 +0000 Subject: [oe-commits] [openembedded-core] 06/10: HACK: extra debug In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210208.1BD0A23350F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 390377d4bf46163abb7fd6ce81080ce6e8ba91ad 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 Mon Mar 2 21:02:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:14 +0000 Subject: [oe-commits] [openembedded-core] 07/10: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210208.2C56A233510@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4ae0b523e18de9d36858da79a4ab84c06babcebd 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 Mon Mar 2 21:02:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:16 +0000 Subject: [oe-commits] [openembedded-core] 09/10: make: Use gziped sources In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210208.4EA122334F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e13de7f2fe3f7ef7e647fe9874297e7266519fb8 Author: Adrian Bunk AuthorDate: Sun Mar 1 22:26:06 2020 +0200 make: Use gziped sources Building lzip-native just for being able to build make is not worth saving 1 MB download, especially since this creates a bottleneck for the whole build. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 2 +- meta/recipes-devtools/make/make_4.3.bb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 4142cf2..a0a72b6 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +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.lz \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.gz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index 70caf0a..cd0ecd4 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,7 +12,6 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" -SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" -SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" +SRC_URI[sha256sum] = "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" 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 Mar 2 21:02:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:12 +0000 Subject: [oe-commits] [openembedded-core] 05/10: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210208.0988223350E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fa1958088cdacb00ef7efa67af49c79e3226fadc 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 Mon Mar 2 21:02:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:15 +0000 Subject: [oe-commits] [openembedded-core] 08/10: test In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210208.3ECA8233511@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit de98c14ca90e0b8110c392df395cd60bd5bfa431 Author: Richard Purdie AuthorDate: Mon Mar 2 15:52:25 2020 +0000 test Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..61f1931 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 156400c..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase): extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) ret2 = bitbake(test_recipe) found_warn2 = re.search(patt, ret2.output) extradebug += "\nFound %s\n\n" % str(found_warn2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:02:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:02:17 +0000 Subject: [oe-commits] [openembedded-core] 10/10: psplash: update to latest git revision and clean up In-Reply-To: <158318292749.19203.11195822622661758051@git.openembedded.org> References: <158318292749.19203.11195822622661758051@git.openembedded.org> Message-ID: <20200302210208.6267F2334F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dafd288faa58d4bd5718872501b8d8dee33f7f71 Author: Scott Murray AuthorDate: Mon Mar 2 14:14:26 2020 -0500 psplash: update to latest git revision and clean up Update SRCREV to pick up: c359546 Fix psplash-systemd failures 3c0a4f3 Remove generated psplash-poky-img.h Also: * set the unit type in psplash-start.service to "notify" to complete the psplash-systemd race fix * remove the rest of the now unnecessary has_png logic bits * change the generated image header destination to B instead of S since that now works after the recent makefile changes, and will avoid unnecessarily polluting the source tree Signed-off-by: Scott Murray Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-start.service | 1 + meta/recipes-core/psplash/psplash_git.bb | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index af9d5d6..a8c97c7 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -4,6 +4,7 @@ DefaultDependencies=no RequiresMountsFor=/run [Service] +Type=notify ExecStart=/usr/bin/psplash [Install] diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 875adb1..22c71f0 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" DEPENDS = "gdk-pixbuf-native" -SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" +SRCREV = "0a902f7cd875ccf018456451be369f05fa55f962" PV = "0.1+git${SRCPV}" PR = "r15" @@ -24,7 +24,6 @@ python __anonymous() { splashfiles = d.getVar('SPLASH_IMAGES').split() pkgs = [] localpaths = [] - haspng = False for uri in splashfiles: fetcher = bb.fetch2.Fetch([uri], d) flocal = os.path.basename(fetcher.localpath(uri)) @@ -42,8 +41,6 @@ python __anonymous() { bb.fatal("The output name '%s' derived from the URI %s is not valid, please specify the outsuffix parameter" % (outname, uri)) else: pkgs.append(outname) - if flocal.endswith(".png"): - haspng = True localpaths.append(flocal) # Set these so that we have less work to do in do_compile and do_install_append @@ -82,7 +79,7 @@ python do_compile () { # Build a separate executable for each splash image workdir = d.getVar('WORKDIR') convertscript = "%s/make-image-header.sh" % d.getVar('S') - destfile = "%s/psplash-poky-img.h" % d.getVar('S') + destfile = "%s/psplash-poky-img.h" % d.getVar('B') localfiles = d.getVar('SPLASH_LOCALPATHS').split() outputfiles = d.getVar('SPLASH_INSTALL').split() for localfile, outputfile in zip(localfiles, outputfiles): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 21:10:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:10:22 +0000 Subject: [oe-commits] [openembedded-core] annotated tag uninative-2.8 created (now da1b921) Message-ID: <158318342274.4429.3828633087699940780@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag uninative-2.8 in repository openembedded-core. at da1b921 (tag) tagging a5beb977a57e7b1941a2a1c5c130881b74da3b6b (commit) replaces yocto-3.0 by Michael Halstead on Mon Mar 2 13:08:59 2020 -0800 - Log ----------------------------------------------------------------- Tagging uninative 2.8 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5ddesACgkQXGgH0cJ5 dnM5GAf/YlzOs1wizGAuI1n1wFhkAfW1urwKJCOkJ2HArgYPxODN0xJxidvrw4P8 elidaLaTZ0Dob063xwQPKD8O2h1yoD1wMU6fRrZkCn1PWPqBT5aYp6RDff767Raj zRU5S5tQ447+8wQeXnBlLr+ITPKIrjzJvUP8SAO9T4BgFQShiKkAAIbQKpufKxDE fvtq8C7pHRkKDrPfkXZIRWCDauxCD3FjACynr5npn5f1SKtEzlrSDMIOleD+4fBy YESjnqc/Wa/0ytKmaFkTISEBBIMJ5RVMXtXVVUZlbwEUvmBYpsSocLPLDiQ1n2av vuWPeFrhpgSoFFIvfFVrDmW3XpdKJw== =sqkC -----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 Mon Mar 2 21:48:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:48:27 +0000 Subject: [oe-commits] [openembedded-core] annotated tag 2019-04.3-warrior created (now 187a4b8) Message-ID: <158318570781.18990.9815657761678655500@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag 2019-04.3-warrior in repository openembedded-core. at 187a4b8 (tag) tagging ca019eec1304ca2a400ea744c0eaafe0a766d5d1 (commit) replaces 2019-04.2-warrior by Vineela Tummalapalli on Mon Mar 2 13:46:17 2020 -0800 - Log ----------------------------------------------------------------- Tagging for 2019-04.3-warrior (yocto-2.7.3) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5dfqkACgkQXGgH0cJ5 dnMloAf7BQXcHPl83YOXD54ByhkHL5VT16JjnF9U8bemoCl47KdB5oTAeZ16gtF5 jPwfrgKlwLYjILJgfKmBo5CMLXKesl65m7GDhiXSum847uHy0WryA/QBQsHG/9XI 5UKqJrZKPZeXmOd1RifC+LIrf72y2WKnL63okWTLRUz/dy1j23lC7FzAZh2K6MrJ fBJ/5tEvDdKoXmlXiEsmpVXCxMOmJ/xhR3uGlwDiH2LGWQaC3u8R2dyjbrwgYnjG a/yCn2opHRNd81i/J4Tfzzrt7QvuVhwX9QdfLE79y25j/ZnJiQu9B5CvpA9pJVgA p+adHaIhVoYI8fC4hw7Pm0hfNxOiLQ== =C3fl -----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 Mon Mar 2 21:51:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:51:40 +0000 Subject: [oe-commits] [bitbake] annotated tag 1.42.3 created (now 0e4b3e2) Message-ID: <158318590037.19773.4717944434489381406@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag 1.42.3 in repository bitbake. at 0e4b3e2 (tag) tagging d411b097d810c386d35dc561f8812bb3f35c9a36 (commit) replaces yocto-2.7.2 by Vineela Tummalapalli on Mon Mar 2 13:51:22 2020 -0800 - Log ----------------------------------------------------------------- Tagging for 2019-04.3-warrior (yocto-2.7.3) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5df9oACgkQXGgH0cJ5 dnNHzggAuCtFjJ2ymMSDwgkQ1pZRkD8IJoT0+TB5aYaxFtXg1/0afEqhw1xHfQZ5 60I3MDa63sBciYyldQ6nVLtffpmyBWYYdFMvalR7lVD7empYoSRz7dewyLLbn+Qk 5DZxFVujLc8qnAKKsOv+YbKdgHJ34HHWdybSqHK2STC/uTs7nrzOls4v9JBX4pw4 cW9nvfmFbHOikFxFtx6Xn79TlVsF1XHVNCkO/P4mR81yT86cfQ1Q02Z5qgOL8kC7 5bntE+KINDj1yMxCWxEn6hcbtEdRqNjSgGfIb03v93WpLD8PQoIn00B8uNSYAGvN /syHCwL6AYAR3HkNOUhda2Xa5cUEBw== =Eipw -----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 Mon Mar 2 21:51:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 21:51:41 +0000 Subject: [oe-commits] [bitbake] annotated tag 2019-04.3-warrior created (now c3daee9) Message-ID: <158318590035.19773.15505954603196167915@git.openembedded.org> This is an automated email from the git hooks/post-receive script. michael_halstead pushed a change to annotated tag 2019-04.3-warrior in repository bitbake. at c3daee9 (tag) tagging d411b097d810c386d35dc561f8812bb3f35c9a36 (commit) replaces yocto-2.7.2 by Vineela Tummalapalli on Mon Mar 2 13:50:14 2020 -0800 - Log ----------------------------------------------------------------- Tagging for 2019-04.3-warrior (yocto-2.7.3) -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEETAATlWjYlkbLPLeFXGgH0cJ5dnMFAl5df5YACgkQXGgH0cJ5 dnNntQf/RTMmmJK9TI78lTB7UOZKPfjVbj6/qr4fdBZvy9yDWUhjk+VCClZavB8V WXUCSnAxaVhZVVwMb0s7XSJqpVQpF39XU74XOs9XwnyZ0d+pa/5qlMwB97FcsJgk dDO1O0F0d5liL7X1K/kKYo/X5bPP/ZvFwo0MYucND+tc9d82JgM8oGbkstMhFKco VtdmOtiwyEPmsuoFDtIqoONmmA8iRusU6NDYOknWeUjueOhK3AwBYsvVhM47rWHh Ntsl1dZigEuitsPWSI01N9vEyLHehejyq8H+xCLRSqA5TJRBcc0HDsXy7l/kzPHw 5hJzG2Rc5zSb5a673rUDJFqnhvZBmw== =rABj -----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 Mon Mar 2 22:08:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 22:08:13 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (72e7786 -> 59f4756) Message-ID: <158318689334.4314.3089734313064599970@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 72e7786 cups-filters: upgrade 1.26.2 -> 1.27.2 add 349dc74 Revert "python3-numpy: add from oe-core" new 59f4756 mosquitto: upgrade 1.6.8 -> 1.6.9 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: .../mosquitto/files/1568.patch | 67 --------------------- .../mosquitto/files/1569.patch | 25 -------- .../mosquitto/files/1570.patch | 39 ------------ .../{mosquitto_1.6.8.bb => mosquitto_1.6.9.bb} | 7 +-- ...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 - 8 files changed, 2 insertions(+), 293 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1568.patch delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1569.patch delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1570.patch rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_1.6.8.bb => mosquitto_1.6.9.bb} (92%) delete mode 100644 meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch delete mode 100644 meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch delete mode 100644 meta-python/recipes-devtools/python-numpy/python-numpy.inc delete 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 Mon Mar 2 22:08:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 22:08:14 +0000 Subject: [oe-commits] [meta-openembedded] 01/01: mosquitto: upgrade 1.6.8 -> 1.6.9 In-Reply-To: <158318689334.4314.3089734313064599970@git.openembedded.org> References: <158318689334.4314.3089734313064599970@git.openembedded.org> Message-ID: <20200302220813.AF71C23350E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 59f47567c00a3f2b0a6fd83db3770f7c3d94ef67 Author: Pierre-Jean Texier AuthorDate: Mon Mar 2 11:11:25 2020 +0000 mosquitto: upgrade 1.6.8 -> 1.6.9 Bugfix release. For details, see: https://mosquitto.org/blog/2020/02/version-1-6-9-released/ Also remove patches applied upstream. Signed-off-by: Pierre-Jean Texier --- .../mosquitto/files/1568.patch | 67 ---------------------- .../mosquitto/files/1569.patch | 25 -------- .../mosquitto/files/1570.patch | 39 ------------- .../{mosquitto_1.6.8.bb => mosquitto_1.6.9.bb} | 7 +-- 4 files changed, 2 insertions(+), 136 deletions(-) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1568.patch b/meta-networking/recipes-connectivity/mosquitto/files/1568.patch deleted file mode 100644 index 15f7a91..0000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/1568.patch +++ /dev/null @@ -1,67 +0,0 @@ -Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1568] -From 50bfc79cae5764a6e513b684a5eb5bef2b35c856 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Wed, 22 Jan 2020 12:30:25 +0100 -Subject: [PATCH] Bugfix: include "deps" directory only if BUNDLED_DEPS has - been provided and set to true - -Signed-off-by: Gianfranco Costamagna ---- - config.mk | 5 ++++- - lib/CMakeLists.txt | 5 ++++- - test/unit/Makefile | 6 +++++- - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/config.mk b/config.mk -index 51e36e0d0..0ac24b3d4 100644 ---- a/config.mk -+++ b/config.mk -@@ -135,7 +135,10 @@ endif - - STATIC_LIB_DEPS:= - --LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -I../src/deps -+LIB_CPPFLAGS=$(CPPFLAGS) -I. -I.. -I../lib -+ifeq ($(WITH_BUNDLED_DEPS),yes) -+ LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -I../src/deps -+endif - LIB_CFLAGS:=$(CFLAGS) - LIB_CXXFLAGS:=$(CXXFLAGS) - LIB_LDFLAGS:=$(LDFLAGS) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e1521f12a..891046a81 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -1,11 +1,14 @@ - add_subdirectory(cpp) - - include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib -- ${mosquitto_SOURCE_DIR}/src/deps - ${STDBOOL_H_PATH} ${STDINT_H_PATH} - ${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}) - link_directories(${mosquitto_SOURCE_DIR}/lib) - -+if (WITH_BUNDLED_DEPS) -+ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps) -+endif (WITH_BUNDLED_DEPS) -+ - set(C_SRC - actions.c - callbacks.c -diff --git a/test/unit/Makefile b/test/unit/Makefile -index 9d422428d..928579492 100644 ---- a/test/unit/Makefile -+++ b/test/unit/Makefile -@@ -2,7 +2,11 @@ include ../../config.mk - - .PHONY: all check test test-broker test-lib clean coverage - --CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -I../../src/deps -+CPPFLAGS:=$(CPPFLAGS) -I../.. -I../../lib -I../../src -+ifeq ($(WITH_BUNDLED_DEPS),yes) -+ CPPFLAGS:=$(CPPFLAGS) -I../../src/deps -+endif -+ - CFLAGS:=$(CFLAGS) -coverage -Wall -ggdb - LDFLAGS:=$(LDFLAGS) -coverage - LDADD:=$(LDADD) -lcunit diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1569.patch b/meta-networking/recipes-connectivity/mosquitto/files/1569.patch deleted file mode 100644 index 9718b98..0000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/1569.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1569] -From fda932612afce2cead2fd2ca1c8ea543b2892177 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Wed, 22 Jan 2020 12:31:01 +0100 -Subject: [PATCH] Bugfix: enabling DLT was overriding everything else on linker - flags because of error in cmake set keyword - -Signed-off-by: Gianfranco Costamagna ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7898ff5b1..6dfbba5e6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -130,7 +130,7 @@ add_definitions (-DWITH_BROKER) - if (WITH_DLT) - message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}") - link_directories(${DLT_LIBDIR}) -- set (MOSQ_LIBS ${DLT_LIBRARIES}) -+ set (MOSQ_LIBS ${MOSQ_LIBS} ${DLT_LIBRARIES}) - endif (WITH_DLT) - - set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES}) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1570.patch b/meta-networking/recipes-connectivity/mosquitto/files/1570.patch deleted file mode 100644 index f11fc48..0000000 --- a/meta-networking/recipes-connectivity/mosquitto/files/1570.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Submitted [https://github.com/eclipse/mosquitto/pull/1570] -From 775677b05190380c3736bf0dbef002ee7b9bff33 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Wed, 22 Jan 2020 12:29:41 +0100 -Subject: [PATCH] cmake: add ADNS enable/disable dynamic support - -Signed-off-by: Gianfranco Costamagna ---- - src/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7898ff5b1..edae76f32 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -105,6 +105,9 @@ if (WITH_SYS_TREE) - add_definitions("-DWITH_SYS_TREE") - endif (WITH_SYS_TREE) - -+option(WITH_ADNS -+ "Include ADNS support?" OFF) -+ - if (CMAKE_SYSTEM_NAME STREQUAL Linux) - option(WITH_SYSTEMD - "Include systemd support?" OFF) -@@ -137,10 +140,11 @@ set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES}) - # Check for getaddrinfo_a - include(CheckLibraryExists) - check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A) --if (HAVE_GETADDRINFO_A) -+if (HAVE_GETADDRINFO_A AND WITH_ADNS) -+ add_definitions("-DWITH_ADNS") - add_definitions(-DHAVE_GETADDRINFO_A) - set (MOSQ_LIBS ${MOSQ_LIBS} anl) --endif (HAVE_GETADDRINFO_A) -+endif (HAVE_GETADDRINFO_A AND WITH_ADNS) - - - if (UNIX) diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.8.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb similarity index 92% rename from meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.8.bb rename to meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb index 6079555..0d840e9 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.8.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb @@ -16,14 +16,11 @@ DEPENDS = "uthash" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ - file://1568.patch \ - file://1569.patch \ - file://1570.patch \ file://1571.patch \ " -SRC_URI[md5sum] = "24a0e567c845b3e41b75e237d200edf8" -SRC_URI[sha256sum] = "7df23c81ca37f0e070574fe74414403cf25183016433d07add6134366fb45df6" +SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b" +SRC_URI[sha256sum] = "412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f6c1685" inherit systemd update-rc.d useradd cmake -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 2 22:35:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 02 Mar 2020 22:35:54 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: kernel-devsrc: support 4.4+ ARM/ARM64 kernels Message-ID: <158318855442.18517.9062435088030737900@git.openembedded.org> 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 3fca888 kernel-devsrc: support 4.4+ ARM/ARM64 kernels 3fca888 is described below commit 3fca888ab5ec19cffc4449d070d6337b4de174e6 Author: Ruslan Bilovol AuthorDate: Fri Feb 14 21:24:56 2020 +0200 kernel-devsrc: support 4.4+ ARM/ARM64 kernels Linux Kernel 4.4 is an LTS kernel so people may still build it with OE. Thus make copying of some files optional: - arm64 module.lds file first appeared with kernel v4.6 commit fd045f6cd98e arm64: add support for module PLTs" - arm32 *.tbl files first appeared in kernel v4.10 in commit 96a8fae0fe09 "ARM: convert to generated system call tables" Signed-off-by: Ruslan Bilovol Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 2888236..5940cc9 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -147,7 +147,7 @@ do_install() { cp -a --parents arch/arm64/kernel/vdso/note.S $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ - cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ + cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || : fi if [ "${ARCH}" = "powerpc" ]; then @@ -187,7 +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 + cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build 2>/dev/null || : 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 Tue Mar 3 06:46:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:05 +0000 Subject: [oe-commits] [meta-openembedded] 01/11: collectd: upgrade 5.8.1 -> 5.10.0 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.6A8BD233519@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5280fda27672b58bed47807870ff1694ef59edf4 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:51 2020 -0800 collectd: upgrade 5.8.1 -> 5.10.0 0001-conditionally-check-libvirt.patch Removed because it is not applicable to 5.10.0. Refresh the following patches: 0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch 0001-configure-Check-for-Wno-error-format-truncation-comp.patch 0001-fix-to-build-with-glibc-2.25.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...uding-sys-sysctl.h-on-glibc-based-systems.patch | 106 +++++++++++---------- .../0001-conditionally-check-libvirt.patch | 39 -------- ...heck-for-Wno-error-format-truncation-comp.patch | 6 +- .../0001-fix-to-build-with-glibc-2.25.patch | 4 +- .../{collectd_5.8.1.bb => collectd_5.10.0.bb} | 5 +- 5 files changed, 65 insertions(+), 95 deletions(-) diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch b/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch index 3dee34c..5704405 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch @@ -3,44 +3,69 @@ From: Khem Raj Date: Sat, 27 Jul 2019 14:20:14 -0700 Subject: [PATCH] Remove including sys/sysctl.h on glibc based systems -Glibc 2.30 has added deprecation notice and collectd detects it as warning [1] +Glibc 2.30 has added deprecation notice and collectd detects it as +warning [1] Fixes -sys/sysctl.h:21:2: error: "The header is deprecated and will be removed." [-Werror,-W#warnings] +sys/sysctl.h:21:2: error: "The header is deprecated and +will be removed." [-Werror,-W#warnings] -[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 +[1] +https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 -Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/3234] +Upstream-Status: Submitted +[https://github.com/collectd/collectd/pull/3234] Signed-off-by: Khem Raj --- - src/contextswitch.c | 2 +- - src/memory.c | 2 +- - src/swap.c | 2 +- - src/uuid.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + src/cpu.c | 2 +- + src/memory.c | 2 +- + src/processes.c | 2 +- + src/swap.c | 2 +- + src/uptime.c | 2 +- + src/uuid.c | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) ---- a/src/contextswitch.c -+++ b/src/contextswitch.c -@@ -26,7 +26,7 @@ - #include "common.h" - #include "plugin.h" +diff --git a/src/cpu.c b/src/cpu.c +index 09d60fe..9d12623 100644 +--- a/src/cpu.c ++++ b/src/cpu.c +@@ -60,7 +60,7 @@ + #if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) || \ + (defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME) -#ifdef HAVE_SYS_SYSCTL_H +#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) #include #endif +diff --git a/src/memory.c b/src/memory.c +index 10bccde..50a8086 100644 --- a/src/memory.c +++ b/src/memory.c @@ -28,7 +28,7 @@ - #include "common.h" #include "plugin.h" + #include "utils/common/common.h" -#ifdef HAVE_SYS_SYSCTL_H +#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) #include #endif #ifdef HAVE_SYS_VMMETER_H +diff --git a/src/processes.c b/src/processes.c +index f83913a..9f71511 100644 +--- a/src/processes.c ++++ b/src/processes.c +@@ -87,7 +87,7 @@ + #if HAVE_MACH_VM_PROT_H + #include + #endif +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include + #endif + /* #endif HAVE_THREAD_INFO */ +diff --git a/src/swap.c b/src/swap.c +index 61c9e28..5a475e4 100644 --- a/src/swap.c +++ b/src/swap.c @@ -49,7 +49,7 @@ @@ -52,39 +77,8 @@ Signed-off-by: Khem Raj #include #endif #if HAVE_SYS_DKSTAT_H ---- a/src/uuid.c -+++ b/src/uuid.c -@@ -29,7 +29,7 @@ - #include "common.h" - #include "plugin.h" - --#if HAVE_SYS_SYSCTL_H -+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) - #include - #endif - ---- a/src/cpu.c -+++ b/src/cpu.c -@@ -60,7 +60,7 @@ - - #if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) || \ - (defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME) --#ifdef HAVE_SYS_SYSCTL_H -+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) - #include - #endif - ---- a/src/processes.c -+++ b/src/processes.c -@@ -82,7 +82,7 @@ - #if HAVE_MACH_VM_PROT_H - #include - #endif --#if HAVE_SYS_SYSCTL_H -+#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) - #include - #endif - /* #endif HAVE_THREAD_INFO */ +diff --git a/src/uptime.c b/src/uptime.c +index 0892bda..4b15150 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -33,7 +33,7 @@ @@ -96,3 +90,19 @@ Signed-off-by: Khem Raj #include /* Using sysctl interface to retrieve the boot time on *BSD / Darwin / OS X * systems */ +diff --git a/src/uuid.c b/src/uuid.c +index 60d09b5..17e4dd8 100644 +--- a/src/uuid.c ++++ b/src/uuid.c +@@ -29,7 +29,7 @@ + #include "plugin.h" + #include "utils/common/common.h" + +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include + #endif + +-- +2.17.1 + diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch deleted file mode 100644 index 5ee75cb..0000000 --- a/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 385bf1c2ec57942e17ee529e57eef0dcd99904e6 Mon Sep 17 00:00:00 2001 -From: Roy Li -Date: Tue, 1 Sep 2015 17:00:33 +0800 -Subject: [PATCH] [PATCH] conditionally check libvirt - -Upstream-Statue: Pending - -check if libvirt is available only when a user wants to use libvirt - -Signed-off-by: Roy Li - ---- - configure.ac | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 101d6f9f..a7eca97d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5758,11 +5758,14 @@ else - with_libxml2="no (pkg-config doesn't know libxml-2.0)" - fi - --$PKG_CONFIG --exists libvirt 2>/dev/null --if test $? = 0; then -- with_libvirt="yes" --else -- with_libvirt="no (pkg-config doesn't know libvirt)" -+if test "x$enable_libvirt" = "xyes"; then -+ $PKG_CONFIG --exists libvirt 2>/dev/null -+ if test "$?" = "0" -+ then -+ with_libvirt="yes" -+ else -+ with_libvirt="no (pkg-config doesn't know libvirt)" -+ fi - fi - - if test "x$with_libxml2" = "xyes"; then diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch index d2c7268..8d31e12 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch @@ -23,9 +23,9 @@ diff --git a/configure.ac b/configure.ac index a7eca97d..560eb988 100644 --- a/configure.ac +++ b/configure.ac -@@ -6794,6 +6794,7 @@ if test "x$enable_werror" != "xno"; then - AM_CFLAGS="$AM_CFLAGS -Werror" - AM_CXXFLAGS="$AM_CXXFLAGS -Werror" +@@ -7101,6 +7101,7 @@ if test "x$GCC" = "xyes"; then + AM_CXXFLAGS="$AM_CXXFLAGS -Werror" + fi fi +AX_CHECK_COMPILE_FLAG([-Werror -Werror=format-truncation],[AM_CFLAGS="$AM_CFLAGS -Wno-error=format-truncation" AM_CXXFLAGS="$AM_CXXFLAGS -Wno-error=format-truncation"]) diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch index be942e5..1e140f9 100644 --- a/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch +++ b/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch @@ -11,8 +11,8 @@ diff --git a/src/md.c b/src/md.c index 3725f9a..202225b 100644 --- a/src/md.c +++ b/src/md.c -@@ -25,6 +25,7 @@ - #include "utils_ignorelist.h" +@@ -26,6 +26,7 @@ + #include "utils/ignorelist/ignorelist.h" #include +#include diff --git a/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb b/meta-oe/recipes-extended/collectd/collectd_5.10.0.bb similarity index 95% rename from meta-oe/recipes-extended/collectd/collectd_5.8.1.bb rename to meta-oe/recipes-extended/collectd/collectd_5.10.0.bb index 8b9fd74..df3a5b2 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.10.0.bb @@ -9,15 +9,14 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://collectd.init \ file://collectd.service \ file://no-gcrypt-badpath.patch \ - file://0001-conditionally-check-libvirt.patch \ file://0001-fix-to-build-with-glibc-2.25.patch \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://0005-Disable-new-gcc8-warnings.patch \ file://0006-libcollectdclient-Fix-string-overflow-errors.patch \ file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \ " -SRC_URI[md5sum] = "bfce96c42cede5243028510bcc57c1e6" -SRC_URI[sha256sum] = "e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da" +SRC_URI[md5sum] = "a8344a199b124711bdbec57f1c0b624f" +SRC_URI[sha256sum] = "a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b" inherit autotools python3native update-rc.d pkgconfig systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:07 +0000 Subject: [oe-commits] [meta-openembedded] 03/11: freeglut: upgrade 3.0.0 -> 3.2.1 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.86E4C23351B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b0f1782beec5ed7256c37269c99ce2f4309cbba5 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:53 2020 -0800 freeglut: upgrade 3.0.0 -> 3.2.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../freeglut/{freeglut_3.0.0.bb => freeglut_3.2.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb b/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb similarity index 78% rename from meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb rename to meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb index 3b540bb..851641c 100644 --- a/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb +++ b/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "90c3ca4dd9d51cf32276bc5344ec9754" -SRC_URI[sha256sum] = "2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2" +SRC_URI[md5sum] = "cd5c670c1086358598a6d4a9d166949d" +SRC_URI[sha256sum] = "d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68" inherit cmake features_check -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:08 +0000 Subject: [oe-commits] [meta-openembedded] 04/11: gtkwave: upgrade 3.3.103 -> 3.3.104 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.9399323351C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d516bde1e0452cb7e58a57c0878ee73c5ba67285 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:54 2020 -0800 gtkwave: upgrade 3.3.103 -> 3.3.104 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../gtkwave/{gtkwave_3.3.103.bb => gtkwave_3.3.104.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb similarity index 85% rename from meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb rename to meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb index fec3c7c..6c06c30 100644 --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.103.bb +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.104.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" -SRC_URI[md5sum] = "5a9a5913f9a02a333b2b23626f153fd7" -SRC_URI[sha256sum] = "c325abf7cf26c53309a67c0ecaaf196774fa982a717a102c599ac8a516eeeaf7" +SRC_URI[md5sum] = "23879689ecf7e2cdd2cd5a91c5c601da" +SRC_URI[sha256sum] = "d20dd1a9307b908439c68122a9f81d3ff434a6bfa5439f0cb01398fec650894f" inherit pkgconfig autotools gettext texinfo mime mime-xdg DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:04 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (59f4756 -> 61b4943) Message-ID: <158321796491.11417.9803053829179871603@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 59f4756 mosquitto: upgrade 1.6.8 -> 1.6.9 new 5280fda collectd: upgrade 5.8.1 -> 5.10.0 new a792391 dnfdragora: upgrade 1.0.1 -> 1.1.2 new b0f1782 freeglut: upgrade 3.0.0 -> 3.2.1 new d516bde gtkwave: upgrade 3.3.103 -> 3.3.104 new efe61e9 jsonrpc: upgrade 1.2.0 -> 1.3.0 new 2fe19e3 libio-pty-perl: upgrade 1.12 -> 1.14 new 6b17a48 libpwquality: upgrade 1.4.0 -> 1.4.2 new 80b4a81 protobuf-c: upgrade 1.3.2 -> 1.3.3 new d603f0d protobuf: upgrade 3.11.3 -> 3.11.4 new 29e1179 python3-decorator: upgrade 4.4.1 -> 4.4.2 new 61b4943 renderdoc: upgrade 1.5 -> 1.6 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: .../jsonrpc/{jsonrpc_1.2.0.bb => jsonrpc_1.3.0.bb} | 2 +- ...bio-pty-perl_1.12.bb => libio-pty-perl_1.14.bb} | 4 +- .../{protobuf-c_1.3.2.bb => protobuf-c_1.3.3.bb} | 2 +- .../{protobuf_3.11.3.bb => protobuf_3.11.4.bb} | 2 +- ...uding-sys-sysctl.h-on-glibc-based-systems.patch | 106 +++++++++++---------- .../0001-conditionally-check-libvirt.patch | 39 -------- ...heck-for-Wno-error-format-truncation-comp.patch | 6 +- .../0001-fix-to-build-with-glibc-2.25.patch | 4 +- .../{collectd_5.8.1.bb => collectd_5.10.0.bb} | 5 +- .../add-missing-python-include-dir-for-cross.patch | 27 +++--- ...libpwquality_1.4.0.bb => libpwquality_1.4.2.bb} | 4 +- ...-set-PYTHON_INSTALL_DIR-by-running-python.patch | 10 +- .../0001-Run-python-scripts-using-env.patch | 25 ----- .../0001-To-fix-error-when-do_package.patch | 13 +-- .../dnfdragora/0001-disable-build-manpages.patch | 10 +- .../recipes-graphics/dnfdragora/dnfdragora_git.bb | 7 +- .../{freeglut_3.0.0.bb => freeglut_3.2.1.bb} | 4 +- .../{gtkwave_3.3.103.bb => gtkwave_3.3.104.bb} | 4 +- .../{renderdoc_1.5.bb => renderdoc_1.6.bb} | 4 +- .../recipes-devtools/python/python-decorator.inc | 4 +- ...corator_4.4.1.bb => python3-decorator_4.4.2.bb} | 0 21 files changed, 111 insertions(+), 171 deletions(-) rename meta-oe/recipes-devtools/jsonrpc/{jsonrpc_1.2.0.bb => jsonrpc_1.3.0.bb} (94%) rename meta-oe/recipes-devtools/perl/{libio-pty-perl_1.12.bb => libio-pty-perl_1.14.bb} (73%) rename meta-oe/recipes-devtools/protobuf/{protobuf-c_1.3.2.bb => protobuf-c_1.3.3.bb} (95%) rename meta-oe/recipes-devtools/protobuf/{protobuf_3.11.3.bb => protobuf_3.11.4.bb} (98%) delete mode 100644 meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch rename meta-oe/recipes-extended/collectd/{collectd_5.8.1.bb => collectd_5.10.0.bb} (95%) rename meta-oe/recipes-extended/libpwquality/{libpwquality_1.4.0.bb => libpwquality_1.4.2.bb} (90%) delete mode 100644 meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch rename meta-oe/recipes-graphics/freeglut/{freeglut_3.0.0.bb => freeglut_3.2.1.bb} (78%) rename meta-oe/recipes-graphics/gtkwave/{gtkwave_3.3.103.bb => gtkwave_3.3.104.bb} (85%) rename meta-oe/recipes-graphics/renderdoc/{renderdoc_1.5.bb => renderdoc_1.6.bb} (89%) rename meta-python/recipes-devtools/python/{python3-decorator_4.4.1.bb => python3-decorator_4.4.2.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:06 +0000 Subject: [oe-commits] [meta-openembedded] 02/11: dnfdragora: upgrade 1.0.1 -> 1.1.2 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.7957A23351A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a792391b0cbc1cdef85f395302e4ecc9a4ba4eef Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:52 2020 -0800 dnfdragora: upgrade 1.0.1 -> 1.1.2 refresh the following paches: 0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch 0001-To-fix-error-when-do_package.patch 0001-disable-build-manpages.patch 0001-Run-python-scripts-using-env.patch removed since it is included in 1.1.2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...-set-PYTHON_INSTALL_DIR-by-running-python.patch | 10 ++++----- .../0001-Run-python-scripts-using-env.patch | 25 ---------------------- .../0001-To-fix-error-when-do_package.patch | 13 +++++------ .../dnfdragora/0001-disable-build-manpages.patch | 10 ++++----- .../recipes-graphics/dnfdragora/dnfdragora_git.bb | 7 +++--- 5 files changed, 20 insertions(+), 45 deletions(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 46d4dbd..6a7b1bf 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -9,12 +9,12 @@ Signed-off-by: Lei Maohui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c66b39..1489ef6 100644 +index 230c87b..e699e83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -19,7 +19,7 @@ else(NOT SPHINX_EXECUTABLE-NOTFOUND) - message(STATUS "Could NOT find sphinx-build.") - endif(NOT SPHINX_EXECUTABLE-NOTFOUND) +@@ -19,7 +19,7 @@ else(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND") + message(STATUS "Found sphinx-build: ${SPHINX_EXECUTABLE}") + endif(SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND") -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +#execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(), end='')" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) @@ -22,5 +22,5 @@ index 7c66b39..1489ef6 100644 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION) message(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") -- -2.7.4 +2.17.1 diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch deleted file mode 100644 index 75b6b8f..0000000 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 15d0afcfa4868b7b072b3434bac0064617d61f99 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Tue, 19 Dec 2017 14:53:14 +0900 -Subject: [PATCH] Run python scripts using env - -Otherwise the build tools hardcode the python path into them. - -Signed-off-by: Lei Maohui ---- - bin/dnfdragora | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/dnfdragora b/bin/dnfdragora -index b8e0550..cd80f7f 100755 ---- a/bin/dnfdragora -+++ b/bin/dnfdragora -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - # vim: set et ts=4 sw=4: - # Copyright 2016-2017 Angelo Naselli - # --- -2.7.4 - diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch index 90ce1d0..bef4711 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch @@ -3,7 +3,8 @@ From: Lei Maohui Date: Tue, 19 Dec 2017 11:15:29 +0900 Subject: [PATCH] To fix error when do_package -QA Issue: nativesdk-dnfdragora: Files/directories were installed but not shipped in any package: +QA Issue: nativesdk-dnfdragora: Files/directories were installed but not +shipped in any package: /etc /etc/dnfdragora /etc/dnfdragora/dnfdragora.yaml @@ -14,18 +15,18 @@ Signed-off-by: Lei Maohui 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c66b39..a5659f7 100644 +index 230c87b..1b8d800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ endif(ENABLE_COMPS) +@@ -68,7 +68,7 @@ endif(ENABLE_COMPS) set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin") set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share") set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale") --set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc") -+set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc") +-set(CMAKE_INSTALL_FULL_SYSCONFDIR "/etc" CACHE PATH "sysconfig directory (default /etc)") ++set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/../etc" CACHE PATH "sysconfig directory (default /etc)") # Configure files configure_file(${CMAKE_SOURCE_DIR}/etc/dnfdragora.yaml.in ${CMAKE_BINARY_DIR}/etc/dnfdragora.yaml @ONLY) -- -2.7.4 +2.17.1 diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch index 88bb634..c8b105e 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch @@ -9,17 +9,17 @@ Signed-off-by: Zheng Ruoqin 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c66b39..fc32750 100644 +index 230c87b..1624998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -65,7 +65,6 @@ endif(GETTEXT_FOUND) +@@ -81,7 +81,6 @@ endif(GETTEXT_FOUND) # Build and install the man-pages - if(NOT SPHINX_EXECUTABLE-NOTFOUND) + if(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND") - add_subdirectory(man) - endif(NOT SPHINX_EXECUTABLE-NOTFOUND) + endif(NOT SPHINX_EXECUTABLE STREQUAL "SPHINX_EXECUTABLE-NOTFOUND") # Installing application code -- -2.7.4 +2.17.1 diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb index 7a51a4a..0073851 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb @@ -7,11 +7,10 @@ SRC_URI = "git://github.com/manatools/dnfdragora.git \ file://0001-disable-build-manpages.patch \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-To-fix-error-when-do_package.patch \ - file://0001-Run-python-scripts-using-env.patch \ " -PV = "1.0.1+git${SRCPV}" -SRCREV = "4fef4ce889b8e4fa03191d414f63bfd50796152a" +PV = "1.1.2+git${SRCPV}" +SRCREV = "19e123132cfd4efd860e5204261c3c228bfe80a8" S = "${WORKDIR}/git" @@ -27,7 +26,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=OFF -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} BBCLASSEXTEND = "nativesdk" -FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora " +FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/ ${datadir}/ ${bindir}/ ${sysconfdir}/dnfdragora ${sysconfdir}/xdg" 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 Tue Mar 3 06:46:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:09 +0000 Subject: [oe-commits] [meta-openembedded] 05/11: jsonrpc: upgrade 1.2.0 -> 1.3.0 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.A28CD23351D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit efe61e93778d07c2403e03cb95d13a553f10c986 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:55 2020 -0800 jsonrpc: upgrade 1.2.0 -> 1.3.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/jsonrpc/{jsonrpc_1.2.0.bb => jsonrpc_1.3.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb similarity index 94% rename from meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb rename to meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb index dbf44d7..ca9675e 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.2.0.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb @@ -10,7 +10,7 @@ SECTION = "libs" DEPENDS = "curl jsoncpp libmicrohttpd hiredis" SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp" -SRCREV = "4ed5b00dcc409405a19e6d8c6478f703153430e1" +SRCREV = "c696f6932113b81cd20cd4a34fdb1808e773f23e" 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 Mar 3 06:46:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:10 +0000 Subject: [oe-commits] [meta-openembedded] 06/11: libio-pty-perl: upgrade 1.12 -> 1.14 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.AD09E23351E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2fe19e304800cedc9a45692399e1c5d14d7eafc3 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:56 2020 -0800 libio-pty-perl: upgrade 1.12 -> 1.14 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../perl/{libio-pty-perl_1.12.bb => libio-pty-perl_1.14.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb similarity index 73% rename from meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb rename to meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb index b1a95e5..1ab21d1 100644 --- a/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb +++ b/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42 SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz" -SRC_URI[md5sum] = "11695a1a516b3bd1b90ce75ff0ce3e6d" -SRC_URI[sha256sum] = "a2ef8770d3309178203f8c8ac25e623e63cf76e97830fd3be280ade1a555290d" +SRC_URI[md5sum] = "70bcec4b1b19838ed209fb96a13f3e89" +SRC_URI[sha256sum] = "51f3e4e311128bdb2c6a15f02c51376cb852ccf9df9bebe8dfbb5f9561eb95b5" S = "${WORKDIR}/IO-Tty-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:13 +0000 Subject: [oe-commits] [meta-openembedded] 09/11: protobuf: upgrade 3.11.3 -> 3.11.4 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.D9A85233522@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d603f0d5329285551b9591ef13340a7319569693 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:59 2020 -0800 protobuf: upgrade 3.11.3 -> 3.11.4 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../protobuf/{protobuf_3.11.3.bb => protobuf_3.11.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb similarity index 98% rename from meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb rename to meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb index 4fa576a..4d6c5b2 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.11.3.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.11.4.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "498de9f761bef56a032815ee44b6e6dbe0892cc4" +SRCREV = "d0bfd5221182da1a7cc280f3337b5e41a89539cf" SRC_URI = "git://github.com/google/protobuf.git;branch=3.11.x \ file://run-ptest \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:14 +0000 Subject: [oe-commits] [meta-openembedded] 10/11: python3-decorator: upgrade 4.4.1 -> 4.4.2 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.E51F7233524@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 29e1179691a750c3477f93afc7694ba119286c82 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:52:00 2020 -0800 python3-decorator: upgrade 4.4.1 -> 4.4.2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-decorator.inc | 4 ++-- .../python/{python3-decorator_4.4.1.bb => python3-decorator_4.4.2.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-decorator.inc b/meta-python/recipes-devtools/python/python-decorator.inc index 65db1a9..3faee39 100644 --- a/meta-python/recipes-devtools/python/python-decorator.inc +++ b/meta-python/recipes-devtools/python/python-decorator.inc @@ -9,8 +9,8 @@ decorator, just because you can." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=be2fd2007972bf96c08af3293d728b22" -SRC_URI[md5sum] = "933981f288c4230816b5beee8d40e6ea" -SRC_URI[sha256sum] = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce" +SRC_URI[md5sum] = "d83c624cce93e6bdfab144821b526e1d" +SRC_URI[sha256sum] = "e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb b/meta-python/recipes-devtools/python/python3-decorator_4.4.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-decorator_4.4.1.bb rename to meta-python/recipes-devtools/python/python3-decorator_4.4.2.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:15 +0000 Subject: [oe-commits] [meta-openembedded] 11/11: renderdoc: upgrade 1.5 -> 1.6 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.F25D4233525@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 61b4943ee787aedb3ceb9ad379f3de5e1e0da33b Author: Wang Mingyu AuthorDate: Tue Mar 3 04:10:22 2020 -0800 renderdoc: upgrade 1.5 -> 1.6 -License-Update: Copyright year updated to 2020. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-graphics/renderdoc/{renderdoc_1.5.bb => renderdoc_1.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb similarity index 89% rename from meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb rename to meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb index 5f81e84..7cb79d0 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.5.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb @@ -2,9 +2,9 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9753b1b4fba3261c27d1ce5c1acef667" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772" -SRCREV = "a94f238e37cfe2f142093eb8e5da7775abaa88c6" +SRCREV = "0e7f772596035137416be01766c2d61205efc63e" SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ file://0001-Remove-glslang-pool_allocator-setAllocator.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:12 +0000 Subject: [oe-commits] [meta-openembedded] 08/11: protobuf-c: upgrade 1.3.2 -> 1.3.3 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.CB696233520@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 80b4a81b9443a27acc579193279ec5dde52870b5 Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:58 2020 -0800 protobuf-c: upgrade 1.3.2 -> 1.3.3 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../protobuf/{protobuf-c_1.3.2.bb => protobuf-c_1.3.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb similarity index 95% rename from meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb rename to meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb index b92f82d..94c3893 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.2.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.3.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558" DEPENDS = "protobuf-native protobuf" -SRCREV = "1390409f4ee4e26d0635310995b516eb702c3f9e" +SRCREV = "f20a3fa131c275a0e795d99a28f94b4dbbb5af26" SRC_URI = "git://github.com/protobuf-c/protobuf-c.git \ file://0001-avoid-race-condition.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 06:46:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 06:46:11 +0000 Subject: [oe-commits] [meta-openembedded] 07/11: libpwquality: upgrade 1.4.0 -> 1.4.2 In-Reply-To: <158321796491.11417.9803053829179871603@git.openembedded.org> References: <158321796491.11417.9803053829179871603@git.openembedded.org> Message-ID: <20200303064605.BB30423351F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6b17a48152a41357ce4389c98fb2e6847f8dfadb Author: Wang Mingyu AuthorDate: Tue Mar 3 03:51:57 2020 -0800 libpwquality: upgrade 1.4.0 -> 1.4.2 refresh add-missing-python-include-dir-for-cross.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../add-missing-python-include-dir-for-cross.patch | 27 +++++++++------------- ...libpwquality_1.4.0.bb => libpwquality_1.4.2.bb} | 4 ++-- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch index d12492f..ec86721 100644 --- a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch +++ b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch @@ -13,28 +13,23 @@ Signed-off-by: Hongxu Jia 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am -index abc5cd3..e35ba71 100644 +index 1d00c0c..52816b2 100644 --- a/python/Makefile.am +++ b/python/Makefile.am -@@ -14,4 +14,4 @@ all-local: - CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install-exec-local: -- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} -+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} + + clean-local: + rm -rf py$(PYTHONREV) diff --git a/python/setup.py.in b/python/setup.py.in -index 6457595..d3db0e5 100755 +index a741b91..6759a95 100755 --- a/python/setup.py.in +++ b/python/setup.py.in -@@ -6,6 +6,7 @@ - - from distutils.core import setup, Extension - from distutils.command.build_ext import build_ext as _build_ext -+import os - - class build_ext(_build_ext): - def genconstants(self, headerfile, outputfile): -@@ -23,7 +24,7 @@ class build_ext(_build_ext): +@@ -33,7 +33,7 @@ class sdist(_sdist): pwqmodule = Extension('pwquality', sources = ['pwquality.c'], @@ -44,5 +39,5 @@ index 6457595..d3db0e5 100755 libraries = ['pwquality']) -- -1.9.1 +2.17.1 diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb similarity index 90% rename from meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb rename to meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb index 9fb25cd..24d2f7e 100644 --- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb +++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb @@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME} file://add-missing-python-include-dir-for-cross.patch \ " -SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c" -SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b" +SRC_URI[md5sum] = "ae6e61fc33f5dac0de5e847eb7520d71" +SRC_URI[sha256sum] = "5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e" UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 09:23:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 09:23:39 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: fixup Message-ID: <158322741992.3710.10190893082112979886@git.openembedded.org> 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 148b610 fixup 148b610 is described below commit 148b6100a0ef41324e90b30ca34c30b2d6a94378 Author: Richard Purdie AuthorDate: Tue Mar 3 09:23:08 2020 +0000 fixup 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 249aa54..4e18980 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 +After=psplash-start.service Requires=psplash-start.service RequiresMountsFor=/run -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 13:06:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:06:52 +0000 Subject: [oe-commits] [openembedded-core] 03/04: kernel-devsrc: support 4.4+ ARM/ARM64 kernels In-Reply-To: <158324080970.32746.10326477156798519560@git.openembedded.org> References: <158324080970.32746.10326477156798519560@git.openembedded.org> Message-ID: <20200303130649.F227623351C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 3329dd6ea914c5fadbf63ecbfde9c66472df19ee Author: Ruslan Bilovol AuthorDate: Fri Feb 14 21:24:56 2020 +0200 kernel-devsrc: support 4.4+ ARM/ARM64 kernels Linux Kernel 4.4 is an LTS kernel so people may still build it with OE. Thus make copying of some files optional: - arm64 module.lds file first appeared with kernel v4.6 commit fd045f6cd98e arm64: add support for module PLTs" - arm32 *.tbl files first appeared in kernel v4.10 in commit 96a8fae0fe09 "ARM: convert to generated system call tables" Signed-off-by: Ruslan Bilovol Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 2888236..5940cc9 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -147,7 +147,7 @@ do_install() { cp -a --parents arch/arm64/kernel/vdso/note.S $kerneldir/build/ cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ - cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ + cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || : fi if [ "${ARCH}" = "powerpc" ]; then @@ -187,7 +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 + cp -a --parents $(find arch/arm -type f -name "*.tbl") $kerneldir/build 2>/dev/null || : 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 Tue Mar 3 13:06:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:06:50 +0000 Subject: [oe-commits] [openembedded-core] 01/04: make: Use gziped sources In-Reply-To: <158324080970.32746.10326477156798519560@git.openembedded.org> References: <158324080970.32746.10326477156798519560@git.openembedded.org> Message-ID: <20200303130649.DB33123351A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 136314ffd107654b7673d937acafb7f4a81ac5a9 Author: Adrian Bunk AuthorDate: Sun Mar 1 22:26:06 2020 +0200 make: Use gziped sources Building lzip-native just for being able to build make is not worth saving 1 MB download, especially since this creates a bottleneck for the whole build. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-devtools/make/make.inc | 2 +- meta/recipes-devtools/make/make_4.3.bb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/make/make.inc b/meta/recipes-devtools/make/make.inc index 4142cf2..a0a72b6 100644 --- a/meta/recipes-devtools/make/make.inc +++ b/meta/recipes-devtools/make/make.inc @@ -5,7 +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.lz \ +SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.gz \ " inherit autotools gettext pkgconfig texinfo diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index 70caf0a..cd0ecd4 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -12,7 +12,6 @@ SRC_URI += "\ EXTRA_OECONF += "--without-guile" -SRC_URI[md5sum] = "d5c40e7bd1e97a7404f5d3be982f479a" -SRC_URI[sha256sum] = "de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82" +SRC_URI[sha256sum] = "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19" 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 Mar 3 13:06:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:06:49 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (01d4043 -> d6b1809) Message-ID: <158324080970.32746.10326477156798519560@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 01d4043 freetype: add pixmap to PACKAGECONFIG new 136314f make: Use gziped sources new 6f31da5 psplash: update to latest git revision and clean up new 3329dd6 kernel-devsrc: support 4.4+ ARM/ARM64 kernels new d6b1809 systemd: Fix service file for race issues 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/psplash/files/psplash-start.service | 1 + meta/recipes-core/psplash/files/psplash-systemd.service | 1 + meta/recipes-core/psplash/psplash_git.bb | 7 ++----- meta/recipes-devtools/make/make.inc | 2 +- meta/recipes-devtools/make/make_4.3.bb | 3 +-- meta/recipes-kernel/linux/kernel-devsrc.bb | 4 ++-- 6 files changed, 8 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 13:06:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:06:53 +0000 Subject: [oe-commits] [openembedded-core] 04/04: systemd: Fix service file for race issues In-Reply-To: <158324080970.32746.10326477156798519560@git.openembedded.org> References: <158324080970.32746.10326477156798519560@git.openembedded.org> Message-ID: <20200303130650.0E9A123351D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d6b1809e8cd7ca78c5b442177393d4299a96ec65 Author: Richard Purdie AuthorDate: Tue Mar 3 09:23:08 2020 +0000 systemd: Fix service file for race issues It seems this service needs both Requires: and After: according to the definitions in the systemd docs, else we see boot race failures. 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 249aa54..4e18980 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 +After=psplash-start.service Requires=psplash-start.service RequiresMountsFor=/run -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 13:06:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:06:51 +0000 Subject: [oe-commits] [openembedded-core] 02/04: psplash: update to latest git revision and clean up In-Reply-To: <158324080970.32746.10326477156798519560@git.openembedded.org> References: <158324080970.32746.10326477156798519560@git.openembedded.org> Message-ID: <20200303130649.E6C3923351B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6f31da5632220a09ac65b8f361cdc9c64e64ce35 Author: Scott Murray AuthorDate: Mon Mar 2 14:14:26 2020 -0500 psplash: update to latest git revision and clean up Update SRCREV to pick up: c359546 Fix psplash-systemd failures 3c0a4f3 Remove generated psplash-poky-img.h Also: * set the unit type in psplash-start.service to "notify" to complete the psplash-systemd race fix * remove the rest of the now unnecessary has_png logic bits * change the generated image header destination to B instead of S since that now works after the recent makefile changes, and will avoid unnecessarily polluting the source tree Signed-off-by: Scott Murray Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-start.service | 1 + meta/recipes-core/psplash/psplash_git.bb | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service index af9d5d6..a8c97c7 100644 --- a/meta/recipes-core/psplash/files/psplash-start.service +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -4,6 +4,7 @@ DefaultDependencies=no RequiresMountsFor=/run [Service] +Type=notify ExecStart=/usr/bin/psplash [Install] diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 875adb1..22c71f0 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=8;md5=8f232c1e95929eacab37f00900580224" DEPENDS = "gdk-pixbuf-native" -SRCREV = "aea172a24c5b0bdc0f4efa780c0faa00c9238362" +SRCREV = "0a902f7cd875ccf018456451be369f05fa55f962" PV = "0.1+git${SRCPV}" PR = "r15" @@ -24,7 +24,6 @@ python __anonymous() { splashfiles = d.getVar('SPLASH_IMAGES').split() pkgs = [] localpaths = [] - haspng = False for uri in splashfiles: fetcher = bb.fetch2.Fetch([uri], d) flocal = os.path.basename(fetcher.localpath(uri)) @@ -42,8 +41,6 @@ python __anonymous() { bb.fatal("The output name '%s' derived from the URI %s is not valid, please specify the outsuffix parameter" % (outname, uri)) else: pkgs.append(outname) - if flocal.endswith(".png"): - haspng = True localpaths.append(flocal) # Set these so that we have less work to do in do_compile and do_install_append @@ -82,7 +79,7 @@ python do_compile () { # Build a separate executable for each splash image workdir = d.getVar('WORKDIR') convertscript = "%s/make-image-header.sh" % d.getVar('S') - destfile = "%s/psplash-poky-img.h" % d.getVar('S') + destfile = "%s/psplash-poky-img.h" % d.getVar('B') localfiles = d.getVar('SPLASH_LOCALPATHS').split() outputfiles = d.getVar('SPLASH_INSTALL').split() for localfile, outputfile in zip(localfiles, outputfiles): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 13:06:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:06:59 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (148b610 -> 4ac97e5) Message-ID: <158324081944.641.1312923186106719215@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 148b610 fixup discard 3fca888 kernel-devsrc: support 4.4+ ARM/ARM64 kernels discard dafd288 psplash: update to latest git revision and clean up discard e13de7f make: Use gziped sources discard de98c14 test discard 4ae0b52 qemuarm64: Add -machine gic-version=3 with kvm discard 390377d HACK: extra debug discard fa19580 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard d59019e sstatesig: Log timestamps for hashequiv in reprodubile builds discard a91f531 HACK: signing: Add extra test debug discard d4ab45a glew/curl: specify exclusive package configs discard c8f59b5 base.bbclass: extend PACKAGECONFIG for conflict package configs add 136314f make: Use gziped sources add 6f31da5 psplash: update to latest git revision and clean up add 3329dd6 kernel-devsrc: support 4.4+ ARM/ARM64 kernels add d6b1809 systemd: Fix service file for race issues new b5bfee3 base.bbclass: extend PACKAGECONFIG for conflict package configs new b5f595b glew/curl: specify exclusive package configs new 29cfcdd HACK: signing: Add extra test debug new 93e3af1 sstatesig: Log timestamps for hashequiv in reprodubile builds new c1a8f46 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 3a7fc96 HACK: extra debug new c620df9 qemuarm64: Add -machine gic-version=3 with kvm new 4ac97e5 test 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 (148b610) \ N -- N -- N refs/heads/master-next (4ac97e5) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 13:07:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:02 +0000 Subject: [oe-commits] [openembedded-core] 03/08: HACK: signing: Add extra test debug In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.A9F0523351C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 29cfcdd4b07545b7aaba3880a81ea1f46207e6c4 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 Mar 3 13:07:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:03 +0000 Subject: [oe-commits] [openembedded-core] 04/08: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.B57F123351D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 93e3af1bbed11d9566619444501ab32780251d13 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 Mar 3 13:07:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:00 +0000 Subject: [oe-commits] [openembedded-core] 01/08: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.95E4923351A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5bfee34120d78db713a1292a4e531c711a433c5 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 Mar 3 13:07:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:01 +0000 Subject: [oe-commits] [openembedded-core] 02/08: glew/curl: specify exclusive package configs In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.A064623351B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5f595b4849448d96e1f81fc59b384971d6e3f72 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 Mar 3 13:07:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:05 +0000 Subject: [oe-commits] [openembedded-core] 06/08: HACK: extra debug In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.D031923351F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3a7fc96a2be8d1f6caf351f98f3cc0cfbae095b3 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 Mar 3 13:07:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:06 +0000 Subject: [oe-commits] [openembedded-core] 07/08: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.E1AB3233520@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c620df947239effdf04c6ef5d20909f78652d4c1 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 Tue Mar 3 13:07:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:04 +0000 Subject: [oe-commits] [openembedded-core] 05/08: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.C2DA623351E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c1a8f46e113aa69b070a45d1c0feeeca4ec0f8cf 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 Mar 3 13:07:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 13:07:07 +0000 Subject: [oe-commits] [openembedded-core] 08/08: test In-Reply-To: <158324081944.641.1312923186106719215@git.openembedded.org> References: <158324081944.641.1312923186106719215@git.openembedded.org> Message-ID: <20200303130659.F256F233522@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4ac97e50ec5b08aa05c3874e1f3a2e94c56b8fb7 Author: Richard Purdie AuthorDate: Mon Mar 2 15:52:25 2020 +0000 test Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..61f1931 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 156400c..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase): extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) ret2 = bitbake(test_recipe) found_warn2 = re.search(patt, ret2.output) extradebug += "\nFound %s\n\n" % str(found_warn2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 17:24:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 17:24:25 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (61b4943 -> d5cf4a0) Message-ID: <158325626501.13200.12819002466461216991@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 61b4943 renderdoc: upgrade 1.5 -> 1.6 new 5abf553 grpc: move from meta-networking to meta-oe new d5cf4a0 brotli: allow building a -native version 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: .../recipes-core/packagegroups/packagegroup-meta-networking.bb | 2 +- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 2 +- .../0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0 .../grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 0 {meta-networking => meta-oe}/recipes-devtools/grpc/grpc_1.24.3.bb | 0 meta-oe/recipes-extended/brotli/brotli_1.0.7.bb | 2 ++ 6 files changed, 4 insertions(+), 2 deletions(-) rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch (100%) rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch (100%) rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc_1.24.3.bb (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 17:24:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 17:24:27 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: brotli: allow building a -native version In-Reply-To: <158325626501.13200.12819002466461216991@git.openembedded.org> References: <158325626501.13200.12819002466461216991@git.openembedded.org> Message-ID: <20200303172425.4937223351D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d5cf4a0041d1c53ebb2c9baa5b3a17c6af41b5b9 Author: Andr? Draszik AuthorDate: Tue Mar 3 13:45:33 2020 +0000 brotli: allow building a -native version nodejs (-native) can be built against a system-installed version of the brotli libraries. Allow doing that by provide a -native version of brotli. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-extended/brotli/brotli_1.0.7.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb index e4e454b..70dbcaf 100644 --- a/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.7.bb @@ -18,3 +18,5 @@ do_install_append () { mv -v "${lib}" "$(echo ${lib} | sed s/-static//)" done } + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 17:24:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 17:24:26 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: grpc: move from meta-networking to meta-oe In-Reply-To: <158325626501.13200.12819002466461216991@git.openembedded.org> References: <158325626501.13200.12819002466461216991@git.openembedded.org> Message-ID: <20200303172425.3890823351C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5abf5531c29b39386f3f83c4086005249f9d391e Author: Martin Jansa AuthorDate: Tue Mar 3 17:25:08 2020 +0100 grpc: move from meta-networking to meta-oe * because sysdig from meta-oe depends on it now, since: commit ed798c764319d83ad9eb1b963bfc99b1fa1a791a Author: Khem Raj Date: Wed Jan 2 17:59:20 2019 -0800 sysdig: Upgrade to 0.26.5 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 +- .../0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0 .../grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 0 {meta-networking => meta-oe}/recipes-devtools/grpc/grpc_1.24.3.bb | 0 5 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 103c99b..1e10c30 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -55,7 +55,7 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\ RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" RDEPENDS_packagegroup-meta-networking-devtools = "\ - python3-ldap grpc \ + python3-ldap \ " RDEPENDS_packagegroup-meta-networking-extended = "\ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d096539..e04b48f 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -110,7 +110,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ android-tools android-tools-conf bootchart breakpad \ capnproto cgdb cscope ctags \ debootstrap dmalloc flatbuffers \ - giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ + giflib grpc icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ kconfig-frontends lemon libedit libgee libsombok3 \ libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ mpich msgpack-c nlohmann-json openocd pax-utils \ diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch similarity index 100% rename from meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch rename to meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch similarity index 100% rename from meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch rename to meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb similarity index 100% rename from meta-networking/recipes-devtools/grpc/grpc_1.24.3.bb rename to meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 19:40:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 19:40:38 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (d5cf4a0 -> 6f1e04c) Message-ID: <158326443852.31613.2286609134275667664@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 d5cf4a0 brotli: allow building a -native version new 754b546 nodejs: drop 'gyp' PACKAGECONFIG new b3b8150 nodejs: allow use of system brotli (and make default) new 6f1e04c libssh: upgrade 0.8.4 -> 0.8.8 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: ...allow-passing-multiple-libs-to-pkg_config.patch | 41 ++++++++++++++ ...uild-allow-use-of-system-installed-brotli.patch | 66 ++++++++++++++++++++++ meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 10 ++-- .../libssh/{libssh_0.8.4.bb => libssh_0.8.8.bb} | 4 +- 4 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch rename meta-oe/recipes-support/libssh/{libssh_0.8.4.bb => libssh_0.8.8.bb} (86%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 19:40:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 19:40:39 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: nodejs: drop 'gyp' PACKAGECONFIG In-Reply-To: <158326443852.31613.2286609134275667664@git.openembedded.org> References: <158326443852.31613.2286609134275667664@git.openembedded.org> Message-ID: <20200303194039.1116D23351F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 754b54699b881459eda3eaf4e2ba893e85b76abf Author: Andr? Draszik AuthorDate: Tue Mar 3 18:22:36 2020 +0000 nodejs: drop 'gyp' PACKAGECONFIG During the python3 / nodejs update, the dependencies weren't updated, so using system-gyp ends up trying to use the python2 version of system- gyp, which will of course fail. Fixing this to depend on the python3 version of gyp still doesn't doesn't make things work, though: ERROR: nodejs-native-12.14.1-r0 do_configure: Execution of '.../nodejs-native/12.14.1-r0/temp/run.do_configure.26054' failed with exit code 1: gyp: Error importing pymod_do_mainmodule (ForEachFormat): No module named 'ForEachFormat' while loading dependencies of .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp while trying to load .../nodejs-native/12.14.1-r0/node-v12.14.1/node.gyp Error running GYP The reason is commit fff922afee6e ("deps,build: compute torque_outputs in v8.gyp") in NodeJS v12, where they modified their bundled version of gyp to become incompatible with the upstream version of gyp by adding extra / unusual search paths to gyp. Since I'm not sure how to deal with that when using system-gyp, and because the original intention for using system-gyp was to make the previous nodejs version compatible with python3 by ultimately switching to the python3 version of system-gyp which isn't necessary anymore, and given nobody else seems to be using this PACKAGECONFIG, just drop it. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 3 --- 1 file changed, 3 deletions(-) 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..49bb71e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb @@ -53,7 +53,6 @@ ARCHFLAGS ?= "" PACKAGECONFIG ??= "ares icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" -PACKAGECONFIG[gyp] = ",,gyp-py2-native" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" @@ -82,8 +81,6 @@ python do_unpack() { shutil.rmtree(d.getVar('S') + '/deps/openssl', True) if 'ares' in d.getVar('PACKAGECONFIG'): shutil.rmtree(d.getVar('S') + '/deps/cares', True) - if 'gyp' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/tools/gyp', True) if 'libuv' in d.getVar('PACKAGECONFIG'): shutil.rmtree(d.getVar('S') + '/deps/uv', True) if 'nghttp2' in d.getVar('PACKAGECONFIG'): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 19:40:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 19:40:41 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: libssh: upgrade 0.8.4 -> 0.8.8 In-Reply-To: <158326443852.31613.2286609134275667664@git.openembedded.org> References: <158326443852.31613.2286609134275667664@git.openembedded.org> Message-ID: <20200303194039.2DCAD233522@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6f1e04c396cfe01c008803086c00323ac7e1f59b Author: Pierre-Jean Texier AuthorDate: Tue Mar 3 15:34:30 2020 +0000 libssh: upgrade 0.8.4 -> 0.8.8 License-Update: Reformat COPYING file 0.8.8 is a security release to especially address CVE-2019-14889. Thins includes the following changes from the 0.8.4 version: 7850307 Bump version to 0.8.8 30c0f0c cpack: Ignore patch files and other stuff b0edec4 CVE-2019-14889: scp: Quote location to be used on shell 391c78d CVE-2019-14889: scp: Don't allow file path longer than 32kb 2ba1dea CVE-2019-14889: misc: Add function to quote file names 82c375b CVE-2019-14889: scp: Log SCP warnings received from the server 4aea835 CVE-2019-14889: scp: Reformat scp.c 2fbeb2a gitlab-ci: Mips is dead e981113 doc: Add a note about OpenSSL linking 3736a03 libcrypto: Add missing includes for modes.h be73335 sftp: Document how to free memory retruned by sftp_canonicalize_path() 5298611 Bump version to 0.8.7 7a49ee5 cmake: Bump API version to 4.7.4 c842bc2 Remove SHA384 HMAC 8892577 Use constant time comparison function for HMAC comparison ac7c64a pki_gcrypt: Include missing stdbool.h 47014eb pki: Fix size type for len in privatekey_string_to_buffer() 2223106 connect: Fix size type for i an j in ssh_select() 4af7736 connector: Fallback on the socket output callback f4a0fcc connector: Don't NULL connector (in|out) channels on event remove fa150ef options: Removed outdated param annotations of ssh_options_set() 810dbd3 config: Avoid buffer overflow fa6aa12 tests/pkd: repro rsa-sha2-{256,512} negotiation bug a4948f6 kex: honor client preference for rsa-sha2-{256,512} host key algorithms e05e4ae pki_crypto: plug pki_signature_from_blob leaks b6d2755 pki: NULL check pki_signature_from_rsa_blob result e69fb89 pki_container_openssh: Add padding to be compatible with OpenSSH f9beb3c gitlab-ci: Disable debian cross mips runner bfc39d5 kex: List also the SHA2 extension when ordering hostkey algorithms 0acfd81 server: Correctly handle extensions d028b24 dh: Make sure we do not access uninitialized memory 68fc17c Bump version to 0.8.6 d327712 Bump SO version to 4.7.3 fded1fb channels: Don't call ssh_channel_close() twice a6e055c packet: Allow SSH2_MSG_EXT_INFO when authenticated 32221ea channels: Send close if we received a remote close 917ba07 channels: Reformat ssh_channel_free() bcdbc11 channel: Add SSH_CHANNEL_FLAG_CLOSED_LOCAL 79289dc channel: Reformat ssh_channel_close() 45172a7 sftp: Do not overwrite errors set by channel functions 7b0c80b tests: Test calling ssh_init() after ssh_finalize() d5bc9a1 libcrypto: Fix access violation in ssh_init() 80d3e10 tests: Verify that signatures are sane and can not be verified by non-matching key 455d495 pki: Sanitize input to verification b1bae1d pki: Return default RSA key type for DIGEST_AUTO ad4f1db pki: Verify the provided public key has expected type 5ffe695 pki: Sanity-check signature matches base key type 230a437 tests: Do not require base RSA type for SHA2 extension whitelist 1df272c packet_cb: Properly verify the signature type c3a57fe pki: Separate signature extraction and verification a238df2 pki: Set correct type for imported signatures f5e8fa5 pki: Use self-explanatory variable names 0a07266 The largest ECDSA key has 521 bits 953eae8 pki_gcrypt: Do not abort on bad signature 1d5215a server: Do not send SSH_MSG_EXT_INFO after rekey 2d06a83 kex: Do not negotiate extensions during rekey fd844ca tests: Verify setting NULL knownhosts does not crash a106a00 options: Do not crash when setting knownhosts to NULL (T108) d8372c3 gcrypt: Bugfix for very slow ecdh 9462105 socket: Add missing braces fe0331c socket: Remove redundant code 709c48e socket: Fix potential buffer overrun 3d56bda pki: Fix typos in documentation 8b4de1c packet: Fix timeout on hostkey type mismatch instead of proper error 906f63b packets: Fix ssh_send_keepalive() 26ea4f0 COPYING: Reformat the last paragraph 3b46198 tests: Fix chroot_wrapper location 3de3494 tests: Ensure the ssh session fd is read-/writeable in torture_proxycommand 69cb3c5 knownhosts: Take StrictHostKeyChecking option into account 5102b16 crypto: Fix compilation for OpenSSL without deprecated APIs dc071dc cmake: Refresh the CMake Config files a8d4fba tests: Improve error reporting in auth test 56b7d2d tests: Typo -- the flags should be checked according to the comment a4b99ee knownhosts: Make sure we have both knownhosts files ready 8a8498b client: Reformat comment 44b32e9 tests/pkd: Properly clean up memory 0590795 session: Drop unused structure member (SSHv1) f11be32 misc: Properly check for errors returned from getpwuid_r() a9be4ab misc: Reformat ssh_get_user_home_dir and ssh_file_readaccess_ok 273fb4c Bump version to 0.8.5 56f7c27 Bump SO version to 4.7.2 1285b37 doc: fix up various typos and trailing whitespace b7de358 libcrypto: Fix memory leak in evp_final() bea6393 gssapi: Set correct state after sending GSSAPI_RESPONSE (select mechanism OID) 9158cc5 socket: Undouble socket fds 8ba10ef client: Send KEX as soon as banners are exchanged 2ff8a09 tests: Verify we can authenticate using ed25519 key d52fa9a tests: Global known_hosts are used for host key verification ec3fdb4 knownhosts: Consult also the global known hosts file d877969 options: Set the global known_hosts file b1a7bd2 tests: Verify the hostkey ordering for negotiation is correct 0831b85 tests: Generate valid known_hosts file, fixing the current test 34d1f5e tests: Verify the ecdsa key types are handled correctly fcf2cd0 kex: Use all supported hostkey algorithms for negotiation 4a4ca44 kex: Honor more host key algorithms than the first one (ssh-ed25519) 17a6c3f knownhosts: Use the correct name for ECDSA keys for host key negotiation e24bb93 tests: Do not trace sshd 5c2d444 tests: Add option tests for global and user specific known_hosts 9763563 options: Add support for getting the known_hosts locations 5f9d9f4 examples: Explicitly track auth state in samplesshd-kbdint e8f3207 messages: Check that the requested service is 'ssh-connection' e5cee20 server: Set correct state after sending INFO_REQUEST (Kbd Interactive) 63056d1 priv: Add ssize_t if not available with MSVC 09e4f3d packet: Add missing break in ssh_packet_incoming_filter() 4b886ac src: Fix typos Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-support/libssh/{libssh_0.8.4.bb => libssh_0.8.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.4.bb b/meta-oe/recipes-support/libssh/libssh_0.8.8.bb similarity index 86% rename from meta-oe/recipes-support/libssh/libssh_0.8.4.bb rename to meta-oe/recipes-support/libssh/libssh_0.8.8.bb index 6040ec9..1952a8f 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.8.4.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.8.8.bb @@ -2,12 +2,12 @@ SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" HOMEPAGE = "http://www.libssh.org" SECTION = "libs" LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139" +LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" DEPENDS = "zlib openssl libgcrypt" SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8" -SRCREV = "789df0b7d0c7abd6b85db9fc5247e146e3d4ddba" +SRCREV = "7850307210590a9a1b03ab0273d29b3926a974c5" 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 Mar 3 19:40:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 19:40:40 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: nodejs: allow use of system brotli (and make default) In-Reply-To: <158326443852.31613.2286609134275667664@git.openembedded.org> References: <158326443852.31613.2286609134275667664@git.openembedded.org> Message-ID: <20200303194039.20BF4233520@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b3b81507b7289a4d8ce96aedc9fcfb46fb919c1c Author: Andr? Draszik AuthorDate: Tue Mar 3 17:28:51 2020 +0000 nodejs: allow use of system brotli (and make default) Use system brotli via PACKAGECONFIG by default. So far, nodejs had been built using its embedded copy of brotli, which we generally try to avoid, for the known reasons (independent updates, cve & license checks, etc). The nodejs patches to enable this have been submitted. brotli is in meta-oe, so enabling this by default should not be a problem. Signed-off-by: Andr? Draszik Signed-off-by: Khem Raj --- ...allow-passing-multiple-libs-to-pkg_config.patch | 41 ++++++++++++++ ...uild-allow-use-of-system-installed-brotli.patch | 66 ++++++++++++++++++++++ meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 7 ++- 3 files changed, 113 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch new file mode 100644 index 0000000..13edf22 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch @@ -0,0 +1,41 @@ +From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Mon, 2 Mar 2020 12:17:09 +0000 +Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Sometimes it's necessary to pass multiple library names to pkg-config, +e.g. the brotli shared libraries can be pulled in with + pkg-config libbrotlienc libbrotlidec + +Update the code to handle both, strings (as used so far), and lists +of strings. + +Signed-off-by: Andr? Draszik +--- +Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046] + configure.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index beb08df088..e3f78f2fed 100755 +--- a/configure.py ++++ b/configure.py +@@ -680,7 +680,11 @@ def pkg_config(pkg): + retval = () + for flag in ['--libs-only-l', '--cflags-only-I', + '--libs-only-L', '--modversion']: +- args += [flag, pkg] ++ args += [flag] ++ if isinstance(pkg, list): ++ args += pkg ++ else: ++ args += [pkg] + try: + proc = subprocess.Popen(shlex.split(pkg_config) + args, + stdout=subprocess.PIPE) +-- +2.25.0 + diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch new file mode 100644 index 0000000..fc038f3 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch @@ -0,0 +1,66 @@ +From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Mon, 2 Mar 2020 12:17:35 +0000 +Subject: [PATCH 2/2] build: allow use of system-installed brotli +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +brotli is available as a shared library since 2016, so it makes sense +to allow its use as a system-installed version. + +Some of the infrastructure was in place already (node.gyp and +node.gypi), but some bits in the configure script here were missing. + +Add them, keeping the default as before, to use the bundled version. + +Refs: https://github.com/google/brotli/pull/421 +Signed-off-by: Andr? Draszik +--- +Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046] + configure.py | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/configure.py b/configure.py +index e3f78f2fed..0190e31b41 100755 +--- a/configure.py ++++ b/configure.py +@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath', + dest='shared_zlib_libpath', + help='a directory to search for the shared zlib DLL') + ++shared_optgroup.add_option('--shared-brotli', ++ action='store_true', ++ dest='shared_brotli', ++ help='link to a shared brotli DLL instead of static linking') ++ ++shared_optgroup.add_option('--shared-brotli-includes', ++ action='store', ++ dest='shared_brotli_includes', ++ help='directory containing brotli header files') ++ ++shared_optgroup.add_option('--shared-brotli-libname', ++ action='store', ++ dest='shared_brotli_libname', ++ default='brotlidec,brotlienc', ++ help='alternative lib name to link to [default: %default]') ++ ++shared_optgroup.add_option('--shared-brotli-libpath', ++ action='store', ++ dest='shared_brotli_libpath', ++ help='a directory to search for the shared brotli DLL') ++ + shared_optgroup.add_option('--shared-cares', + action='store_true', + dest='shared_cares', +@@ -1692,6 +1713,7 @@ configure_napi(output) + configure_library('zlib', output) + configure_library('http_parser', output) + configure_library('libuv', output) ++configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc']) + configure_library('cares', output, pkgname='libcares') + configure_library('nghttp2', output, pkgname='libnghttp2') + configure_v8(output) +-- +2.25.0 + 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 49bb71e..1ea438c 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb @@ -20,6 +20,8 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0003-Install-both-binaries-and-use-libdir.patch \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ file://big-endian.patch \ + file://0001-build-allow-passing-multiple-libs-to-pkg_config.patch \ + file://0002-build-allow-use-of-system-installed-brotli.patch \ " SRC_URI_append_class-target = " \ file://0002-Using-native-binaries.patch \ @@ -51,8 +53,9 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '- GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " ARCHFLAGS ?= "" -PACKAGECONFIG ??= "ares icu libuv zlib" +PACKAGECONFIG ??= "ares brotli icu libuv zlib" PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" @@ -81,6 +84,8 @@ python do_unpack() { shutil.rmtree(d.getVar('S') + '/deps/openssl', True) if 'ares' in d.getVar('PACKAGECONFIG'): shutil.rmtree(d.getVar('S') + '/deps/cares', True) + if 'brotli' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/brotli', True) if 'libuv' in d.getVar('PACKAGECONFIG'): shutil.rmtree(d.getVar('S') + '/deps/uv', True) if 'nghttp2' in d.getVar('PACKAGECONFIG'): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 21:10:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 21:10:31 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: dlm: Fix host-user-contaminated QA errors Message-ID: <158326983140.24328.2897306864561168155@git.openembedded.org> 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 71e0072 dlm: Fix host-user-contaminated QA errors 71e0072 is described below commit 71e00725fc7d7b470ed8e996fe361951dd1086d2 Author: Khem Raj AuthorDate: Tue Mar 3 13:06:31 2020 -0800 dlm: Fix host-user-contaminated QA errors - Drop unused 0001-dlm-fix-package-qa-error.patch - Merge appends into main task - remove explicitly mentioning systemd in deps, systemd bbclass will add it - Add a patch to fix install using cp cmd to preserve file permissions Fixes dlm: /usr/lib/libdlmcontrol.so.3 is owned by uid 1000, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] Signed-off-by: Khem Raj --- .../dlm/dlm/0001-dlm-fix-package-qa-error.patch | 32 -------------- ...Replace-cp-a-with-mode-preserving-options.patch | 51 ++++++++++++++++++++++ meta-networking/recipes-extended/dlm/dlm_4.0.9.bb | 24 ++++------ 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch b/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch deleted file mode 100644 index 3e384f7..0000000 --- a/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1fb68433bde97d571fc781b52c9521b17fbb8df0 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 24 Jul 2018 17:42:43 +0800 -Subject: [PATCH] dlm: fix package qa error - -pass LDFLAG to makefile to fix below error: -do_package_qa: QA Issue: No GNU_HASH in the elf binary: -/packages-split/dlm/usr/sbin/dlm_stonith' [ldflags] - -Upstream-Status: Inappropriate[oe-specific] - -Signed-off-by: Changqing Li ---- - fence/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fence/Makefile b/fence/Makefile -index cca0b2c..2b3963c 100644 ---- a/fence/Makefile -+++ b/fence/Makefile -@@ -33,7 +33,7 @@ BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += `pkg-config libxml-2.0 --cflags` - BIN_CFLAGS += -I../include - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += `pkg-config libxml-2.0 --libs` - BIN_LDFLAGS += -ldl - --- -2.7.4 - diff --git a/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch new file mode 100644 index 0000000..e6a3757 --- /dev/null +++ b/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch @@ -0,0 +1,51 @@ +From 2f72f9271b8dd61ca5092e025b0f8243c6fd68f2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 3 Mar 2020 12:38:19 -0800 +Subject: [PATCH] make: Replace cp -a with mode preserving options + +Helps fix permissions in staging area + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + dlm_controld/Makefile | 4 ++-- + libdlm/Makefile | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index 6081cf8..fe71be2 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -88,8 +88,8 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 644 libdlmcontrol.h $(DESTDIR)/$(HDRDIR) + $(INSTALL) -m 644 dlm_controld.8 $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/libdlm/Makefile b/libdlm/Makefile +index ab32761..8820bf8 100644 +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -125,10 +125,10 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(UDEVDIR) + $(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 755 $(LLT_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LLT_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LLT_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 644 $(LLT_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR) +-- +2.25.1 + diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb index 4bf9944..577db70 100644 --- a/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb +++ b/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb @@ -8,6 +8,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \ file://0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch \ file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ + file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \ " SRC_URI[md5sum] = "4c57a941a15547859cd38fd55f66388e" @@ -21,7 +22,7 @@ LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" S = "${WORKDIR}/dlm-dlm-${PV}" -DEPENDS = "corosync systemd" +DEPENDS += "corosync" inherit pkgconfig systemd features_check @@ -40,29 +41,20 @@ do_compile_prepend_toolchain-clang() { sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile } -do_compile_prepend() { +do_compile() { sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile -} - -do_compile () { oe_runmake 'CC=${CC}' } -do_install_append (){ - install -d ${D}${sysconfdir}/sysconfig/ - install -d ${D}${sysconfdir}/init.d/ - install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm - install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm +do_install() { + oe_runmake install DESTDIR=${D} LIBDIR=${libdir} + install -Dm 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm + install -Dm 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm # install systemd unit files if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system + install -Dm 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system/dlm.service fi } -do_install() { - oe_runmake install DESTDIR=${D} LIBDIR=${libdir} -} - -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 22:53:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:53:18 +0000 Subject: [oe-commits] [openembedded-core] 01/06: babeltrace: only check latest git tag version for 1.x.x In-Reply-To: <158327599787.22056.302567931919551630@git.openembedded.org> References: <158327599787.22056.302567931919551630@git.openembedded.org> Message-ID: <20200303225318.3B87F233522@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 30823ade8dc438718ec05743153899632c781993 Author: Anders Wallin AuthorDate: Tue Mar 3 16:54:20 2020 +0100 babeltrace: only check latest git tag version for 1.x.x version 2.x.x will be added with a new babeltrace2 recipe Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index c050dc6..4d2492a 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -11,7 +11,7 @@ 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+)+)$" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P1(\.\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 Mar 3 22:53:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:53:17 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (4ac97e5 -> 7eacadb) Message-ID: <158327599787.22056.302567931919551630@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 4ac97e5 test new 30823ad babeltrace: only check latest git tag version for 1.x.x new 3b91800 lib/oe/utils: allow to set a lower bound on returned cpu_count() new 08e7c4b bitbake.conf: more deterministic xz compression (threads) new 7689182 bitbake.conf: omit XZ threads and RAM from sstate signatures new 9ff819b libuv: move from meta-oe to core for bind update new 7eacadb bind: Update to latest ESV version 9.16 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/bitbake.conf | 5 ++- meta/conf/distro/include/maintainers.inc | 1 + meta/lib/oe/utils.py | 5 +-- ...igure.in-remove-useless-L-use_openssl-lib.patch | 30 ---------------- ...lwresd-V-and-start-log-hide-build-options.patch | 33 +++++++++--------- ...-searching-for-json-headers-searches-sysr.patch | 14 ++++---- .../bind/{bind_9.11.13.bb => bind_9.16.0.bb} | 40 ++++++++-------------- meta/recipes-connectivity/libuv/libuv_1.34.2.bb | 19 ++++++++++ meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 2 +- 9 files changed, 66 insertions(+), 83 deletions(-) delete mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch rename meta/recipes-connectivity/bind/{bind_9.11.13.bb => bind_9.16.0.bb} (77%) create mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.2.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 22:53:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:53:20 +0000 Subject: [oe-commits] [openembedded-core] 03/06: bitbake.conf: more deterministic xz compression (threads) In-Reply-To: <158327599787.22056.302567931919551630@git.openembedded.org> References: <158327599787.22056.302567931919551630@git.openembedded.org> Message-ID: <20200303225318.520D6233525@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 08e7c4b0ce99222143d0b84aee1221923446ce26 Author: Andr? Draszik AuthorDate: Tue Mar 3 16:05:11 2020 +0000 bitbake.conf: more deterministic xz compression (threads) xz archives can be non-deterministic / non-reproducible: a) archives are created differently in single- vs multi-threaded modes b) xz will scale down the compression level so as to be try to work within any memory limit given to it when operating in single-threaded mode This means that due to bitbake's default of using as many threads as there are cores in the system, files compressed with xz will be different if built on a multi-core system compared to single-core systems. They will also potentially be different if built on single-core systems with different amounts of physical memory, due to bitbake's default of limiting xz's memory consumption. Force multi-threaded operation by default, even on single-core systems, so as to ensure archives are created in the same way in all cases. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e201b67..131ba29 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -795,7 +795,7 @@ BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" # Default parallelism and resource usage for xz -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" +XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count(at_least=2)}" ################################################################## # Magic Cookie for SANITY CHECK -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 22:53:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:53:19 +0000 Subject: [oe-commits] [openembedded-core] 02/06: lib/oe/utils: allow to set a lower bound on returned cpu_count() In-Reply-To: <158327599787.22056.302567931919551630@git.openembedded.org> References: <158327599787.22056.302567931919551630@git.openembedded.org> Message-ID: <20200303225318.473E4233524@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3b91800dc852c0dfc3ff7ab79573c086ac2ba2d3 Author: Andr? Draszik AuthorDate: Tue Mar 3 16:05:10 2020 +0000 lib/oe/utils: allow to set a lower bound on returned cpu_count() This will be needed for making xz compression more deterministic, as xz archives are created differently in single- vs multi-threaded modes. This means that due to bitbake's default of using as many threads as there are cores in the system, files compressed with xz will be different if built on a multi-core system compared to single-core systems. Allowing cpu_count() here to return a lower bound, will allow forcing xz to always use multi-threaded operation. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/lib/oe/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index e350b05..aee4336 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -248,9 +248,10 @@ def trim_version(version, num_parts=2): trimmed = ".".join(parts[:num_parts]) return trimmed -def cpu_count(): +def cpu_count(at_least=1): import multiprocessing - return multiprocessing.cpu_count() + cpus = multiprocessing.cpu_count() + return max(cpus, at_least) def execute_pre_post_process(d, cmds): if cmds is None: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 22:53:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:53:21 +0000 Subject: [oe-commits] [openembedded-core] 04/06: bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <158327599787.22056.302567931919551630@git.openembedded.org> References: <158327599787.22056.302567931919551630@git.openembedded.org> Message-ID: <20200303225318.5E192233526@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7689182b132d97c583b648643b21c1699c328321 Author: Andr? Draszik AuthorDate: Tue Mar 3 16:05:12 2020 +0000 bitbake.conf: omit XZ threads and RAM from sstate signatures The number of threads used, and the amount of memory allowed to be used, should not affect sstate signatures, as they don't affect the outcome of the compression if xz operates in multi-threaded mode [1]. Otherwise, it becomes impossible to re-use sstate from automated builders on developer's machines (as the former might execute bitbake with certain constraints different compared to developer's machines). This is in particular a problem with the opkg package writing backend, as the OPKGBUILDCMD depends on XZ_DEFAULTS. Without the vardepexclude, there is no re-use possible of the package_write_ipk sstate. Whitelist the maximum number of threads and the memory limit given assumptions outlined in [2] below. Signed-off-by: Andr? Draszik [1] When starting out in multi-threaded mode, the output is always deterministic, as even if xz scales down to single-threaded later, the archives are still split into blocks and size information is still added, thus keeping them compatible with multi-threaded mode. Also, when starting out in multi-threaded mode, xz never scales down the compression level to accomodate memory usage restrictions, it just scales down the number of threads and errors out if it can not accomodate the memory limit. [2] Assumptions * We only support multi-threaded mode (threads >= 2), builds should not try to use xz in single-threaded mode * The thread limit should be set via XZ_THREADS, not via modifying XZ_DEFAULTS or XZ_OPTS, or any other way * The thread limit should not be set to xz's magic value zero (0), as that will lead to single-threaded mode on single-core systems. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 131ba29..4b544a2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -795,7 +795,10 @@ BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" # Default parallelism and resource usage for xz -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count(at_least=2)}" +XZ_MEMLIMIT ?= "50%" +XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" +XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" ################################################################## # Magic Cookie for SANITY CHECK -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 22:53:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:53:22 +0000 Subject: [oe-commits] [openembedded-core] 05/06: libuv: move from meta-oe to core for bind update In-Reply-To: <158327599787.22056.302567931919551630@git.openembedded.org> References: <158327599787.22056.302567931919551630@git.openembedded.org> Message-ID: <20200303225318.6A3F2233527@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9ff819b18e0dd36137feeb50234582a83fcb27ea Author: Armin Kuster AuthorDate: Tue Mar 3 13:09:03 2020 -0800 libuv: move from meta-oe to core for bind update Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-connectivity/libuv/libuv_1.34.2.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 10095ff..d724148 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -392,6 +392,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin " RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling " RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal " RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic " +RECIPE_MAINTAINER_pn-libuv = "Armin Kuster " RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.2.bb b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb new file mode 100644 index 0000000..234cec3 --- /dev/null +++ b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv" +BUGTRACKER = "https://github.com/libuv/libuv/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 22:53:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:53:23 +0000 Subject: [oe-commits] [openembedded-core] 06/06: bind: Update to latest ESV version 9.16 In-Reply-To: <158327599787.22056.302567931919551630@git.openembedded.org> References: <158327599787.22056.302567931919551630@git.openembedded.org> Message-ID: <20200303225318.79DCB233528@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7eacadb4ee3e58b8481d4c53f147f3d2ab377068 Author: Armin Kuster AuthorDate: Thu Feb 27 12:56:08 2020 -0800 bind: Update to latest ESV version 9.16 Removed obsolete packageconfig options License change to MPL-2.0 https://gitlab.isc.org/isc-projects/bind9/blob/master/LICENSE Refreshed: bind-ensure-searching-for-json-headers-searches-sysr.patch 0001-named-lwresd-V-and-start-log-hide-build-options.patch Drop obsolete patch: 0001-configure.in-remove-useless-L-use_openssl-lib.patch Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- ...igure.in-remove-useless-L-use_openssl-lib.patch | 30 ---------------- ...lwresd-V-and-start-log-hide-build-options.patch | 33 +++++++++--------- ...-searching-for-json-headers-searches-sysr.patch | 14 ++++---- .../bind/{bind_9.11.13.bb => bind_9.16.0.bb} | 40 ++++++++-------------- 4 files changed, 38 insertions(+), 79 deletions(-) diff --git a/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch b/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch deleted file mode 100644 index 9d31b98..0000000 --- a/meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2325a92f1896a2a7f586611686801b41fbc91b50 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 27 Aug 2018 15:00:51 +0800 -Subject: [PATCH] configure.in: remove useless `-L$use_openssl/lib' - -Since `--with-openssl=${STAGING_DIR_HOST}${prefix}' is used in bind recipe, -the `-L$use_openssl/lib' has a hardcoded suffix, removing it is harmless -and helpful for clean up host build path in isc-config.sh - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e85a5c6..2bbfc58 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1631,7 +1631,7 @@ If you don't want OpenSSL, use --without-openssl]) - fi - ;; - *) -- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" -+ DST_OPENSSL_LIBS="-lcrypto" - ;; - esac - fi diff --git a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 75908aa..5bcc16c 100644 --- a/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ b/meta/recipes-connectivity/bind/bind/0001-named-lwresd-V-and-start-log-hide-build-options.patch @@ -12,23 +12,24 @@ $ named -V Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Hongxu Jia + +Refreshed for 9.16.0 +Signed-off-by: Armin Kuster + --- bin/named/include/named/globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index ba3457e..7741da7 100644 ---- a/bin/named/include/named/globals.h -+++ b/bin/named/include/named/globals.h -@@ -68,7 +68,7 @@ EXTERN const char * ns_g_version INIT(VERSION); - EXTERN const char * ns_g_product INIT(PRODUCT); - EXTERN const char * ns_g_description INIT(DESCRIPTION); - EXTERN const char * ns_g_srcid INIT(SRCID); --EXTERN const char * ns_g_configargs INIT(CONFIGARGS); -+EXTERN const char * ns_g_configargs INIT("*** (options are hidden)"); - EXTERN const char * ns_g_builder INIT(BUILDER); - EXTERN in_port_t ns_g_port INIT(0); - EXTERN isc_dscp_t ns_g_dscp INIT(-1); --- -2.7.4 - +Index: bind-9.16.0/bin/named/include/named/globals.h +=================================================================== +--- bind-9.16.0.orig/bin/named/include/named/globals.h ++++ bind-9.16.0/bin/named/include/named/globals.h +@@ -69,7 +69,7 @@ EXTERN const char *named_g_version I + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +-EXTERN const char *named_g_configargs INIT(CONFIGARGS); ++EXTERN const char *named_g_configargs INIT("*** (options are hidden)"); + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); diff --git a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch index 84559e5..19f1a25 100644 --- a/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ b/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch @@ -32,16 +32,16 @@ Signed-off-by: Paul Gortmaker configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 17392fd..e85a5c6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2449,7 +2449,7 @@ case "$use_libjson" in - libjson_libs="" +Index: bind-9.16.0/configure.ac +=================================================================== +--- bind-9.16.0.orig/configure.ac ++++ bind-9.16.0/configure.ac +@@ -1214,7 +1214,7 @@ case "$use_lmdb" in + lmdb_libs="" ;; auto|yes) - for d in /usr /usr/local /opt/local + for d in "${STAGING_INCDIR}" do - if test -f "${d}/include/json/json.h" + if test -f "${d}/include/lmdb.h" then diff --git a/meta/recipes-connectivity/bind/bind_9.11.13.bb b/meta/recipes-connectivity/bind/bind_9.16.0.bb similarity index 77% rename from meta/recipes-connectivity/bind/bind_9.11.13.bb rename to meta/recipes-connectivity/bind/bind_9.16.0.bb index 4e64171..62e9be4 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.13.bb +++ b/meta/recipes-connectivity/bind/bind_9.16.0.bb @@ -2,12 +2,12 @@ SUMMARY = "ISC Internet Domain Name Server" HOMEPAGE = "http://www.isc.org/sw/bind/" SECTION = "console/network" -LICENSE = "ISC & BSD" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8f17f64e47e83b60cd920a1e4b54419e" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1" -DEPENDS = "openssl libcap zlib" +DEPENDS = "openssl libcap zlib libuv" -SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ +SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://conf.patch \ file://named.service \ file://bind9 \ @@ -15,22 +15,20 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://make-etc-initd-bind-stop-work.patch \ file://init.d-add-support-for-read-only-rootfs.patch \ file://bind-ensure-searching-for-json-headers-searches-sysr.patch \ - file://0001-configure.in-remove-useless-L-use_openssl-lib.patch \ file://0001-named-lwresd-V-and-start-log-hide-build-options.patch \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[md5sum] = "17de0d024ab1eac377f1c2854dc25057" -SRC_URI[sha256sum] = "fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d" +SRC_URI[md5sum] = "f973848bf32797c5f546de7d92a6fd07" +SRC_URI[sha256sum] = "af4bd9bdaeb1aa7399429972f3a8aa01dd6886b7ae046d703ab8da45330f2e28" +SRC_URI[sha1sum] = "01678973598db55dfb03cd12a004d3d75a8ab2bf" +SRC_URI[sha384sum] = "29df1a4a9d2a460ff970ea3d9abb47ff1204c762fa5c23da0627b0eeb847560f706d333796f61c5aeba09b8333532359" +SRC_URI[sha512sum] = "6f836fe4cb12d3e2e3a871f69e5b249b2bae6ae1dc542395c79cc974ca95aa595e963b6716a38f6c9d5cb3c54ec606fcd932412a6fbe596651123ac1379dd010" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" -# stay at 9.11 until 9.16, from 9.16 follow the ESV versions divisible by 4 +# stay at 9.16 follow the ESV versions divisible by 4 UPSTREAM_CHECK_REGEX = "(?P9.(11|16|20|24|28)(\.\d+)+(-P\d+)*)/" -# BIND >= 9.11.2 need dhcpd >= 4.4.0, -# 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 multilib_header MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh" @@ -40,17 +38,14 @@ PACKAGECONFIG ?= "readline" PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2" PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline" PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit" -PACKAGECONFIG[urandom] = "--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,," PACKAGECONFIG[python3] = "--with-python=yes --with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python, python3-ply-native," -ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" -EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \ - --disable-devpoll --enable-epoll --with-gost=no \ - --with-gssapi=no --with-ecdsa=yes --with-eddsa=no \ - --with-lmdb=no \ +EXTRA_OECONF = " --with-libtool --disable-devpoll --enable-epoll \ + --with-gssapi=no --with-lmdb=no --with-zlib \ --sysconfdir=${sysconfdir}/bind \ --with-openssl=${STAGING_DIR_HOST}${prefix} \ " +LDFLAGS_append = " -lz" inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native distutils3-base', '', d)} @@ -66,13 +61,6 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE_${PN} = "named.service" -do_install_prepend() { - # clean host path in isc-config.sh before the hardlink created - # by "make install": - # bind9-config -> isc-config.sh - sed -i -e "s,${STAGING_LIBDIR},${libdir}," ${B}/isc-config.sh -} - do_install_append() { rmdir "${D}${localstatedir}/run" @@ -130,7 +118,7 @@ FILES_${PN}-dev += "${bindir}/isc-config.h" FILES_${PN} += "${sbindir}/generate-rndc-key.sh" PACKAGE_BEFORE_PN += "${PN}-libs" -FILES_${PN}-libs = "${libdir}/*.so*" +FILES_${PN}-libs = "${libdir}/*.so* ${libdir}/named/*.so*" FILES_${PN}-staticdev += "${libdir}/*.la" PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 22:59:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 22:59:37 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: blktrace: modify two scripts for python3 Message-ID: <158327637783.25863.12109234669855556106@git.openembedded.org> 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 66f2732 blktrace: modify two scripts for python3 66f2732 is described below commit 66f2732bfdb9873680f6432f80e214670557c460 Author: Joe Slater AuthorDate: Tue Mar 3 14:56:41 2020 -0800 blktrace: modify two scripts for python3 Backport from git.kernel.dk. Changed shebangs to use python3. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- .../blktrace/make-btt-scripts-python3-ready.patch | 197 +++++++++++++++++++++ meta/recipes-kernel/blktrace/blktrace_git.bb | 1 + 2 files changed, 198 insertions(+) diff --git a/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch b/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch new file mode 100644 index 0000000..3b0c1c6 --- /dev/null +++ b/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch @@ -0,0 +1,197 @@ +From 70d5ca2d5f3d6b97c11c641b7e0c5836983219a0 Mon Sep 17 00:00:00 2001 +From: Eric Sandeen +Date: Wed, 28 Mar 2018 15:26:36 -0500 +Subject: [oe-core][PATCH 1/1] make btt scripts python3-ready + +Many distributions are moving to python3 by default. Here's +an attempt to make the python scripts in blktrace python3-ready. + +Most of this was done with automated tools. I hand fixed some +space-vs tab issues, and cast an array index to integer. It +passes rudimentary testing when run under python2.7 as well +as python3. + +This doesn't do anything with the shebangs, it leaves them both +invoking whatever "env python" coughs up on the system. + +Signed-off-by: Eric Sandeen +Signed-off-by: Jens Axboe + +Unchanged except to modify shebangs to use python3 since +oe-core does not support python2 anymore. + +Upstream-Status: Backport [git://git.kernel.dk/blktrace.git commit 70d5ca2d5...] + +Signed-off-by: Joe Slater + +--- + btt/bno_plot.py | 28 +++++++++++++++------------- + btt/btt_plot.py | 22 +++++++++++++--------- + 2 files changed, 28 insertions(+), 22 deletions(-) + +--- git.orig/btt/bno_plot.py ++++ git/btt/bno_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt blkno plotting interface + # +@@ -38,6 +38,8 @@ automatically push the keys under the gr + To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. + """ + ++from __future__ import absolute_import ++from __future__ import print_function + import getopt, glob, os, sys, tempfile + + verbose = 0 +@@ -60,14 +62,14 @@ def parse_args(in_args): + + try: + (opts, args) = getopt.getopt(in_args, s_opts, l_opts) +- except getopt.error, msg: +- print >>sys.stderr, msg +- print >>sys.stderr, __doc__ ++ except getopt.error as msg: ++ print(msg, file=sys.stderr) ++ print(__doc__, file=sys.stderr) + sys.exit(1) + + for (o, a) in opts: + if o in ('-h', '--help'): +- print __doc__ ++ print(__doc__) + sys.exit(0) + elif o in ('-v', '--verbose'): + verbose += 1 +@@ -84,10 +86,10 @@ if __name__ == '__main__': + (bnos, keys_below) = parse_args(sys.argv[1:]) + + if verbose: +- print 'Using files:', +- for bno in bnos: print bno, +- if keys_below: print '\nKeys are to be placed below graph' +- else: print '' ++ print('Using files:', end=' ') ++ for bno in bnos: print(bno, end=' ') ++ if keys_below: print('\nKeys are to be placed below graph') ++ else: print('') + + tmpdir = tempfile.mktemp() + os.mkdir(tmpdir) +@@ -99,7 +101,7 @@ if __name__ == '__main__': + fo = open(t, 'w') + for line in open(f, 'r'): + fld = line.split(None) +- print >>fo, fld[0], fld[1], int(fld[2])-int(fld[1]) ++ print(fld[0], fld[1], int(fld[2])-int(fld[1]), file=fo) + fo.close() + + t = t[t.rfind('/')+1:] +@@ -107,16 +109,16 @@ if __name__ == '__main__': + else: plot_cmd = "%s,'%s'" % (plot_cmd, t) + + fo = open('%s/plot.cmds' % tmpdir, 'w') +- print >>fo, cmds +- if len(bnos) > 10 or keys_below: print >>fo, 'set key below' +- print >>fo, plot_cmd ++ print(cmds, file=fo) ++ if len(bnos) > 10 or keys_below: print('set key below', file=fo) ++ print(plot_cmd, file=fo) + fo.close() + + pid = os.fork() + if pid == 0: + cmd = 'gnuplot %s/plot.cmds -' % tmpdir + +- if verbose: print 'Executing %s' % cmd ++ if verbose: print('Executing %s' % cmd) + + os.chdir(tmpdir) + os.system(cmd) +--- git.orig/btt/btt_plot.py ++++ git/btt/btt_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt_plot.py: Generate matplotlib plots for BTT generate data files + # +@@ -55,6 +55,10 @@ Arguments: + but the -o (--output) and -T (--title) options will be ignored. + """ + ++from __future__ import absolute_import ++from __future__ import print_function ++import six ++from six.moves import range + __author__ = 'Alan D. Brunelle ' + + #------------------------------------------------------------------------------ +@@ -82,7 +86,7 @@ get_base = lambda file: file[file.find( + def fatal(msg): + """Generate fatal error message and exit""" + +- print >>sys.stderr, 'FATAL: %s' % msg ++ print('FATAL: %s' % msg, file=sys.stderr) + sys.exit(1) + + #------------------------------------------------------------------------------ +@@ -163,7 +167,7 @@ def get_data(files): + if not os.path.exists(file): + fatal('%s not found' % file) + elif verbose: +- print 'Processing %s' % file ++ print('Processing %s' % file) + + xs = [] + ys = [] +@@ -214,8 +218,8 @@ def parse_args(args): + + try: + (opts, args) = getopt.getopt(args[1:], s_opts, l_opts) +- except getopt.error, msg: +- print >>sys.stderr, msg ++ except getopt.error as msg: ++ print(msg, file=sys.stderr) + fatal(__doc__) + + for (o, a) in opts: +@@ -293,15 +297,15 @@ def generate_output(type, db): + def color(idx, style): + """Returns a color/symbol type based upon the index passed.""" + +- colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ] ++ colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ] + l_styles = [ '-', ':', '--', '-.' ] + m_styles = [ 'o', '+', '.', ',', 's', 'v', 'x', '<', '>' ] + + color = colors[idx % len(colors)] + if style == 'line': +- style = l_styles[(idx / len(l_styles)) % len(l_styles)] ++ style = l_styles[int((idx / len(l_styles)) % len(l_styles))] + elif style == 'marker': +- style = m_styles[(idx / len(m_styles)) % len(m_styles)] ++ style = m_styles[int((idx / len(m_styles)) % len(m_styles))] + + return '%s%s' % (color, style) + +@@ -314,7 +318,7 @@ def generate_output(type, db): + ofile = '%s.png' % type + + if verbose: +- print 'Generating plot into %s' % ofile ++ print('Generating plot into %s' % ofile) + + fig = plt.figure(figsize=plot_size) + ax = fig.add_subplot(111) +@@ -329,7 +333,7 @@ def generate_output(type, db): + legends = None + + keys = [] +- for file in db.iterkeys(): ++ for file in six.iterkeys(db): + if not file in ['min_x', 'max_x', 'min_y', 'max_y']: + keys.append(file) + diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb index 2605ff9..6903053 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_git.bb @@ -12,6 +12,7 @@ PV = "1.2.0+git${SRCPV}" SRC_URI = "git://git.kernel.dk/blktrace.git \ file://ldflags.patch \ file://CVE-2018-10689.patch \ + file://make-btt-scripts-python3-ready.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 Mar 3 23:28:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 23:28:37 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (66f2732 -> 72deeb7) Message-ID: <158327811699.3789.12686712642404054301@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 66f2732 blktrace: modify two scripts for python3 discard 7eacadb bind: Update to latest ESV version 9.16 new 72deeb7 blktrace: modify two scripts for 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 (66f2732) \ N -- N -- N refs/heads/master-next (72deeb7) 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: ...igure.in-remove-useless-L-use_openssl-lib.patch | 30 ++++++++++++++++ ...lwresd-V-and-start-log-hide-build-options.patch | 33 +++++++++--------- ...-searching-for-json-headers-searches-sysr.patch | 14 ++++---- .../bind/{bind_9.16.0.bb => bind_9.11.13.bb} | 40 ++++++++++++++-------- 4 files changed, 79 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-connectivity/bind/bind/0001-configure.in-remove-useless-L-use_openssl-lib.patch rename meta/recipes-connectivity/bind/{bind_9.16.0.bb => bind_9.11.13.bb} (77%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 3 23:28:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 03 Mar 2020 23:28:38 +0000 Subject: [oe-commits] [openembedded-core] 01/01: blktrace: modify two scripts for python3 In-Reply-To: <158327811699.3789.12686712642404054301@git.openembedded.org> References: <158327811699.3789.12686712642404054301@git.openembedded.org> Message-ID: <20200303232837.76B8D233524@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 72deeb73d427707e918cef3d7b8ce31d435a4bfc Author: Joe Slater AuthorDate: Tue Mar 3 14:56:41 2020 -0800 blktrace: modify two scripts for python3 Backport from git.kernel.dk. Changed shebangs to use python3. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- .../blktrace/make-btt-scripts-python3-ready.patch | 197 +++++++++++++++++++++ meta/recipes-kernel/blktrace/blktrace_git.bb | 1 + 2 files changed, 198 insertions(+) diff --git a/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch b/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch new file mode 100644 index 0000000..3b0c1c6 --- /dev/null +++ b/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch @@ -0,0 +1,197 @@ +From 70d5ca2d5f3d6b97c11c641b7e0c5836983219a0 Mon Sep 17 00:00:00 2001 +From: Eric Sandeen +Date: Wed, 28 Mar 2018 15:26:36 -0500 +Subject: [oe-core][PATCH 1/1] make btt scripts python3-ready + +Many distributions are moving to python3 by default. Here's +an attempt to make the python scripts in blktrace python3-ready. + +Most of this was done with automated tools. I hand fixed some +space-vs tab issues, and cast an array index to integer. It +passes rudimentary testing when run under python2.7 as well +as python3. + +This doesn't do anything with the shebangs, it leaves them both +invoking whatever "env python" coughs up on the system. + +Signed-off-by: Eric Sandeen +Signed-off-by: Jens Axboe + +Unchanged except to modify shebangs to use python3 since +oe-core does not support python2 anymore. + +Upstream-Status: Backport [git://git.kernel.dk/blktrace.git commit 70d5ca2d5...] + +Signed-off-by: Joe Slater + +--- + btt/bno_plot.py | 28 +++++++++++++++------------- + btt/btt_plot.py | 22 +++++++++++++--------- + 2 files changed, 28 insertions(+), 22 deletions(-) + +--- git.orig/btt/bno_plot.py ++++ git/btt/bno_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt blkno plotting interface + # +@@ -38,6 +38,8 @@ automatically push the keys under the gr + To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. + """ + ++from __future__ import absolute_import ++from __future__ import print_function + import getopt, glob, os, sys, tempfile + + verbose = 0 +@@ -60,14 +62,14 @@ def parse_args(in_args): + + try: + (opts, args) = getopt.getopt(in_args, s_opts, l_opts) +- except getopt.error, msg: +- print >>sys.stderr, msg +- print >>sys.stderr, __doc__ ++ except getopt.error as msg: ++ print(msg, file=sys.stderr) ++ print(__doc__, file=sys.stderr) + sys.exit(1) + + for (o, a) in opts: + if o in ('-h', '--help'): +- print __doc__ ++ print(__doc__) + sys.exit(0) + elif o in ('-v', '--verbose'): + verbose += 1 +@@ -84,10 +86,10 @@ if __name__ == '__main__': + (bnos, keys_below) = parse_args(sys.argv[1:]) + + if verbose: +- print 'Using files:', +- for bno in bnos: print bno, +- if keys_below: print '\nKeys are to be placed below graph' +- else: print '' ++ print('Using files:', end=' ') ++ for bno in bnos: print(bno, end=' ') ++ if keys_below: print('\nKeys are to be placed below graph') ++ else: print('') + + tmpdir = tempfile.mktemp() + os.mkdir(tmpdir) +@@ -99,7 +101,7 @@ if __name__ == '__main__': + fo = open(t, 'w') + for line in open(f, 'r'): + fld = line.split(None) +- print >>fo, fld[0], fld[1], int(fld[2])-int(fld[1]) ++ print(fld[0], fld[1], int(fld[2])-int(fld[1]), file=fo) + fo.close() + + t = t[t.rfind('/')+1:] +@@ -107,16 +109,16 @@ if __name__ == '__main__': + else: plot_cmd = "%s,'%s'" % (plot_cmd, t) + + fo = open('%s/plot.cmds' % tmpdir, 'w') +- print >>fo, cmds +- if len(bnos) > 10 or keys_below: print >>fo, 'set key below' +- print >>fo, plot_cmd ++ print(cmds, file=fo) ++ if len(bnos) > 10 or keys_below: print('set key below', file=fo) ++ print(plot_cmd, file=fo) + fo.close() + + pid = os.fork() + if pid == 0: + cmd = 'gnuplot %s/plot.cmds -' % tmpdir + +- if verbose: print 'Executing %s' % cmd ++ if verbose: print('Executing %s' % cmd) + + os.chdir(tmpdir) + os.system(cmd) +--- git.orig/btt/btt_plot.py ++++ git/btt/btt_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt_plot.py: Generate matplotlib plots for BTT generate data files + # +@@ -55,6 +55,10 @@ Arguments: + but the -o (--output) and -T (--title) options will be ignored. + """ + ++from __future__ import absolute_import ++from __future__ import print_function ++import six ++from six.moves import range + __author__ = 'Alan D. Brunelle ' + + #------------------------------------------------------------------------------ +@@ -82,7 +86,7 @@ get_base = lambda file: file[file.find( + def fatal(msg): + """Generate fatal error message and exit""" + +- print >>sys.stderr, 'FATAL: %s' % msg ++ print('FATAL: %s' % msg, file=sys.stderr) + sys.exit(1) + + #------------------------------------------------------------------------------ +@@ -163,7 +167,7 @@ def get_data(files): + if not os.path.exists(file): + fatal('%s not found' % file) + elif verbose: +- print 'Processing %s' % file ++ print('Processing %s' % file) + + xs = [] + ys = [] +@@ -214,8 +218,8 @@ def parse_args(args): + + try: + (opts, args) = getopt.getopt(args[1:], s_opts, l_opts) +- except getopt.error, msg: +- print >>sys.stderr, msg ++ except getopt.error as msg: ++ print(msg, file=sys.stderr) + fatal(__doc__) + + for (o, a) in opts: +@@ -293,15 +297,15 @@ def generate_output(type, db): + def color(idx, style): + """Returns a color/symbol type based upon the index passed.""" + +- colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ] ++ colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ] + l_styles = [ '-', ':', '--', '-.' ] + m_styles = [ 'o', '+', '.', ',', 's', 'v', 'x', '<', '>' ] + + color = colors[idx % len(colors)] + if style == 'line': +- style = l_styles[(idx / len(l_styles)) % len(l_styles)] ++ style = l_styles[int((idx / len(l_styles)) % len(l_styles))] + elif style == 'marker': +- style = m_styles[(idx / len(m_styles)) % len(m_styles)] ++ style = m_styles[int((idx / len(m_styles)) % len(m_styles))] + + return '%s%s' % (color, style) + +@@ -314,7 +318,7 @@ def generate_output(type, db): + ofile = '%s.png' % type + + if verbose: +- print 'Generating plot into %s' % ofile ++ print('Generating plot into %s' % ofile) + + fig = plt.figure(figsize=plot_size) + ax = fig.add_subplot(111) +@@ -329,7 +333,7 @@ def generate_output(type, db): + legends = None + + keys = [] +- for file in db.iterkeys(): ++ for file in six.iterkeys(db): + if not file in ['min_x', 'max_x', 'min_y', 'max_y']: + keys.append(file) + diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb index 2605ff9..6903053 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_git.bb @@ -12,6 +12,7 @@ PV = "1.2.0+git${SRCPV}" SRC_URI = "git://git.kernel.dk/blktrace.git \ file://ldflags.patch \ file://CVE-2018-10689.patch \ + file://make-btt-scripts-python3-ready.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 Mar 4 17:19:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:19:55 +0000 Subject: [oe-commits] [meta-openembedded] 01/11: libcamera: Created new minimal core image file for ibcamera In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171954.D4C2923353A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c6ab2196ae568b8f50f19ed2cba7a879817ba707 Author: Madhavan Krishnan AuthorDate: Tue Mar 3 07:51:40 2020 +0100 libcamera: Created new minimal core image file for ibcamera Signed-off-by: Madhavan Krishnan Signed-off-by: Khem Raj --- .../images/multimedia-libcamera-image.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb b/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb new file mode 100644 index 0000000..20f00ed --- /dev/null +++ b/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb @@ -0,0 +1,19 @@ +# Copyright (C) 2020 Madhavan Krishnan +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "libcamera image" +LICENSE = "MIT" + +require meta-multimedia-image-base.bb + +IMAGE_INSTALL += " \ + kernel-modules \ + xkeyboard-config \ +" + +IMAGE_INSTALL_append = "\ + libcamera \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-base \ +" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:19:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:19:56 +0000 Subject: [oe-commits] [meta-openembedded] 02/11: fbgrab: upgrade 1.3 -> 1.3.1 In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171954.E451023353B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 127ad16f25910a1504905d8b06889fa9c0c4a165 Author: Pierre-Jean Texier AuthorDate: Wed Mar 4 10:50:22 2020 +0000 fbgrab: upgrade 1.3 -> 1.3.1 Switch SRC_URI to github because 'http://fbgrab.monells.se' is no more reachable it redirects to a github page. See full changelog https://github.com/GunnarMonell/fbgrab/releases Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../recipes-graphics/fbgrab/{fbgrab_1.3.bb => fbgrab_1.3.1.bb} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.1.bb similarity index 58% rename from meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb rename to meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.1.bb index e12bc09..212ba12 100644 --- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb +++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.1.bb @@ -1,15 +1,15 @@ SUMMARY = "FBGrab is a framebuffer screenshot program" -HOMEPAGE = "http://fbgrab.monells.se/" +HOMEPAGE = "https://github.com/GunnarMonell/fbgrab" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a" SECTION = "console/utils" DEPENDS = "libpng zlib" -SRC_URI = "http://fbgrab.monells.se/${BP}.tar.gz" +SRC_URI = "git://github.com/GunnarMonell/fbgrab.git;protocol=https" -inherit autotools-brokensep +SRCREV = "d3a8b6b42b6b74228e92758a0b015d8b8c1e6fa0" +S = "${WORKDIR}/git" -SRC_URI[md5sum] = "7d8c24081c681dfbba21f2934c1ac656" -SRC_URI[sha256sum] = "5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed" +inherit autotools-brokensep do_configure_prepend() { sed -i 's|$(DESTDIR)/usr/man/|$(DESTDIR)${mandir}/|g' ${S}/Makefile -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:19:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:19:54 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (71e0072 -> 36a020a) Message-ID: <158334239420.23763.1399659429667547861@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 71e0072 dlm: Fix host-user-contaminated QA errors new c6ab219 libcamera: Created new minimal core image file for ibcamera new 127ad16 fbgrab: upgrade 1.3 -> 1.3.1 new 757eece Revert "piglist: add from oe-core" new 7b4c03e wireshark: upgrade 3.2.1 -> 3.2.2 new 5ad5cf3 tcsh: upgrade 6.21.00 -> 6.22.02 new f8c5acd OpenCSD: Support for Arm CoreSight decode lib new 0fc787c packagegroup-meta-multimedia: Purge gst 0.10 related rdeps new d43c851 vlc: Depend on gst-1.0 ugly plugins instead of 0.10 new 1371781 minidlna: Retarget gettext patch to gettex version 0.20 new 0a956ca openh264: Upgrade to 2.0.0 new 36a020a x265: Disable assembly on x86 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: .../images/multimedia-libcamera-image.bb | 19 ++++++ .../minidlna/0001-Update-Gettext-version.patch | 6 +- ...o-not-poke-at-host-gcc-for-target-options.patch | 25 ++++++++ ...file-Use-cp-options-to-preserve-file-mode.patch | 32 ++++++++++ .../openh264/0001-codec-Disable-asm-for-mips.patch | 70 ++++++++++++++++++++++ .../{openh264_1.7.0.bb => openh264_2.0.0.bb} | 17 ++++-- .../packagegroups/packagegroup-meta-multimedia.bb | 6 +- .../recipes-multimedia/vlc/vlc_3.0.8.bb | 2 +- .../recipes-multimedia/x265/x265_3.2.1.bb | 2 + .../{wireshark_3.2.1.bb => wireshark_3.2.2.bb} | 4 +- meta-oe/recipes-devtools/opencsd/opencsd_git.bb | 28 +++++++++ .../fbgrab/{fbgrab_1.3.bb => fbgrab_1.3.1.bb} | 10 ++-- ...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 -------------------- .../tcsh/{tcsh_6.21.00.bb => tcsh_6.22.02.bb} | 4 +- 16 files changed, 203 insertions(+), 153 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch rename meta-multimedia/recipes-multimedia/openh264/{openh264_1.7.0.bb => openh264_2.0.0.bb} (68%) rename meta-networking/recipes-support/wireshark/{wireshark_3.2.1.bb => wireshark_3.2.2.bb} (95%) create mode 100644 meta-oe/recipes-devtools/opencsd/opencsd_git.bb rename meta-oe/recipes-graphics/fbgrab/{fbgrab_1.3.bb => fbgrab_1.3.1.bb} (58%) delete mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch delete mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch delete mode 100644 meta-oe/recipes-graphics/piglit/piglit_git.bb rename meta-oe/recipes-shells/tcsh/{tcsh_6.21.00.bb => tcsh_6.22.02.bb} (91%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:19:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:19:58 +0000 Subject: [oe-commits] [meta-openembedded] 04/11: wireshark: upgrade 3.2.1 -> 3.2.2 In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.113D3233548@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7b4c03e45a55d012736beed6dbf76f8f50c33f1b Author: Zheng Ruoqin AuthorDate: Wed Mar 4 18:17:18 2020 +0800 wireshark: upgrade 3.2.1 -> 3.2.2 Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../wireshark/{wireshark_3.2.1.bb => wireshark_3.2.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb similarity index 95% rename from meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb rename to meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb index 5f89ec8..b2bcf5f 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.2.1.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.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] = "e699b1e001c6303013791d81faf7727d" -SRC_URI[sha256sum] = "589f640058d6408ebbd695a80ebbd6e7bd99d8db64ecda253d27100dfd27e85b" +SRC_URI[md5sum] = "e468b78e1176e0212b13ef809f59dcbb" +SRC_URI[sha256sum] = "5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208feeded79" PE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:19:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:19:57 +0000 Subject: [oe-commits] [meta-openembedded] 03/11: Revert "piglist: add from oe-core" In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.01097233546@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 757eece4ac1892e3ec2355e54a6cd354101d025b Author: Adrian Bunk AuthorDate: Wed Mar 4 11:28:17 2020 +0200 Revert "piglist: add from oe-core" This reverts commit af22a7a46ab6306aa4d59037e59b4dcf373b2603. The recipe is staying in OE-core. Signed-off-by: Adrian Bunk 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 deletions(-) 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 deleted file mode 100644 index e07e810..0000000 --- a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 5d6ec36..0000000 --- a/meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 58d10d6..0000000 --- a/meta-oe/recipes-graphics/piglit/piglit_git.bb +++ /dev/null @@ -1,64 +0,0 @@ -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 Wed Mar 4 17:19:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:19:59 +0000 Subject: [oe-commits] [meta-openembedded] 05/11: tcsh: upgrade 6.21.00 -> 6.22.02 In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.1EDD723354A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5ad5cf3127effeb67963d6382b2a2763d78210c0 Author: Zheng Ruoqin AuthorDate: Wed Mar 4 18:19:14 2020 +0800 tcsh: upgrade 6.21.00 -> 6.22.02 Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- meta-oe/recipes-shells/tcsh/{tcsh_6.21.00.bb => tcsh_6.22.02.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.21.00.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb similarity index 91% rename from meta-oe/recipes-shells/tcsh/tcsh_6.21.00.bb rename to meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb index 278ab04..79ab67a 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh_6.21.00.bb +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb @@ -13,8 +13,8 @@ SRC_URI = " \ file://0001-Enable-system-malloc-on-all-linux.patch \ file://0002-Add-debian-csh-scripts.patch \ " -SRC_URI[md5sum] = "5bd5f11515cc5cca927777fa92f9d4b9" -SRC_URI[sha256sum] = "c438325448371f59b12a4c93bfd3f6982e6f79f8c5aef4bc83aac8f62766e972" +SRC_URI[md5sum] = "f34909eab33733aecc05d27adc82277b" +SRC_URI[sha256sum] = "ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b" EXTRA_OEMAKE += "CC_FOR_GETHOST='${BUILD_CC}'" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:20:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:20:01 +0000 Subject: [oe-commits] [meta-openembedded] 07/11: packagegroup-meta-multimedia: Purge gst 0.10 related rdeps In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.3D68223354C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0fc787cfa4a321a908d26f5d688ef11e600d40c9 Author: Khem Raj AuthorDate: Tue Mar 3 21:52:53 2020 -0800 packagegroup-meta-multimedia: Purge gst 0.10 related rdeps Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-multimedia.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index cef45f9..e0cb415 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -29,9 +29,9 @@ RDEPENDS_packagegroup-meta-multimedia = "\ rtmpdump libopenmpt schroedinger mpd mpc libmpdclient \ ncmpc libmpd dcadec libiec61883 \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna gst-fluendo-mpegdemux vlc", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265 gst-openmax", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper gst-plugins-ugly gst-fluendo-mp3 gst-plugins-gl", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna vlc", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "openh264 opencore-amr faac vo-amrwbenc", "", d)} \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:20:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:20:00 +0000 Subject: [oe-commits] [meta-openembedded] 06/11: OpenCSD: Support for Arm CoreSight decode lib In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.2E32523354B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f8c5acdae8770a36a30397ae4f153703ecea16c8 Author: Leo Yan AuthorDate: Wed Mar 4 12:28:11 2020 +0000 OpenCSD: Support for Arm CoreSight decode lib This recipe is to support OpenCSD, which is an open source CoreSight trace decode library and utility. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/opencsd/opencsd_git.bb | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/meta-oe/recipes-devtools/opencsd/opencsd_git.bb b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb new file mode 100644 index 0000000..0c3b483 --- /dev/null +++ b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "OpenCSD - An open source CoreSight(tm) Trace Decode library" +HOMEPAGE = "https://github.com/Linaro/OpenCSD" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5" + +SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=http;branch=master" +SRCREV = "03c194117971e4ad0598df29395757ced2e6e9bd" + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST = "(x86_64.*|aarch64.*)-linux" + +EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \ + CROSS_COMPILE='${TARGET_SYS}-' \ + CC='${CC}' \ + CXX='${CXX}' \ + LINKER='${CXX}' \ + LINUX64=1 \ + DEBUG=1 \ + " + +do_compile() { + ( cd ${S}/decoder/build/linux; oe_runmake ${EXTRA_OEMAKE}; cd - ) +} + +do_install() { + ( cd ${S}/decoder/build/linux; oe_runmake PREFIX=${D}/usr install; cd - ) +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:20:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:20:02 +0000 Subject: [oe-commits] [meta-openembedded] 08/11: vlc: Depend on gst-1.0 ugly plugins instead of 0.10 In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.4B1F423354E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d43c851622e46c4312af9b45811782ae41f3f3a0 Author: Khem Raj AuthorDate: Tue Mar 3 21:53:36 2020 -0800 vlc: Depend on gst-1.0 ugly plugins instead of 0.10 Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7fadca4..c15ff9a 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb @@ -65,7 +65,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:20:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:20:03 +0000 Subject: [oe-commits] [meta-openembedded] 09/11: minidlna: Retarget gettext patch to gettex version 0.20 In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.622F4233550@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1371781154468988cdb69bac3ffed7f255bed2d9 Author: Khem Raj AuthorDate: Tue Mar 3 22:03:33 2020 -0800 minidlna: Retarget gettext patch to gettex version 0.20 This fixes *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Signed-off-by: Khem Raj --- .../minidlna/minidlna/0001-Update-Gettext-version.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch index c18095d..6100da3 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch @@ -10,8 +10,6 @@ Signed-off-by: Baptiste Durand configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index f343d21..a556b33 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ @@ -23,12 +21,12 @@ index f343d21..a556b33 100644 #LT_INIT AC_CANONICAL_TARGET -@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC AM_ICONV AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_VERSION(0.19) ++AM_GNU_GETTEXT_VERSION(0.20) # Checks for programs. AC_PROG_AWK -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:20:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:20:04 +0000 Subject: [oe-commits] [meta-openembedded] 10/11: openh264: Upgrade to 2.0.0 In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.7BAA923353A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0a956ca8e14b08e1f8eebc4afd98f1479df5af86 Author: Khem Raj AuthorDate: Tue Mar 3 22:33:30 2020 -0800 openh264: Upgrade to 2.0.0 - Fix host-user-contaminated QA issues - make clean is broken so mark it so - Enable PIC in asm which fixes textrels issue - Fix build on mips Signed-off-by: Khem Raj --- ...o-not-poke-at-host-gcc-for-target-options.patch | 25 ++++++++ ...file-Use-cp-options-to-preserve-file-mode.patch | 32 ++++++++++ .../openh264/0001-codec-Disable-asm-for-mips.patch | 70 ++++++++++++++++++++++ .../{openh264_1.7.0.bb => openh264_2.0.0.bb} | 17 ++++-- 4 files changed, 139 insertions(+), 5 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch new file mode 100644 index 0000000..5f59059 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch @@ -0,0 +1,25 @@ +From af9bd9201c755e0b01251021f4e7642d3fec9c1c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 4 Mar 2020 08:38:46 -0800 +Subject: [PATCH] Makefile: Do not poke at host gcc for target options + +Signed-off-by: Khem Raj +--- + build/arch.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/build/arch.mk b/build/arch.mk +index 8ac3e70a..b80cee8c 100644 +--- a/build/arch.mk ++++ b/build/arch.mk +@@ -35,7 +35,6 @@ ifneq ($(filter mips mips64, $(ARCH)),) + ifeq ($(USE_ASM), Yes) + ASM_ARCH = mips + ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ +-LOONGSON3A = $(shell g++ -dM -E - < /dev/null | grep '_MIPS_TUNE ' | cut -f 3 -d " ") + ifeq ($(LOONGSON3A), "loongson3a") + CFLAGS += -DHAVE_MMI + endif +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch new file mode 100644 index 0000000..92f3294 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch @@ -0,0 +1,32 @@ +From 1c3bda45c55d2334af384caf9e7f240b7aaf2eb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 3 Mar 2020 22:28:25 -0800 +Subject: [PATCH] Makefile: Use cp options to preserve file mode + +This fixes packaging issues e.g. +openh264: /usr/lib/libopenh264.so is owned by uid 1000, which is the same as the user running bitbake + +Upstream-Status: Submitted [https://github.com/cisco/openh264/pull/3245] +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 74ff029d..ac643412 100644 +--- a/Makefile ++++ b/Makefile +@@ -306,8 +306,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $ + mkdir -p $(DESTDIR)$(SHAREDLIB_DIR) + install -m 755 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXFULLVER) $(DESTDIR)$(SHAREDLIB_DIR) + if [ "$(SHAREDLIBSUFFIXFULLVER)" != "$(SHAREDLIBSUFFIX)" ]; then \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ + fi + mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig + install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch new file mode 100644 index 0000000..60ea69d --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch @@ -0,0 +1,70 @@ +From edb62d2518d87536290d00a11c78c311e3680914 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 4 Mar 2020 09:14:57 -0800 +Subject: [PATCH] codec: Disable asm for mips + +It needs loongson support which qemumips is not targettin + +Signed-off-by: Khem Raj +--- + codec/common/targets.mk | 2 +- + codec/decoder/targets.mk | 2 +- + codec/encoder/targets.mk | 2 +- + codec/processing/targets.mk | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/codec/common/targets.mk b/codec/common/targets.mk +index 96843cd9..e76cb2cb 100644 +--- a/codec/common/targets.mk ++++ b/codec/common/targets.mk +@@ -74,7 +74,7 @@ COMMON_ASM_MIPS_SRCS=\ + $(COMMON_SRCDIR)/mips/satd_sad_mmi.c\ + + COMMON_OBJSMIPS += $(COMMON_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + COMMON_OBJS += $(COMMON_OBJSMIPS) + endif + OBJS += $(COMMON_OBJSMIPS) +diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk +index eaf5d3c0..615d9216 100644 +--- a/codec/decoder/targets.mk ++++ b/codec/decoder/targets.mk +@@ -60,7 +60,7 @@ DECODER_ASM_MIPS_SRCS=\ + $(DECODER_SRCDIR)/core/mips/dct_mmi.c\ + + DECODER_OBJSMIPS += $(DECODER_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + DECODER_OBJS += $(DECODER_OBJSMIPS) + endif + OBJS += $(DECODER_OBJSMIPS) +diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk +index 1f053280..fd49c1fd 100644 +--- a/codec/encoder/targets.mk ++++ b/codec/encoder/targets.mk +@@ -88,7 +88,7 @@ ENCODER_ASM_MIPS_SRCS=\ + $(ENCODER_SRCDIR)/core/mips/score_mmi.c\ + + ENCODER_OBJSMIPS += $(ENCODER_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + ENCODER_OBJS += $(ENCODER_OBJSMIPS) + endif + OBJS += $(ENCODER_OBJSMIPS) +diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk +index 300de2d8..8451d66e 100644 +--- a/codec/processing/targets.mk ++++ b/codec/processing/targets.mk +@@ -62,7 +62,7 @@ PROCESSING_ASM_MIPS_SRCS=\ + $(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\ + + PROCESSING_OBJSMIPS += $(PROCESSING_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + PROCESSING_OBJS += $(PROCESSING_OBJSMIPS) + endif + OBJS += $(PROCESSING_OBJSMIPS) +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb similarity index 68% rename from meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb rename to meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb index e2f028a..31b9da2 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb @@ -3,17 +3,21 @@ decoding. It is suitable for use in real time applications such as WebRTC." HOMEPAGE = "http://www.openh264.org/" SECTION = "libs/multimedia" -DEPENDS_x86 += "nasm-native" -DEPENDS_x86-64 += "nasm-native" +DEPENDS_append_x86 = " nasm-native" +DEPENDS_append_x86-64 = " nasm-native" LICENSE = "BSD-2-Clause" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" S = "${WORKDIR}/git" -SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb" -BRANCH = "openh264v1.7" -SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};" +SRCREV = "71374015cdf13f7aab4bc2d820f77905b3becfb8" +BRANCH = "openh264v2.0.0" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ + file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ + file://0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch \ + file://0001-codec-Disable-asm-for-mips.patch \ + " COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" @@ -30,6 +34,7 @@ EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" EXTRA_OEMAKE_mips = "ARCH=mips" EXTRA_OEMAKE_mips64 = "ARCH=mips64" +EXTRA_OEMAKE_append = " ENABLEPIC=Yes" do_configure() { : } @@ -41,3 +46,5 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } + +CLEANBROKEN = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 17:20:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 17:20:05 +0000 Subject: [oe-commits] [meta-openembedded] 11/11: x265: Disable assembly on x86 In-Reply-To: <158334239420.23763.1399659429667547861@git.openembedded.org> References: <158334239420.23763.1399659429667547861@git.openembedded.org> Message-ID: <20200304171955.909B5233539@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 36a020a3ffa7fafd34a4a1e2c09f8f453bff82f4 Author: Khem Raj AuthorDate: Tue Mar 3 23:30:26 2020 -0800 x265: Disable assembly on x86 Fixes ERROR: QA Issue: x265: ELF binary /usr/lib/libx265.so.179 has relocations in .text [textrel] Signed-off-by: Khem Raj Cc: Scott Branden --- meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb index 21ae596..8c34526 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +++ b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -17,6 +17,8 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5 inherit lib_package pkgconfig cmake +EXTRA_OECMAKE_append_x86 = " -DENABLE_ASSEMBLY=OFF" + 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 Wed Mar 4 18:59:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 18:59:15 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: vlc: Depend on gst-1.0 plugins-bad instead of 0.10 In-Reply-To: <158334835479.11383.5410590597448669776@git.openembedded.org> References: <158334835479.11383.5410590597448669776@git.openembedded.org> Message-ID: <20200304185915.10F5A23353A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b418ad49042d9324f424915c53f8926413e3dd96 Author: Khem Raj AuthorDate: Tue Mar 3 21:53:36 2020 -0800 vlc: Depend on gst-1.0 plugins-bad instead of 0.10 Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7fadca4..c15ff9a 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb @@ -65,7 +65,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 18:59:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 18:59:14 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (36a020a -> 2ffa77a) Message-ID: <158334835479.11383.5410590597448669776@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 36a020a x265: Disable assembly on x86 discard 0a956ca openh264: Upgrade to 2.0.0 discard 1371781 minidlna: Retarget gettext patch to gettex version 0.20 discard d43c851 vlc: Depend on gst-1.0 ugly plugins instead of 0.10 new b418ad4 vlc: Depend on gst-1.0 plugins-bad instead of 0.10 new 2eab129 minidlna: Retarget gettext patch to gettex version 0.20 new 86e097e openh264: Upgrade to 2.0.0 new 2ffa77a x265: Disable assembly on x86 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 (36a020a) \ N -- N -- N refs/heads/master-next (2ffa77a) 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 Wed Mar 4 18:59:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 18:59:16 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: minidlna: Retarget gettext patch to gettex version 0.20 In-Reply-To: <158334835479.11383.5410590597448669776@git.openembedded.org> References: <158334835479.11383.5410590597448669776@git.openembedded.org> Message-ID: <20200304185915.1F5BB23353B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2eab1296ba1f389a21e04b620b83e859ec8c50af Author: Khem Raj AuthorDate: Tue Mar 3 22:03:33 2020 -0800 minidlna: Retarget gettext patch to gettex version 0.20 This fixes *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Signed-off-by: Khem Raj --- .../minidlna/minidlna/0001-Update-Gettext-version.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch index c18095d..6100da3 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch @@ -10,8 +10,6 @@ Signed-off-by: Baptiste Durand configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index f343d21..a556b33 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ @@ -23,12 +21,12 @@ index f343d21..a556b33 100644 #LT_INIT AC_CANONICAL_TARGET -@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC AM_ICONV AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_VERSION(0.19) ++AM_GNU_GETTEXT_VERSION(0.20) # Checks for programs. AC_PROG_AWK -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 18:59:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 18:59:17 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: openh264: Upgrade to 2.0.0 In-Reply-To: <158334835479.11383.5410590597448669776@git.openembedded.org> References: <158334835479.11383.5410590597448669776@git.openembedded.org> Message-ID: <20200304185915.2CC80233546@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 86e097ecb9b8de16212eab52fd69a80abb724cfe Author: Khem Raj AuthorDate: Tue Mar 3 22:33:30 2020 -0800 openh264: Upgrade to 2.0.0 - Fix host-user-contaminated QA issues - make clean is broken so mark it so - Enable PIC in asm which fixes textrels issue - Fix build on mips Signed-off-by: Khem Raj --- ...o-not-poke-at-host-gcc-for-target-options.patch | 25 ++++++++ ...file-Use-cp-options-to-preserve-file-mode.patch | 32 ++++++++++ .../openh264/0001-codec-Disable-asm-for-mips.patch | 70 ++++++++++++++++++++++ .../{openh264_1.7.0.bb => openh264_2.0.0.bb} | 17 ++++-- 4 files changed, 139 insertions(+), 5 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch new file mode 100644 index 0000000..5f59059 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch @@ -0,0 +1,25 @@ +From af9bd9201c755e0b01251021f4e7642d3fec9c1c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 4 Mar 2020 08:38:46 -0800 +Subject: [PATCH] Makefile: Do not poke at host gcc for target options + +Signed-off-by: Khem Raj +--- + build/arch.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/build/arch.mk b/build/arch.mk +index 8ac3e70a..b80cee8c 100644 +--- a/build/arch.mk ++++ b/build/arch.mk +@@ -35,7 +35,6 @@ ifneq ($(filter mips mips64, $(ARCH)),) + ifeq ($(USE_ASM), Yes) + ASM_ARCH = mips + ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ +-LOONGSON3A = $(shell g++ -dM -E - < /dev/null | grep '_MIPS_TUNE ' | cut -f 3 -d " ") + ifeq ($(LOONGSON3A), "loongson3a") + CFLAGS += -DHAVE_MMI + endif +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch new file mode 100644 index 0000000..92f3294 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch @@ -0,0 +1,32 @@ +From 1c3bda45c55d2334af384caf9e7f240b7aaf2eb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 3 Mar 2020 22:28:25 -0800 +Subject: [PATCH] Makefile: Use cp options to preserve file mode + +This fixes packaging issues e.g. +openh264: /usr/lib/libopenh264.so is owned by uid 1000, which is the same as the user running bitbake + +Upstream-Status: Submitted [https://github.com/cisco/openh264/pull/3245] +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 74ff029d..ac643412 100644 +--- a/Makefile ++++ b/Makefile +@@ -306,8 +306,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $ + mkdir -p $(DESTDIR)$(SHAREDLIB_DIR) + install -m 755 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXFULLVER) $(DESTDIR)$(SHAREDLIB_DIR) + if [ "$(SHAREDLIBSUFFIXFULLVER)" != "$(SHAREDLIBSUFFIX)" ]; then \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ + fi + mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig + install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch new file mode 100644 index 0000000..60ea69d --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch @@ -0,0 +1,70 @@ +From edb62d2518d87536290d00a11c78c311e3680914 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 4 Mar 2020 09:14:57 -0800 +Subject: [PATCH] codec: Disable asm for mips + +It needs loongson support which qemumips is not targettin + +Signed-off-by: Khem Raj +--- + codec/common/targets.mk | 2 +- + codec/decoder/targets.mk | 2 +- + codec/encoder/targets.mk | 2 +- + codec/processing/targets.mk | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/codec/common/targets.mk b/codec/common/targets.mk +index 96843cd9..e76cb2cb 100644 +--- a/codec/common/targets.mk ++++ b/codec/common/targets.mk +@@ -74,7 +74,7 @@ COMMON_ASM_MIPS_SRCS=\ + $(COMMON_SRCDIR)/mips/satd_sad_mmi.c\ + + COMMON_OBJSMIPS += $(COMMON_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + COMMON_OBJS += $(COMMON_OBJSMIPS) + endif + OBJS += $(COMMON_OBJSMIPS) +diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk +index eaf5d3c0..615d9216 100644 +--- a/codec/decoder/targets.mk ++++ b/codec/decoder/targets.mk +@@ -60,7 +60,7 @@ DECODER_ASM_MIPS_SRCS=\ + $(DECODER_SRCDIR)/core/mips/dct_mmi.c\ + + DECODER_OBJSMIPS += $(DECODER_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + DECODER_OBJS += $(DECODER_OBJSMIPS) + endif + OBJS += $(DECODER_OBJSMIPS) +diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk +index 1f053280..fd49c1fd 100644 +--- a/codec/encoder/targets.mk ++++ b/codec/encoder/targets.mk +@@ -88,7 +88,7 @@ ENCODER_ASM_MIPS_SRCS=\ + $(ENCODER_SRCDIR)/core/mips/score_mmi.c\ + + ENCODER_OBJSMIPS += $(ENCODER_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + ENCODER_OBJS += $(ENCODER_OBJSMIPS) + endif + OBJS += $(ENCODER_OBJSMIPS) +diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk +index 300de2d8..8451d66e 100644 +--- a/codec/processing/targets.mk ++++ b/codec/processing/targets.mk +@@ -62,7 +62,7 @@ PROCESSING_ASM_MIPS_SRCS=\ + $(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\ + + PROCESSING_OBJSMIPS += $(PROCESSING_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + PROCESSING_OBJS += $(PROCESSING_OBJSMIPS) + endif + OBJS += $(PROCESSING_OBJSMIPS) +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb similarity index 68% rename from meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb rename to meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb index e2f028a..31b9da2 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb @@ -3,17 +3,21 @@ decoding. It is suitable for use in real time applications such as WebRTC." HOMEPAGE = "http://www.openh264.org/" SECTION = "libs/multimedia" -DEPENDS_x86 += "nasm-native" -DEPENDS_x86-64 += "nasm-native" +DEPENDS_append_x86 = " nasm-native" +DEPENDS_append_x86-64 = " nasm-native" LICENSE = "BSD-2-Clause" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" S = "${WORKDIR}/git" -SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb" -BRANCH = "openh264v1.7" -SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};" +SRCREV = "71374015cdf13f7aab4bc2d820f77905b3becfb8" +BRANCH = "openh264v2.0.0" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ + file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ + file://0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch \ + file://0001-codec-Disable-asm-for-mips.patch \ + " COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" @@ -30,6 +34,7 @@ EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" EXTRA_OEMAKE_mips = "ARCH=mips" EXTRA_OEMAKE_mips64 = "ARCH=mips64" +EXTRA_OEMAKE_append = " ENABLEPIC=Yes" do_configure() { : } @@ -41,3 +46,5 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } + +CLEANBROKEN = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 18:59:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 18:59:18 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: x265: Disable assembly on x86 In-Reply-To: <158334835479.11383.5410590597448669776@git.openembedded.org> References: <158334835479.11383.5410590597448669776@git.openembedded.org> Message-ID: <20200304185915.3AE38233548@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2ffa77acb3ef1c1cfe9e39f67f3309601a2dd3de Author: Khem Raj AuthorDate: Tue Mar 3 23:30:26 2020 -0800 x265: Disable assembly on x86 Fixes ERROR: QA Issue: x265: ELF binary /usr/lib/libx265.so.179 has relocations in .text [textrel] Signed-off-by: Khem Raj Cc: Scott Branden --- meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb index 21ae596..8c34526 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +++ b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -17,6 +17,8 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5 inherit lib_package pkgconfig cmake +EXTRA_OECMAKE_append_x86 = " -DENABLE_ASSEMBLY=OFF" + 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 Wed Mar 4 19:24:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:24:26 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: packagegroup-meta-multimedia: Purge gst 0.10 related rdeps In-Reply-To: <158334986532.22127.9483420886918135641@git.openembedded.org> References: <158334986532.22127.9483420886918135641@git.openembedded.org> Message-ID: <20200304192426.39A1223353A@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 89a156df279657e3503bfa3775220a124534fc37 Author: Khem Raj AuthorDate: Tue Mar 3 21:52:53 2020 -0800 packagegroup-meta-multimedia: Purge gst 0.10 related rdeps Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-multimedia.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index cef45f9..e0cb415 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -29,9 +29,9 @@ RDEPENDS_packagegroup-meta-multimedia = "\ rtmpdump libopenmpt schroedinger mpd mpc libmpdclient \ ncmpc libmpd dcadec libiec61883 \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna gst-fluendo-mpegdemux vlc", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265 gst-openmax", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper gst-plugins-ugly gst-fluendo-mp3 gst-plugins-gl", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna vlc", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "vo-aacenc sox libde265", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "streamripper", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "openh264 opencore-amr faac vo-amrwbenc", "", d)} \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 19:24:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:24:27 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: vlc: Depend on gst-1.0 plugins-bad instead of 0.10 In-Reply-To: <158334986532.22127.9483420886918135641@git.openembedded.org> References: <158334986532.22127.9483420886918135641@git.openembedded.org> Message-ID: <20200304192426.4BE6B23353B@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 a4004635b24df882340f8f7d00eeb49d4fc6c4c4 Author: Khem Raj AuthorDate: Tue Mar 3 21:53:36 2020 -0800 vlc: Depend on gst-1.0 plugins-bad instead of 0.10 Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7fadca4..c15ff9a 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.8.bb @@ -65,7 +65,7 @@ PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 19:24:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:24:28 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: minidlna: Retarget gettext patch to gettex version 0.20 In-Reply-To: <158334986532.22127.9483420886918135641@git.openembedded.org> References: <158334986532.22127.9483420886918135641@git.openembedded.org> Message-ID: <20200304192426.5F05C233546@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 3515db02856a09f0e71f108ce6a2e6160db22241 Author: Khem Raj AuthorDate: Tue Mar 3 22:03:33 2020 -0800 minidlna: Retarget gettext patch to gettex version 0.20 This fixes *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Signed-off-by: Khem Raj --- .../minidlna/minidlna/0001-Update-Gettext-version.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch index c18095d..6100da3 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch @@ -10,8 +10,6 @@ Signed-off-by: Baptiste Durand configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index f343d21..a556b33 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ @@ -23,12 +21,12 @@ index f343d21..a556b33 100644 #LT_INIT AC_CANONICAL_TARGET -@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS]) +@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC AM_ICONV AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_VERSION(0.19) ++AM_GNU_GETTEXT_VERSION(0.20) # Checks for programs. AC_PROG_AWK -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 19:24:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:24:25 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (349dc74 -> 9068314) Message-ID: <158334986532.22127.9483420886918135641@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 349dc74 Revert "python3-numpy: add from oe-core" add 59f4756 mosquitto: upgrade 1.6.8 -> 1.6.9 add 5280fda collectd: upgrade 5.8.1 -> 5.10.0 add a792391 dnfdragora: upgrade 1.0.1 -> 1.1.2 add b0f1782 freeglut: upgrade 3.0.0 -> 3.2.1 add d516bde gtkwave: upgrade 3.3.103 -> 3.3.104 add efe61e9 jsonrpc: upgrade 1.2.0 -> 1.3.0 add 2fe19e3 libio-pty-perl: upgrade 1.12 -> 1.14 add 6b17a48 libpwquality: upgrade 1.4.0 -> 1.4.2 add 80b4a81 protobuf-c: upgrade 1.3.2 -> 1.3.3 add d603f0d protobuf: upgrade 3.11.3 -> 3.11.4 add 29e1179 python3-decorator: upgrade 4.4.1 -> 4.4.2 add 61b4943 renderdoc: upgrade 1.5 -> 1.6 add 5abf553 grpc: move from meta-networking to meta-oe add d5cf4a0 brotli: allow building a -native version add 754b546 nodejs: drop 'gyp' PACKAGECONFIG add b3b8150 nodejs: allow use of system brotli (and make default) add 6f1e04c libssh: upgrade 0.8.4 -> 0.8.8 add 71e0072 dlm: Fix host-user-contaminated QA errors add c6ab219 libcamera: Created new minimal core image file for ibcamera add 127ad16 fbgrab: upgrade 1.3 -> 1.3.1 add 757eece Revert "piglist: add from oe-core" add 7b4c03e wireshark: upgrade 3.2.1 -> 3.2.2 add 5ad5cf3 tcsh: upgrade 6.21.00 -> 6.22.02 new 89a156d packagegroup-meta-multimedia: Purge gst 0.10 related rdeps new a400463 vlc: Depend on gst-1.0 plugins-bad instead of 0.10 new 3515db0 minidlna: Retarget gettext patch to gettex version 0.20 new 366b427 openh264: Upgrade to 2.0.0 new 9068314 x265: Disable assembly on x86 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: .../images/multimedia-libcamera-image.bb | 19 ++++ .../minidlna/0001-Update-Gettext-version.patch | 6 +- ...o-not-poke-at-host-gcc-for-target-options.patch | 25 +++++ ...file-Use-cp-options-to-preserve-file-mode.patch | 32 +++++++ .../openh264/0001-codec-Disable-asm-for-mips.patch | 70 ++++++++++++++ .../{openh264_1.7.0.bb => openh264_2.0.0.bb} | 17 +++- .../packagegroups/packagegroup-meta-multimedia.bb | 6 +- .../recipes-multimedia/vlc/vlc_3.0.8.bb | 2 +- .../recipes-multimedia/x265/x265_3.2.1.bb | 2 + .../mosquitto/files/1568.patch | 67 ------------- .../mosquitto/files/1569.patch | 25 ----- .../mosquitto/files/1570.patch | 39 -------- .../{mosquitto_1.6.8.bb => mosquitto_1.6.9.bb} | 7 +- .../packagegroups/packagegroup-meta-networking.bb | 2 +- .../dlm/dlm/0001-dlm-fix-package-qa-error.patch | 32 ------- ...Replace-cp-a-with-mode-preserving-options.patch | 51 ++++++++++ meta-networking/recipes-extended/dlm/dlm_4.0.9.bb | 24 ++--- .../{wireshark_3.2.1.bb => wireshark_3.2.2.bb} | 4 +- .../packagegroups/packagegroup-meta-oe.bb | 2 +- ...txt-Fix-grpc_cpp_plugin-path-during-cross.patch | 0 ....txt-Fix-libraries-installation-for-Linux.patch | 0 .../recipes-devtools/grpc/grpc_1.24.3.bb | 0 .../jsonrpc/{jsonrpc_1.2.0.bb => jsonrpc_1.3.0.bb} | 2 +- ...allow-passing-multiple-libs-to-pkg_config.patch | 41 ++++++++ ...uild-allow-use-of-system-installed-brotli.patch | 66 +++++++++++++ meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 10 +- ...bio-pty-perl_1.12.bb => libio-pty-perl_1.14.bb} | 4 +- .../{protobuf-c_1.3.2.bb => protobuf-c_1.3.3.bb} | 2 +- .../{protobuf_3.11.3.bb => protobuf_3.11.4.bb} | 2 +- meta-oe/recipes-extended/brotli/brotli_1.0.7.bb | 2 + ...uding-sys-sysctl.h-on-glibc-based-systems.patch | 106 +++++++++++---------- .../0001-conditionally-check-libvirt.patch | 39 -------- ...heck-for-Wno-error-format-truncation-comp.patch | 6 +- .../0001-fix-to-build-with-glibc-2.25.patch | 4 +- .../{collectd_5.8.1.bb => collectd_5.10.0.bb} | 5 +- .../add-missing-python-include-dir-for-cross.patch | 27 +++--- ...libpwquality_1.4.0.bb => libpwquality_1.4.2.bb} | 4 +- ...-set-PYTHON_INSTALL_DIR-by-running-python.patch | 10 +- .../0001-Run-python-scripts-using-env.patch | 25 ----- .../0001-To-fix-error-when-do_package.patch | 13 +-- .../dnfdragora/0001-disable-build-manpages.patch | 10 +- .../recipes-graphics/dnfdragora/dnfdragora_git.bb | 7 +- .../fbgrab/{fbgrab_1.3.bb => fbgrab_1.3.1.bb} | 10 +- .../{freeglut_3.0.0.bb => freeglut_3.2.1.bb} | 4 +- .../{gtkwave_3.3.103.bb => gtkwave_3.3.104.bb} | 4 +- ...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 ------------- .../{renderdoc_1.5.bb => renderdoc_1.6.bb} | 4 +- .../tcsh/{tcsh_6.21.00.bb => tcsh_6.22.02.bb} | 4 +- .../libssh/{libssh_0.8.4.bb => libssh_0.8.8.bb} | 4 +- .../recipes-devtools/python/python-decorator.inc | 4 +- ...corator_4.4.1.bb => python3-decorator_4.4.2.bb} | 0 53 files changed, 466 insertions(+), 516 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch create mode 100644 meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch rename meta-multimedia/recipes-multimedia/openh264/{openh264_1.7.0.bb => openh264_2.0.0.bb} (68%) delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1568.patch delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1569.patch delete mode 100644 meta-networking/recipes-connectivity/mosquitto/files/1570.patch rename meta-networking/recipes-connectivity/mosquitto/{mosquitto_1.6.8.bb => mosquitto_1.6.9.bb} (92%) delete mode 100644 meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch create mode 100644 meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch rename meta-networking/recipes-support/wireshark/{wireshark_3.2.1.bb => wireshark_3.2.2.bb} (95%) rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch (100%) rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch (100%) rename {meta-networking => meta-oe}/recipes-devtools/grpc/grpc_1.24.3.bb (100%) rename meta-oe/recipes-devtools/jsonrpc/{jsonrpc_1.2.0.bb => jsonrpc_1.3.0.bb} (94%) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch rename meta-oe/recipes-devtools/perl/{libio-pty-perl_1.12.bb => libio-pty-perl_1.14.bb} (73%) rename meta-oe/recipes-devtools/protobuf/{protobuf-c_1.3.2.bb => protobuf-c_1.3.3.bb} (95%) rename meta-oe/recipes-devtools/protobuf/{protobuf_3.11.3.bb => protobuf_3.11.4.bb} (98%) delete mode 100644 meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch rename meta-oe/recipes-extended/collectd/{collectd_5.8.1.bb => collectd_5.10.0.bb} (95%) rename meta-oe/recipes-extended/libpwquality/{libpwquality_1.4.0.bb => libpwquality_1.4.2.bb} (90%) delete mode 100644 meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch rename meta-oe/recipes-graphics/fbgrab/{fbgrab_1.3.bb => fbgrab_1.3.1.bb} (58%) rename meta-oe/recipes-graphics/freeglut/{freeglut_3.0.0.bb => freeglut_3.2.1.bb} (78%) rename meta-oe/recipes-graphics/gtkwave/{gtkwave_3.3.103.bb => gtkwave_3.3.104.bb} (85%) delete mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch delete mode 100644 meta-oe/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch delete mode 100644 meta-oe/recipes-graphics/piglit/piglit_git.bb rename meta-oe/recipes-graphics/renderdoc/{renderdoc_1.5.bb => renderdoc_1.6.bb} (89%) rename meta-oe/recipes-shells/tcsh/{tcsh_6.21.00.bb => tcsh_6.22.02.bb} (91%) rename meta-oe/recipes-support/libssh/{libssh_0.8.4.bb => libssh_0.8.8.bb} (86%) rename meta-python/recipes-devtools/python/{python3-decorator_4.4.1.bb => python3-decorator_4.4.2.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 19:24:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:24:29 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: openh264: Upgrade to 2.0.0 In-Reply-To: <158334986532.22127.9483420886918135641@git.openembedded.org> References: <158334986532.22127.9483420886918135641@git.openembedded.org> Message-ID: <20200304192426.73868233548@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 366b427fef6be25488c45cef1deb44aa4cc60c0e Author: Khem Raj AuthorDate: Tue Mar 3 22:33:30 2020 -0800 openh264: Upgrade to 2.0.0 - Fix host-user-contaminated QA issues - make clean is broken so mark it so - Enable PIC in asm which fixes textrels issue - Fix build on mips Signed-off-by: Khem Raj --- ...o-not-poke-at-host-gcc-for-target-options.patch | 25 ++++++++ ...file-Use-cp-options-to-preserve-file-mode.patch | 32 ++++++++++ .../openh264/0001-codec-Disable-asm-for-mips.patch | 70 ++++++++++++++++++++++ .../{openh264_1.7.0.bb => openh264_2.0.0.bb} | 17 ++++-- 4 files changed, 139 insertions(+), 5 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch new file mode 100644 index 0000000..5f59059 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch @@ -0,0 +1,25 @@ +From af9bd9201c755e0b01251021f4e7642d3fec9c1c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 4 Mar 2020 08:38:46 -0800 +Subject: [PATCH] Makefile: Do not poke at host gcc for target options + +Signed-off-by: Khem Raj +--- + build/arch.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/build/arch.mk b/build/arch.mk +index 8ac3e70a..b80cee8c 100644 +--- a/build/arch.mk ++++ b/build/arch.mk +@@ -35,7 +35,6 @@ ifneq ($(filter mips mips64, $(ARCH)),) + ifeq ($(USE_ASM), Yes) + ASM_ARCH = mips + ASMFLAGS += -I$(SRC_PATH)codec/common/mips/ +-LOONGSON3A = $(shell g++ -dM -E - < /dev/null | grep '_MIPS_TUNE ' | cut -f 3 -d " ") + ifeq ($(LOONGSON3A), "loongson3a") + CFLAGS += -DHAVE_MMI + endif +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch new file mode 100644 index 0000000..92f3294 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-Makefile-Use-cp-options-to-preserve-file-mode.patch @@ -0,0 +1,32 @@ +From 1c3bda45c55d2334af384caf9e7f240b7aaf2eb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 3 Mar 2020 22:28:25 -0800 +Subject: [PATCH] Makefile: Use cp options to preserve file mode + +This fixes packaging issues e.g. +openh264: /usr/lib/libopenh264.so is owned by uid 1000, which is the same as the user running bitbake + +Upstream-Status: Submitted [https://github.com/cisco/openh264/pull/3245] +Signed-off-by: Khem Raj +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 74ff029d..ac643412 100644 +--- a/Makefile ++++ b/Makefile +@@ -306,8 +306,8 @@ install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $ + mkdir -p $(DESTDIR)$(SHAREDLIB_DIR) + install -m 755 $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXFULLVER) $(DESTDIR)$(SHAREDLIB_DIR) + if [ "$(SHAREDLIBSUFFIXFULLVER)" != "$(SHAREDLIBSUFFIX)" ]; then \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ +- cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXMAJORVER) $(DESTDIR)$(SHAREDLIB_DIR) ; \ ++ cp -R --no-dereference --preserve=mode,links $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR) ; \ + fi + mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig + install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch new file mode 100644 index 0000000..60ea69d --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/0001-codec-Disable-asm-for-mips.patch @@ -0,0 +1,70 @@ +From edb62d2518d87536290d00a11c78c311e3680914 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 4 Mar 2020 09:14:57 -0800 +Subject: [PATCH] codec: Disable asm for mips + +It needs loongson support which qemumips is not targettin + +Signed-off-by: Khem Raj +--- + codec/common/targets.mk | 2 +- + codec/decoder/targets.mk | 2 +- + codec/encoder/targets.mk | 2 +- + codec/processing/targets.mk | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/codec/common/targets.mk b/codec/common/targets.mk +index 96843cd9..e76cb2cb 100644 +--- a/codec/common/targets.mk ++++ b/codec/common/targets.mk +@@ -74,7 +74,7 @@ COMMON_ASM_MIPS_SRCS=\ + $(COMMON_SRCDIR)/mips/satd_sad_mmi.c\ + + COMMON_OBJSMIPS += $(COMMON_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + COMMON_OBJS += $(COMMON_OBJSMIPS) + endif + OBJS += $(COMMON_OBJSMIPS) +diff --git a/codec/decoder/targets.mk b/codec/decoder/targets.mk +index eaf5d3c0..615d9216 100644 +--- a/codec/decoder/targets.mk ++++ b/codec/decoder/targets.mk +@@ -60,7 +60,7 @@ DECODER_ASM_MIPS_SRCS=\ + $(DECODER_SRCDIR)/core/mips/dct_mmi.c\ + + DECODER_OBJSMIPS += $(DECODER_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + DECODER_OBJS += $(DECODER_OBJSMIPS) + endif + OBJS += $(DECODER_OBJSMIPS) +diff --git a/codec/encoder/targets.mk b/codec/encoder/targets.mk +index 1f053280..fd49c1fd 100644 +--- a/codec/encoder/targets.mk ++++ b/codec/encoder/targets.mk +@@ -88,7 +88,7 @@ ENCODER_ASM_MIPS_SRCS=\ + $(ENCODER_SRCDIR)/core/mips/score_mmi.c\ + + ENCODER_OBJSMIPS += $(ENCODER_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + ENCODER_OBJS += $(ENCODER_OBJSMIPS) + endif + OBJS += $(ENCODER_OBJSMIPS) +diff --git a/codec/processing/targets.mk b/codec/processing/targets.mk +index 300de2d8..8451d66e 100644 +--- a/codec/processing/targets.mk ++++ b/codec/processing/targets.mk +@@ -62,7 +62,7 @@ PROCESSING_ASM_MIPS_SRCS=\ + $(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\ + + PROCESSING_OBJSMIPS += $(PROCESSING_ASM_MIPS_SRCS:.c=.$(OBJ)) +-ifeq ($(ASM_ARCH), mips) ++ifeq ($(ASM_ARCH), mips64) + PROCESSING_OBJS += $(PROCESSING_OBJSMIPS) + endif + OBJS += $(PROCESSING_OBJSMIPS) +-- +2.25.1 + diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb similarity index 68% rename from meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb rename to meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb index e2f028a..31b9da2 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.0.0.bb @@ -3,17 +3,21 @@ decoding. It is suitable for use in real time applications such as WebRTC." HOMEPAGE = "http://www.openh264.org/" SECTION = "libs/multimedia" -DEPENDS_x86 += "nasm-native" -DEPENDS_x86-64 += "nasm-native" +DEPENDS_append_x86 = " nasm-native" +DEPENDS_append_x86-64 = " nasm-native" LICENSE = "BSD-2-Clause" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://LICENSE;md5=bb6d3771da6a07d33fd50d4d9aa73bcf" S = "${WORKDIR}/git" -SRCREV = "a180c9d4d6f1a4830ca9eed9d159d54996bd63cb" -BRANCH = "openh264v1.7" -SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH};" +SRCREV = "71374015cdf13f7aab4bc2d820f77905b3becfb8" +BRANCH = "openh264v2.0.0" +SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ + file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ + file://0001-Makefile-Do-not-poke-at-host-gcc-for-target-options.patch \ + file://0001-codec-Disable-asm-for-mips.patch \ + " COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" @@ -30,6 +34,7 @@ EXTRA_OEMAKE_x86-64 = "ARCH=x86_64" EXTRA_OEMAKE_mips = "ARCH=mips" EXTRA_OEMAKE_mips64 = "ARCH=mips64" +EXTRA_OEMAKE_append = " ENABLEPIC=Yes" do_configure() { : } @@ -41,3 +46,5 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } + +CLEANBROKEN = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 19:24:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:24:30 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: x265: Disable assembly on x86 In-Reply-To: <158334986532.22127.9483420886918135641@git.openembedded.org> References: <158334986532.22127.9483420886918135641@git.openembedded.org> Message-ID: <20200304192426.91B3723354A@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 90683147fa6840b16816a75154dba89725ddb0a3 Author: Khem Raj AuthorDate: Tue Mar 3 23:30:26 2020 -0800 x265: Disable assembly on x86 Fixes ERROR: QA Issue: x265: ELF binary /usr/lib/libx265.so.179 has relocations in .text [textrel] Signed-off-by: Khem Raj Cc: Scott Branden --- meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb index 21ae596..8c34526 100644 --- a/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +++ b/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -17,6 +17,8 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5 inherit lib_package pkgconfig cmake +EXTRA_OECMAKE_append_x86 = " -DENABLE_ASSEMBLY=OFF" + 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 Wed Mar 4 19:26:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:26:18 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (2ffa77a -> ca6d9ad) Message-ID: <158334997819.23210.15002037775105282450@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 2ffa77a x265: Disable assembly on x86 discard 86e097e openh264: Upgrade to 2.0.0 discard 2eab129 minidlna: Retarget gettext patch to gettex version 0.20 discard b418ad4 vlc: Depend on gst-1.0 plugins-bad instead of 0.10 discard 0fc787c packagegroup-meta-multimedia: Purge gst 0.10 related rdeps discard f8c5acd OpenCSD: Support for Arm CoreSight decode lib add 89a156d packagegroup-meta-multimedia: Purge gst 0.10 related rdeps add a400463 vlc: Depend on gst-1.0 plugins-bad instead of 0.10 add 3515db0 minidlna: Retarget gettext patch to gettex version 0.20 add 366b427 openh264: Upgrade to 2.0.0 add 9068314 x265: Disable assembly on x86 new ca6d9ad OpenCSD: Support for Arm CoreSight decode lib 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 (2ffa77a) \ N -- N -- N refs/heads/master-next (ca6d9ad) 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 Mar 4 19:26:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 19:26:19 +0000 Subject: [oe-commits] [meta-openembedded] 01/01: OpenCSD: Support for Arm CoreSight decode lib In-Reply-To: <158334997819.23210.15002037775105282450@git.openembedded.org> References: <158334997819.23210.15002037775105282450@git.openembedded.org> Message-ID: <20200304192618.750DC233548@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ca6d9adb3c338edae1afacdfe2bd721e5f0fbb65 Author: Leo Yan AuthorDate: Wed Mar 4 12:28:11 2020 +0000 OpenCSD: Support for Arm CoreSight decode lib This recipe is to support OpenCSD, which is an open source CoreSight trace decode library and utility. Signed-off-by: Leo Yan Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/opencsd/opencsd_git.bb | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/meta-oe/recipes-devtools/opencsd/opencsd_git.bb b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb new file mode 100644 index 0000000..0c3b483 --- /dev/null +++ b/meta-oe/recipes-devtools/opencsd/opencsd_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "OpenCSD - An open source CoreSight(tm) Trace Decode library" +HOMEPAGE = "https://github.com/Linaro/OpenCSD" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5" + +SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=http;branch=master" +SRCREV = "03c194117971e4ad0598df29395757ced2e6e9bd" + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST = "(x86_64.*|aarch64.*)-linux" + +EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \ + CROSS_COMPILE='${TARGET_SYS}-' \ + CC='${CC}' \ + CXX='${CXX}' \ + LINKER='${CXX}' \ + LINUX64=1 \ + DEBUG=1 \ + " + +do_compile() { + ( cd ${S}/decoder/build/linux; oe_runmake ${EXTRA_OEMAKE}; cd - ) +} + +do_install() { + ( cd ${S}/decoder/build/linux; oe_runmake PREFIX=${D}/usr install; cd - ) +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:27 +0000 Subject: [oe-commits] [openembedded-core] 01/11: libmodule-build-perl: make it reproducible In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223826.6BFAF23354E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 21ed74e57c3c298cdc35883e98a4217fc5e5604d Author: Alexander Kanavin AuthorDate: Wed Mar 4 13:58:43 2020 +0100 libmodule-build-perl: make it reproducible Particularly, delete html docs as they have sysroot paths in them, and adjust build configuration to not refer to host paths either. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index b1967c7..a6fd7b1 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -33,13 +33,26 @@ do_patch_module_build () { do_patch[postfuncs] += "do_patch_module_build" +EXTRA_CPAN_BUILD_FLAGS = "--create_packlist=0" + +do_install_append () { + rm -rf ${D}${docdir}/perl/html +} + do_install_ptest() { cp -r ${B}/inc ${D}${PTEST_PATH} cp -r ${B}/blib ${D}${PTEST_PATH} cp -r ${B}/_build ${D}${PTEST_PATH} cp -r ${B}/lib ${D}${PTEST_PATH} chown -R root:root ${D}${PTEST_PATH} - sed -i -e "s,'perl' => .*,'perl' => '/usr/bin/perl'\,,g" ${D}${PTEST_PATH}/_build/build_params + sed -i -e "s,'perl' => .*,'perl' => '/usr/bin/perl'\,,g" \ + -e "s,${STAGING_BINDIR_NATIVE}/perl-native/\.\.,${bindir}/,g" \ + -e "s,${S},,g" \ + -e "s,${D},,g" \ + ${D}${PTEST_PATH}/_build/build_params \ + ${D}${PTEST_PATH}/_build/runtime_params + rm -rf ${D}${PTEST_PATH}/blib/libhtml/site/lib/Module/ + rm -rf ${D}${PTEST_PATH}/_build/magicnum } RDEPENDS_${PN} += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:26 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (72deeb7 -> 1381d63) Message-ID: <158336150599.31125.14292152208017220021@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 72deeb7 blktrace: modify two scripts for python3 new 21ed74e libmodule-build-perl: make it reproducible new f87052a classes/kernel.bbclass: Fix parsing errors new e9cc06f buildtools-extended-tarball: add nativesdk-libxcrypt-dev new 5bf56f4 gdbm: add depend on readline for consistent builds new a8eda77 kernel-yocto.bbclass: fix a wrong inter-task dependency new aa6c17f linux-firmware: use 'make install' for installation new 8090c53 python3-native: Should not search the system for headers/libraries. new e9b75e0 linux-yocto/5.2: backport perf build fix for latest binutils new 18cdcfa linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT new 8338f79 linux-yocto/5.4: update to v5.4.23 new 1381d63 linux-yocto: drop 5.2 recipes 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 +- meta/classes/kernel.bbclass | 4 +- .../meta/buildtools-extended-tarball.bb | 1 + .../perl/libmodule-build-perl_0.4231.bb | 15 +++++- ...Don-t-search-system-for-headers-libraries.patch | 29 ++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + .../linux-firmware/linux-firmware_20200122.bb | 22 +-------- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 44 ------------------ meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +-- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 32 ------------- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 ++-- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 54 ---------------------- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 ++++----- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 + 14 files changed, 69 insertions(+), 173 deletions(-) create mode 100644 meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_5.2.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:28 +0000 Subject: [oe-commits] [openembedded-core] 02/11: classes/kernel.bbclass: Fix parsing errors In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223826.86A41233550@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f87052aa90fc057b0b04abd1eccdcbcf3bf3302c Author: Joshua Watt AuthorDate: Wed Mar 4 12:31:39 2020 -0600 classes/kernel.bbclass: Fix parsing errors legitimize_package_name wants the actual value of KERNEL_REVISION, so use d.getVar() to fetch it as is done elsewhere in the file. Failing to do so can result it weird errors at parsing time. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 15219c5..0eadd3e 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -570,9 +570,9 @@ RDEPENDS_${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base" # Allow machines to override this dependency if kernel image files are # not wanted in images as standard RDEPENDS_${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image" -PKG_${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name('${KERNEL_VERSION}')}" +PKG_${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" RDEPENDS_${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux', '', d)}" -PKG_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name('${KERNEL_VERSION}')}" +PKG_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" RPROVIDES_${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION}" ALLOW_EMPTY_${KERNEL_PACKAGE_NAME} = "1" ALLOW_EMPTY_${KERNEL_PACKAGE_NAME}-base = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:29 +0000 Subject: [oe-commits] [openembedded-core] 03/11: buildtools-extended-tarball: add nativesdk-libxcrypt-dev In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223826.9C80C233552@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e9cc06f93b4e0a5398619f8904973ee412e705f9 Author: Jeremy Puhlman AuthorDate: Wed Mar 4 11:39:36 2020 -0800 buildtools-extended-tarball: add nativesdk-libxcrypt-dev virtual/crypt-native is assume provided in bitbake.conf, so buildtools-extended-tarball shoud provide crypt since it doesn't use the host's headers/libraries. [YOCTO #13714] Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index d756036..4a79b09 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libstdc++-dev \ nativesdk-libtool \ nativesdk-pkgconfig \ + nativesdk-libxcrypt-dev \ " TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:30 +0000 Subject: [oe-commits] [openembedded-core] 04/11: gdbm: add depend on readline for consistent builds In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223826.B5E21233554@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5bf56f49a94d84cc0c8f0a233a4753741da9a4ef Author: Jeremy Puhlman AuthorDate: Wed Mar 4 14:24:47 2020 -0800 gdbm: add depend on readline for consistent builds Whether readline is installed on the build host or not influences the way gdbm builds. Depend on readline for a consistent build. This fails to build on a system with readline, and using the buildtools-extended installer. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3..5326184 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest +DEPENDS_class-native += "readline" + # Needed for dbm python module EXTRA_OECONF = "-enable-libgdbm-compat" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:31 +0000 Subject: [oe-commits] [openembedded-core] 05/11: kernel-yocto.bbclass: fix a wrong inter-task dependency In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223826.CDCCE233556@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a8eda77c0c575931bfc1018ab971105f8a2bcc0c Author: Ming Liu AuthorDate: Wed Mar 4 14:55:43 2020 +0100 kernel-yocto.bbclass: fix a wrong inter-task dependency do_kernel_checkout and do_symlink_kernsrc are both modifying ${S}, they could conflict with eacher other, move do_kernel_checkout after do_symlink_kernsrc does fix that. Signed-off-by: Ming Liu Signed-off-by: Stefan Agner 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 44863ad..d71ce21 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -317,7 +317,7 @@ do_kernel_checkout() { } do_kernel_checkout[dirs] = "${S}" -addtask kernel_checkout before do_kernel_metadata after do_unpack +addtask kernel_checkout before do_kernel_metadata after do_symlink_kernsrc addtask kernel_metadata after do_validate_branches do_unpack before do_patch do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" do_validate_branches[depends] = "kern-tools-native: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 Mar 4 22:38:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:32 +0000 Subject: [oe-commits] [openembedded-core] 06/11: linux-firmware: use 'make install' for installation In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223826.DDA69233557@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aa6c17fcaead0ae6a7793702ebd76d3cc540a135 Author: Alexander Kanavin AuthorDate: Wed Mar 4 11:13:07 2020 +0100 linux-firmware: use 'make install' for installation Copying the source tree over was missing important symlinks that since recent updates can only be created with make install. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../linux-firmware/linux-firmware_20200122.bb | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 0d1422c..f7198cb 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -208,27 +208,7 @@ do_compile() { } do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ - cp -r * ${D}${nonarch_base_libdir}/firmware/ - - # Avoid Makefile to be deployed - rm ${D}${nonarch_base_libdir}/firmware/Makefile - - # Remove unbuild firmware which needs cmake and bash - rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf - - # Remove pointless bash script - rm ${D}${nonarch_base_libdir}/firmware/configure - - # Remove python script used to check the WHENCE file - rm ${D}${nonarch_base_libdir}/firmware/check_whence.py - - # Libertas sd8686 - ln -sf libertas/sd8686_v9.bin ${D}${nonarch_base_libdir}/firmware/sd8686.bin - ln -sf libertas/sd8686_v9_helper.bin ${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin - - # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it - ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) + oe_runmake 'DESTDIR=${D}' install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:33 +0000 Subject: [oe-commits] [openembedded-core] 07/11: python3-native: Should not search the system for headers/libraries. In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223826.EA9A523354E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8090c53d65fdbff97dca38bf16681f0a71c8ce5a Author: Jeremy Puhlman AuthorDate: Tue Mar 3 16:24:09 2020 -0800 python3-native: Should not search the system for headers/libraries. The specific issue here is rpc/rpc.h, but its likely more general. /usr/include is searched for rpc/rpc.h and if it exists on the system, it changes behavior. If you are using the extended buildtools tarball on a machine that has /usr/include/rpc/rpc.h, it will decide that is good enough and not continue to search. nis fails to build because /usr/include and /usr/lib are not part of the include/link paths for the buildtools tarball compiler(nor should they be). This makes it so python3-native will not build if you are using the extended buildtools tarball, but from a larger issue perspective it is building in likely different ways depending on what machine it is building on. libtirpc is already a depend so we shouldn't need the hosts rpc/rcp.h. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...Don-t-search-system-for-headers-libraries.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 2 files changed, 30 insertions(+) diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch new file mode 100644 index 0000000..acf8e1e --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -0,0 +1,29 @@ +From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 4 Mar 2020 00:06:42 +0000 +Subject: [PATCH] Don't search system for headers/libraries + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9da1b3a..59782c0 100644 +--- a/setup.py ++++ b/setup.py +@@ -674,8 +674,8 @@ class PyBuildExt(build_ext): + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + +- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] +- system_include_dirs = ['/usr/include'] ++ system_lib_dirs = [] ++ system_include_dirs = [] + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +-- +2.24.1 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 7796852..5e3c29c 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -37,6 +37,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ SRC_URI_append_class-native = " \ file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \ + file://0001-Don-t-search-system-for-headers-libraries.patch \ " SRC_URI[md5sum] = "b3fb85fd479c0bf950c626ef80cacb57" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:34 +0000 Subject: [oe-commits] [openembedded-core] 08/11: linux-yocto/5.2: backport perf build fix for latest binutils In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223827.04AB823354C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e9b75e0f7169e3a34c41174d8091a609ac90dc81 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:21 2020 -0500 linux-yocto/5.2: backport perf build fix for latest binutils [ Author: Changbin Du Date: Tue Jan 28 23:29:38 2020 +0800 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 Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 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 441545f..a23a5e6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_machine ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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 6d49e00..ac9904f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" -SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuarm ?= "e0a3a01b24070b15121e938ea19755091bf0d662" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" 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 44516dc..eab142e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -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_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" +SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" +SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:35 +0000 Subject: [oe-commits] [openembedded-core] 09/11: linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223827.12074233550@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 18cdcfa3978f63724e4e30443126019f34747104 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:22 2020 -0500 linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT Integrating the following configuration tweak: [ Author: Alexander Kanavin Date: Mon Feb 24 10:34:00 2020 +0100 common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT This will allow testing libinput in particular: https://www.kernel.org/doc/html/latest/input/uinput.html https://wayland.freedesktop.org/libinput/doc/latest/test-suite.html Signed-off-by: Alexander Kanavin Signed-off-by: Bruce Ashfield ] 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 37282b2..964d2fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" 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-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 463451f..47fcc98 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" 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 5dd7b68..53d5652 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_machine_qemux86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_machine_qemumips64 ?= "fcbec8b4f0f2f24a31ce5c6e6439c69f7512fb31" SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 4 22:38:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:37 +0000 Subject: [oe-commits] [openembedded-core] 11/11: linux-yocto: drop 5.2 recipes In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223827.33633233552@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1381d63695310aa4bc18171e49aa18db26d5a00e Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:24 2020 -0500 linux-yocto: drop 5.2 recipes linux-yocto 5.4 will serve as the versioned reference kernel in the upcoming release, and -dev will serve as the "newer" kernel. As such, we drop v5.2 from master, but will continue to update and support it in released branches. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 44 ------------------ meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 32 -------------- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 54 ----------------------- 3 files changed, 130 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 deleted file mode 100644 index a23a5e6..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v5.2/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 ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" -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.32" - -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_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb deleted file mode 100644 index ac9904f..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v5.2/standard/tiny/base" -KBRANCH_qemuarm ?= "v5.2/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "5.2.32" -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 ?= "e0a3a01b24070b15121e938ea19755091bf0d662" -SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" - -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.2;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.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb deleted file mode 100644 index eab142e..0000000 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -KBRANCH ?= "v5.2/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v5.2/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.2/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.2/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.2/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.2/standard/base" -KBRANCH_qemux86 ?= "v5.2/standard/base" -KBRANCH_qemux86-64 ?= "v5.2/standard/base" -KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" -SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" -SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" -SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" - -# remap qemuarm to qemuarma15 for the 5.2 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.2;destsuffix=${KMETA}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.32" - -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|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 Wed Mar 4 22:38:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 04 Mar 2020 22:38:36 +0000 Subject: [oe-commits] [openembedded-core] 10/11: linux-yocto/5.4: update to v5.4.23 In-Reply-To: <158336150599.31125.14292152208017220021@git.openembedded.org> References: <158336150599.31125.14292152208017220021@git.openembedded.org> Message-ID: <20200304223827.24586233558@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8338f79e3f098973c8f94f0dd4dc6b657759cf34 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:23 2020 -0500 linux-yocto/5.4: update to v5.4.23 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: bfe3046ecafd Linux 5.4.23 bb7ffcbec227 ASoC: SOF: Intel: hda: Add iDisp4 DAI fb81480206ae bpf: Selftests build error in sockmap_basic.c 19be2b3eea34 s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range 148c8531b69c s390/kaslr: Fix casts in get_random e26be2667399 net/mlx5e: Fix crash in recovery flow without devlink reporter fca1cdd3417e net/mlx5: Fix sleep while atomic in mlx5_eswitch_get_vepa 06320052ee69 net/mlx5e: Reset RQ doorbell counter before moving RQ state from RST to RDY 773dfd2223e3 xen: Enable interrupts when calling _cond_resched() 9724b3f28dab ata: ahci: Add shutdown to freeze hardware resources of ahci 8eb92c122840 io_uring: prevent sq_thread from spinning when it should stop b0f5f25c5541 rxrpc: Fix call RCU cleanup using non-bh-safe locks 829e0a0ae2dc netfilter: xt_hashlimit: limit the max size of hashtable 86502c68b81e ALSA: seq: Fix concurrent access to queue current tick/time 2b550d1c7ac6 ALSA: seq: Avoid concurrent access to queue flags 84e041a5df79 ALSA: rawmidi: Avoid bit fields for state flags c7deb9612e35 io_uring: fix __io_iopoll_check deadlock in io_sq_thread d562fdad84dd arm64: lse: Fix LSE atomics with LLVM 8132323eb397 bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill 2463a30f6678 genirq/proc: Reject invalid affinity masks (again) c23074e20989 crypto: rename sm3-256 to sm3 in hash_algo_name 8278f34f6ca8 iommu/vt-d: Fix compile warning from intel-svm.h cfde4697ea4d ecryptfs: replace BUG_ON with error handling code 4c585d1e98d9 ASoC: fsl_sai: Fix exiting path on probing failure 59c723344aec ASoC: atmel: fix atmel_ssc_set_audio link failure 125b4a5345e2 staging: greybus: use after free in gb_audio_manager_remove_all() 2ca19dfafc04 staging: rtl8723bs: fix copy of overlapping memory e6535a8c5d98 usb: dwc2: Fix in ISOC request length checking ceb1997a2ec3 usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus 826a43b22ce6 scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session" d92e714a463d scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout" 42b4f3c8ec0b drm/msm/dpu: fix BGR565 vs RGB565 confusion 337cbf3ea855 drm/i915/gt: Protect defer_request() from new waiters 93805d430c53 drm/bridge: tc358767: fix poll timeouts 7de50906e772 drm/i915/gvt: more locking for ppgtt mm LRU list 19f8fb273193 drm/i915/execlists: Always force a context reload when rewinding RING_TAIL 1e0175a15474 drm/i915/gt: Detect if we miss WaIdleLiteRestore 341c8e03a90a Revert "dmaengine: imx-sdma: Fix memory leak" 9ad7f8df34d2 Btrfs: fix deadlock during fast fsync when logging prealloc extents beyond eof 73e1f2663273 btrfs: don't set path->leave_spinning for truncate d3d0fb9d42d3 Btrfs: fix race between shrinking truncate and fiemap c383f8ad2a12 Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents 9af8e258895f btrfs: do not check delayed items are empty for single transaction cleanup 6065ca5d013d btrfs: reset fs_root to NULL on error in open_ctree 37a2e704807a btrfs: fix bytes_may_use underflow in prealloc error condtition 40ea30638d20 btrfs: destroy qgroup extent records on transaction abort 7e946e30a46d KVM: apic: avoid calculating pending eoi from an uninitialized val dc5537061baf KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1 16f8553f75b5 KVM: nVMX: clear PIN_BASED_POSTED_INTR from nested pinbased_ctls only when apicv is globally disabled 0f042f5e98f1 KVM: nVMX: Check IO instruction VM-exit conditions c4064f14f744 KVM: nVMX: Refactor IO bitmap checks into helper function e5d25003d059 ext4: fix race between writepages and enabling EXT4_EXTENTS_FL 5195dc6e9365 ext4: rename s_journal_flag_rwsem to s_writepages_rwsem 6ccdd6616a1c ext4: fix mount failure with quota configured as module eac2bb1042b2 ext4: fix potential race between s_flex_groups online resizing and access 58631f8cbc24 ext4: fix potential race between s_group_info online resizing and access bb43897de9b3 ext4: fix potential race between online resizing and write operations ded8c21ac49c ext4: add cond_resched() to __ext4_find_entry() 1673674ccd86 ext4: fix a data race in EXT4_I(inode)->i_disksize 56b3949a2b5f KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI 24dfae91a23a KVM: nVMX: Don't emulate instructions in guest mode e61c236dcf34 sched/psi: Fix OOB write when writing 0 bytes to PSI files 26ae0493c181 drm/i915: Update drm/i915 bug filing URL 2104c4905a08 drm/i915: Wean off drm_pci_alloc/drm_pci_free 3e740fa80cc8 drm/nouveau/kms/gv100-: Re-set LUT after clearing for modesets 5e7dda6ddad1 drm/amdgpu/gfx10: disable gfxoff when reading rlc clock 7e482baf6d70 drm/amdgpu/gfx9: disable gfxoff when reading rlc clock f141fac489ee drm/amdgpu/soc15: fix xclk for raven 95236ae76bf8 mm: Avoid creating virtual address aliases in brk()/mmap()/mremap() 9bb971b33565 lib/stackdepot.c: fix global out-of-bounds in stack_slabs ef32399bf729 mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM 198f5aa0f73e mm/vmscan.c: don't round up scan size for online memory cgroup 8735a5b6e1fb genirq/irqdomain: Make sure all irq domain flags are distinct 6e304262e393 nvme-multipath: Fix memory leak with ana_log_buf e078c8d8971b mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() aa4f749f8136 Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()" 7b77e5a08224 ACPI: PM: s2idle: Check fixed wakeup events in acpi_s2idle_wake() f18121a59b5a MAINTAINERS: Update drm/i915 bug filing URL cf3c30a7112c serdev: ttyport: restore client ops on deregistration 80990c30b776 tty: serial: qcom_geni_serial: Fix RX cancel command failure 5b0af5e58368 tty: serial: imx: setup the correct sg entry for tx dma 671ea19c3214 tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode 5ae6e5683755 serial: 8250: Check UPF_IRQ_SHARED in advance e0253c422024 x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF 88e4901d3ebd x86/mce/amd: Fix kobject lifetime de2cce5ae563 x86/mce/amd: Publish the bank pointer only after setup has succeeded 6df12de90e74 x86/ima: use correct identifier for SetupMode variable 453692eb5a38 jbd2: fix ocfs2 corrupt when clearing block group bits 98583fb54c2b arm64: memory: Add missing brackets to untagged_addr() macro 9b9374cf1ea7 powerpc/hugetlb: Fix 8M hugepages on 8xx 723a44f2288e powerpc/hugetlb: Fix 512k hugepages on 8xx with 16k page size 2ffeef3db358 powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S 04e3f1d1e135 powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery a03b3cea86fd powerpc/eeh: Fix deadlock handling dead PHB 9e1fab44502c powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss 2558e71bbfc5 drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context 3b8edaada13e staging: rtl8723bs: Fix potential overuse of kernel memory 4113e08e75d3 staging: rtl8723bs: Fix potential security hole de63cd8b5521 staging: rtl8188eu: Fix potential overuse of kernel memory ddedb84fcdc8 staging: rtl8188eu: Fix potential security hole 91aa9e475827 scsi: Revert "target/core: Inline transport_lun_remove_cmd()" 24aeb16934e8 usb: dwc3: debug: fix string position formatting mixup with ret and len 6dbf3ea0f566 usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields 256cc85f6f86 usb: dwc2: Fix SET/CLEAR_FEATURE and GET_STATUS flows c2f07cb7e317 USB: hub: Fix the broken detection of USB3 device in SMSC hub e5d078af8e5f USB: hub: Don't record a connect-change event during reset-resume 5af8add0167c USB: Fix novation SourceControl XL after suspend b3c64c8b2fab usb: uas: fix a plug & unplug racing e805982b13e3 USB: quirks: blacklist duplicate ep on Sound Devices USBPre2 4c02497e8f65 USB: core: add endpoint-blacklist quirk f9965af8e493 usb: host: xhci: update event ring dequeue pointer on purpose 5d0faf16f960 xhci: Fix memory leak when caching protocol extended capability PSI tables - take 2 ef69cf19bda8 xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms 02e326360053 xhci: fix runtime pm enabling for quirky Intel hosts 512dae7753cd xhci: Force Maximum Packet size for Full-speed bulk devices to valid range. 22ff13ac65cb staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi. 41a53f5b68ec staging: android: ashmem: Disallow ashmem memory from being remapped 897d5aaf3397 vt: vt_ioctl: fix race in VT_RESIZEX 21275a431289 vt: selection, handle pending signals in paste_selection a2c3858faf3a vt: fix scrollback flushing on background consoles 1eb78bc92c84 floppy: check FDC index for errors before assigning it c5455e3fab20 e1000e: Use rtnl_lock to prevent race conditions between net and pci/pm 47a7a44650c1 USB: misc: iowarrior: add support for the 100 device 9b5e87086fa9 USB: misc: iowarrior: add support for the 28 and 28L devices c8e28d325c97 USB: misc: iowarrior: add support for 2 OEMed devices cfda8551dd59 thunderbolt: Prevent crash if non-active NVMem file is read 802a8369d21f btrfs: handle logged extent failure properly 3c4ef8ac8f4b ecryptfs: fix a memory leak bug in ecryptfs_init_messaging() 7e1dbc6656ff ecryptfs: fix a memory leak bug in parse_tag_1_packet() 909149bf61da tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST 9f83363875be ASoC: sun8i-codec: Fix setting DAI data format 3de0bbe21312 ASoC: codec2codec: avoid invalid/double-free of pcm runtime c45877ca9f62 ALSA: hda/realtek - Apply quirk for yet another MSI laptop 9dc3b7a5833a ALSA: hda/realtek - Apply quirk for MSI GP63, too 80c1e9c4c484 ALSA: hda: Use scnprintf() for printing texts for sysfs/procfs b76e00b67dc6 iommu/qcom: Fix bogus detach logic f22dcb31727e Linux 5.4.22 105542cea2ea rtc: Kconfig: select REGMAP_I2C when necessary cea9007ebb95 bcache: properly initialize 'path' and 'err' in register_bcache() 7967c3299e3f drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c (v2) 51c9c98a7bbe s390/pci: Recover handle in clp_set_pci_fn() 332c8b5bc358 mlxsw: spectrum_dpipe: Add missing error path 399ca7ee9130 fuse: don't overflow LLONG_MAX with end offset 77912b69a989 virtio_balloon: prevent pfn array overflow 9c80ae965082 cifs: log warning message (once) if out of disk space 3f14879fd6ce i40e: Relax i40e_xsk_wakeup's return value when PF is busy 6fa2bb0d06ca help_next should increase position index 6b851823ceaa NFS: Fix memory leaks 0562d37d143a drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage c3e3d17d0c5b drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency 17bddc85f980 brd: check and limit max_part par 7291351c00e1 microblaze: Prevent the overflow of the start 7ceb32672b1e asm-generic/tlb: add missing CONFIG symbol 7a48064a42e0 iwlwifi: mvm: Check the sta is not NULL in iwl_mvm_cfg_he_sta() 1656781d15c0 iwlwifi: mvm: Fix thermal zone registration 0448387729d9 nvme-pci: remove nvmeq->tags 1d0fbf3e2687 nvmet: Pass lockdep expression to RCU lists d5461fdd9645 irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL 793137b0511c bcache: fix incorrect data type usage in btree_flush_write() 57a180a630d8 bcache: explicity type cast in bset_bkey_last() 374eec821858 bcache: fix memory corruption in bch_cache_accounting_clear() dc8c75f35374 reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() 23b88b51de5c lib/scatterlist.c: adjust indentation in __sg_alloc_table 5a553bd43f59 ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans() 799c4c1e389f ocfs2: make local header paths relative to C files 7a97311de48d btrfs: do not do delalloc reservation under page lock a531e6ba85a0 powerpc: Do not consider weak unresolved symbol relocations as bad 528c36e14b17 radeon: insert 10ms sleep in dce5_crtc_load_lut 224c0751dfb7 trigger_next should increase position index e349287276c2 ftrace: fpid_next() should increase position index 8a7bfa3d97dc char: hpet: Fix out-of-bounds read bug 427f39e23326 drm/nouveau/disp/nv50-: prevent oops when no channel method map provided 39c6932240c5 irqchip/gic-v3: Only provision redistributors that are enabled in ACPI 074c4c43fce2 drm/amd/display: do not allocate display_mode_lib unnecessarily 1687b204ae83 rbd: work around -Wuninitialized warning bd4e1894166b ceph: check availability of mds cluster on mount after wait timeout 7288d5338c85 powerpc/mm: Don't log user reads to 0xffffffff 3ce3df5d00d0 bpf: map_seq_next should always increase position index 9a178494d05b cifs: fix NULL dereference in match_prepath 9c5ede115a6e cifs: Fix mount options set in automount 1d8e40cf86e4 cifs: fix unitialized variable poential problem with network I/O cache lock patch a2763f62baa4 iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop 034c5f26d2bf rtw88: fix potential NULL skb access in TX ISR e7e4d0eaa639 hostap: Adjust indentation in prism2_hostapd_add_sta 32662df2d0bc ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82 2ccaac382af0 ARM: 8951/1: Fix Kexec compilation issue. 16ec28640dc6 selftests/eeh: Bump EEH wait time to 60s 93df1b23b157 powerpc/pseries/lparcfg: Fix display of Maximum Memory 411327180703 jbd2: make sure ESHUTDOWN to be recorded in the journal superblock 314e25f4b0cf jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record b911c5e8686a selftests: bpf: Reset global state between reuseport test runs 251c53a92b54 alarmtimer: Make alarmtimer platform device child of RTC device 777baa1baf63 iommu/vt-d: Remove unnecessary WARN_ON_ONCE() b5f6bf0fdd71 bcache: fix use-after-free in register_bcache() 393b8509be33 bcache: rework error unwinding in register_bcache f7d8ebf26d23 bcache: cached_dev_free needs to put the sb page 714cd4a5127a btrfs: Fix split-brain handling when changing FSID to metadata uuid dc22bc8a8626 btrfs: separate definition of assertion failure handlers 3420f1b304b3 media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value 3f6c8de753ed powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV 9d5fc7f14ef2 drm/nouveau/mmu: fix comptag memory leak 707518c16ba4 sunrpc: Fix potential leaks in sunrpc_cache_unhash() 46503858e275 ALSA: hda - Add docking station support for Lenovo Thinkpad T420s ea038a5270b5 bpf, btf: Always output invariant hit in pahole DWARF to BTF transform f11aefc9961d driver core: platform: fix u32 greater or equal to zero comparison 843eb0a8cf53 s390/ftrace: generate traced function stack frame 68c3cc414e08 s390: adjust -mpacked-stack support check for clang 10 838bddc295a0 x86/decoder: Add TEST opcode to Group3-2 a4f6948e57f0 objtool: Fix ARCH=x86_64 build error 59e2355bdfc5 kbuild: use -S instead of -E for precise cc-option test in Kconfig ba6ad897c3dc spi: spi-fsl-qspi: Ensure width is respected in spi-mem operations dbdc1c12966e ALSA: hda/hdmi - add retry logic to parse_intel_hdmi() fa7d320dbbbe irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems 27f3dc35fd59 regulator: core: Fix exported symbols to the exported GPL version 18eca3cb5dd9 remoteproc: Initialize rproc_class before use 496d6c021828 module: avoid setting info->name early in case we can fall back to info->mod->name 7303a0b0a537 btrfs: device stats, log when stats are zeroed f9ab58f9a2ab btrfs: safely advance counter when looking up bio csums ebf8e5411888 btrfs: fix possible NULL-pointer dereference in integrity checks 50b93369668b pwm: Remove set but not set variable 'pwm' adf4ab6d8312 ide: serverworks: potential overflow in svwks_set_pio_mode() e5c8d3abd927 cmd64x: potential buffer overflow in cmd64x_program_timings() 419035d75dbe pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional e7e6b53fea10 x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd 225a5b5bee00 f2fs: fix memleak of kobject 337c7b95e16e regulator: vctrl-regulator: Avoid deadlock getting and setting the voltage bf754c88865d ASoC: SOF: Intel: hda: Fix SKL dai count 84255fe86d07 debugobjects: Fix various data races 0b2ecef39d8e watchdog/softlockup: Enforce that timestamp is valid on boot d8a6a443ff0a perf/x86/amd: Constrain Large Increment per Cycle events f2323c374e49 sched/topology: Assert non-NUMA topology masks don't (partially) overlap 5d13f62b9ef6 sched/core: Fix size of rq::uclamp initialization 8da6ae7dcb16 arm64: dts: ti: k3-j721e-main: Add missing power-domains for smmu 88cf251d3c0d KVM: PPC: Remove set but not used variable 'ra', 'rs', 'rt' d4870a4343f3 EDAC/sifive: Fix return value check in ecc_register() 0a8f90d5654d drm/amd/display: fixup DML dependencies 304982d21e2b arm64: fix alternatives with LLVM's integrated assembler f68668292496 arm64: lse: fix LSE atomics with LLVM's integrated assembler b04235f1e11d RDMA/mlx5: Don't fake udata for kernel path da2d50868e59 ALSA: usb-audio: add implicit fb quirk for MOTU M Series 5a6f5b327fce crypto: essiv - fix AEAD capitalization and preposition use in help text 817faa4ed433 scsi: iscsi: Don't destroy session if there are outstanding connections 12b685be50c7 scsi: ufs-mediatek: add apply_dev_quirks variant operation 4fa2dd4eebfd scsi: ufs: pass device information to apply_dev_quirks 0016939be0ee f2fs: free sysfs kobject 06c34c604b13 f2fs: set I_LINKABLE early to avoid wrong access by vfs f51caa62dea1 ALSA: usb-audio: unlock on error in probe 480494e28a51 iommu/arm-smmu-v3: Use WRITE_ONCE() when changing validity of an STE 23d3f191a576 kbuild: remove *.tmp file when filechk fails 1fc9746acbb2 usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue 9112d1ef5a1b perf/imx_ddr: Fix cpu hotplug state cleanup 994b203b619d drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add 13d368cd1e13 gpiolib: Set lockdep class for hierarchical irq domains 7f0d9ac2621e dm thin: don't allow changing data device during thin-pool reload 74f42a77318e drm/nouveau/fault/gv100-: fix memory leak on module unload 18792937b064 drm/nouveau/drm/ttm: Remove set but not used variable 'mem' a94c84c5c4bc drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler 93672fa5b9b3 drm/nouveau/gr/gk20a,gm200-: add terminators to method lists read from fw 63e00e2c80e5 drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new() 760baae7ab35 vme: bridges: reduce stack usage 76fac0e735c7 bpf: Return -EBADRQC for invalid map type in __bpf_tx_xdp_map be1113b4b415 ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare a8b37e32415e driver core: Print device when resources present in really_probe() 3f6af05d1d1b driver core: platform: Prevent resouce overflow from causing infinite loops 11c759264c32 visorbus: fix uninitialized variable access 83f964dd14a7 misc: xilinx_sdfec: fix xsdfec_poll()'s return type 9087af8639c2 tty: synclink_gt: Adjust indentation in several functions 71faeca11055 tty: synclinkmp: Adjust indentation in several functions a922fa72a860 raid6/test: fix a compilation warning 6cfe307b5be7 ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m 5bff3c470f84 ALSA: usb-audio: Add boot quirk for MOTU M Series d691d1e5836d ARM: dts: rockchip: add reg property to brcmf sub node for rk3188-bqedison2qc 7c32c479b1e0 arm64: dts: rockchip: add reg property to brcmf sub-nodes f9de6fb6e679 arm64: dts: rockchip: fix dwmmc clock name for px30 989a495ed9a3 clocksource: davinci: only enable clockevents once tim34 is initialized 48be6f9d2f7e wan: ixp4xx_hss: fix compile-testing on 64-bit 73f48c1004d4 x86/nmi: Remove irq_work from the long duration NMI handler b075c29e816c bnxt: Detach page from page pool before sending up the stack 1e703d621b9c Input: edt-ft5x06 - work around first register access error 2b1fd461067f rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls 5f0a4eba2a88 efi/x86: Don't panic or BUG() on non-critical error conditions 5cf01eacd5c2 soc/tegra: fuse: Correct straps' address for older Tegra124 device trees 75d916c3b393 IB/hfi1: Add RcvShortLengthErrCnt to hfi1stats 9cfe6c21ff17 IB/hfi1: Add software counter for ctxt0 seq drop 8689967be56d staging: rtl8188: avoid excessive stack usage bfe29951e250 drm/mediatek: Add gamma property according to hardware capability 6ceef50235d1 udf: Fix free space reporting for metadata and virtual partitions 03560e4a19fe usbip: Fix unsafe unaligned pointer usage e653e1c05423 ARM: dts: stm32: Add power-supply for DSI panel on stm32f469-disco 6e86c4ce5d3a usb: dwc3: use proper initializers for property entries ab7edf7fa651 drm: remove the newline for CRC source name. 9d89ff3d27e0 RDMA/hns: Avoid printing address of mtt page 5a2a529974e1 mlx5: work around high stack usage with gcc 010cdc1be053 drm/amdkfd: Fix permissions of hang_hws 960671ac5065 iommu/vt-d: Avoid sending invalid page response 2aab9e9d1f3d iommu/vt-d: Match CPU and IOMMU paging mode 4ffdfc414d81 ACPI: button: Add DMI quirk for Razer Blade Stealth 13 late 2019 lid switch e9e24f2ca9a6 ASoC: Intel: sof_rt5682: Ignore the speaker amp when there isn't one. d00a15040454 vfio/spapr/nvlink2: Skip unpinning pages on error exit e44b48f5bb64 tools lib api fs: Fix gcc9 stringop-truncation compilation error 3e32b1282b11 net: phy: fixed_phy: fix use-after-free when checking link GPIO 4070a491bfcf ALSA: sh: Fix compile warning wrt const cf24ed82438c ALSA: hda/realtek - Apply mic mute LED quirk for Dell E7xx laptops, too 2417ea1d07a5 clk: uniphier: Add SCSSI clock gate for each channel 6447bfe82922 clk: Use parent node pointer during registration if necessary 6c7984312d35 ALSA: sh: Fix unused variable warnings 9f87fff25159 clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock d1d92e97260f RDMA/rxe: Fix error type of mmap_offset c87c4d442b9f fbdev: fix numbering of fbcon options 67ca691658f5 ASoC: soc-topology: fix endianness issues 04361b8961d6 reset: uniphier: Add SCSSI reset control for each channel e39aac0e65f1 pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs 9ed73297980b drm/fbdev: Fallback to non tiled mode if all tiles not present d3db7b78e7d6 PM / devfreq: rk3399_dmc: Add COMPILE_TEST and HAVE_ARM_SMCCC dependency 704582e6a714 PM / devfreq: exynos-ppmu: Fix excessive stack usage bc866376d7cd x86/vdso: Provide missing include file b5fe09b676de crypto: chtls - Fixed memory leak a739564c4c53 net: phy: realtek: add logging for the RGMII TX delay configuration 4783bf08f8d2 bpf: Print error message for bpftool cgroup show 8a7aa4feeaea dmaengine: imx-sdma: Fix memory leak f99958a96c7f dmaengine: Store module owner in dma_device struct 93a3eff6fab3 clk: actually call the clock init before any other callback of the clock fa0150ba88fa iommu/iova: Silence warnings under memory pressure 8c358435459b iommu/amd: Only support x2APIC with IVHD type 11h/40h b1b7add9d2de iommu/amd: Check feature support bit before accessing MSI capability registers 0c09d9dc8440 arm64: dts: qcom: db845c: Enable ath10k 8bit host-cap quirk ce591c921944 scsi: lpfc: Fix: Rework setting of fdmi symbolic node name registration 111749fba968 selinux: ensure we cleanup the internal AVC counters on error in avc_update() 069d2385f381 ARM: dts: r8a7779: Add device node for ARM global timer f9b42cb09d8b clk: renesas: rcar-gen3: Allow changing the RPC[D2] clocks d80f9dfe47ce drm/mediatek: handle events when enabling/disabling crtc 57cd234da28c crypto: inside-secure - add unspecified HAS_IOMEM dependency df0f4455a12f scsi: aic7xxx: Adjust indentation in ahc_find_syncrate f6ebbf46c3a8 scsi: ufs: Complete pending requests in host reset and restore path 8728001e1e41 nfsd: Clone should commit src file metadata too d67d31cb0e92 ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1 3fa5ba7b1912 clk: qcom: smd: Add missing bimc clock 43ef7ad610dc drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV 75423fdad259 orinoco: avoid assertion in case of NULL pointer 5a14db967b72 rtlwifi: rtl_pci: Fix -Wcast-function-type f20bc906af52 iwlegacy: Fix -Wcast-function-type 3acea3092a33 ipw2x00: Fix -Wcast-function-type bc8746721cdf b43legacy: Fix -Wcast-function-type 90053ff023da PCI: Add DMA alias quirk for PLX PEX NTB 27a35f09367f PCI: Add nr_devfns parameter to pci_add_dma_alias() dd77f77004b6 ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status b6c857e5e500 netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy 1e2b6e5f32aa fore200e: Fix incorrect checks of NULL pointer dereference 58bc57b373e0 r8169: check that Realtek PHY driver module is loaded cdd5b09bcbc0 samples/bpf: Set -fno-stack-protector when building BPF programs af77e76625be reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling 6107a895e383 media: v4l2-device.h: Explicitly compare grp{id,mask} to zero in v4l2_device macros cf03458ab2cf selftests/net: make so_txtime more robust to timer variance 687ef9c269b6 gpu/drm: ingenic: Avoid null pointer deference in plane atomic update e07c107a2483 Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace" 6a05af0b718a PCI: Increase D3 delay for AMD Ryzen5/7 XHCI controllers 5700b8073f03 PCI: Add generic quirk for increasing D3hot delay 1e7b1684de37 media: cx23885: Add support for AVerMedia CE310B a3a7f90936d7 PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in 76ce0e269b4a bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO 2fc336213605 ARM: dts: imx6: rdu2: Limit USBH1 to Full Speed f3e63a4ddf19 ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3 dbe3806c7191 ARM: exynos_defconfig: Bring back explicitly wanted options 4ece124849a2 clk: imx: Add correct failure handling for clk based helpers 0685dfa0a2ff padata: validate cpumask without removed CPU during offline c3a007435359 arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core 0e44cd879ba1 selinux: ensure we cleanup the internal AVC counters on error in avc_insert() 5fed8c513adb opp: Free static OPPs on errors while adding them ef6b35dfe142 arm: dts: allwinner: H3: Add PMU node 5a241d7bf1e6 arm64: dts: allwinner: H5: Add PMU node 02dfae36b03f arm64: dts: allwinner: H6: Add PMU mode 5f0a50b0a37d NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). 53d9b08dc80d net/wan/fsl_ucc_hdlc: reject muram offsets above 64K 12ba455b1d28 regulator: rk808: Lower log level on optional GPIOs being not available bae02d239a38 ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682 fa54ae038c95 ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's 4c50665fc968 modules: lockdep: Suppress suspicious RCU usage warning fa0316aaf094 arm64: dts: rockchip: Fix NanoPC-T4 cooling maps 3a28e0701264 drm/panel: simple: Add Logic PD Type 28 display support c3c3f3449b8c drm/amdgpu: Ensure ret is always initialized when using SOC15_WAIT_ON_RREG ddbdf757a7ef ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start 69c12b79e9e2 drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table ad9728b377a6 bpf, sockhash: Synchronize_rcu before free'ing map 25c85d8574d8 drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode dff5d0fc77a5 clk: qcom: rcg2: Don't crash if our parent can't be found; return an error 8d122cd0d266 clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq() 8ba34cdadba3 kconfig: fix broken dependency in randconfig-generated .config 39a708219509 block, bfq: do not plug I/O for bfq_queues with no proc refs b0d5c881d36e drivers/block/zram/zram_drv.c: fix error return codes not being returned in writeback_store 53aaa9f1a638 Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker 3aa694d0e112 KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups 25cbba5d4e14 nbd: add a flush_workqueue in nbd_start_device 201fdd62bb23 tracing: Simplify assignment parsing for hist triggers 7bc84d854017 drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero 806f57ec2b52 rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed b752d473b1fb selftests: settings: tests can be in subsubdirs 6f65dd66ea6f brcmfmac: sdio: Fix OOB interrupt initialization on brcm43362 abf8d588e3b1 rtw88: fix rate mask for 1SS chip 3eee03d0ffb8 ath10k: Correct the DMA direction for management tx buffers 494c30b80550 ext4, jbd2: ensure panic when aborting with zero errno 8343f165f3d4 ARM: 8952/1: Disable kmemleak on XIP kernels 8c72748e9f6a tracing: Fix very unlikely race of registering two stat tracers 75225eee8715 tracing: Fix tracing_stat return values in error handling paths 8be3ac46ef80 powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() 256e52a1a915 s390/pci: Fix possible deadlock in recover_store() 37ea6d15b197 wan/hdlc_x25: fix skb handling 77b131f652d4 dmaengine: fsl-qdma: fix duplicated argument to && d30a4882e630 udf: Allow writing to 'Rewritable' partitions a3536e5589c7 pwm: omap-dmtimer: Simplify error handling 971579fae1b4 x86/sysfb: Fix check for bad VRAM size 7828a927b850 clk: ti: dra7: fix parent for gmac_clkctrl 2d7fa7564bc4 ext4: fix deadlock allocating bio_post_read_ctx from mempool c982320078dd jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal 56953ccd7f00 kselftest: Minimise dependency of get_size on C library interfaces 6aa96ec9c196 drm/amd/display: Clear state after exiting fixed active VRR state c7fc72092134 clocksource/drivers/bcm2835_timer: Fix memory leak of timer 9f0414eed212 usb: dwc2: Fix IN FIFO allocation 2cea5895b69d usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe() 531d0ac5fbbd drm/nouveau/nouveau: fix incorrect sizeof on args.src an args.dst d34ecf4949de spi: fsl-lpspi: fix only one cs-gpio working 9f3a2e147f0e drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov 750a95d63746 uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol() b2f28d11f2a1 raid6/test: fix a compilation error 448563605d98 net: ethernet: ixp4xx: Standard module init b5d649f14470 sparc: Add .exit.data section. c09d0bd924ac MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init() ed140997f80c efi/x86: Map the entire EFI vendor string before copying it 04a5bebd7789 pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins 9ad79d4fa032 IB/core: Let IB core distribute cache update events f606721660a6 kernel/module: Fix memleak in module_add_modinfo_attrs() fc3c0fc85d69 media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run() bc4730880281 char/random: silence a lockdep splat with printk() 0b455673e7c4 x86/fpu: Deactivate FPU state after failure during state load 9b743915bd00 iommu/vt-d: Fix off-by-one in PASID allocation 739abce96dd0 gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap() e715aa99c502 clk: meson: meson8b: make the CCF use the glitch-free mali mux 271b18405eb0 powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number 2f812301bacf clk: at91: sam9x60: fix programmable clock prescaler e1e1cdbc646f media: sun4i-csi: Fix [HV]sync polarity handling 65fbde986aef media: sun4i-csi: Fix data sampling polarity handling f5076ea1bc9d media: sun4i-csi: Deal with DRAM offset cb514c01f6e4 media: i2c: mt9v032: fix enum mbus codes and frame sizes ecb8ea6f93e5 media: ov5640: Fix check for PLL1 exceeding max allowed rate 9c76a7b28edc pxa168fb: Fix the function used to release some memory in an error handling path 4a8bb7ce9f0b drm/msm/adreno: fix zap vs no-zap handling 4aa148666a70 drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank() d21cc4ea7a82 printk: fix exclusive_console replaying f46afae807aa pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs fcc0000109b0 gianfar: Fix TX timestamping with a stacked DSA driver c324effa6d9d ALSA: ctl: allow TLV read operation for callback type of element in locked case 4125714ce1d6 ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT 348a7ccdb9f0 leds: pca963x: Fix open-drain initialization 4e2d5e3eb865 drm/amd/display: Map ODM memory correctly when doing ODM combine b3224bf30709 PCI: Fix pci_add_dma_alias() bitmask size 071963d37143 brcmfmac: Fix use after free in brcmf_sdio_readframes() 55195593a8c6 brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() c4d0a90b5029 cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order 4d7f8ca608b2 clk: meson: pll: Fix by 0 division in __pll_params_to_rate() 343fc9a26887 media: meson: add missing allocation failure check on new_buf 85275286d118 f2fs: call f2fs_balance_fs outside of locked page 678b25bfd983 f2fs: preallocate DIO blocks when forcing buffered_io 255edefeb0b8 rcu: Fix data-race due to atomic_t copy-by-value b7725deb9d61 rcu: Fix missed wakeup of exp_wq waiters 3ece067c12e1 rcu/nocb: Fix dump_tree hierarchy print always active 2339f7a55c84 drm/qxl: Complete exception handling in qxl_device_init() 3deb6e993ec4 wil6210: fix break that is never reached because of zero'ing of a retry counter 281ebbcdee49 ath10k: Fix qmi init error handling 726196728c2c drm/gma500: Fixup fbdev stolen size usage evaluation 60e055d59d0e net/sched: flower: add missing validation of TCA_FLOWER_FLAGS 58cd462bc5b1 net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS d9bc012b4a47 net: dsa: tag_qca: Make sure there is headroom for tag 42dd56266b9f net/smc: fix leak of kernel memory to user space f1f2eea30d19 enic: prevent waking up stopped tx queues over watchdog reset 8f22873582a7 core: Don't skip generic XDP program execution for cloned SKBs 2d636a1263be Linux 5.4.21 c10cfc131c0b mmc: core: Rework wp-gpio handling b0ad23142a2a gpio: add gpiod_toggle_active_low() 2cbbe28c734b KVM: x86/mmu: Fix struct guest_walker arrays for 5-level paging ac3aea49cc35 ext4: choose hardlimit when softlimit is larger than hardlimit in ext4_statfs_project() 9275ae515385 jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer f09998f7a11f jbd2: move the clearing of b_modified flag to the journal_unmap_buffer() 0e365eafbcaa Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode config" 590d35beddcc NFSv4.1 make cachethis=no for writes 7bee7eabf0ed perf stat: Don't report a null stalled cycles per insn metric 1164c3380958 KVM: x86: Mask off reserved bit from #DB exception payload ec86856b4672 arm64: dts: fast models: Fix FVP PCI interrupt-map property 51a610a5c88d cifs: fix mount option display for sec=krb5i db5a68ffad2a mac80211: fix quiet mode activation in action frames 671338889e8f hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions. 98509dfe6f25 perf/x86/intel: Fix inaccurate period in context switch for auto-reload 1d2a31baf6b6 spmi: pmic-arb: Set lockdep class for hierarchical irq domains 9f6f61c61a84 sched/uclamp: Reject negative values in cpu_uclamp_write() 115402ee80ce s390/time: Fix clk type in get_tod_clock ae88de70c254 RDMA/core: Fix protection fault in get_pkey_idx_qp_list 2c753af06f23 RDMA/rxe: Fix soft lockup problem due to using tasklets in softirq 8662e612ae4c RDMA/hfi1: Fix memory leak in _dev_comp_vect_mappings_create b860a4524217 RDMA/iw_cxgb4: initiate CLOSE when entering TERM c60c4b4b6bf2 RDMA/core: Fix invalid memory access in spec_filter_size 8a14f01c4d0f IB/umad: Fix kernel crash while unloading ib_umad 6603342a6060 IB/rdmavt: Reset all QPs when the device is shut down b16dfda32ca5 IB/hfi1: Close window for pq and request coliding 327f33e54c7f IB/hfi1: Acquire lock to release TID entries when user file is closed e30e30c042fe IB/mlx5: Return failure when rts2rts_qp_counters_set_id is not supported cf0ea974b6a2 drivers: ipmi: fix off-by-one bounds check that leads to a out-of-bounds write 5e9f573dc8e7 nvme: fix the parameter order for nvme_get_log in nvme_get_fw_slot_info fa3c053b8313 bus: moxtet: fix potential stack buffer overflow 279c15b917ec drm/panfrost: Make sure the shrinker does not reclaim referenced BOs 3ea7f138cec1 drm/vgem: Close use-after-free race in vgem_gem_create 9ea66515918e s390/uv: Fix handling of length extensions 9e6874da9446 s390/pkey: fix missing length of protected key on return ebc3ddc1a255 perf/x86/amd: Add missing L2 misses event spec to AMD Family 17h's event map db6f68908bce KVM: nVMX: Use correct root level for nested EPT shadow page tables ce8b9b8032bd EDAC/mc: Fix use-after-free and memleaks during device removal b2e977a9731f EDAC/sysfs: Remove csrow objects on errors 03f6c2bf9562 cifs: make sure we do not overflow the max EA buffer size ff04f342f8c4 xprtrdma: Fix DMA scatter-gather list mapping imbalance 22f15745c4e7 arm64: ssbs: Fix context-switch when SSBS is present on all CPUs 4267ba3bac6d gpio: xilinx: Fix bug where the wrong GPIO register is written to 8791bb8f8471 ARM: npcm: Bring back GPIOLIB support cafaf6bcce60 btrfs: log message when rw remount is attempted with unclean tree-log 2655c88c03e8 btrfs: print message when tree-log replay starts f3cdf024ed19 btrfs: ref-verify: fix memory leaks bf4a9715a914 Btrfs: fix race between using extent maps and merging them c43f560acc85 ext4: improve explanation of a mount failure caused by a misconfigured kernel 94f0fe04da78 ext4: add cond_resched() to ext4_protect_reserved_inode 5b0a26514d6c ext4: fix checksum errors with indexed dirs 449e607322d7 ext4: fix support for inode sizes > 1024 bytes f080204b677d ext4: don't assume that mmp_nodename/bdevname have NUL 86c30da1b684 ALSA: usb-audio: Add clock validity quirk for Denon MC7000/MCX8000 67d49871f8e4 ALSA: usb-audio: sound: usb: usb true/false for bool return type c3b35c87e5b6 ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system 303740645567 ACPICA: Introduce acpi_any_gpe_status_set() 0671627a5faa ACPI: PM: s2idle: Avoid possible race related to the EC GPE b9f78af90d92 ACPI: EC: Fix flushing of pending work 25487999ca3a ALSA: usb-audio: Apply sample rate quirk for Audioengine D1 2b7e7004970a ALSA: hda/realtek - Fix silent output on MSI-GL73 1e73c5eae8c6 ALSA: hda/realtek - Add more codec supported Headset Button c28273b42c95 ALSA: usb-audio: Fix UAC2/3 effect unit parsing 2323beb68436 Input: synaptics - remove the LEN0049 dmi id from topbuttonpad list efca0d73501a Input: synaptics - enable SMBus on ThinkPad L470 c6426ba5731b Input: synaptics - switch T470s to RMI4 by default 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 964d2fe..1c238c9 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 ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" -SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine ?= "f617c0993374d56792e266e37606d424166b1edd" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" 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.20" +LINUX_VERSION ?= "5.4.23" 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 47fcc98..193bd9b 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.20" +LINUX_VERSION ?= "5.4.23" 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 ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" -SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine_qemuarm ?= "d361ce4ddedafa6d504d726c5da098d32f46886e" +SRCREV_machine ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" 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 53d5652..ab7c646 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 ?= "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 ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine_qemuarm ?= "3745c440f4781ffaab809f999c14da1abd3457bb" +SRCREV_machine_qemuarm64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemumips ?= "eb0e84ae58eb7a88a48bdbddfb53095228840974" +SRCREV_machine_qemuppc ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemuriscv64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemux86 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemux86-64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemumips64 ?= "7ca67eee407193dff5132da8bacc036f670faaea" +SRCREV_machine ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" # 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.20" +LINUX_VERSION ?= "5.4.23" 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 Thu Mar 5 01:51:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 01:51:15 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (ca6d9ad -> 63aad89) Message-ID: <158337307587.31427.17136781900553097603@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 ca6d9ad OpenCSD: Support for Arm CoreSight decode lib new 63aad89 gd: fix CVE-2017-6363 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 (ca6d9ad) \ N -- N -- N refs/heads/master-next (63aad89) 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-devtools/opencsd/opencsd_git.bb | 28 ------------------ meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++++++++++++++++++++++ meta-oe/recipes-support/gd/gd_2.2.5.bb | 1 + 3 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 meta-oe/recipes-devtools/opencsd/opencsd_git.bb create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 01:51:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 01:51:16 +0000 Subject: [oe-commits] [meta-openembedded] 01/01: gd: fix CVE-2017-6363 In-Reply-To: <158337307587.31427.17136781900553097603@git.openembedded.org> References: <158337307587.31427.17136781900553097603@git.openembedded.org> Message-ID: <20200305015116.48F18233552@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 63aad89c765b5f58e242363fbffeae5f01e69d80 Author: Haiqing Bai AuthorDate: Wed Mar 4 14:24:13 2020 +0800 gd: fix CVE-2017-6363 Backport the CVE patch from the upstream to fix the heap-based buffer over-read in tiffWriter. Signed-off-by: Haiqing Bai Signed-off-by: Khem Raj --- meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++++++++++++++++++++++ meta-oe/recipes-support/gd/gd_2.2.5.bb | 1 + 2 files changed, 36 insertions(+) diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch new file mode 100644 index 0000000..25b5880 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch @@ -0,0 +1,35 @@ +From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 31 Jan 2018 14:50:16 -0500 +Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds + #383 + +The gd image formats allow for a palette of 256 colors, +so if the transparent index is out of range, disable it. + +Upstream-Status: Backport +[https://github.com/libgd/libgd.git commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c] +CVE-2017-6363 + +Signed-off-by: Haiqing Bai +--- + src/gd_gd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gd_gd.c b/src/gd_gd.c +index f8d39cb..5a86fc3 100644 +--- a/src/gd_gd.c ++++ b/src/gd_gd.c +@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag) + if (!gdGetWord (&im->transparent, in)) { + goto fail1; + } +- if (im->transparent == 257) { ++ /* Make sure transparent index is within bounds of the palette. */ ++ if (im->transparent >= 256 || im->transparent < 0) { + im->transparent = (-1); + } + } +-- +1.9.1 + diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb index 35f9bb2..dda2e67 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb +++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \ file://CVE-2018-1000222.patch \ file://CVE-2019-6978.patch \ + file://CVE-2017-6363.patch \ " SRCREV = "8255231b68889597d04d451a72438ab92a405aba" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 02:54:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 02:54:58 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (63aad89 -> d16876d) Message-ID: <158337689830.3004.10880414853903920157@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 63aad89 gd: fix CVE-2017-6363 new 0fa20f8 python3-gmqtt: upgrade 0.4.4 -> 0.6.2 new 2886e87 python3-evdev: upgrade 1.2.0 -> 1.3.0 new cab232a python3-pycurl: upgrade 7.43.0.3 -> 7.43.0.5 new 1559cf5 python3-socketio: upgrade 4.3.1 -> 4.4.0 new d16876d gd: fix CVE-2017-6363 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 (63aad89) \ N -- N -- N refs/heads/master-next (d16876d) 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-devtools/python/python-evdev.inc | 6 +- ...x-build-on-32bit-arches-with-64bit-time_t.patch | 83 ---------------------- .../recipes-devtools/python/python-pycurl.inc | 11 ++- .../recipes-devtools/python/python-socketio.inc | 4 +- ...thon3-evdev_1.2.0.bb => python3-evdev_1.3.0.bb} | 1 + ...thon3-gmqtt_0.4.4.bb => python3-gmqtt_0.6.2.bb} | 4 +- ...curl_7.43.0.3.bb => python3-pycurl_7.43.0.5.bb} | 1 + ...socketio_4.3.1.bb => python3-socketio_4.4.0.bb} | 1 + 8 files changed, 15 insertions(+), 96 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch rename meta-python/recipes-devtools/python/{python3-evdev_1.2.0.bb => python3-evdev_1.3.0.bb} (98%) rename meta-python/recipes-devtools/python/{python3-gmqtt_0.4.4.bb => python3-gmqtt_0.6.2.bb} (74%) rename meta-python/recipes-devtools/python/{python3-pycurl_7.43.0.3.bb => python3-pycurl_7.43.0.5.bb} (97%) rename meta-python/recipes-devtools/python/{python3-socketio_4.3.1.bb => python3-socketio_4.4.0.bb} (98%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 02:54:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 02:54:59 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: python3-gmqtt: upgrade 0.4.4 -> 0.6.2 In-Reply-To: <158337689830.3004.10880414853903920157@git.openembedded.org> References: <158337689830.3004.10880414853903920157@git.openembedded.org> Message-ID: <20200305025458.CF23023355A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0fa20f865287844cafea09fa389f8ada95dbc904 Author: Pierre-Jean Texier AuthorDate: Wed Mar 4 20:20:28 2020 +0000 python3-gmqtt: upgrade 0.4.4 -> 0.6.2 See full changelog https://github.com/wialon/gmqtt/releases Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../python/{python3-gmqtt_0.4.4.bb => python3-gmqtt_0.6.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-gmqtt_0.4.4.bb b/meta-python/recipes-devtools/python/python3-gmqtt_0.6.2.bb similarity index 74% rename from meta-python/recipes-devtools/python/python3-gmqtt_0.4.4.bb rename to meta-python/recipes-devtools/python/python3-gmqtt_0.6.2.bb index ff89087..8d4ac88 100644 --- a/meta-python/recipes-devtools/python/python3-gmqtt_0.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-gmqtt_0.6.2.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/wialon/gmqtt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" -SRC_URI[md5sum] = "af3a2c6c2f8e3c934b31159ffdce5fd6" -SRC_URI[sha256sum] = "b96bca8a54b8af057d4cc42a79f9e2b40cdbb5a2bfebbc5f05ee35575d3e3089" +SRC_URI[md5sum] = "f763f12c5e6ba6f0fa0ec4a6dc8c3fd9" +SRC_URI[sha256sum] = "3b3c12cb62bbc3ee0bd81da3d9fbd78c5414098aaf58236c3663edfeda5237e0" inherit pypi setuptools3 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 02:55:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 02:55:01 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: python3-pycurl: upgrade 7.43.0.3 -> 7.43.0.5 In-Reply-To: <158337689830.3004.10880414853903920157@git.openembedded.org> References: <158337689830.3004.10880414853903920157@git.openembedded.org> Message-ID: <20200305025458.EE4AC233567@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cab232ac5944ee939841830bfae6e7089dc0dbff Author: Pierre-Jean Texier AuthorDate: Wed Mar 4 20:40:24 2020 +0000 python3-pycurl: upgrade 7.43.0.3 -> 7.43.0.5 License-Update: copyright years updated -Copyright (C) 2013-2019 by Oleg Pudeyev +Copyright (C) 2013-2020 by Oleg Pudeyev Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pycurl.inc | 11 +++++------ ...{python3-pycurl_7.43.0.3.bb => python3-pycurl_7.43.0.5.bb} | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pycurl.inc b/meta-python/recipes-devtools/python/python-pycurl.inc index ac9a370..0f66143 100644 --- a/meta-python/recipes-devtools/python/python-pycurl.inc +++ b/meta-python/recipes-devtools/python/python-pycurl.inc @@ -8,13 +8,12 @@ SECTION = "devel/python" HOMEPAGE = "http://pycurl.io/" LICENSE = "LGPLv2 | MIT" -LIC_FILES_CHKSUM = " \ - file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING-MIT;md5=2df767ed35d8ea83de4a93feb55e7815 \ -" +LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING-MIT;md5=60872a112595004233b769b6cbfd65b6 \ + " -SRC_URI[md5sum] = "f0ed4c805e8bec734990e2e0ee78568e" -SRC_URI[sha256sum] = "6f08330c5cf79fa8ef68b9912b9901db7ffd34b63e225dce74db56bb21deda8e" +SRC_URI[md5sum] = "0b387d4609ed20c88baede8579a4d425" +SRC_URI[sha256sum] = "ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-pycurl_7.43.0.3.bb b/meta-python/recipes-devtools/python/python3-pycurl_7.43.0.5.bb similarity index 97% rename from meta-python/recipes-devtools/python/python3-pycurl_7.43.0.3.bb rename to meta-python/recipes-devtools/python/python3-pycurl_7.43.0.5.bb index 5ad319a..c98b7d6 100644 --- a/meta-python/recipes-devtools/python/python3-pycurl_7.43.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-pycurl_7.43.0.5.bb @@ -1,2 +1,3 @@ inherit setuptools3 require python-pycurl.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 02:55:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 02:55:02 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: python3-socketio: upgrade 4.3.1 -> 4.4.0 In-Reply-To: <158337689830.3004.10880414853903920157@git.openembedded.org> References: <158337689830.3004.10880414853903920157@git.openembedded.org> Message-ID: <20200305025459.0702B233568@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1559cf58103030156c88cd23652ce390c791d7a8 Author: Pierre-Jean Texier AuthorDate: Wed Mar 4 21:05:59 2020 +0000 python3-socketio: upgrade 4.3.1 -> 4.4.0 See full changelog https://github.com/miguelgrinberg/python-socketio/blob/master/CHANGES.md Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-socketio.inc | 4 ++-- .../python/{python3-socketio_4.3.1.bb => python3-socketio_4.4.0.bb} | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-socketio.inc b/meta-python/recipes-devtools/python/python-socketio.inc index 7ee99f8..117eb60 100644 --- a/meta-python/recipes-devtools/python/python-socketio.inc +++ b/meta-python/recipes-devtools/python/python-socketio.inc @@ -9,8 +9,8 @@ inherit pypi PYPI_PACKAGE = "python-socketio" -SRC_URI[md5sum] = "86cd47dddea1785ce7a6c72f55c93fe7" -SRC_URI[sha256sum] = "506b2cf7a520b40ea0b3f25e1272eff8de134dce6f471c1f6bc0de8c90fe8c57" +SRC_URI[md5sum] = "6631497753977b70d2b5ceb12af2775f" +SRC_URI[sha256sum] = "48cba5b827ac665dbf923a4f5ec590812aed5299a831fc43576a9af346272534" PACKAGECONFIG ?= "" PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" diff --git a/meta-python/recipes-devtools/python/python3-socketio_4.3.1.bb b/meta-python/recipes-devtools/python/python3-socketio_4.4.0.bb similarity index 98% rename from meta-python/recipes-devtools/python/python3-socketio_4.3.1.bb rename to meta-python/recipes-devtools/python/python3-socketio_4.4.0.bb index 8ff590b..e2542cf 100644 --- a/meta-python/recipes-devtools/python/python3-socketio_4.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-socketio_4.4.0.bb @@ -2,3 +2,4 @@ inherit setuptools3 PACKAGECONFIG ?= "asyncio_client client" require python-socketio.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 02:55:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 02:55:00 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: python3-evdev: upgrade 1.2.0 -> 1.3.0 In-Reply-To: <158337689830.3004.10880414853903920157@git.openembedded.org> References: <158337689830.3004.10880414853903920157@git.openembedded.org> Message-ID: <20200305025458.DF9C0233565@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2886e8779dae15bbd7757f60313f5676c47e91e9 Author: Pierre-Jean Texier AuthorDate: Wed Mar 4 20:31:09 2020 +0000 python3-evdev: upgrade 1.2.0 -> 1.3.0 Remove patch applied upstream. See full changelog https://python-evdev.readthedocs.io/en/latest/changelog.html Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-evdev.inc | 6 +- ...x-build-on-32bit-arches-with-64bit-time_t.patch | 83 ---------------------- ...thon3-evdev_1.2.0.bb => python3-evdev_1.3.0.bb} | 1 + 3 files changed, 4 insertions(+), 86 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-evdev.inc b/meta-python/recipes-devtools/python/python-evdev.inc index a536815..5f5426a 100644 --- a/meta-python/recipes-devtools/python/python-evdev.inc +++ b/meta-python/recipes-devtools/python/python-evdev.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=18debddbb3f52c661a129724a883a8e2" FILESEXTRAPATHS_prepend := "${THISDIR}/python-evdev:" -SRC_URI += " file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch" +SRC_URI = "${PYPI_SRC_URI}" -SRC_URI[md5sum] = "53e440943dfa2514f95b3c448d6a36cb" -SRC_URI[sha256sum] = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166" +SRC_URI[md5sum] = "05f9e900d6e11e1674475d2dd2668f0d" +SRC_URI[sha256sum] = "b1c649b4fed7252711011da235782b2c260b32e004058d62473471e5cd30634d" do_compile_prepend() { rm -rf ${S}/evdev/ecodes.c diff --git a/meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index 154172c..0000000 --- a/meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 435e78aaf6745e4da0fe3d4455473011626c77d1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Nov 2019 11:21:20 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f - -Upstream-Status: Submitted [https://github.com/gvalkov/python-evdev/pull/112] -Signed-off-by: Khem Raj ---- - evdev/input.c | 13 +++++++++---- - evdev/uinput.c | 9 ++++++++- - 2 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/evdev/input.c b/evdev/input.c -index 67b9348..432db92 100644 ---- a/evdev/input.c -+++ b/evdev/input.c -@@ -24,6 +24,11 @@ - #include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #define MAX_NAME_SIZE 256 - - extern char* EV_NAME[EV_CNT]; -@@ -60,8 +65,8 @@ device_read(PyObject *self, PyObject *args) - return NULL; - } - -- PyObject* sec = PyLong_FromLong(event.time.tv_sec); -- PyObject* usec = PyLong_FromLong(event.time.tv_usec); -+ PyObject* sec = PyLong_FromLong(event.input_event_sec); -+ PyObject* usec = PyLong_FromLong(event.input_event_usec); - PyObject* val = PyLong_FromLong(event.value); - PyObject* py_input_event = NULL; - -@@ -102,8 +107,8 @@ device_read_many(PyObject *self, PyObject *args) - - // Construct a list of event tuples, which we'll make sense of in Python - for (unsigned i = 0 ; i < nread/event_size ; i++) { -- sec = PyLong_FromLong(event[i].time.tv_sec); -- usec = PyLong_FromLong(event[i].time.tv_usec); -+ sec = PyLong_FromLong(event[i].input_event_sec); -+ usec = PyLong_FromLong(event[i].input_event_usec); - val = PyLong_FromLong(event[i].value); - - py_input_event = Py_BuildValue("OOhhO", sec, usec, event[i].type, event[i].code, val); -diff --git a/evdev/uinput.c b/evdev/uinput.c -index 192568d..56fe86c 100644 ---- a/evdev/uinput.c -+++ b/evdev/uinput.c -@@ -16,6 +16,10 @@ - #include - #endif - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif - - // Workaround for installing on kernels newer than 4.4. - #ifndef FF_MAX_EFFECTS -@@ -232,8 +236,11 @@ uinput_write(PyObject *self, PyObject *args) - if (!ret) return NULL; - - struct input_event event; -+ struct timeval tval; - memset(&event, 0, sizeof(event)); -- gettimeofday(&event.time, 0); -+ gettimeofday(&tval, 0); -+ event.input_event_usec = tval.tv_usec; -+ event.input_event_sec = tval.tv_sec; - event.type = type; - event.code = code; - event.value = value; diff --git a/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb b/meta-python/recipes-devtools/python/python3-evdev_1.3.0.bb similarity index 98% rename from meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb rename to meta-python/recipes-devtools/python/python3-evdev_1.3.0.bb index 3a92b6e..d87bf2f 100644 --- a/meta-python/recipes-devtools/python/python3-evdev_1.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-evdev_1.3.0.bb @@ -1,2 +1,3 @@ inherit pypi setuptools3 require python-evdev.inc + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 02:55:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 02:55:03 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: gd: fix CVE-2017-6363 In-Reply-To: <158337689830.3004.10880414853903920157@git.openembedded.org> References: <158337689830.3004.10880414853903920157@git.openembedded.org> Message-ID: <20200305025459.1BC7723356A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d16876d77723fa5670c412e76ca8f2ddf1f89a96 Author: Haiqing Bai AuthorDate: Wed Mar 4 14:24:13 2020 +0800 gd: fix CVE-2017-6363 Backport the CVE patch from the upstream to fix the heap-based buffer over-read in tiffWriter. Signed-off-by: Haiqing Bai Signed-off-by: Khem Raj --- meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++++++++++++++++++++++ meta-oe/recipes-support/gd/gd_2.2.5.bb | 1 + 2 files changed, 36 insertions(+) diff --git a/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch new file mode 100644 index 0000000..25b5880 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch @@ -0,0 +1,35 @@ +From 8f7b60ea7db87de5df76169e3f3918e401ef8bf7 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Wed, 31 Jan 2018 14:50:16 -0500 +Subject: [PATCH] gd/gd2: make sure transparent palette index is within bounds + #383 + +The gd image formats allow for a palette of 256 colors, +so if the transparent index is out of range, disable it. + +Upstream-Status: Backport +[https://github.com/libgd/libgd.git commit:0be86e1926939a98afbd2f3a23c673dfc4df2a7c] +CVE-2017-6363 + +Signed-off-by: Haiqing Bai +--- + src/gd_gd.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gd_gd.c b/src/gd_gd.c +index f8d39cb..5a86fc3 100644 +--- a/src/gd_gd.c ++++ b/src/gd_gd.c +@@ -54,7 +54,8 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFlag) + if (!gdGetWord (&im->transparent, in)) { + goto fail1; + } +- if (im->transparent == 257) { ++ /* Make sure transparent index is within bounds of the palette. */ ++ if (im->transparent >= 256 || im->transparent < 0) { + im->transparent = (-1); + } + } +-- +1.9.1 + diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb index 35f9bb2..dda2e67 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb +++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ file://0001-annotate.c-gdft.c-Replace-strncpy-with-memccpy-to-fi.patch \ file://CVE-2018-1000222.patch \ file://CVE-2019-6978.patch \ + file://CVE-2017-6363.patch \ " SRCREV = "8255231b68889597d04d451a72438ab92a405aba" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 07:52:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 07:52:03 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: libtinyxml2: upgrade 7.1.0 -> 8.0.0 Message-ID: <158339472384.17951.7238524545947537219@git.openembedded.org> 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 e5c5df9 libtinyxml2: upgrade 7.1.0 -> 8.0.0 e5c5df9 is described below commit e5c5df9bcd8b0fbdcf33e8aa8d1949d03885400e Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 07:24:52 2020 +0000 libtinyxml2: upgrade 7.1.0 -> 8.0.0 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../libtinyxml2/{libtinyxml2_7.1.0.bb => libtinyxml2_8.0.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb similarity index 88% rename from meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb rename to meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb index 9e197a9..a2491cf 100644 --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_7.1.0.bb +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" SRC_URI = "git://github.com/leethomason/tinyxml2.git" -SRCREV = "9c740e8d2341bd46dbe8e87053cdb4d931971967" +SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" 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 Mar 5 15:09:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:09:21 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: tcsh: Update SRC_URI Message-ID: <158342096187.25786.1018782911083310178@git.openembedded.org> 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 0a3b6af tcsh: Update SRC_URI 0a3b6af is described below commit 0a3b6af9776acda460fd1fc5c2b854c4c30c39a5 Author: Khem Raj AuthorDate: Thu Mar 5 07:07:50 2020 -0800 tcsh: Update SRC_URI the ftp site seems to be intermittent Signed-off-by: Khem Raj --- meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb index 79ab67a..b30c343 100644 --- a/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb +++ b/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5" SECTION = "base" DEPENDS = "ncurses virtual/crypt gettext-native" SRC_URI = " \ - http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${BP}.tar.gz \ + https://astron.com/pub/${BPN}/${BP}.tar.gz \ file://0001-Enable-system-malloc-on-all-linux.patch \ file://0002-Add-debian-csh-scripts.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:05 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (0a3b6af -> 4211ff4) Message-ID: <158342112540.27899.9282625535069780024@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 0a3b6af tcsh: Update SRC_URI new 780bcdc uriparser: fix upstream version check new 4a13dc6 zeromq: fix upstream version check new 06d2b6a czmq: fix upstream version check new 5eeaa3e irssi: fix upstream version check new 18b4345 dbus-broker: fix upstream version check new c4fa664 jq: fix upstream version check new 07196b6 pugixml: fix upstream version check new b7eaa85 uim: fix upstream version check new f0aaedb libstatgrab: fix upstream version check new 171f3df icewm: fix upstream version check new 4211ff4 cloc: fix upstream version check 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-oe/recipes-connectivity/irssi/irssi_1.1.2.bb | 2 ++ meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb | 2 ++ meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb | 2 ++ meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 ++ meta-oe/recipes-devtools/cloc/cloc_1.84.bb | 2 ++ meta-oe/recipes-devtools/jq/jq_1.6.bb | 6 ++++-- meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb | 2 ++ meta-oe/recipes-extended/icewm/icewm_1.5.5.bb | 2 ++ meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb | 2 ++ meta-oe/recipes-support/uim/uim_1.8.8.bb | 2 ++ meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb | 2 ++ 11 files changed, 24 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 Mar 5 15:12:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:06 +0000 Subject: [oe-commits] [meta-openembedded] 01/11: uriparser: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.9D66E233587@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 780bcdc0f5020639ea29611510b356a8ffc207c6 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 10:40:07 2020 +0000 uriparser: fix upstream version check Fixes: INFO: Skip package uriparser (status = UNKNOWN_BROKEN, current version = 0.9.3, next version = N/A) After this commit: INFO: Skip package uriparser (status = MATCH, current version = 0.9.3, next version = 0.9.3) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb b/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb index 8c28c9d..da52bb5 100644 --- a/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb +++ b/meta-oe/recipes-support/uriparser/uriparser_0.9.3.bb @@ -8,6 +8,8 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz SRC_URI[md5sum] = "9874b64f6f4ff656f3f69598e38f12b7" SRC_URI[sha256sum] = "6cef39d6eaf1a48504ee0264ce85f078758057dafb1edd0a898183b55ff76014" +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + inherit cmake EXTRA_OECMAKE += "-DURIPARSER_BUILD_DOCS:BOOL=OFF -DURIPARSER_BUILD_TESTS:BOOL=OFF" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:07 +0000 Subject: [oe-commits] [meta-openembedded] 02/11: zeromq: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.A9514233588@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4a13dc6a9d0714735a8aabf97af2c60f9201fcb0 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 10:50:08 2020 +0000 zeromq: fix upstream version check Fixes: INFO: Skip package zeromq (status = UNKNOWN_BROKEN, current version = 4.3.2, next version = N/A) After this commit: INFO: Skip package zeromq (status = MATCH, current version = 4.3.2, next version = 4.3.2) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb index adf2c7b..49215f2 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb @@ -12,6 +12,8 @@ SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" SRC_URI[sha256sum] = "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" + inherit cmake ptest pkgconfig EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTS=ON', '-DBUILD_TESTS=OFF', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:08 +0000 Subject: [oe-commits] [meta-openembedded] 03/11: czmq: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.B2EEA233589@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 06d2b6a33b1ca22fd1ea322816afcfda5fa21ca5 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 10:53:33 2020 +0000 czmq: fix upstream version check Fixes: INFO: Skip package czmq (status = UNKNOWN_BROKEN, current version = 4.2.0, next version = N/A) After this commit: INFO: Skip package czmq (status = MATCH, current version = 4.2.0, next version = 4.2.0) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb index 4ec1c04..7c9a33e 100644 --- a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb +++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb @@ -9,6 +9,8 @@ SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.ta SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722" SRC_URI[sha256sum] = "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb" +UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" + inherit cmake PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:09 +0000 Subject: [oe-commits] [meta-openembedded] 04/11: irssi: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.BE47F23358A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5eeaa3edef4f805a1bd99148d467c686b823dbd3 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 12:54:16 2020 +0000 irssi: fix upstream version check Fixes: INFO: Skip package irssi (status = UNKNOWN_BROKEN, current version = 1.1.2, next version = N/A) After this commit: INFO: irssi, 1.1.2, 1.2.2, None, N/ Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb index e2867e8..cd797e0 100644 --- a/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb +++ b/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb @@ -9,6 +9,8 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz SRC_URI[md5sum] = "271d2fd875cddd34526234d8a766d82c" SRC_URI[sha256sum] = "5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf9732" +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + inherit autotools pkgconfig EXTRA_OECONF += "--with-textui \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:10 +0000 Subject: [oe-commits] [meta-openembedded] 05/11: dbus-broker: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.C8E0423358C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 18b434594c68977237f61bf4658c0a04f264f444 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 12:58:44 2020 +0000 dbus-broker: fix upstream version check Fixes: INFO: Skip package dbus-broker (status = UNKNOWN_BROKEN, current version = 21, next version = N/A) After this commit: INFO: dbus-broker, 21, 22, None, N/A Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-core/dbus/dbus-broker_21.bb b/meta-oe/recipes-core/dbus/dbus-broker_21.bb index bad4427..67b515d 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_21.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_21.bb @@ -16,6 +16,8 @@ SRC_URI += " file://0006-launch-policy-fix-crash-when-exporting-selinux.patch" SRC_URI[md5sum] = "a17886a92ab1e0bc2e4b1a274339e388" SRC_URI[sha256sum] = "6fff9a831a514659e2c7d704e76867ce31ebcf43e8d7a62e080c6656f64cd39e" +UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" + inherit meson pkgconfig systemd features_check DEPENDS = "expat systemd" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:11 +0000 Subject: [oe-commits] [meta-openembedded] 06/11: jq: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.D353023358D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c4fa664720e9eb9b5707f48802a37bcd3fd5be56 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 13:09:15 2020 +0000 jq: fix upstream version check Fixes: INFO: Skip package jq (status = UNKNOWN_BROKEN, current version = 1.6, next version = N/A) After this commit: INFO: Skip package jq (status = MATCH, current version = 1.6, next version = 1.6) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-devtools/jq/jq_1.6.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/jq/jq_1.6.bb b/meta-oe/recipes-devtools/jq/jq_1.6.bb index 0086eae..bfaeed5 100644 --- a/meta-oe/recipes-devtools/jq/jq_1.6.bb +++ b/meta-oe/recipes-devtools/jq/jq_1.6.bb @@ -8,8 +8,10 @@ SECTION = "utils" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf" -SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BP}/${BP}.tar.gz \ -" +SRC_URI = "https://github.com/stedolan/${BPN}/releases/download/${BP}/${BP}.tar.gz" + +UPSTREAM_CHECK_URI = "https://github.com/stedolan/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "jq\-(?P(\d+\.\d+))(?!_\d+).tar.gz" SRC_URI[md5sum] = "e68fbd6a992e36f1ac48c99bbf825d6b" SRC_URI[sha256sum] = "5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:13 +0000 Subject: [oe-commits] [meta-openembedded] 08/11: uim: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.E77D923358F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b7eaa85ee38dcd659d47814f21b67cdff96828fc Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 13:15:06 2020 +0000 uim: fix upstream version check Fixes: INFO: Skip package uim (status = UNKNOWN_BROKEN, current version = 1.8.8, next version = N/A) After this commit: INFO: Skip package uim (status = MATCH, current version = 1.8.8, next version = 1.8.8) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-support/uim/uim_1.8.8.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.8.bb index c1136cd..0366ad8 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -13,6 +13,8 @@ SRC_URI_append_class-target = "\ SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:12 +0000 Subject: [oe-commits] [meta-openembedded] 07/11: pugixml: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.DCEAD23358E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 07196b6a8cd774538cf9b82fc9fd2c7204a36e64 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 13:11:48 2020 +0000 pugixml: fix upstream version check Fixes: INFO: Skip package pugixml (status = UNKNOWN_BROKEN, current version = 1.10, next version = N/A) After this commit: INFO: Skip package pugixml (status = MATCH, current version = 1.10, next version = 1.10) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb b/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb index d48ad37..69e6628 100644 --- a/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb +++ b/meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb @@ -13,6 +13,8 @@ SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" SRC_URI[md5sum] = "f97237e9908201c6d8536210747b66af" SRC_URI[sha256sum] = "55f399fbb470942410d348584dc953bcaec926415d3462f471ef350f29b5870a" +UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" + inherit cmake EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:14 +0000 Subject: [oe-commits] [meta-openembedded] 09/11: libstatgrab: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151205.F0F92233591@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f0aaedbe013146971faf277ffa1c003e5c3692a4 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 14:44:45 2020 +0000 libstatgrab: fix upstream version check Fixes: INFO: Skip package libstatgrab (status = UNKNOWN_BROKEN, current version = 0.92, next version = N/A) After this commit: INFO: Skip package libstatgrab (status = MATCH, current version = 0.92, next version = 0.92) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb index c61d7c9..a081cb1 100644 --- a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -14,6 +14,8 @@ SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATG SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + # Perl5 is for tests only EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 15:12:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:15 +0000 Subject: [oe-commits] [meta-openembedded] 10/11: icewm: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151206.0761A233592@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 171f3df9e11720bd262adcf9befb77e7eab90f06 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 14:49:54 2020 +0000 icewm: fix upstream version check Fixes: INFO: Skip package icewm (status = UNKNOWN_BROKEN, current version = 1.5.5, next version = N/A) After this commit: INFO: icewm, 1.5.5, 1.6.4, None, N/A Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-extended/icewm/icewm_1.5.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb b/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb index fe6de00..887a32d 100644 --- a/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb +++ b/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb @@ -8,6 +8,8 @@ SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV} SRC_URI[md5sum] = "6eba94a7935a0531d2c14eeb1426aeef" SRC_URI[sha256sum] = "f1c1344b20a9e8635143f70ee27930b55f813c15ca61f84d77584d311b6ac027" +UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" + inherit autotools pkgconfig gettext perlnative features_check qemu 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 Thu Mar 5 15:12:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:12:16 +0000 Subject: [oe-commits] [meta-openembedded] 11/11: cloc: fix upstream version check In-Reply-To: <158342112540.27899.9282625535069780024@git.openembedded.org> References: <158342112540.27899.9282625535069780024@git.openembedded.org> Message-ID: <20200305151206.10CB4233593@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4211ff4855ae03edf53b55d443bcf5b452b05f7a Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 14:59:09 2020 +0000 cloc: fix upstream version check Fixes: INFO: Skip package cloc (status = UNKNOWN_BROKEN, current version = 1.84, next version = N/A) After this commit: INFO: Skip package cloc (status = MATCH, current version = 1.84, next version = 1.84) Signed-off-by: Pierre-Jean Texier --- meta-oe/recipes-devtools/cloc/cloc_1.84.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-devtools/cloc/cloc_1.84.bb b/meta-oe/recipes-devtools/cloc/cloc_1.84.bb index f9ecd0e..3e46c72 100644 --- a/meta-oe/recipes-devtools/cloc/cloc_1.84.bb +++ b/meta-oe/recipes-devtools/cloc/cloc_1.84.bb @@ -9,6 +9,8 @@ SRC_URI = "https://github.com/AlDanial/cloc/releases/download/${PV}/${BP}.tar.gz SRC_URI[md5sum] = "a52f3843825377cfa4e4b3b30a567ab4" SRC_URI[sha256sum] = "c3f0a6bd2319110418ccb3e55a7a1b6d0edfd7528bfd2ae5d530938abe90f254" +UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" + do_configure[noexec] = "1" 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 Mar 5 15:29:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 15:29:13 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: sstate: Drop obsolete check in hash validation Message-ID: <158342215351.2013.17694362735236827240@git.openembedded.org> 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 c007358 sstate: Drop obsolete check in hash validation c007358 is described below commit c0073589e9a96dde065b83e70204609187162ae5 Author: Richard Purdie AuthorDate: Thu Mar 5 15:27:41 2020 +0000 sstate: Drop obsolete check in hash validation Now this function has a summary parameter we can drop this check. It could well be why the mysterious "locked sigs" selftest fails interemittently if this function were called with a single hash to check. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 0beeb33..c73c3b4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -966,10 +966,6 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, if len(tasklist) >= min_tasks: bb.event.fire(bb.event.ProcessFinished(msg), d) - # Likely checking an individual task hash again for multiconfig sharing of sstate tasks so skip reporting - if len(sq_data['hash']) == 1: - return found - inheritlist = d.getVar("INHERIT") if "toaster" in inheritlist: evdata = {'missed': [], 'found': []}; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:48 +0000 Subject: [oe-commits] [openembedded-core] 01/17: kernel-yocto.bbclass: fix a wrong inter-task dependency In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163247.EEF65233588@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 541cd9247216676b09f3ef81527c300527a14f64 Author: Ming Liu AuthorDate: Wed Mar 4 14:55:43 2020 +0100 kernel-yocto.bbclass: fix a wrong inter-task dependency do_kernel_checkout and do_symlink_kernsrc are both modifying ${S}, they could conflict with eacher other, move do_kernel_checkout after do_symlink_kernsrc does fix that. Signed-off-by: Ming Liu Signed-off-by: Stefan Agner 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 44863ad..d71ce21 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -317,7 +317,7 @@ do_kernel_checkout() { } do_kernel_checkout[dirs] = "${S}" -addtask kernel_checkout before do_kernel_metadata after do_unpack +addtask kernel_checkout before do_kernel_metadata after do_symlink_kernsrc addtask kernel_metadata after do_validate_branches do_unpack before do_patch do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:49 +0000 Subject: [oe-commits] [openembedded-core] 02/17: linux-firmware: use 'make install' for installation In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.075E0233589@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b0690323994ff5f723eafa37b9458ee917a56270 Author: Alexander Kanavin AuthorDate: Wed Mar 4 11:13:07 2020 +0100 linux-firmware: use 'make install' for installation Copying the source tree over was missing important symlinks that since recent updates can only be created with make install. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../linux-firmware/linux-firmware_20200122.bb | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 0d1422c..f7198cb 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -208,27 +208,7 @@ do_compile() { } do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ - cp -r * ${D}${nonarch_base_libdir}/firmware/ - - # Avoid Makefile to be deployed - rm ${D}${nonarch_base_libdir}/firmware/Makefile - - # Remove unbuild firmware which needs cmake and bash - rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf - - # Remove pointless bash script - rm ${D}${nonarch_base_libdir}/firmware/configure - - # Remove python script used to check the WHENCE file - rm ${D}${nonarch_base_libdir}/firmware/check_whence.py - - # Libertas sd8686 - ln -sf libertas/sd8686_v9.bin ${D}${nonarch_base_libdir}/firmware/sd8686.bin - ln -sf libertas/sd8686_v9_helper.bin ${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin - - # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it - ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) + oe_runmake 'DESTDIR=${D}' install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:47 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (c007358 -> 9ab928d4) Message-ID: <158342596751.2837.15480990791248312598@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 c007358 sstate: Drop obsolete check in hash validation discard 1381d63 linux-yocto: drop 5.2 recipes discard 8338f79 linux-yocto/5.4: update to v5.4.23 discard 18cdcfa linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT discard e9b75e0 linux-yocto/5.2: backport perf build fix for latest binutils discard 8090c53 python3-native: Should not search the system for headers/libraries. discard aa6c17f linux-firmware: use 'make install' for installation discard a8eda77 kernel-yocto.bbclass: fix a wrong inter-task dependency discard 5bf56f4 gdbm: add depend on readline for consistent builds new 541cd92 kernel-yocto.bbclass: fix a wrong inter-task dependency new b069032 linux-firmware: use 'make install' for installation new b97a56a python3-native: Should not search the system for headers/libraries. new f34002a linux-yocto/5.2: backport perf build fix for latest binutils new d198ef8 linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT new c4cdb45 linux-yocto/5.4: update to v5.4.23 new 17e1ec4 linux-yocto: drop 5.2 recipes new 3d9f7d3 sstate: Drop obsolete check in hash validation new a764f25 gdbm: Disable readlind new c8282627 python-numpy: convert shebang from python to python3 new eea77ff dnf: fix python3 syntax warning new a450261 qemu: update Xen packages names for the xen-tools recipe new e9e3f0d babeltrace2: added first version, 2.0.1 new 7b5ca3d mesa: updated to 20.0 release new 48fcfcc openssl: pass PERL=perl environment variable to configurator new c6bd6ed xkbcomp: upgrade 1.4.2 -> 1.4.3 new 9ab928d4 netbase: Upgrade to 6.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 (c007358) \ N -- N -- N refs/heads/master-next (9ab928d4) 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/conf/distro/include/distro_alias.inc | 1 + meta/conf/distro/include/maintainers.inc | 1 + meta/conf/distro/include/ptest-packagelists.inc | 1 + .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- .../netbase/{netbase_6.0.bb => netbase_6.1.bb} | 4 +- .../packagegroup-core-tools-profile.bb | 2 + .../dnf/dnf/Fix-SyntaxWarning.patch | 34 ++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + ...01-convert-shebang-from-python-to-python3.patch | 579 +++++++++++++++++++++ .../recipes-devtools/python-numpy/python-numpy.inc | 1 + meta/recipes-devtools/qemu/qemu.inc | 2 +- .../mesa/{mesa-gl_19.3.4.bb => mesa-gl_20.0.0.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- .../mesa/{mesa_19.3.4.bb => mesa_20.0.0.bb} | 4 +- .../{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb} | 4 +- ...s-do-not-run-test-applications-from-.libs.patch | 28 + .../lttng/{babeltrace => babeltrace2}/run-ptest | 2 +- .../{babeltrace_1.5.8.bb => babeltrace2_2.0.1.bb} | 72 ++- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 4 +- 19 files changed, 692 insertions(+), 52 deletions(-) rename meta/recipes-core/netbase/{netbase_6.0.bb => netbase_6.1.bb} (82%) create mode 100644 meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch create mode 100644 meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch rename meta/recipes-graphics/mesa/{mesa-gl_19.3.4.bb => mesa-gl_20.0.0.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.4.bb => mesa_20.0.0.bb} (88%) rename meta/recipes-graphics/xorg-app/{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb} (79%) create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch copy meta/recipes-kernel/lttng/{babeltrace => babeltrace2}/run-ptest (70%) copy meta/recipes-kernel/lttng/{babeltrace_1.5.8.bb => babeltrace2_2.0.1.bb} (54%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:51 +0000 Subject: [oe-commits] [openembedded-core] 04/17: linux-yocto/5.2: backport perf build fix for latest binutils In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.200AC23358C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f34002a41134d09167c00a972f35769a45678017 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:21 2020 -0500 linux-yocto/5.2: backport perf build fix for latest binutils [ Author: Changbin Du Date: Tue Jan 28 23:29:38 2020 +0800 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 Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 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 441545f..a23a5e6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_machine ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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 6d49e00..ac9904f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" -SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuarm ?= "e0a3a01b24070b15121e938ea19755091bf0d662" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" 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 44516dc..eab142e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -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_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" +SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" +SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:50 +0000 Subject: [oe-commits] [openembedded-core] 03/17: python3-native: Should not search the system for headers/libraries. In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.12F5C23358A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b97a56ab8719152ae4d1f2e98228c1781ff53067 Author: Jeremy Puhlman AuthorDate: Tue Mar 3 16:24:09 2020 -0800 python3-native: Should not search the system for headers/libraries. The specific issue here is rpc/rpc.h, but its likely more general. /usr/include is searched for rpc/rpc.h and if it exists on the system, it changes behavior. If you are using the extended buildtools tarball on a machine that has /usr/include/rpc/rpc.h, it will decide that is good enough and not continue to search. nis fails to build because /usr/include and /usr/lib are not part of the include/link paths for the buildtools tarball compiler(nor should they be). This makes it so python3-native will not build if you are using the extended buildtools tarball, but from a larger issue perspective it is building in likely different ways depending on what machine it is building on. libtirpc is already a depend so we shouldn't need the hosts rpc/rcp.h. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...Don-t-search-system-for-headers-libraries.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 2 files changed, 30 insertions(+) diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch new file mode 100644 index 0000000..acf8e1e --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -0,0 +1,29 @@ +From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 4 Mar 2020 00:06:42 +0000 +Subject: [PATCH] Don't search system for headers/libraries + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9da1b3a..59782c0 100644 +--- a/setup.py ++++ b/setup.py +@@ -674,8 +674,8 @@ class PyBuildExt(build_ext): + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + +- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] +- system_include_dirs = ['/usr/include'] ++ system_lib_dirs = [] ++ system_include_dirs = [] + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +-- +2.24.1 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 7796852..5e3c29c 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -37,6 +37,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ SRC_URI_append_class-native = " \ file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \ + file://0001-Don-t-search-system-for-headers-libraries.patch \ " SRC_URI[md5sum] = "b3fb85fd479c0bf950c626ef80cacb57" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:55 +0000 Subject: [oe-commits] [openembedded-core] 08/17: sstate: Drop obsolete check in hash validation In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.558E9233591@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3d9f7d3f74408afce6aa2b031a43f6a7afc3159a Author: Richard Purdie AuthorDate: Thu Mar 5 15:27:41 2020 +0000 sstate: Drop obsolete check in hash validation Now this function has a summary parameter we can drop this check. It could well be why the mysterious "locked sigs" selftest fails interemittently if this function were called with a single hash to check. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 0beeb33..c73c3b4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -966,10 +966,6 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, if len(tasklist) >= min_tasks: bb.event.fire(bb.event.ProcessFinished(msg), d) - # Likely checking an individual task hash again for multiconfig sharing of sstate tasks so skip reporting - if len(sq_data['hash']) == 1: - return found - inheritlist = d.getVar("INHERIT") if "toaster" in inheritlist: evdata = {'missed': [], 'found': []}; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:56 +0000 Subject: [oe-commits] [openembedded-core] 09/17: gdbm: Disable readlind In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.61AE6233592@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a764f25fec8383a0f2a5095c61aa7593b39e1949 Author: Jeremy A. Puhlman AuthorDate: Wed Mar 4 16:33:10 2020 -0800 gdbm: Disable readlind Turns off readline for both native and target. Also corrected a typo with enable-libgdbm-compat Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3..5cb7c55 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest # Needed for dbm python module -EXTRA_OECONF = "-enable-libgdbm-compat" +EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" # Stop presence of dbm/nbdm on the host contaminating builds CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:54 +0000 Subject: [oe-commits] [openembedded-core] 07/17: linux-yocto: drop 5.2 recipes In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.49C3723358F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 17e1ec487fb2c9be03ef0ab8ce2ebbfe7be1de61 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:24 2020 -0500 linux-yocto: drop 5.2 recipes linux-yocto 5.4 will serve as the versioned reference kernel in the upcoming release, and -dev will serve as the "newer" kernel. As such, we drop v5.2 from master, but will continue to update and support it in released branches. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 44 ------------------ meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 32 -------------- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 54 ----------------------- 3 files changed, 130 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 deleted file mode 100644 index a23a5e6..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v5.2/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 ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" -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.32" - -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_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb deleted file mode 100644 index ac9904f..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v5.2/standard/tiny/base" -KBRANCH_qemuarm ?= "v5.2/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "5.2.32" -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 ?= "e0a3a01b24070b15121e938ea19755091bf0d662" -SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" - -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.2;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.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb deleted file mode 100644 index eab142e..0000000 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -KBRANCH ?= "v5.2/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v5.2/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.2/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.2/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.2/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.2/standard/base" -KBRANCH_qemux86 ?= "v5.2/standard/base" -KBRANCH_qemux86-64 ?= "v5.2/standard/base" -KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" -SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" -SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" -SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" - -# remap qemuarm to qemuarma15 for the 5.2 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.2;destsuffix=${KMETA}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.32" - -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|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 Thu Mar 5 16:32:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:52 +0000 Subject: [oe-commits] [openembedded-core] 05/17: linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.2EF0423358D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d198ef852051ba017d89454d5979ea4037aa1a1b Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:22 2020 -0500 linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT Integrating the following configuration tweak: [ Author: Alexander Kanavin Date: Mon Feb 24 10:34:00 2020 +0100 common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT This will allow testing libinput in particular: https://www.kernel.org/doc/html/latest/input/uinput.html https://wayland.freedesktop.org/libinput/doc/latest/test-suite.html Signed-off-by: Alexander Kanavin Signed-off-by: Bruce Ashfield ] 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 37282b2..964d2fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" 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-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 463451f..47fcc98 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" 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 5dd7b68..53d5652 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_machine_qemux86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_machine_qemumips64 ?= "fcbec8b4f0f2f24a31ce5c6e6439c69f7512fb31" SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:53 +0000 Subject: [oe-commits] [openembedded-core] 06/17: linux-yocto/5.4: update to v5.4.23 In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.3D74423358E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c4cdb45927109732c419f8110b66182e44009fa7 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:23 2020 -0500 linux-yocto/5.4: update to v5.4.23 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: bfe3046ecafd Linux 5.4.23 bb7ffcbec227 ASoC: SOF: Intel: hda: Add iDisp4 DAI fb81480206ae bpf: Selftests build error in sockmap_basic.c 19be2b3eea34 s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range 148c8531b69c s390/kaslr: Fix casts in get_random e26be2667399 net/mlx5e: Fix crash in recovery flow without devlink reporter fca1cdd3417e net/mlx5: Fix sleep while atomic in mlx5_eswitch_get_vepa 06320052ee69 net/mlx5e: Reset RQ doorbell counter before moving RQ state from RST to RDY 773dfd2223e3 xen: Enable interrupts when calling _cond_resched() 9724b3f28dab ata: ahci: Add shutdown to freeze hardware resources of ahci 8eb92c122840 io_uring: prevent sq_thread from spinning when it should stop b0f5f25c5541 rxrpc: Fix call RCU cleanup using non-bh-safe locks 829e0a0ae2dc netfilter: xt_hashlimit: limit the max size of hashtable 86502c68b81e ALSA: seq: Fix concurrent access to queue current tick/time 2b550d1c7ac6 ALSA: seq: Avoid concurrent access to queue flags 84e041a5df79 ALSA: rawmidi: Avoid bit fields for state flags c7deb9612e35 io_uring: fix __io_iopoll_check deadlock in io_sq_thread d562fdad84dd arm64: lse: Fix LSE atomics with LLVM 8132323eb397 bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill 2463a30f6678 genirq/proc: Reject invalid affinity masks (again) c23074e20989 crypto: rename sm3-256 to sm3 in hash_algo_name 8278f34f6ca8 iommu/vt-d: Fix compile warning from intel-svm.h cfde4697ea4d ecryptfs: replace BUG_ON with error handling code 4c585d1e98d9 ASoC: fsl_sai: Fix exiting path on probing failure 59c723344aec ASoC: atmel: fix atmel_ssc_set_audio link failure 125b4a5345e2 staging: greybus: use after free in gb_audio_manager_remove_all() 2ca19dfafc04 staging: rtl8723bs: fix copy of overlapping memory e6535a8c5d98 usb: dwc2: Fix in ISOC request length checking ceb1997a2ec3 usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus 826a43b22ce6 scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session" d92e714a463d scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout" 42b4f3c8ec0b drm/msm/dpu: fix BGR565 vs RGB565 confusion 337cbf3ea855 drm/i915/gt: Protect defer_request() from new waiters 93805d430c53 drm/bridge: tc358767: fix poll timeouts 7de50906e772 drm/i915/gvt: more locking for ppgtt mm LRU list 19f8fb273193 drm/i915/execlists: Always force a context reload when rewinding RING_TAIL 1e0175a15474 drm/i915/gt: Detect if we miss WaIdleLiteRestore 341c8e03a90a Revert "dmaengine: imx-sdma: Fix memory leak" 9ad7f8df34d2 Btrfs: fix deadlock during fast fsync when logging prealloc extents beyond eof 73e1f2663273 btrfs: don't set path->leave_spinning for truncate d3d0fb9d42d3 Btrfs: fix race between shrinking truncate and fiemap c383f8ad2a12 Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents 9af8e258895f btrfs: do not check delayed items are empty for single transaction cleanup 6065ca5d013d btrfs: reset fs_root to NULL on error in open_ctree 37a2e704807a btrfs: fix bytes_may_use underflow in prealloc error condtition 40ea30638d20 btrfs: destroy qgroup extent records on transaction abort 7e946e30a46d KVM: apic: avoid calculating pending eoi from an uninitialized val dc5537061baf KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1 16f8553f75b5 KVM: nVMX: clear PIN_BASED_POSTED_INTR from nested pinbased_ctls only when apicv is globally disabled 0f042f5e98f1 KVM: nVMX: Check IO instruction VM-exit conditions c4064f14f744 KVM: nVMX: Refactor IO bitmap checks into helper function e5d25003d059 ext4: fix race between writepages and enabling EXT4_EXTENTS_FL 5195dc6e9365 ext4: rename s_journal_flag_rwsem to s_writepages_rwsem 6ccdd6616a1c ext4: fix mount failure with quota configured as module eac2bb1042b2 ext4: fix potential race between s_flex_groups online resizing and access 58631f8cbc24 ext4: fix potential race between s_group_info online resizing and access bb43897de9b3 ext4: fix potential race between online resizing and write operations ded8c21ac49c ext4: add cond_resched() to __ext4_find_entry() 1673674ccd86 ext4: fix a data race in EXT4_I(inode)->i_disksize 56b3949a2b5f KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI 24dfae91a23a KVM: nVMX: Don't emulate instructions in guest mode e61c236dcf34 sched/psi: Fix OOB write when writing 0 bytes to PSI files 26ae0493c181 drm/i915: Update drm/i915 bug filing URL 2104c4905a08 drm/i915: Wean off drm_pci_alloc/drm_pci_free 3e740fa80cc8 drm/nouveau/kms/gv100-: Re-set LUT after clearing for modesets 5e7dda6ddad1 drm/amdgpu/gfx10: disable gfxoff when reading rlc clock 7e482baf6d70 drm/amdgpu/gfx9: disable gfxoff when reading rlc clock f141fac489ee drm/amdgpu/soc15: fix xclk for raven 95236ae76bf8 mm: Avoid creating virtual address aliases in brk()/mmap()/mremap() 9bb971b33565 lib/stackdepot.c: fix global out-of-bounds in stack_slabs ef32399bf729 mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM 198f5aa0f73e mm/vmscan.c: don't round up scan size for online memory cgroup 8735a5b6e1fb genirq/irqdomain: Make sure all irq domain flags are distinct 6e304262e393 nvme-multipath: Fix memory leak with ana_log_buf e078c8d8971b mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() aa4f749f8136 Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()" 7b77e5a08224 ACPI: PM: s2idle: Check fixed wakeup events in acpi_s2idle_wake() f18121a59b5a MAINTAINERS: Update drm/i915 bug filing URL cf3c30a7112c serdev: ttyport: restore client ops on deregistration 80990c30b776 tty: serial: qcom_geni_serial: Fix RX cancel command failure 5b0af5e58368 tty: serial: imx: setup the correct sg entry for tx dma 671ea19c3214 tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode 5ae6e5683755 serial: 8250: Check UPF_IRQ_SHARED in advance e0253c422024 x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF 88e4901d3ebd x86/mce/amd: Fix kobject lifetime de2cce5ae563 x86/mce/amd: Publish the bank pointer only after setup has succeeded 6df12de90e74 x86/ima: use correct identifier for SetupMode variable 453692eb5a38 jbd2: fix ocfs2 corrupt when clearing block group bits 98583fb54c2b arm64: memory: Add missing brackets to untagged_addr() macro 9b9374cf1ea7 powerpc/hugetlb: Fix 8M hugepages on 8xx 723a44f2288e powerpc/hugetlb: Fix 512k hugepages on 8xx with 16k page size 2ffeef3db358 powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S 04e3f1d1e135 powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery a03b3cea86fd powerpc/eeh: Fix deadlock handling dead PHB 9e1fab44502c powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss 2558e71bbfc5 drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context 3b8edaada13e staging: rtl8723bs: Fix potential overuse of kernel memory 4113e08e75d3 staging: rtl8723bs: Fix potential security hole de63cd8b5521 staging: rtl8188eu: Fix potential overuse of kernel memory ddedb84fcdc8 staging: rtl8188eu: Fix potential security hole 91aa9e475827 scsi: Revert "target/core: Inline transport_lun_remove_cmd()" 24aeb16934e8 usb: dwc3: debug: fix string position formatting mixup with ret and len 6dbf3ea0f566 usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields 256cc85f6f86 usb: dwc2: Fix SET/CLEAR_FEATURE and GET_STATUS flows c2f07cb7e317 USB: hub: Fix the broken detection of USB3 device in SMSC hub e5d078af8e5f USB: hub: Don't record a connect-change event during reset-resume 5af8add0167c USB: Fix novation SourceControl XL after suspend b3c64c8b2fab usb: uas: fix a plug & unplug racing e805982b13e3 USB: quirks: blacklist duplicate ep on Sound Devices USBPre2 4c02497e8f65 USB: core: add endpoint-blacklist quirk f9965af8e493 usb: host: xhci: update event ring dequeue pointer on purpose 5d0faf16f960 xhci: Fix memory leak when caching protocol extended capability PSI tables - take 2 ef69cf19bda8 xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms 02e326360053 xhci: fix runtime pm enabling for quirky Intel hosts 512dae7753cd xhci: Force Maximum Packet size for Full-speed bulk devices to valid range. 22ff13ac65cb staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi. 41a53f5b68ec staging: android: ashmem: Disallow ashmem memory from being remapped 897d5aaf3397 vt: vt_ioctl: fix race in VT_RESIZEX 21275a431289 vt: selection, handle pending signals in paste_selection a2c3858faf3a vt: fix scrollback flushing on background consoles 1eb78bc92c84 floppy: check FDC index for errors before assigning it c5455e3fab20 e1000e: Use rtnl_lock to prevent race conditions between net and pci/pm 47a7a44650c1 USB: misc: iowarrior: add support for the 100 device 9b5e87086fa9 USB: misc: iowarrior: add support for the 28 and 28L devices c8e28d325c97 USB: misc: iowarrior: add support for 2 OEMed devices cfda8551dd59 thunderbolt: Prevent crash if non-active NVMem file is read 802a8369d21f btrfs: handle logged extent failure properly 3c4ef8ac8f4b ecryptfs: fix a memory leak bug in ecryptfs_init_messaging() 7e1dbc6656ff ecryptfs: fix a memory leak bug in parse_tag_1_packet() 909149bf61da tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST 9f83363875be ASoC: sun8i-codec: Fix setting DAI data format 3de0bbe21312 ASoC: codec2codec: avoid invalid/double-free of pcm runtime c45877ca9f62 ALSA: hda/realtek - Apply quirk for yet another MSI laptop 9dc3b7a5833a ALSA: hda/realtek - Apply quirk for MSI GP63, too 80c1e9c4c484 ALSA: hda: Use scnprintf() for printing texts for sysfs/procfs b76e00b67dc6 iommu/qcom: Fix bogus detach logic f22dcb31727e Linux 5.4.22 105542cea2ea rtc: Kconfig: select REGMAP_I2C when necessary cea9007ebb95 bcache: properly initialize 'path' and 'err' in register_bcache() 7967c3299e3f drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c (v2) 51c9c98a7bbe s390/pci: Recover handle in clp_set_pci_fn() 332c8b5bc358 mlxsw: spectrum_dpipe: Add missing error path 399ca7ee9130 fuse: don't overflow LLONG_MAX with end offset 77912b69a989 virtio_balloon: prevent pfn array overflow 9c80ae965082 cifs: log warning message (once) if out of disk space 3f14879fd6ce i40e: Relax i40e_xsk_wakeup's return value when PF is busy 6fa2bb0d06ca help_next should increase position index 6b851823ceaa NFS: Fix memory leaks 0562d37d143a drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage c3e3d17d0c5b drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency 17bddc85f980 brd: check and limit max_part par 7291351c00e1 microblaze: Prevent the overflow of the start 7ceb32672b1e asm-generic/tlb: add missing CONFIG symbol 7a48064a42e0 iwlwifi: mvm: Check the sta is not NULL in iwl_mvm_cfg_he_sta() 1656781d15c0 iwlwifi: mvm: Fix thermal zone registration 0448387729d9 nvme-pci: remove nvmeq->tags 1d0fbf3e2687 nvmet: Pass lockdep expression to RCU lists d5461fdd9645 irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL 793137b0511c bcache: fix incorrect data type usage in btree_flush_write() 57a180a630d8 bcache: explicity type cast in bset_bkey_last() 374eec821858 bcache: fix memory corruption in bch_cache_accounting_clear() dc8c75f35374 reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() 23b88b51de5c lib/scatterlist.c: adjust indentation in __sg_alloc_table 5a553bd43f59 ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans() 799c4c1e389f ocfs2: make local header paths relative to C files 7a97311de48d btrfs: do not do delalloc reservation under page lock a531e6ba85a0 powerpc: Do not consider weak unresolved symbol relocations as bad 528c36e14b17 radeon: insert 10ms sleep in dce5_crtc_load_lut 224c0751dfb7 trigger_next should increase position index e349287276c2 ftrace: fpid_next() should increase position index 8a7bfa3d97dc char: hpet: Fix out-of-bounds read bug 427f39e23326 drm/nouveau/disp/nv50-: prevent oops when no channel method map provided 39c6932240c5 irqchip/gic-v3: Only provision redistributors that are enabled in ACPI 074c4c43fce2 drm/amd/display: do not allocate display_mode_lib unnecessarily 1687b204ae83 rbd: work around -Wuninitialized warning bd4e1894166b ceph: check availability of mds cluster on mount after wait timeout 7288d5338c85 powerpc/mm: Don't log user reads to 0xffffffff 3ce3df5d00d0 bpf: map_seq_next should always increase position index 9a178494d05b cifs: fix NULL dereference in match_prepath 9c5ede115a6e cifs: Fix mount options set in automount 1d8e40cf86e4 cifs: fix unitialized variable poential problem with network I/O cache lock patch a2763f62baa4 iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop 034c5f26d2bf rtw88: fix potential NULL skb access in TX ISR e7e4d0eaa639 hostap: Adjust indentation in prism2_hostapd_add_sta 32662df2d0bc ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82 2ccaac382af0 ARM: 8951/1: Fix Kexec compilation issue. 16ec28640dc6 selftests/eeh: Bump EEH wait time to 60s 93df1b23b157 powerpc/pseries/lparcfg: Fix display of Maximum Memory 411327180703 jbd2: make sure ESHUTDOWN to be recorded in the journal superblock 314e25f4b0cf jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record b911c5e8686a selftests: bpf: Reset global state between reuseport test runs 251c53a92b54 alarmtimer: Make alarmtimer platform device child of RTC device 777baa1baf63 iommu/vt-d: Remove unnecessary WARN_ON_ONCE() b5f6bf0fdd71 bcache: fix use-after-free in register_bcache() 393b8509be33 bcache: rework error unwinding in register_bcache f7d8ebf26d23 bcache: cached_dev_free needs to put the sb page 714cd4a5127a btrfs: Fix split-brain handling when changing FSID to metadata uuid dc22bc8a8626 btrfs: separate definition of assertion failure handlers 3420f1b304b3 media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value 3f6c8de753ed powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV 9d5fc7f14ef2 drm/nouveau/mmu: fix comptag memory leak 707518c16ba4 sunrpc: Fix potential leaks in sunrpc_cache_unhash() 46503858e275 ALSA: hda - Add docking station support for Lenovo Thinkpad T420s ea038a5270b5 bpf, btf: Always output invariant hit in pahole DWARF to BTF transform f11aefc9961d driver core: platform: fix u32 greater or equal to zero comparison 843eb0a8cf53 s390/ftrace: generate traced function stack frame 68c3cc414e08 s390: adjust -mpacked-stack support check for clang 10 838bddc295a0 x86/decoder: Add TEST opcode to Group3-2 a4f6948e57f0 objtool: Fix ARCH=x86_64 build error 59e2355bdfc5 kbuild: use -S instead of -E for precise cc-option test in Kconfig ba6ad897c3dc spi: spi-fsl-qspi: Ensure width is respected in spi-mem operations dbdc1c12966e ALSA: hda/hdmi - add retry logic to parse_intel_hdmi() fa7d320dbbbe irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems 27f3dc35fd59 regulator: core: Fix exported symbols to the exported GPL version 18eca3cb5dd9 remoteproc: Initialize rproc_class before use 496d6c021828 module: avoid setting info->name early in case we can fall back to info->mod->name 7303a0b0a537 btrfs: device stats, log when stats are zeroed f9ab58f9a2ab btrfs: safely advance counter when looking up bio csums ebf8e5411888 btrfs: fix possible NULL-pointer dereference in integrity checks 50b93369668b pwm: Remove set but not set variable 'pwm' adf4ab6d8312 ide: serverworks: potential overflow in svwks_set_pio_mode() e5c8d3abd927 cmd64x: potential buffer overflow in cmd64x_program_timings() 419035d75dbe pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional e7e6b53fea10 x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd 225a5b5bee00 f2fs: fix memleak of kobject 337c7b95e16e regulator: vctrl-regulator: Avoid deadlock getting and setting the voltage bf754c88865d ASoC: SOF: Intel: hda: Fix SKL dai count 84255fe86d07 debugobjects: Fix various data races 0b2ecef39d8e watchdog/softlockup: Enforce that timestamp is valid on boot d8a6a443ff0a perf/x86/amd: Constrain Large Increment per Cycle events f2323c374e49 sched/topology: Assert non-NUMA topology masks don't (partially) overlap 5d13f62b9ef6 sched/core: Fix size of rq::uclamp initialization 8da6ae7dcb16 arm64: dts: ti: k3-j721e-main: Add missing power-domains for smmu 88cf251d3c0d KVM: PPC: Remove set but not used variable 'ra', 'rs', 'rt' d4870a4343f3 EDAC/sifive: Fix return value check in ecc_register() 0a8f90d5654d drm/amd/display: fixup DML dependencies 304982d21e2b arm64: fix alternatives with LLVM's integrated assembler f68668292496 arm64: lse: fix LSE atomics with LLVM's integrated assembler b04235f1e11d RDMA/mlx5: Don't fake udata for kernel path da2d50868e59 ALSA: usb-audio: add implicit fb quirk for MOTU M Series 5a6f5b327fce crypto: essiv - fix AEAD capitalization and preposition use in help text 817faa4ed433 scsi: iscsi: Don't destroy session if there are outstanding connections 12b685be50c7 scsi: ufs-mediatek: add apply_dev_quirks variant operation 4fa2dd4eebfd scsi: ufs: pass device information to apply_dev_quirks 0016939be0ee f2fs: free sysfs kobject 06c34c604b13 f2fs: set I_LINKABLE early to avoid wrong access by vfs f51caa62dea1 ALSA: usb-audio: unlock on error in probe 480494e28a51 iommu/arm-smmu-v3: Use WRITE_ONCE() when changing validity of an STE 23d3f191a576 kbuild: remove *.tmp file when filechk fails 1fc9746acbb2 usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue 9112d1ef5a1b perf/imx_ddr: Fix cpu hotplug state cleanup 994b203b619d drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add 13d368cd1e13 gpiolib: Set lockdep class for hierarchical irq domains 7f0d9ac2621e dm thin: don't allow changing data device during thin-pool reload 74f42a77318e drm/nouveau/fault/gv100-: fix memory leak on module unload 18792937b064 drm/nouveau/drm/ttm: Remove set but not used variable 'mem' a94c84c5c4bc drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler 93672fa5b9b3 drm/nouveau/gr/gk20a,gm200-: add terminators to method lists read from fw 63e00e2c80e5 drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new() 760baae7ab35 vme: bridges: reduce stack usage 76fac0e735c7 bpf: Return -EBADRQC for invalid map type in __bpf_tx_xdp_map be1113b4b415 ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare a8b37e32415e driver core: Print device when resources present in really_probe() 3f6af05d1d1b driver core: platform: Prevent resouce overflow from causing infinite loops 11c759264c32 visorbus: fix uninitialized variable access 83f964dd14a7 misc: xilinx_sdfec: fix xsdfec_poll()'s return type 9087af8639c2 tty: synclink_gt: Adjust indentation in several functions 71faeca11055 tty: synclinkmp: Adjust indentation in several functions a922fa72a860 raid6/test: fix a compilation warning 6cfe307b5be7 ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m 5bff3c470f84 ALSA: usb-audio: Add boot quirk for MOTU M Series d691d1e5836d ARM: dts: rockchip: add reg property to brcmf sub node for rk3188-bqedison2qc 7c32c479b1e0 arm64: dts: rockchip: add reg property to brcmf sub-nodes f9de6fb6e679 arm64: dts: rockchip: fix dwmmc clock name for px30 989a495ed9a3 clocksource: davinci: only enable clockevents once tim34 is initialized 48be6f9d2f7e wan: ixp4xx_hss: fix compile-testing on 64-bit 73f48c1004d4 x86/nmi: Remove irq_work from the long duration NMI handler b075c29e816c bnxt: Detach page from page pool before sending up the stack 1e703d621b9c Input: edt-ft5x06 - work around first register access error 2b1fd461067f rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls 5f0a4eba2a88 efi/x86: Don't panic or BUG() on non-critical error conditions 5cf01eacd5c2 soc/tegra: fuse: Correct straps' address for older Tegra124 device trees 75d916c3b393 IB/hfi1: Add RcvShortLengthErrCnt to hfi1stats 9cfe6c21ff17 IB/hfi1: Add software counter for ctxt0 seq drop 8689967be56d staging: rtl8188: avoid excessive stack usage bfe29951e250 drm/mediatek: Add gamma property according to hardware capability 6ceef50235d1 udf: Fix free space reporting for metadata and virtual partitions 03560e4a19fe usbip: Fix unsafe unaligned pointer usage e653e1c05423 ARM: dts: stm32: Add power-supply for DSI panel on stm32f469-disco 6e86c4ce5d3a usb: dwc3: use proper initializers for property entries ab7edf7fa651 drm: remove the newline for CRC source name. 9d89ff3d27e0 RDMA/hns: Avoid printing address of mtt page 5a2a529974e1 mlx5: work around high stack usage with gcc 010cdc1be053 drm/amdkfd: Fix permissions of hang_hws 960671ac5065 iommu/vt-d: Avoid sending invalid page response 2aab9e9d1f3d iommu/vt-d: Match CPU and IOMMU paging mode 4ffdfc414d81 ACPI: button: Add DMI quirk for Razer Blade Stealth 13 late 2019 lid switch e9e24f2ca9a6 ASoC: Intel: sof_rt5682: Ignore the speaker amp when there isn't one. d00a15040454 vfio/spapr/nvlink2: Skip unpinning pages on error exit e44b48f5bb64 tools lib api fs: Fix gcc9 stringop-truncation compilation error 3e32b1282b11 net: phy: fixed_phy: fix use-after-free when checking link GPIO 4070a491bfcf ALSA: sh: Fix compile warning wrt const cf24ed82438c ALSA: hda/realtek - Apply mic mute LED quirk for Dell E7xx laptops, too 2417ea1d07a5 clk: uniphier: Add SCSSI clock gate for each channel 6447bfe82922 clk: Use parent node pointer during registration if necessary 6c7984312d35 ALSA: sh: Fix unused variable warnings 9f87fff25159 clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock d1d92e97260f RDMA/rxe: Fix error type of mmap_offset c87c4d442b9f fbdev: fix numbering of fbcon options 67ca691658f5 ASoC: soc-topology: fix endianness issues 04361b8961d6 reset: uniphier: Add SCSSI reset control for each channel e39aac0e65f1 pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs 9ed73297980b drm/fbdev: Fallback to non tiled mode if all tiles not present d3db7b78e7d6 PM / devfreq: rk3399_dmc: Add COMPILE_TEST and HAVE_ARM_SMCCC dependency 704582e6a714 PM / devfreq: exynos-ppmu: Fix excessive stack usage bc866376d7cd x86/vdso: Provide missing include file b5fe09b676de crypto: chtls - Fixed memory leak a739564c4c53 net: phy: realtek: add logging for the RGMII TX delay configuration 4783bf08f8d2 bpf: Print error message for bpftool cgroup show 8a7aa4feeaea dmaengine: imx-sdma: Fix memory leak f99958a96c7f dmaengine: Store module owner in dma_device struct 93a3eff6fab3 clk: actually call the clock init before any other callback of the clock fa0150ba88fa iommu/iova: Silence warnings under memory pressure 8c358435459b iommu/amd: Only support x2APIC with IVHD type 11h/40h b1b7add9d2de iommu/amd: Check feature support bit before accessing MSI capability registers 0c09d9dc8440 arm64: dts: qcom: db845c: Enable ath10k 8bit host-cap quirk ce591c921944 scsi: lpfc: Fix: Rework setting of fdmi symbolic node name registration 111749fba968 selinux: ensure we cleanup the internal AVC counters on error in avc_update() 069d2385f381 ARM: dts: r8a7779: Add device node for ARM global timer f9b42cb09d8b clk: renesas: rcar-gen3: Allow changing the RPC[D2] clocks d80f9dfe47ce drm/mediatek: handle events when enabling/disabling crtc 57cd234da28c crypto: inside-secure - add unspecified HAS_IOMEM dependency df0f4455a12f scsi: aic7xxx: Adjust indentation in ahc_find_syncrate f6ebbf46c3a8 scsi: ufs: Complete pending requests in host reset and restore path 8728001e1e41 nfsd: Clone should commit src file metadata too d67d31cb0e92 ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1 3fa5ba7b1912 clk: qcom: smd: Add missing bimc clock 43ef7ad610dc drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV 75423fdad259 orinoco: avoid assertion in case of NULL pointer 5a14db967b72 rtlwifi: rtl_pci: Fix -Wcast-function-type f20bc906af52 iwlegacy: Fix -Wcast-function-type 3acea3092a33 ipw2x00: Fix -Wcast-function-type bc8746721cdf b43legacy: Fix -Wcast-function-type 90053ff023da PCI: Add DMA alias quirk for PLX PEX NTB 27a35f09367f PCI: Add nr_devfns parameter to pci_add_dma_alias() dd77f77004b6 ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status b6c857e5e500 netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy 1e2b6e5f32aa fore200e: Fix incorrect checks of NULL pointer dereference 58bc57b373e0 r8169: check that Realtek PHY driver module is loaded cdd5b09bcbc0 samples/bpf: Set -fno-stack-protector when building BPF programs af77e76625be reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling 6107a895e383 media: v4l2-device.h: Explicitly compare grp{id,mask} to zero in v4l2_device macros cf03458ab2cf selftests/net: make so_txtime more robust to timer variance 687ef9c269b6 gpu/drm: ingenic: Avoid null pointer deference in plane atomic update e07c107a2483 Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace" 6a05af0b718a PCI: Increase D3 delay for AMD Ryzen5/7 XHCI controllers 5700b8073f03 PCI: Add generic quirk for increasing D3hot delay 1e7b1684de37 media: cx23885: Add support for AVerMedia CE310B a3a7f90936d7 PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in 76ce0e269b4a bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO 2fc336213605 ARM: dts: imx6: rdu2: Limit USBH1 to Full Speed f3e63a4ddf19 ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3 dbe3806c7191 ARM: exynos_defconfig: Bring back explicitly wanted options 4ece124849a2 clk: imx: Add correct failure handling for clk based helpers 0685dfa0a2ff padata: validate cpumask without removed CPU during offline c3a007435359 arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core 0e44cd879ba1 selinux: ensure we cleanup the internal AVC counters on error in avc_insert() 5fed8c513adb opp: Free static OPPs on errors while adding them ef6b35dfe142 arm: dts: allwinner: H3: Add PMU node 5a241d7bf1e6 arm64: dts: allwinner: H5: Add PMU node 02dfae36b03f arm64: dts: allwinner: H6: Add PMU mode 5f0a50b0a37d NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). 53d9b08dc80d net/wan/fsl_ucc_hdlc: reject muram offsets above 64K 12ba455b1d28 regulator: rk808: Lower log level on optional GPIOs being not available bae02d239a38 ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682 fa54ae038c95 ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's 4c50665fc968 modules: lockdep: Suppress suspicious RCU usage warning fa0316aaf094 arm64: dts: rockchip: Fix NanoPC-T4 cooling maps 3a28e0701264 drm/panel: simple: Add Logic PD Type 28 display support c3c3f3449b8c drm/amdgpu: Ensure ret is always initialized when using SOC15_WAIT_ON_RREG ddbdf757a7ef ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start 69c12b79e9e2 drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table ad9728b377a6 bpf, sockhash: Synchronize_rcu before free'ing map 25c85d8574d8 drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode dff5d0fc77a5 clk: qcom: rcg2: Don't crash if our parent can't be found; return an error 8d122cd0d266 clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq() 8ba34cdadba3 kconfig: fix broken dependency in randconfig-generated .config 39a708219509 block, bfq: do not plug I/O for bfq_queues with no proc refs b0d5c881d36e drivers/block/zram/zram_drv.c: fix error return codes not being returned in writeback_store 53aaa9f1a638 Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker 3aa694d0e112 KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups 25cbba5d4e14 nbd: add a flush_workqueue in nbd_start_device 201fdd62bb23 tracing: Simplify assignment parsing for hist triggers 7bc84d854017 drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero 806f57ec2b52 rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed b752d473b1fb selftests: settings: tests can be in subsubdirs 6f65dd66ea6f brcmfmac: sdio: Fix OOB interrupt initialization on brcm43362 abf8d588e3b1 rtw88: fix rate mask for 1SS chip 3eee03d0ffb8 ath10k: Correct the DMA direction for management tx buffers 494c30b80550 ext4, jbd2: ensure panic when aborting with zero errno 8343f165f3d4 ARM: 8952/1: Disable kmemleak on XIP kernels 8c72748e9f6a tracing: Fix very unlikely race of registering two stat tracers 75225eee8715 tracing: Fix tracing_stat return values in error handling paths 8be3ac46ef80 powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() 256e52a1a915 s390/pci: Fix possible deadlock in recover_store() 37ea6d15b197 wan/hdlc_x25: fix skb handling 77b131f652d4 dmaengine: fsl-qdma: fix duplicated argument to && d30a4882e630 udf: Allow writing to 'Rewritable' partitions a3536e5589c7 pwm: omap-dmtimer: Simplify error handling 971579fae1b4 x86/sysfb: Fix check for bad VRAM size 7828a927b850 clk: ti: dra7: fix parent for gmac_clkctrl 2d7fa7564bc4 ext4: fix deadlock allocating bio_post_read_ctx from mempool c982320078dd jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal 56953ccd7f00 kselftest: Minimise dependency of get_size on C library interfaces 6aa96ec9c196 drm/amd/display: Clear state after exiting fixed active VRR state c7fc72092134 clocksource/drivers/bcm2835_timer: Fix memory leak of timer 9f0414eed212 usb: dwc2: Fix IN FIFO allocation 2cea5895b69d usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe() 531d0ac5fbbd drm/nouveau/nouveau: fix incorrect sizeof on args.src an args.dst d34ecf4949de spi: fsl-lpspi: fix only one cs-gpio working 9f3a2e147f0e drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov 750a95d63746 uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol() b2f28d11f2a1 raid6/test: fix a compilation error 448563605d98 net: ethernet: ixp4xx: Standard module init b5d649f14470 sparc: Add .exit.data section. c09d0bd924ac MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init() ed140997f80c efi/x86: Map the entire EFI vendor string before copying it 04a5bebd7789 pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins 9ad79d4fa032 IB/core: Let IB core distribute cache update events f606721660a6 kernel/module: Fix memleak in module_add_modinfo_attrs() fc3c0fc85d69 media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run() bc4730880281 char/random: silence a lockdep splat with printk() 0b455673e7c4 x86/fpu: Deactivate FPU state after failure during state load 9b743915bd00 iommu/vt-d: Fix off-by-one in PASID allocation 739abce96dd0 gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap() e715aa99c502 clk: meson: meson8b: make the CCF use the glitch-free mali mux 271b18405eb0 powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number 2f812301bacf clk: at91: sam9x60: fix programmable clock prescaler e1e1cdbc646f media: sun4i-csi: Fix [HV]sync polarity handling 65fbde986aef media: sun4i-csi: Fix data sampling polarity handling f5076ea1bc9d media: sun4i-csi: Deal with DRAM offset cb514c01f6e4 media: i2c: mt9v032: fix enum mbus codes and frame sizes ecb8ea6f93e5 media: ov5640: Fix check for PLL1 exceeding max allowed rate 9c76a7b28edc pxa168fb: Fix the function used to release some memory in an error handling path 4a8bb7ce9f0b drm/msm/adreno: fix zap vs no-zap handling 4aa148666a70 drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank() d21cc4ea7a82 printk: fix exclusive_console replaying f46afae807aa pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs fcc0000109b0 gianfar: Fix TX timestamping with a stacked DSA driver c324effa6d9d ALSA: ctl: allow TLV read operation for callback type of element in locked case 4125714ce1d6 ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT 348a7ccdb9f0 leds: pca963x: Fix open-drain initialization 4e2d5e3eb865 drm/amd/display: Map ODM memory correctly when doing ODM combine b3224bf30709 PCI: Fix pci_add_dma_alias() bitmask size 071963d37143 brcmfmac: Fix use after free in brcmf_sdio_readframes() 55195593a8c6 brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() c4d0a90b5029 cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order 4d7f8ca608b2 clk: meson: pll: Fix by 0 division in __pll_params_to_rate() 343fc9a26887 media: meson: add missing allocation failure check on new_buf 85275286d118 f2fs: call f2fs_balance_fs outside of locked page 678b25bfd983 f2fs: preallocate DIO blocks when forcing buffered_io 255edefeb0b8 rcu: Fix data-race due to atomic_t copy-by-value b7725deb9d61 rcu: Fix missed wakeup of exp_wq waiters 3ece067c12e1 rcu/nocb: Fix dump_tree hierarchy print always active 2339f7a55c84 drm/qxl: Complete exception handling in qxl_device_init() 3deb6e993ec4 wil6210: fix break that is never reached because of zero'ing of a retry counter 281ebbcdee49 ath10k: Fix qmi init error handling 726196728c2c drm/gma500: Fixup fbdev stolen size usage evaluation 60e055d59d0e net/sched: flower: add missing validation of TCA_FLOWER_FLAGS 58cd462bc5b1 net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS d9bc012b4a47 net: dsa: tag_qca: Make sure there is headroom for tag 42dd56266b9f net/smc: fix leak of kernel memory to user space f1f2eea30d19 enic: prevent waking up stopped tx queues over watchdog reset 8f22873582a7 core: Don't skip generic XDP program execution for cloned SKBs 2d636a1263be Linux 5.4.21 c10cfc131c0b mmc: core: Rework wp-gpio handling b0ad23142a2a gpio: add gpiod_toggle_active_low() 2cbbe28c734b KVM: x86/mmu: Fix struct guest_walker arrays for 5-level paging ac3aea49cc35 ext4: choose hardlimit when softlimit is larger than hardlimit in ext4_statfs_project() 9275ae515385 jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer f09998f7a11f jbd2: move the clearing of b_modified flag to the journal_unmap_buffer() 0e365eafbcaa Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode config" 590d35beddcc NFSv4.1 make cachethis=no for writes 7bee7eabf0ed perf stat: Don't report a null stalled cycles per insn metric 1164c3380958 KVM: x86: Mask off reserved bit from #DB exception payload ec86856b4672 arm64: dts: fast models: Fix FVP PCI interrupt-map property 51a610a5c88d cifs: fix mount option display for sec=krb5i db5a68ffad2a mac80211: fix quiet mode activation in action frames 671338889e8f hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions. 98509dfe6f25 perf/x86/intel: Fix inaccurate period in context switch for auto-reload 1d2a31baf6b6 spmi: pmic-arb: Set lockdep class for hierarchical irq domains 9f6f61c61a84 sched/uclamp: Reject negative values in cpu_uclamp_write() 115402ee80ce s390/time: Fix clk type in get_tod_clock ae88de70c254 RDMA/core: Fix protection fault in get_pkey_idx_qp_list 2c753af06f23 RDMA/rxe: Fix soft lockup problem due to using tasklets in softirq 8662e612ae4c RDMA/hfi1: Fix memory leak in _dev_comp_vect_mappings_create b860a4524217 RDMA/iw_cxgb4: initiate CLOSE when entering TERM c60c4b4b6bf2 RDMA/core: Fix invalid memory access in spec_filter_size 8a14f01c4d0f IB/umad: Fix kernel crash while unloading ib_umad 6603342a6060 IB/rdmavt: Reset all QPs when the device is shut down b16dfda32ca5 IB/hfi1: Close window for pq and request coliding 327f33e54c7f IB/hfi1: Acquire lock to release TID entries when user file is closed e30e30c042fe IB/mlx5: Return failure when rts2rts_qp_counters_set_id is not supported cf0ea974b6a2 drivers: ipmi: fix off-by-one bounds check that leads to a out-of-bounds write 5e9f573dc8e7 nvme: fix the parameter order for nvme_get_log in nvme_get_fw_slot_info fa3c053b8313 bus: moxtet: fix potential stack buffer overflow 279c15b917ec drm/panfrost: Make sure the shrinker does not reclaim referenced BOs 3ea7f138cec1 drm/vgem: Close use-after-free race in vgem_gem_create 9ea66515918e s390/uv: Fix handling of length extensions 9e6874da9446 s390/pkey: fix missing length of protected key on return ebc3ddc1a255 perf/x86/amd: Add missing L2 misses event spec to AMD Family 17h's event map db6f68908bce KVM: nVMX: Use correct root level for nested EPT shadow page tables ce8b9b8032bd EDAC/mc: Fix use-after-free and memleaks during device removal b2e977a9731f EDAC/sysfs: Remove csrow objects on errors 03f6c2bf9562 cifs: make sure we do not overflow the max EA buffer size ff04f342f8c4 xprtrdma: Fix DMA scatter-gather list mapping imbalance 22f15745c4e7 arm64: ssbs: Fix context-switch when SSBS is present on all CPUs 4267ba3bac6d gpio: xilinx: Fix bug where the wrong GPIO register is written to 8791bb8f8471 ARM: npcm: Bring back GPIOLIB support cafaf6bcce60 btrfs: log message when rw remount is attempted with unclean tree-log 2655c88c03e8 btrfs: print message when tree-log replay starts f3cdf024ed19 btrfs: ref-verify: fix memory leaks bf4a9715a914 Btrfs: fix race between using extent maps and merging them c43f560acc85 ext4: improve explanation of a mount failure caused by a misconfigured kernel 94f0fe04da78 ext4: add cond_resched() to ext4_protect_reserved_inode 5b0a26514d6c ext4: fix checksum errors with indexed dirs 449e607322d7 ext4: fix support for inode sizes > 1024 bytes f080204b677d ext4: don't assume that mmp_nodename/bdevname have NUL 86c30da1b684 ALSA: usb-audio: Add clock validity quirk for Denon MC7000/MCX8000 67d49871f8e4 ALSA: usb-audio: sound: usb: usb true/false for bool return type c3b35c87e5b6 ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system 303740645567 ACPICA: Introduce acpi_any_gpe_status_set() 0671627a5faa ACPI: PM: s2idle: Avoid possible race related to the EC GPE b9f78af90d92 ACPI: EC: Fix flushing of pending work 25487999ca3a ALSA: usb-audio: Apply sample rate quirk for Audioengine D1 2b7e7004970a ALSA: hda/realtek - Fix silent output on MSI-GL73 1e73c5eae8c6 ALSA: hda/realtek - Add more codec supported Headset Button c28273b42c95 ALSA: usb-audio: Fix UAC2/3 effect unit parsing 2323beb68436 Input: synaptics - remove the LEN0049 dmi id from topbuttonpad list efca0d73501a Input: synaptics - enable SMBus on ThinkPad L470 c6426ba5731b Input: synaptics - switch T470s to RMI4 by default 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 964d2fe..1c238c9 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 ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" -SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine ?= "f617c0993374d56792e266e37606d424166b1edd" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" 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.20" +LINUX_VERSION ?= "5.4.23" 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 47fcc98..193bd9b 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.20" +LINUX_VERSION ?= "5.4.23" 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 ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" -SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine_qemuarm ?= "d361ce4ddedafa6d504d726c5da098d32f46886e" +SRCREV_machine ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" 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 53d5652..ab7c646 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 ?= "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 ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine_qemuarm ?= "3745c440f4781ffaab809f999c14da1abd3457bb" +SRCREV_machine_qemuarm64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemumips ?= "eb0e84ae58eb7a88a48bdbddfb53095228840974" +SRCREV_machine_qemuppc ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemuriscv64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemux86 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemux86-64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemumips64 ?= "7ca67eee407193dff5132da8bacc036f670faaea" +SRCREV_machine ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" # 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.20" +LINUX_VERSION ?= "5.4.23" 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 Thu Mar 5 16:32:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:58 +0000 Subject: [oe-commits] [openembedded-core] 11/17: dnf: fix python3 syntax warning In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.7AC50233594@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit eea77ff3b10c477a5091a69ac7d8a5ea8209b293 Author: Joe Slater AuthorDate: Wed Mar 4 16:30:20 2020 -0800 dnf: fix python3 syntax warning Backport from dnf version 4.2.7. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- .../dnf/dnf/Fix-SyntaxWarning.patch | 34 ++++++++++++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + 2 files changed, 35 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch new file mode 100644 index 0000000..1bd8b09 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch @@ -0,0 +1,34 @@ +From 23c5b15efe42e5e6ee695e54798bac248532d8d6 Mon Sep 17 00:00:00 2001 + +Date: Tue, 28 May 2019 13:14:51 +0200 +Subject: [oe-core][PATCH 1/1] Fix SyntaxWarning: "is" with a literal. Did you + mean "=="? + +--- + dnf/cli/commands/repoquery.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +--- + +Unchanged. Appears in version 4.2.7. + +Upstream-Status: Backport [git://github.com/rpm-software-management/dnf.git] + +Signed-off-by: Joe Slater + + +diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py +index 941a470..63fc668 100644 +--- a/dnf/cli/commands/repoquery.py ++++ b/dnf/cli/commands/repoquery.py +@@ -611,7 +611,7 @@ class RepoQueryCommand(commands.Command): + + def tree_seed(self, query, aquery, opts, level=-1, usedpkgs=None): + for pkg in sorted(set(query.run()), key=lambda p: p.name): +- usedpkgs = set() if usedpkgs is None or level is -1 else usedpkgs ++ usedpkgs = set() if usedpkgs is None or level == -1 else usedpkgs + if pkg.name.startswith("rpmlib") or pkg.name.startswith("solvable"): + return + self.grow_tree(level, pkg, opts) +-- +2.7.4 + diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f6e616e..5244e10 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0005-Do-not-prepend-installroot-to-logdir.patch \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ + file://Fix-SyntaxWarning.patch \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:32:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:59 +0000 Subject: [oe-commits] [openembedded-core] 12/17: qemu: update Xen packages names for the xen-tools recipe In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.8C1F1233588@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a450261f897ec72b741b2ebd4ff9386497844333 Author: Christopher Clark AuthorDate: Wed Mar 4 15:17:24 2020 -0800 qemu: update Xen packages names for the xen-tools recipe The Xen recipe has been divided into separate recipes for the hypervisor and tools in meta-virtualization commit 545461ba, so the package name references in the qemu recipe need to be updated to the new xen-tools packages. This change allows the temporary bbappend applied to qemu in meta-virtualization in that change to be retired. Signed-off-by: Christopher Clark Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f26e722..f3342ea 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -136,7 +136,7 @@ PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," -PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen,xen-libxenstore xen-libxenctrl xen-libxenguest" +PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest" PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl," PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg," PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:33:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:33:01 +0000 Subject: [oe-commits] [openembedded-core] 14/17: mesa: updated to 20.0 release In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.A94E1233587@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7b5ca3dad0248a1df9e0887ae9a3dc159bd23d9f Author: Nathan Hartman AuthorDate: Thu Mar 5 07:41:19 2020 -0800 mesa: updated to 20.0 release Updated mesa and mesa-gl recipes to 20.0 release. The license checksum difference is due to a small change in the license formatting. The asterisk for footnotes was changed to a '[1]' See: https://gitlab.freedesktop.org/mesa/mesa/-/commit/199572b65b7a03ffc887783e7f0f96f95bf1f99d glxgears runs successfully at 60 fps on a rpi4. Signed-off-by: Nathan Hartman Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.4.bb => mesa-gl_20.0.0.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/{mesa_19.3.4.bb => mesa_20.0.0.bb} | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb rename to meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 54d7ea8..b7ef496 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=c1843d93c460bbf778d6037ce324f9f7" PE = "2" diff --git a/meta/recipes-graphics/mesa/mesa_19.3.4.bb b/meta/recipes-graphics/mesa/mesa_20.0.0.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.4.bb rename to meta/recipes-graphics/mesa/mesa_20.0.0.bb index 5f456c2..2ed7ca2 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.4.bb +++ b/meta/recipes-graphics/mesa/mesa_20.0.0.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] = "09e7700d9af511384d131fb77b5802cb" -SRC_URI[sha256sum] = "1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4" +SRC_URI[md5sum] = "681229d992bbd6250a5be4f308708795" +SRC_URI[sha256sum] = "bb6db3e54b608d2536d4000b3de7dd3ae115fc114e8acbb5afff4b3bbed04b34" 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 Mar 5 16:32:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:32:57 +0000 Subject: [oe-commits] [openembedded-core] 10/17: python-numpy: convert shebang from python to python3 In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.6E74D233593@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c82826279c30da192ec1bbf320c63e19a1b6e8b3 Author: Changqing Li AuthorDate: Thu Mar 5 12:58:25 2020 +0800 python-numpy: convert shebang from python to python3 Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- ...01-convert-shebang-from-python-to-python3.patch | 579 +++++++++++++++++++++ .../recipes-devtools/python-numpy/python-numpy.inc | 1 + 2 files changed, 580 insertions(+) diff --git a/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch b/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch new file mode 100644 index 0000000..b86e131 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch @@ -0,0 +1,579 @@ +From c53237f90e4a3a435a20517552186d394d6d09c8 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 5 Mar 2020 12:02:35 +0800 +Subject: [PATCH] convert shebang from python to python3 + +Upstream-Status: Backport +[https://github.com/numpy/numpy/commit/583901a074dc65145d3d6136ba7dcd02634d680b] + +Signed-off-by: Changqing Li +--- + doc/DISTUTILS.rst.txt | 2 +- + doc/cdoc/numpyfilter.py | 2 +- + doc/postprocess.py | 2 +- + doc/summarize.py | 2 +- + numpy/distutils/conv_template.py | 2 +- + numpy/distutils/cpuinfo.py | 2 +- + numpy/distutils/from_template.py | 2 +- + numpy/distutils/setup.py | 2 +- + numpy/distutils/system_info.py | 2 +- + numpy/f2py/__init__.py | 2 +- + numpy/f2py/auxfuncs.py | 2 +- + numpy/f2py/capi_maps.py | 2 +- + numpy/f2py/cb_rules.py | 2 +- + numpy/f2py/cfuncs.py | 2 +- + numpy/f2py/common_rules.py | 2 +- + numpy/f2py/crackfortran.py | 2 +- + numpy/f2py/diagnose.py | 2 +- + numpy/f2py/f2py2e.py | 2 +- + numpy/f2py/f90mod_rules.py | 2 +- + numpy/f2py/func2subr.py | 2 +- + numpy/f2py/rules.py | 2 +- + numpy/f2py/setup.py | 2 +- + numpy/f2py/use_rules.py | 2 +- + numpy/linalg/lapack_lite/clapack_scrub.py | 2 +- + numpy/linalg/lapack_lite/make_lite.py | 2 +- + numpy/ma/bench.py | 2 +- + numpy/ma/setup.py | 2 +- + numpy/matrixlib/setup.py | 2 +- + numpy/random/examples/cython/extending.pyx | 2 +- + numpy/random/examples/cython/extending_distributions.pyx | 2 +- + numpy/setup.py | 2 +- + numpy/testing/print_coercion_tables.py | 2 +- + numpy/testing/setup.py | 2 +- + runtests.py | 2 +- + setup.py | 2 +- + tools/c_coverage/c_coverage_report.py | 2 +- + tools/changelog.py | 2 +- + tools/ci/push_docs_to_repo.py | 2 +- + tools/cythonize.py | 2 +- + tools/find_deprecated_escaped_characters.py | 2 +- + tools/refguide_check.py | 2 +- + tools/swig/test/setup.py | 2 +- + tools/swig/test/testArray.py | 2 +- + tools/swig/test/testFarray.py | 2 +- + tools/swig/test/testFlat.py | 2 +- + tools/swig/test/testFortran.py | 2 +- + tools/swig/test/testMatrix.py | 2 +- + tools/swig/test/testSuperTensor.py | 2 +- + tools/swig/test/testTensor.py | 2 +- + tools/swig/test/testVector.py | 2 +- + tools/test-installed-numpy.py | 2 +- + 51 files changed, 51 insertions(+), 51 deletions(-) + +diff --git a/doc/DISTUTILS.rst.txt b/doc/DISTUTILS.rst.txt +index eadde63..2402110 100644 +--- a/doc/DISTUTILS.rst.txt ++++ b/doc/DISTUTILS.rst.txt +@@ -59,7 +59,7 @@ SciPy pure Python package example + + Below is an example of a minimal ``setup.py`` file for a pure SciPy package:: + +- #!/usr/bin/env python ++ #!/usr/bin/env python3 + def configuration(parent_package='',top_path=None): + from numpy.distutils.misc_util import Configuration + config = Configuration('mypackage',parent_package,top_path) +diff --git a/doc/cdoc/numpyfilter.py b/doc/cdoc/numpyfilter.py +index 0ec5069..067bd36 100755 +--- a/doc/cdoc/numpyfilter.py ++++ b/doc/cdoc/numpyfilter.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + numpyfilter.py INPUTFILE + +diff --git a/doc/postprocess.py b/doc/postprocess.py +index 2e50c11..1be6f39 100755 +--- a/doc/postprocess.py ++++ b/doc/postprocess.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + %prog MODE FILES... + +diff --git a/doc/summarize.py b/doc/summarize.py +index cfce271..563af02 100755 +--- a/doc/summarize.py ++++ b/doc/summarize.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + summarize.py + +diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py +index 3bcb7b8..88432c8 100644 +--- a/numpy/distutils/conv_template.py ++++ b/numpy/distutils/conv_template.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + takes templated file .xxx.src and produces .xxx file where .xxx is + .i or .c or .h, using the following template rules +diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py +index 5802993..7f6742e 100644 +--- a/numpy/distutils/cpuinfo.py ++++ b/numpy/distutils/cpuinfo.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + cpuinfo + +diff --git a/numpy/distutils/from_template.py b/numpy/distutils/from_template.py +index c5c1163..af75971 100644 +--- a/numpy/distutils/from_template.py ++++ b/numpy/distutils/from_template.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + process_file(filename) +diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py +index 82a53bd..646921b 100644 +--- a/numpy/distutils/setup.py ++++ b/numpy/distutils/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + def configuration(parent_package='',top_path=None): +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index f94dce1..df526f6 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + This file defines a set of system_info classes for getting + information about various resources (libraries, library directories, +diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py +index d146739..0a83b99 100644 +--- a/numpy/f2py/__init__.py ++++ b/numpy/f2py/__init__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Fortran to Python Interface Generator. + + """ +diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py +index 404bdbd..d23d959 100644 +--- a/numpy/f2py/auxfuncs.py ++++ b/numpy/f2py/auxfuncs.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Auxiliary functions for f2py2e. +diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py +index c41dd77..a3e2dc2 100644 +--- a/numpy/f2py/capi_maps.py ++++ b/numpy/f2py/capi_maps.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Copyright 1999,2000 Pearu Peterson all rights reserved, +diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py +index 183d7c2..93e93fe 100644 +--- a/numpy/f2py/cb_rules.py ++++ b/numpy/f2py/cb_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build call-back mechanism for f2py2e. +diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py +index d59b630..3847745 100644 +--- a/numpy/f2py/cfuncs.py ++++ b/numpy/f2py/cfuncs.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + C declarations, CPP macros, and C functions for f2py2e. +diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py +index 62c1ba2..c1825d4 100644 +--- a/numpy/f2py/common_rules.py ++++ b/numpy/f2py/common_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build common block mechanism for f2py2e. +diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py +index 2aaf5d7..fb5ef2f 100755 +--- a/numpy/f2py/crackfortran.py ++++ b/numpy/f2py/crackfortran.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + crackfortran --- read fortran (77,90) code and extract declaration information. + +diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py +index 0241fed..6c0304c 100644 +--- a/numpy/f2py/diagnose.py ++++ b/numpy/f2py/diagnose.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + import os +diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py +index 110337f..c0789f6 100755 +--- a/numpy/f2py/f2py2e.py ++++ b/numpy/f2py/f2py2e.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + f2py2e - Fortran to Python C/API generator. 2nd Edition. +diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py +index 85eae80..70be128 100644 +--- a/numpy/f2py/f90mod_rules.py ++++ b/numpy/f2py/f90mod_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build F90 module support for f2py2e. +diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py +index 6010d5a..fdea0c2 100644 +--- a/numpy/f2py/func2subr.py ++++ b/numpy/f2py/func2subr.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Rules for building C/API module with f2py2e. +diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py +index 1b41498..790d197 100755 +--- a/numpy/f2py/rules.py ++++ b/numpy/f2py/rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Rules for building C/API module with f2py2e. +diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py +index c0c50ce..044c9f2 100644 +--- a/numpy/f2py/setup.py ++++ b/numpy/f2py/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + setup.py for installing F2PY + +diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py +index 6f44f16..8214f42 100644 +--- a/numpy/f2py/use_rules.py ++++ b/numpy/f2py/use_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build 'use others module data' mechanism for f2py2e. +diff --git a/numpy/linalg/lapack_lite/clapack_scrub.py b/numpy/linalg/lapack_lite/clapack_scrub.py +index 4345861..91e66e7 100644 +--- a/numpy/linalg/lapack_lite/clapack_scrub.py ++++ b/numpy/linalg/lapack_lite/clapack_scrub.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + import sys, os +diff --git a/numpy/linalg/lapack_lite/make_lite.py b/numpy/linalg/lapack_lite/make_lite.py +index 61102d6..0211f4e 100755 +--- a/numpy/linalg/lapack_lite/make_lite.py ++++ b/numpy/linalg/lapack_lite/make_lite.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + Usage: make_lite.py + +diff --git a/numpy/ma/bench.py b/numpy/ma/bench.py +index a9ba42d..a377436 100644 +--- a/numpy/ma/bench.py ++++ b/numpy/ma/bench.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from __future__ import division, print_function +diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py +index d1d6c89..a04b79b 100644 +--- a/numpy/ma/setup.py ++++ b/numpy/ma/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + def configuration(parent_package='',top_path=None): +diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py +index d0981d6..57534d1 100644 +--- a/numpy/matrixlib/setup.py ++++ b/numpy/matrixlib/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + def configuration(parent_package='', top_path=None): +diff --git a/numpy/random/examples/cython/extending.pyx b/numpy/random/examples/cython/extending.pyx +index a6a4ba4..33f28f9 100644 +--- a/numpy/random/examples/cython/extending.pyx ++++ b/numpy/random/examples/cython/extending.pyx +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + #cython: language_level=3 + + from libc.stdint cimport uint32_t +diff --git a/numpy/random/examples/cython/extending_distributions.pyx b/numpy/random/examples/cython/extending_distributions.pyx +index 3cefec9..7a526ab 100644 +--- a/numpy/random/examples/cython/extending_distributions.pyx ++++ b/numpy/random/examples/cython/extending_distributions.pyx +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + #cython: language_level=3 + """ + This file shows how the distributions that are accessed through +diff --git a/numpy/setup.py b/numpy/setup.py +index 4ccdaee..db06c82 100644 +--- a/numpy/setup.py ++++ b/numpy/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + +diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py +index 3a359f4..a9c5363 100755 +--- a/numpy/testing/print_coercion_tables.py ++++ b/numpy/testing/print_coercion_tables.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Prints type-coercion tables for the built-in NumPy types + + """ +diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py +index 7c3f2fb..bd315ee 100755 +--- a/numpy/testing/setup.py ++++ b/numpy/testing/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + +diff --git a/runtests.py b/runtests.py +index 23245ae..cafdb92 100755 +--- a/runtests.py ++++ b/runtests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + runtests.py [OPTIONS] [-- ARGS] + +diff --git a/setup.py b/setup.py +index a205913..010884f 100755 +--- a/setup.py ++++ b/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ NumPy is the fundamental package for array computing with Python. + + It provides: +diff --git a/tools/c_coverage/c_coverage_report.py b/tools/c_coverage/c_coverage_report.py +index 327f6dc..8837684 100755 +--- a/tools/c_coverage/c_coverage_report.py ++++ b/tools/c_coverage/c_coverage_report.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + A script to create C code-coverage reports based on the output of + valgrind's callgrind tool. +diff --git a/tools/changelog.py b/tools/changelog.py +index b135b14..5d8b33c 100755 +--- a/tools/changelog.py ++++ b/tools/changelog.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- encoding:utf-8 -*- + """ + Script to generate contributor and pull request lists +diff --git a/tools/ci/push_docs_to_repo.py b/tools/ci/push_docs_to_repo.py +index a989668..ae53054 100755 +--- a/tools/ci/push_docs_to_repo.py ++++ b/tools/ci/push_docs_to_repo.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + import argparse + import subprocess +diff --git a/tools/cythonize.py b/tools/cythonize.py +index c81b72d..c1d4384 100755 +--- a/tools/cythonize.py ++++ b/tools/cythonize.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ cythonize + + Cythonize pyx files into C files as needed. +diff --git a/tools/find_deprecated_escaped_characters.py b/tools/find_deprecated_escaped_characters.py +index 6f90001..10e0378 100644 +--- a/tools/find_deprecated_escaped_characters.py ++++ b/tools/find_deprecated_escaped_characters.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + r""" + Look for escape sequences deprecated in Python 3.6. + +diff --git a/tools/refguide_check.py b/tools/refguide_check.py +index c208072..798e322 100644 +--- a/tools/refguide_check.py ++++ b/tools/refguide_check.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + refguide_check.py [OPTIONS] [-- ARGS] + +diff --git a/tools/swig/test/setup.py b/tools/swig/test/setup.py +index 4ff870e..f8f05e6 100755 +--- a/tools/swig/test/setup.py ++++ b/tools/swig/test/setup.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + # System imports +diff --git a/tools/swig/test/testArray.py b/tools/swig/test/testArray.py +index 8d9c797..54ffe71 100755 +--- a/tools/swig/test/testArray.py ++++ b/tools/swig/test/testArray.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py +index 0037dc9..bedf384 100755 +--- a/tools/swig/test/testFarray.py ++++ b/tools/swig/test/testFarray.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testFlat.py b/tools/swig/test/testFlat.py +index 71be277..55034bf 100755 +--- a/tools/swig/test/testFlat.py ++++ b/tools/swig/test/testFlat.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testFortran.py b/tools/swig/test/testFortran.py +index 426e894..0f7d0e6 100644 +--- a/tools/swig/test/testFortran.py ++++ b/tools/swig/test/testFortran.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testMatrix.py b/tools/swig/test/testMatrix.py +index 065be0d..854a23c 100755 +--- a/tools/swig/test/testMatrix.py ++++ b/tools/swig/test/testMatrix.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testSuperTensor.py b/tools/swig/test/testSuperTensor.py +index 97fe80c..31b63d0 100644 +--- a/tools/swig/test/testSuperTensor.py ++++ b/tools/swig/test/testSuperTensor.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + # System imports +diff --git a/tools/swig/test/testTensor.py b/tools/swig/test/testTensor.py +index ac1b749..f47d9e8 100755 +--- a/tools/swig/test/testTensor.py ++++ b/tools/swig/test/testTensor.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testVector.py b/tools/swig/test/testVector.py +index 45e763b..067b922 100755 +--- a/tools/swig/test/testVector.py ++++ b/tools/swig/test/testVector.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/test-installed-numpy.py b/tools/test-installed-numpy.py +index 5240253..fd7541c 100755 +--- a/tools/test-installed-numpy.py ++++ b/tools/test-installed-numpy.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # A simple script to test the installed version of numpy by calling +-- +2.7.4 + diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc index 8413434..42032a0 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy.inc +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc @@ -8,6 +8,7 @@ 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 \ + file://0001-convert-shebang-from-python-to-python3.patch \ " SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0" SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:33:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:33:00 +0000 Subject: [oe-commits] [openembedded-core] 13/17: babeltrace2: added first version, 2.0.1 In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.9CCB1233589@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e9e3f0d4790ffd08461756e1938f20d149fdef65 Author: Anders Wallin AuthorDate: Thu Mar 5 13:06:29 2020 +0100 babeltrace2: added first version, 2.0.1 Babeltrace 1 vs. Babeltrace 2 The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was released. Babeltrace 2 is a complete rewrite of the library, Python bindings, and CLI. It is plugin based and offers much more features and potential than Babeltrace 1. Because Babeltrace 2 is still a young released project, some distributions still provide packages for the Babeltrace 1 project. Both projects can coexist on the same system as there are no common installed files. Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 1 + meta/conf/distro/include/maintainers.inc | 1 + meta/conf/distro/include/ptest-packagelists.inc | 1 + .../packagegroup-core-tools-profile.bb | 2 + ...s-do-not-run-test-applications-from-.libs.patch | 28 +++++++ meta/recipes-kernel/lttng/babeltrace2/run-ptest | 9 +++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 92 ++++++++++++++++++++++ 7 files changed, 134 insertions(+) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 79ebcae..0e4a9a9 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -15,6 +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-babeltrace2 = "OSPDT" 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" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index d724148..1468b16 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -59,6 +59,7 @@ RECIPE_MAINTAINER_pn-automake = "Robert Yang " RECIPE_MAINTAINER_pn-avahi = "Yi Zhao " RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao " RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin " RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal " RECIPE_MAINTAINER_pn-base-passwd = "Anuj Mittal " RECIPE_MAINTAINER_pn-bash = "Hongxu Jia " diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 4afac58..d6f3aaf 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -64,6 +64,7 @@ PTESTS_FAST = "\ PTESTS_SLOW = "\ babeltrace-ptest \ + babeltrace2-ptest \ busybox-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 984c2fa..ac180b5 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -46,6 +46,7 @@ LTTNGMODULES = "lttng-modules" LTTNGMODULES_arc = "" BABELTRACE = "babeltrace" +BABELTRACE2 = "babeltrace2" # valgrind does not work on the following configurations/architectures @@ -69,6 +70,7 @@ RDEPENDS_${PN} = "\ ${LTTNGTOOLS} \ ${LTTNGMODULES} \ ${BABELTRACE} \ + ${BABELTRACE2} \ ${SYSTEMTAP} \ ${VALGRIND} \ " diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch new file mode 100644 index 0000000..805dde8 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch @@ -0,0 +1,28 @@ +From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001 +Message-Id: <582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux at gmail.com> +From: Anders Wallin +Date: Thu, 5 Mar 2020 11:20:04 +0100 +Subject: [PATCH] tests: do not run test applications from .libs + +Cross compile specific change + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Anders Wallin +--- + tests/lib/test_plugin | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin +index 652c90cc..1f817c50 100755 +--- a/tests/lib/test_plugin ++++ b/tests/lib/test_plugin +@@ -26,4 +26,4 @@ fi + # shellcheck source=../utils/utils.sh + source "$UTILSSH" + +-"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" ++"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins" +-- +2.25.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest new file mode 100755 index 0000000..72fe223 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/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 abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb new file mode 100644 index 0000000..16953d6 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -0,0 +1,92 @@ +SUMMARY = "Babeltrace2 - 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://babeltrace.org/" +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" +LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" + +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" + +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ + file://run-ptest \ + file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + " +SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +EXTRA_OECONF = "--disable-debug-info" + +PACKAGECONFIG ??= "manpages" +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" + +FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" +FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" + +ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk python3" + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + install -d "${D}${PTEST_PATH}/tests" + + # Copy required files from source directory + for d in $(find "${S}/tests" -type d -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${S}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + find "${S}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.py \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.expect \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" + cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/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 + + # 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 '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Substitute links to installed binaries. + install -d "${D}${PTEST_PATH}/src/cli/" + ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/ + + # Remove architechture specific testfiles + rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:33:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:33:02 +0000 Subject: [oe-commits] [openembedded-core] 15/17: openssl: pass PERL=perl environment variable to configurator In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.B57C223358A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 48fcfcc7e832aef750fccd099c977e40a1d11ebc Author: Ruslan Bilovol AuthorDate: Thu Mar 5 13:53:33 2020 +0200 openssl: pass PERL=perl environment variable to configurator In our build environment we use wrapper script for perl in non-standard configuration with extra variables set (provided by custom buildtools-tarball). In this case openssl fails to build because by default it's Configure script detects and uses perl executable directly (with absolute path) obviously missing extra settings from wrapper script. Pass PERL=perl environment variable to Configure, so it won't try to use perl executable directly but will use what is provided from environment. Signed-off-by: Ruslan Bilovol Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index c2ba005..d4871fe 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -123,7 +123,7 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ + PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target perl ${B}/configdata.pm --dump } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:33:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:33:04 +0000 Subject: [oe-commits] [openembedded-core] 17/17: netbase: Upgrade to 6.1 In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.C87FC233595@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9ab928d46d4e38af3df8e70ae9dabc839fce0411 Author: Mingli Yu AuthorDate: Thu Mar 5 18:02:57 2020 +0800 netbase: Upgrade to 6.1 Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-core/netbase/{netbase_6.0.bb => netbase_6.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/netbase/netbase_6.0.bb b/meta/recipes-core/netbase/netbase_6.1.bb similarity index 82% rename from meta/recipes-core/netbase/netbase_6.0.bb rename to meta/recipes-core/netbase/netbase_6.1.bb index 2fb5762..bc0049c 100644 --- a/meta/recipes-core/netbase/netbase_6.0.bb +++ b/meta/recipes-core/netbase/netbase_6.1.bb @@ -8,8 +8,8 @@ PE = "1" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" -SRC_URI[md5sum] = "3417b0487161f1a2b070a3308cd7f957" -SRC_URI[sha256sum] = "692baeb7b76eba5580c7edbc97ce1784a06b5aa4b367c5ed0b39e0ce7a97d594" +SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55" +SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 16:33:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 16:33:03 +0000 Subject: [oe-commits] [openembedded-core] 16/17: xkbcomp: upgrade 1.4.2 -> 1.4.3 In-Reply-To: <158342596751.2837.15480990791248312598@git.openembedded.org> References: <158342596751.2837.15480990791248312598@git.openembedded.org> Message-ID: <20200305163248.BF87023358C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c6bd6ed1f860b7b00ca505cb5d48b9a52ad9c91c Author: Zheng Ruoqin AuthorDate: Wed Mar 4 18:15:07 2020 +0800 xkbcomp: upgrade 1.4.2 -> 1.4.3 Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb similarity index 79% rename from meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb rename to meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb index ed1eed8..2fa79c8 100644 --- a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb @@ -15,5 +15,5 @@ BBCLASSEXTEND = "native" EXTRA_OECONF += "--disable-selective-werror" -SRC_URI[md5sum] = "12610df19df2af3797f2c130ee2bce97" -SRC_URI[sha256sum] = "6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424" +SRC_URI[md5sum] = "6e4751d99373f85d459ab4dff28893f5" +SRC_URI[sha256sum] = "06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 21:22:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 21:22:12 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (4211ff4 -> 9e27bb2) Message-ID: <158344333264.26376.16299080633248195083@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 4211ff4 cloc: fix upstream version check new c39747b xfsdump: fix do patch error new 76073b9 monit: new package new 9e27bb2 networkmanager: Upgrade 1.18.4 -> 1.22.8 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: .../files/0001-xfsdump-support-usrmerge.patch | 26 ++++++----- ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 6 +-- ...te-settings-settings-property-documentati.patch | 23 ++++++---- ...0001-Fix-build-with-musl-systemd-specific.patch | 26 +++++------ .../musl/0002-Fix-build-with-musl.patch | 30 ++++++------ ...kmanager_1.18.4.bb => networkmanager_1.22.8.bb} | 42 +++++++++++------ meta-oe/recipes-support/monit/monit/monit | 42 +++++++++++++++++ meta-oe/recipes-support/monit/monit/monitrc | 44 ++++++++++++++++++ meta-oe/recipes-support/monit/monit_5.26.0.bb | 53 ++++++++++++++++++++++ 9 files changed, 224 insertions(+), 68 deletions(-) rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.4.bb => networkmanager_1.22.8.bb} (77%) create mode 100644 meta-oe/recipes-support/monit/monit/monit create mode 100644 meta-oe/recipes-support/monit/monit/monitrc create mode 100644 meta-oe/recipes-support/monit/monit_5.26.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 21:22:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 21:22:14 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: monit: new package In-Reply-To: <158344333264.26376.16299080633248195083@git.openembedded.org> References: <158344333264.26376.16299080633248195083@git.openembedded.org> Message-ID: <20200305212213.2D46523280D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 76073b901f099240d5b853e6ca88232304dbc5e8 Author: Joris Offouga AuthorDate: Thu Mar 5 16:08:09 2020 +0100 monit: new package Signed-off-by: Joris Offouga Signed-off-by: Khem Raj --- meta-oe/recipes-support/monit/monit/monit | 42 +++++++++++++++++++++ meta-oe/recipes-support/monit/monit/monitrc | 44 ++++++++++++++++++++++ meta-oe/recipes-support/monit/monit_5.26.0.bb | 53 +++++++++++++++++++++++++++ 3 files changed, 139 insertions(+) diff --git a/meta-oe/recipes-support/monit/monit/monit b/meta-oe/recipes-support/monit/monit/monit new file mode 100644 index 0000000..394704e --- /dev/null +++ b/meta-oe/recipes-support/monit/monit/monit @@ -0,0 +1,42 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/monit and type +# > update-rc.d monit defaults 89 +# +monit=/usr/bin/monit +pidfile=/var/run/monit.pid +monit_args="-c /etc/monitrc" + +test -x "$monit" || exit 0 + +case "$1" in + start) + echo -n "Starting Monit" + start-stop-daemon --start --quiet --exec $monit -- $monit_args + RETVAL=$? + echo "." + ;; + stop) + echo -n "Stopping Monit" + start-stop-daemon --stop --quiet --pidfile $pidfile + RETVAL=$? + echo "." + ;; + restart) + $0 stop + $0 start + RETVAL=$? + ;; + status) + $monit $monit_args status + RETVAL=$? + echo "." + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL + diff --git a/meta-oe/recipes-support/monit/monit/monitrc b/meta-oe/recipes-support/monit/monit/monitrc new file mode 100644 index 0000000..f8d6a43 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit/monitrc @@ -0,0 +1,44 @@ +############################################################################### +## Monit control file +############################################################################### +## +## Comments begin with a '#' and extend through the end of the line. Keywords +## are case insensitive. All path's MUST BE FULLY QUALIFIED, starting with '/'. +## +## Below you will find examples of some frequently used statements. For +## information about the control file and a complete list of statements and +## options, please have a look in the Monit manual. +## +## +############################################################################### +## Global section +############################################################################### +## +## Start Monit in the background (run as a daemon): +# +set daemon 30 # check services at 30 seconds intervals +# with start delay 240 # optional: delay the first check by 4-minutes (by +# # default Monit check immediately after Monit start) +# +# +## Set syslog logging. If you want to log to a standalone log file instead, +## specify the full path to the log file +# +set log syslog + +set httpd port 2812 + allow 0.0.0.0/0 # allow localhost to connect to the server and + allow admin:monit # require user 'admin' with password 'monit' + #with ssl { # enable SSL/TLS and set path to server certificate + # pemfile: /etc/ssl/certs/monit.pem + #} + +############################################################################### +## Includes +############################################################################### +## +## It is possible to include additional configuration parts from other files or +## directories. +# +include /etc/monit.d/* + diff --git a/meta-oe/recipes-support/monit/monit_5.26.0.bb b/meta-oe/recipes-support/monit/monit_5.26.0.bb new file mode 100644 index 0000000..a954682 --- /dev/null +++ b/meta-oe/recipes-support/monit/monit_5.26.0.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ +processes, programs, files, directories and filesystems on a UNIX system. \ +Monit conducts automatic maintenance and repair and can execute meaningful \ +causal actions in error situations." + +HOMEPAGE = "http://mmonit.com/monit/" + +LICENSE = "AGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ + file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" + +SRC_URI = " \ + https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ + file://monit \ + file://monitrc \ +" + +SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df" +SRC_URI[sha256sum] = "87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2" + +DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" + +inherit autotools-brokensep systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + +EXTRA_OECONF = "\ + libmonit_cv_setjmp_available=no \ + libmonit_cv_vsnprintf_c99_conformant=no \ + --with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ +" + +SYSTEMD_SERVICE_${PN} = "monit.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "monit" +INITSCRIPT_PARAMS_${PN} = "defaults 89" + +do_install_append() { + + # Configuration file + install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc + + # SystemD + install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service + sed -i -e 's, at prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service + + # SysV + install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 21:22:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 21:22:13 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: xfsdump: fix do patch error In-Reply-To: <158344333264.26376.16299080633248195083@git.openembedded.org> References: <158344333264.26376.16299080633248195083@git.openembedded.org> Message-ID: <20200305212213.222BB23280C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c39747bc66879d6a06031872a99bf04ec9d36721 Author: Changqing Li AuthorDate: Thu Mar 5 16:27:59 2020 +0800 xfsdump: fix do patch error update patch to fix do_patch error Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../files/0001-xfsdump-support-usrmerge.patch | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch index 04ec7b3..bfb25e8 100644 --- a/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch +++ b/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch @@ -1,44 +1,48 @@ -From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001 +From fea8c4634469784c16211e2597411c18c72dfa4a Mon Sep 17 00:00:00 2001 From: Changqing Li -Date: Thu, 5 Sep 2019 11:17:15 +0800 +Date: Thu, 5 Mar 2020 14:36:14 +0800 Subject: [PATCH] xfsdump: support usrmerge Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li --- - dump/Makefile | 4 +--- - restore/Makefile | 4 +--- - 2 files changed, 2 insertions(+), 6 deletions(-) + dump/Makefile | 6 +----- + restore/Makefile | 6 +----- + 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dump/Makefile b/dump/Makefile -index 97879fa..14da664 100644 +index 66f00d3..cc2d973 100644 --- a/dump/Makefile +++ b/dump/Makefile -@@ -97,10 +97,8 @@ default: depend $(LTCOMMAND) +@@ -97,12 +97,8 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) install: default - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) -- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) +- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora +- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ +- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) diff --git a/restore/Makefile b/restore/Makefile -index c6f3f25..7835ecc 100644 +index ac3f8c8..3c46394 100644 --- a/restore/Makefile +++ b/restore/Makefile -@@ -107,10 +107,8 @@ default: depend $(LTCOMMAND) +@@ -111,12 +111,8 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) install: default - $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) - $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) -- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) +- # skip symlink when /sbin is alread symlinked to /usr/sbin, like on Fedora +- test $(PKG_ROOT_SBIN_DIR) -ef $(PKG_SBIN_DIR) || \ +- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 5 21:22:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 05 Mar 2020 21:22:15 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: networkmanager: Upgrade 1.18.4 -> 1.22.8 In-Reply-To: <158344333264.26376.16299080633248195083@git.openembedded.org> References: <158344333264.26376.16299080633248195083@git.openembedded.org> Message-ID: <20200305212213.3D06E23280E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9e27bb2754c18654ee0aeadfa4650937a3eacbf7 Author: Adrian AuthorDate: Thu Mar 5 22:10:44 2020 +0100 networkmanager: Upgrade 1.18.4 -> 1.22.8 - rebased patches - Option --enable-polkit-agent is not available with current NM, removed - Option --with-libnm-glib is not available with current NM, removed - New package NM-cloud-setup for new experimental cloud setup feature - NM tries to re-license from GPL to LGPL, added LGPL to LICENSES - Removed empty packages libnmutil libnmglib libnmglib-vpn Signed-off-by: Adrian Freihofer Signed-off-by: Khem Raj --- ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 6 ++-- ...te-settings-settings-property-documentati.patch | 23 ++++++------ ...0001-Fix-build-with-musl-systemd-specific.patch | 26 +++++++------- .../musl/0002-Fix-build-with-musl.patch | 30 ++++++++-------- ...kmanager_1.18.4.bb => networkmanager_1.22.8.bb} | 42 ++++++++++++++-------- 5 files changed, 70 insertions(+), 57 deletions(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch index 302c029..19c8c74 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch @@ -1,4 +1,4 @@ -From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001 +From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Tue, 13 Mar 2018 17:36:20 +0100 Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations @@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 967eac0..b914219 100644 +index 65ceffb..ad4b0fc 100644 --- a/configure.ac +++ b/configure.ac -@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then +@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch index 5581dd3..446637b 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch @@ -1,4 +1,4 @@ -From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001 +From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 22 Mar 2018 11:08:30 +0100 Subject: [PATCH] Do not create settings settings/property documentation @@ -6,23 +6,29 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + It was tried to get this work but gi / GirRepository could not be found by python. Anyway it is not necessary for us to have the settings/property docs. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas M?ller + --- Makefile.am | 11 ----------- configure.ac | 5 ----- 2 files changed, 16 deletions(-) diff --git a/Makefile.am b/Makefile.am -index b180466..1ab4658 100644 +index d5cbcf5..2a1819a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1298,9 +1298,7 @@ EXTRA_DIST += \ - if HAVE_INTROSPECTION +@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir + INTROSPECTION_GIRS += libnm/NM-1.0.gir libnm_noinst_data = \ - libnm/nm-property-docs.xml \ @@ -31,7 +37,7 @@ index b180466..1ab4658 100644 libnm/nm-settings-keyfile-docs.xml \ libnm/nm-settings-ifcfg-rh-docs.xml -@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) +@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp clients_common_settings_doc_h = clients/common/settings-docs.h @@ -51,10 +57,10 @@ index b180466..1ab4658 100644 $(clients_common_settings_doc_h) \ $(clients_common_settings_doc_h).in diff --git a/configure.ac b/configure.ac -index b914219..872c292 100644 +index ad4b0fc..0092092 100644 --- a/configure.ac +++ b/configure.ac -@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0) +@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0) # check if we can build setting property documentation build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then @@ -66,6 +72,3 @@ index b914219..872c292 100644 AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([--enable-introspection requires perl]) --- -2.20.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch index af6f938..c23fc30 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch @@ -1,4 +1,4 @@ -From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001 +From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 2 Apr 2019 01:34:35 +0200 Subject: [PATCH] Fix build with musl - systemd specific @@ -12,6 +12,7 @@ for musl. Upstream-Status: Pending Signed-off-by: Andreas M?ller + --- shared/systemd/src/basic/in-addr-util.c | 1 + shared/systemd/src/basic/process-util.c | 9 +++++++++ @@ -22,10 +23,10 @@ Signed-off-by: Andreas M?ller 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c -index 5899f62..0adb248 100644 +index 91d687c..8388304 100644 --- a/shared/systemd/src/basic/in-addr-util.c +++ b/shared/systemd/src/basic/in-addr-util.c -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #include "in-addr-util.h" #include "macro.h" #include "parse-util.h" @@ -34,10 +35,10 @@ index 5899f62..0adb248 100644 #include "strxcpyx.h" #include "util.h" diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c -index 7431be3..189060a 100644 +index 1456167..42f51a0 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c -@@ -21,6 +21,9 @@ +@@ -17,6 +17,9 @@ #include #include #include @@ -47,7 +48,7 @@ index 7431be3..189060a 100644 #if 0 /* NM_IGNORED */ #if HAVE_VALGRIND_VALGRIND_H #include -@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) { +@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -61,7 +62,7 @@ index 7431be3..189060a 100644 pid_t getpid_cached(void) { static bool installed = false; -@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) { +@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) { * only half-documented (glibc doesn't document it but LSB does ? though only superficially) * we'll check for errors only in the most generic fashion possible. */ @@ -74,10 +75,10 @@ index 7431be3..189060a 100644 cached_pid = CACHED_PID_UNSET; return new_pid; diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h -index 15443f1..4807198 100644 +index a0886e0..da47d14 100644 --- a/shared/systemd/src/basic/socket-util.h +++ b/shared/systemd/src/basic/socket-util.h -@@ -13,6 +13,12 @@ +@@ -14,6 +14,12 @@ #include #include @@ -147,10 +148,10 @@ index c3b9448..e80a938 100644 #include #include diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h -index b23f4c8..8f2f6e0 100644 +index 04cc82b..2cf589a 100644 --- a/shared/systemd/src/basic/string-util.h +++ b/shared/systemd/src/basic/string-util.h -@@ -27,6 +27,11 @@ +@@ -26,6 +26,11 @@ #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) @@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644 int strcmp_ptr(const char *a, const char *b) _pure_; static inline bool streq_ptr(const char *a, const char *b) { --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch index e0973af..196a335 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch @@ -1,7 +1,7 @@ -From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001 +From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 8 Apr 2019 23:10:43 +0200 -Subject: [PATCH 2/2] Fix build with musl +Subject: [PATCH] Fix build with musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace' [2] (search for Upstream-Status: Pending Signed-off-by: Andreas M?ller + --- clients/tui/nmt-device-entry.c | 1 - libnm-core/nm-utils.h | 4 ++++ @@ -41,10 +42,10 @@ Signed-off-by: Andreas M?ller 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c -index 43fbbc1..3eae286 100644 +index 4ab5932..915248c 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c -@@ -39,7 +39,6 @@ +@@ -26,7 +26,6 @@ #include "nmt-device-entry.h" #include @@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644 #include "nmtui.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 2b5baba..f7abab6 100644 +index 5418a1e..f492da6 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h -@@ -25,6 +25,10 @@ +@@ -10,6 +10,10 @@ #error "Only can be included directly." #endif @@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644 #include diff --git a/shared/nm-default.h b/shared/nm-default.h -index 54e9916..26e9f4e 100644 +index ace6ede..25357da 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h -@@ -211,6 +211,9 @@ +@@ -182,6 +182,9 @@ #endif #include @@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644 /*****************************************************************************/ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index bd4fbcc..f70b309 100644 +index 3bbc975..4e8a3f6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -24,6 +24,7 @@ +@@ -9,6 +9,7 @@ #include "nm-device.h" #include @@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644 #include #include #include -@@ -32,7 +33,6 @@ +@@ -17,7 +18,6 @@ #include #include #include @@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644 #include diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index d4b0115..22a3a90 100644 +index 7abe4df..9f53147 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c -@@ -28,7 +28,6 @@ +@@ -14,7 +14,6 @@ #include #include #include @@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644 #include #include #include --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb similarity index 77% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb index 27508c4..b26a5ce 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb @@ -2,9 +2,9 @@ SUMMARY = "NetworkManager" HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" SECTION = "net/misc" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " DEPENDS = " \ @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ file://musl/0002-Fix-build-with-musl.patch \ " -SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d" -SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e" +SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284" +SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f" S = "${WORKDIR}/NetworkManager-${PV}" @@ -65,7 +65,7 @@ PACKAGECONFIG[systemd] = " \ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ --without-systemdsystemunitdir, \ " -PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" @@ -75,33 +75,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib" PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" +PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ +PACKAGES =+ " \ ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl \ + ${PN}-adsl ${PN}-cloud-setup \ " -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" +FILES_${PN}-cloud-setup = " \ + ${libexecdir}/nm-cloud-setup \ + ${systemd_system_unitdir}/nm-cloud-setup.service \ + ${systemd_system_unitdir}/nm-cloud-setup.timer \ + ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ + ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ +" +ALLOW_EMPTY_${PN}-cloud-setup = "1" +SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" + FILES_${PN} += " \ ${libexecdir} \ ${libdir}/NetworkManager/${PV}/*.so \ - ${nonarch_libdir}/NetworkManager/VPN \ + ${libdir}/NetworkManager \ ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/system-connections \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ ${nonarch_base_libdir}/udev/* \ - ${systemd_unitdir}/system \ + ${systemd_system_unitdir} \ ${libdir}/pppd \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:14:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:14:58 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: mraa_git.bb: update to v2.1.0 Message-ID: <158345369803.27280.14178681667465881180@git.openembedded.org> 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 a14de53 mraa_git.bb: update to v2.1.0 a14de53 is described below commit a14de538f2def720b88d7a5a30f70810ccc0bd74 Author: Propanu AuthorDate: Wed Feb 26 12:45:36 2020 -0800 mraa_git.bb: update to v2.1.0 Update SRCREV to latest v2.1.0 and SRC_URI to reflect new Eclipse Foundation project location. Signed-off-by: Mihai Tudor Panu Signed-off-by: Khem Raj --- meta-oe/recipes-extended/mraa/mraa_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index 6d42c67..a663039 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/intel-iot-devkit/mraa" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2" +LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" -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 Fri Mar 6 00:16:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:15 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (a14de53 -> 58325f9) Message-ID: <158345377550.27928.18389993904420313292@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 a14de53 mraa_git.bb: update to v2.1.0 new c562cfd quagga: fix reproducibily issue. new ef402b5 quagga: make version.h a multilib header new 0d4dbfb libdnet: make dnet-config a multilib_script new 854c1db net-snmp: fix reproducibilty issues in net-snmp-config new ea6cf8c net-snmp: multilib fixes new d135d8d proftpd: remove macro-prefix-map from prxs new 58325f9 proftpd: make prxs a mulitlib script 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-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 4 +++- meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 5 ++++- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 8 +++++++- meta-networking/recipes-protocols/quagga/quagga.inc | 5 ++++- 4 files changed, 18 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:16:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:16 +0000 Subject: [oe-commits] [meta-openembedded] 01/07: quagga: fix reproducibily issue. In-Reply-To: <158345377550.27928.18389993904420313292@git.openembedded.org> References: <158345377550.27928.18389993904420313292@git.openembedded.org> Message-ID: <20200306001615.C1DF023281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c562cfd236187bc052aa0d8a0016cfb7fb28c0c3 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:31 2020 -0800 quagga: fix reproducibily issue. version.h contains the options passed to configure, which includes the path to the recipe-sysroot on the build host. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 310bc7e..3494a43 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -106,6 +106,7 @@ do_install () { sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* + sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h # For PAM for feature in ${DISTRO_FEATURES}; do -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:16:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:17 +0000 Subject: [oe-commits] [meta-openembedded] 02/07: quagga: make version.h a multilib header In-Reply-To: <158345377550.27928.18389993904420313292@git.openembedded.org> References: <158345377550.27928.18389993904420313292@git.openembedded.org> Message-ID: <20200306001615.CF74023282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ef402b51543535ff977e90c143c6a740082c8490 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:32 2020 -0800 quagga: make version.h a multilib header version.h contains the configure options passed during the build which differs between multilibs Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 3494a43..134a33d 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -40,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" -inherit autotools update-rc.d useradd systemd pkgconfig +inherit autotools update-rc.d useradd systemd pkgconfig multilib_header SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" @@ -108,6 +108,8 @@ do_install () { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h + oe_multilib_header quagga/version.h + # For PAM for feature in ${DISTRO_FEATURES}; do if [ "$feature" = "pam" ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:16:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:18 +0000 Subject: [oe-commits] [meta-openembedded] 03/07: libdnet: make dnet-config a multilib_script In-Reply-To: <158345377550.27928.18389993904420313292@git.openembedded.org> References: <158345377550.27928.18389993904420313292@git.openembedded.org> Message-ID: <20200306001615.E080023282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0d4dbfb7bebda0215a6a7b49d582fef39c964bbd Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:33 2020 -0800 libdnet: make dnet-config a multilib_script Script encodes library paths. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb index 5b6e45c..5b27cfe 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -11,8 +11,10 @@ UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -inherit autotools +inherit autotools multilib_script acpaths = "-I ./config/" BBCLASSEXTEND = "native" + +MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:16:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:19 +0000 Subject: [oe-commits] [meta-openembedded] 04/07: net-snmp: fix reproducibilty issues in net-snmp-config In-Reply-To: <158345377550.27928.18389993904420313292@git.openembedded.org> References: <158345377550.27928.18389993904420313292@git.openembedded.org> Message-ID: <20200306001615.F0C8B23282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 854c1db6a3796ce7351ebf7347eb0c081b606ae5 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:34 2020 -0800 net-snmp: fix reproducibilty issues in net-snmp-config Both STAGING_HOST_DIR and -fmacro-prefix-map path to WORKDIR were encoded in the config. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 2 ++ 1 file changed, 2 insertions(+) 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 317350e..91c50c4 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 @@ -124,11 +124,13 @@ do_install_append() { -i ${D}${bindir}/net-snmp-create-v3-user sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g' \ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*--sysroot=[^ "]*@@g' \ -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \ -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ + -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/net-snmp-config if [ "${HAS_PERL}" = "1" ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:16:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:20 +0000 Subject: [oe-commits] [meta-openembedded] 05/07: net-snmp: multilib fixes In-Reply-To: <158345377550.27928.18389993904420313292@git.openembedded.org> References: <158345377550.27928.18389993904420313292@git.openembedded.org> Message-ID: <20200306001616.0CFE2232830@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ea6cf8c34d71aa8191750e7247dd1b37787269e8 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:35 2020 -0800 net-snmp: multilib fixes net-snmp/net-snmp-config.h: - encodes type sizes - encodes pathing into the libdir net-snmp-config: - encodes build configuration data and lib pathing. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 91c50c4..762dec4 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 @@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" UPSTREAM_CHECK_REGEX = "/net-snmp/(?P\d+(\.\d+)+)/" -inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest +inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest multilib_script multilib_header EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" @@ -138,6 +138,8 @@ do_install_append() { -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ -i ${D}${bindir}/net-snmp-config fi + + oe_multilib_header net-snmp/net-snmp-config.h } do_install_ptest() { @@ -270,3 +272,5 @@ RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" LEAD_SONAME = "libnetsnmp.so" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/net-snmp-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:16:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:21 +0000 Subject: [oe-commits] [meta-openembedded] 06/07: proftpd: remove macro-prefix-map from prxs In-Reply-To: <158345377550.27928.18389993904420313292@git.openembedded.org> References: <158345377550.27928.18389993904420313292@git.openembedded.org> Message-ID: <20200306001616.1DEF923283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d135d8d9ed6f6fd2f5a1677e1667983e42fc36eb Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:36 2020 -0800 proftpd: remove macro-prefix-map from prxs macro-prefix-map points to build WORKDIR which will cause reproducibilty failures. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb index 4099472..a080bec 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb @@ -110,6 +110,7 @@ do_install () { sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ -e 's|${STAGING_DIR_NATIVE}||g' \ -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -e 's|-fmacro-prefix-map=[^ ]*||g' \ -i ${D}/${bindir}/prxs # ftpmail perl script, which reads the proftpd log file and sends -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 00:16:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 00:16:22 +0000 Subject: [oe-commits] [meta-openembedded] 07/07: proftpd: make prxs a mulitlib script In-Reply-To: <158345377550.27928.18389993904420313292@git.openembedded.org> References: <158345377550.27928.18389993904420313292@git.openembedded.org> Message-ID: <20200306001616.2C9C623283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 58325f96bb00aa34fc916f5221c60842fe1bc968 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:37 2020 -0800 proftpd: make prxs a mulitlib script Script encodes compiler settings and compiler name. my $compiler = q(x86_64-poky-linux-gcc -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 ); Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb index a080bec..d5bbdd3 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb @@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b" SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf" -inherit autotools-brokensep useradd update-rc.d systemd +inherit autotools-brokensep useradd update-rc.d systemd multilib_script PACKAGECONFIG ??= "shadow \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ @@ -134,6 +134,8 @@ GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}" USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ --shell /bin/false ${FTPUSER}" +MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs" + FILES_${PN} += "/home/${FTPUSER}" RDEPENDS_${PN} += "perl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 05:44:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 05:44:14 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (58325f9 -> 8317488) Message-ID: <158347345447.12047.17062152444155682316@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 58325f9 proftpd: make prxs a mulitlib script new a511084 python3-pygobject: remove this recipe new 8317488 layer.conf: add meta-python to LAYERDEPENDS 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/conf/layer.conf | 5 +- .../0001-python-pyobject-fix-install-dir.patch | 121 --------------------- .../python/python3-pygobject_3.34.0.bb | 33 ------ 3 files changed, 4 insertions(+), 155 deletions(-) delete mode 100644 meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch delete mode 100644 meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 05:44:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 05:44:16 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: layer.conf: add meta-python to LAYERDEPENDS In-Reply-To: <158347345447.12047.17062152444155682316@git.openembedded.org> References: <158347345447.12047.17062152444155682316@git.openembedded.org> Message-ID: <20200306054414.D376323282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 83174882344dbeb624da649f0eccad8c7a523b2e Author: Changqing Li AuthorDate: Fri Mar 6 13:37:56 2020 +0800 layer.conf: add meta-python to LAYERDEPENDS yocto-check-layer/test_world failed since error: ERROR: test_world (common.CommonCheckLayer) ERROR: Nothing PROVIDES 'python3-pytoml-native' (but /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb DEPENDS on or otherwise requires it). Close matches: python3-numpy-native python3-pycairo-native python3-rpm-native ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'mozjs', 'python3-pytoml-native'] mozjs depend on recipe under meta-python, but meta-python isn't in LAYERDEPENDS, so error occurred. Fix by add it into LAYERDEPENDS. Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index c537736..0ce0ad2 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -27,7 +27,10 @@ BBFILE_PRIORITY_openembedded-layer = "6" # cause compatibility issues with other layers LAYERVERSION_openembedded-layer = "1" -LAYERDEPENDS_openembedded-layer = "core" +LAYERDEPENDS_openembedded-layer = " \ + core \ + meta-python \ +" LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 05:44:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 05:44:15 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: python3-pygobject: remove this recipe In-Reply-To: <158347345447.12047.17062152444155682316@git.openembedded.org> References: <158347345447.12047.17062152444155682316@git.openembedded.org> Message-ID: <20200306054414.C0C2C23282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a511084358098b90beab4dfbd4e1e8ec668b8981 Author: Changqing Li AuthorDate: Fri Mar 6 12:34:35 2020 +0800 python3-pygobject: remove this recipe python3-pygobject already in oe-core, previously, we have python-pygobject in meta-oe, but recently, in order to drop python2, we transfer python-pygobject to python3-pygobject, so duplicated with oe-core, meantime, this will cause test_signature failure when do yocto-check-layer for layer meta-oe. Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../0001-python-pyobject-fix-install-dir.patch | 121 --------------------- .../python/python3-pygobject_3.34.0.bb | 33 ------ 2 files changed, 154 deletions(-) diff --git a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch b/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch deleted file mode 100644 index 848cda5..0000000 --- a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 8b4648d5bc50cb1c14961ed38bf97d5a693f5237 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 24 Jun 2019 14:51:52 +0800 -Subject: [PATCH] python-pyobject: fix the wrong install dir for python2 - -* after upgrade to 3.32.1, pygobject switch to build with meson, and - default python option is python3, switch to python2 - -* default install dir get by python.install_sources and -python.get_install_dir is get from python's sysconfig info, -not like python3, for python2, the install dir include the basedir of -recipe-sysroot-native, add stagedir option for user to config -correct install dir. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li ---- - gi/meson.build | 7 +++---- - gi/overrides/meson.build | 4 ++-- - gi/repository/meson.build | 4 ++-- - meson.build | 4 +++- - meson_options.txt | 1 + - pygtkcompat/meson.build | 4 ++-- - 6 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/gi/meson.build b/gi/meson.build -index c1afd68..249c23d 100644 ---- a/gi/meson.build -+++ b/gi/meson.build -@@ -60,9 +60,8 @@ python_sources = [ - 'types.py', - ] - --python.install_sources(python_sources, -- pure : false, -- subdir : 'gi' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi') - ) - - # https://github.com/mesonbuild/meson/issues/4117 -@@ -76,7 +75,7 @@ giext = python.extension_module('_gi', sources, - dependencies : [python_ext_dep, glib_dep, gi_dep, ffi_dep], - include_directories: include_directories('..'), - install: true, -- subdir : 'gi', -+ install_dir: join_paths(stagedir, 'gi'), - c_args: pyext_c_args + main_c_args - ) - -diff --git a/gi/overrides/meson.build b/gi/overrides/meson.build -index 6ff073f..964fef1 100644 ---- a/gi/overrides/meson.build -+++ b/gi/overrides/meson.build -@@ -10,6 +10,6 @@ python_sources = [ - 'keysyms.py', - '__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'overrides') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'overrides') - ) -diff --git a/gi/repository/meson.build b/gi/repository/meson.build -index fdc136b..fc88adf 100644 ---- a/gi/repository/meson.build -+++ b/gi/repository/meson.build -@@ -1,5 +1,5 @@ - python_sources = ['__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'repository') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'repository') - ) -diff --git a/meson.build b/meson.build -index d27a005..ecd55d5 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,12 +165,14 @@ else - py_version = pygobject_version - endif - -+stagedir = get_option('stagedir') -+ - pkginfo_conf = configuration_data() - pkginfo_conf.set('VERSION', py_version) - configure_file(input : 'PKG-INFO.in', - output : 'PyGObject- at 0@.egg-info'.format(py_version), - configuration : pkginfo_conf, -- install_dir : python.get_install_dir(pure : false)) -+ install_dir : stagedir) - - subdir('gi') - subdir('pygtkcompat') -diff --git a/meson_options.txt b/meson_options.txt -index 5dd4cbc..21def16 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ - option('python', type : 'string', value : 'python3') - option('pycairo', type : 'boolean', value : true, description : 'build with pycairo integration') - option('tests', type : 'boolean', value : true, description : 'build unit tests') -+option('stagedir', type : 'string', value : '') -diff --git a/pygtkcompat/meson.build b/pygtkcompat/meson.build -index 9e43c44..ef3322d 100644 ---- a/pygtkcompat/meson.build -+++ b/pygtkcompat/meson.build -@@ -3,6 +3,6 @@ python_sources = [ - 'generictreemodel.py', - 'pygtkcompat.py'] - --python.install_sources(python_sources, -- subdir : 'pygtkcompat' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'pygtkcompat') - ) --- -2.7.4 - diff --git a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb b/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb deleted file mode 100644 index e06f4dc..0000000 --- a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Python GObject bindings" -HOMEPAGE = "http://www.pygtk.org/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection distutils3-base upstream-version-is-even - -DEPENDS += "python3 glib-2.0" - -SRCNAME = "pygobject" -SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ -" - -SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6" -SRC_URI[sha256sum] = "87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -UNKNOWN_CONFIGURE_WHITELIST = "introspection" - -PACKAGECONFIG ??= "" - -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python-pycairo, python-pycairo" -PACKAGECONFIG[tests] = "-Dtests=true, -Dtests=false, , " - -EXTRA_OEMESON_append = " -Dpython=python3" - -BBCLASSEXTEND = "native" -RDEPENDS_${PN} = "python3-pkgutil" -RDEPENDS_${PN}_class-native = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:44 +0000 Subject: [oe-commits] [openembedded-core] 01/28: babeltrace: only check latest git tag version for 1.x.x In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.7BEC123282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0616a5dbc61561fefcd1822ce263837437466df2 Author: Anders Wallin AuthorDate: Tue Mar 3 16:54:20 2020 +0100 babeltrace: only check latest git tag version for 1.x.x version 2.x.x will be added with a new babeltrace2 recipe Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb index c050dc6..4d2492a 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb @@ -11,7 +11,7 @@ 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+)+)$" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P1(\.\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 Fri Mar 6 08:19:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:45 +0000 Subject: [oe-commits] [openembedded-core] 02/28: lib/oe/utils: allow to set a lower bound on returned cpu_count() In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.8748F23282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c6dda204e15c5b27559f7617b18a7b3ce604e2f8 Author: Andr? Draszik AuthorDate: Tue Mar 3 16:05:10 2020 +0000 lib/oe/utils: allow to set a lower bound on returned cpu_count() This will be needed for making xz compression more deterministic, as xz archives are created differently in single- vs multi-threaded modes. This means that due to bitbake's default of using as many threads as there are cores in the system, files compressed with xz will be different if built on a multi-core system compared to single-core systems. Allowing cpu_count() here to return a lower bound, will allow forcing xz to always use multi-threaded operation. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/lib/oe/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index e350b05..aee4336 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -248,9 +248,10 @@ def trim_version(version, num_parts=2): trimmed = ".".join(parts[:num_parts]) return trimmed -def cpu_count(): +def cpu_count(at_least=1): import multiprocessing - return multiprocessing.cpu_count() + cpus = multiprocessing.cpu_count() + return max(cpus, at_least) def execute_pre_post_process(d, cmds): if cmds is None: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:46 +0000 Subject: [oe-commits] [openembedded-core] 03/28: bitbake.conf: more deterministic xz compression (threads) In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.9472B23282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d96aa8594c8d7531da34645cadbac4f7549d8ae6 Author: Andr? Draszik AuthorDate: Tue Mar 3 16:05:11 2020 +0000 bitbake.conf: more deterministic xz compression (threads) xz archives can be non-deterministic / non-reproducible: a) archives are created differently in single- vs multi-threaded modes b) xz will scale down the compression level so as to be try to work within any memory limit given to it when operating in single-threaded mode This means that due to bitbake's default of using as many threads as there are cores in the system, files compressed with xz will be different if built on a multi-core system compared to single-core systems. They will also potentially be different if built on single-core systems with different amounts of physical memory, due to bitbake's default of limiting xz's memory consumption. Force multi-threaded operation by default, even on single-core systems, so as to ensure archives are created in the same way in all cases. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index e201b67..131ba29 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -795,7 +795,7 @@ BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" # Default parallelism and resource usage for xz -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count()}" +XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count(at_least=2)}" ################################################################## # Magic Cookie for SANITY CHECK -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:43 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (d6b1809 -> bc9402d) Message-ID: <158348278390.9210.10318185258038528641@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 d6b1809 systemd: Fix service file for race issues new 0616a5d babeltrace: only check latest git tag version for 1.x.x new c6dda20 lib/oe/utils: allow to set a lower bound on returned cpu_count() new d96aa85 bitbake.conf: more deterministic xz compression (threads) new 7927d5f bitbake.conf: omit XZ threads and RAM from sstate signatures new 2c0ca46 blktrace: modify two scripts for python3 new 7f58aed libmodule-build-perl: make it reproducible new 9bff4d1 classes/kernel.bbclass: Fix parsing errors new da948b2 buildtools-extended-tarball: add nativesdk-libxcrypt-dev new 965090f kernel-yocto.bbclass: fix a wrong inter-task dependency new 8764cc8 linux-firmware: use 'make install' for installation new 456a143 linux-firmware: install / package all license files again new f37dfc7 python3-native: Should not search the system for headers/libraries. new 14a338d linux-yocto/5.2: backport perf build fix for latest binutils new add2cd5 linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT new aef9438 linux-yocto/5.4: update to v5.4.23 new e71cda6 linux-yocto: drop 5.2 recipes new 5a9f81f gdbm: Disable readlind new dc1e84d python-numpy: convert shebang from python to python3 new 0870009 dnf: fix python3 syntax warning new e7a7ce0 qemu: update Xen packages names for the xen-tools recipe new be52889 babeltrace2: added first version, 2.0.1 new 0ee03e1 mesa: updated to 20.0 release new 2b087fe openssl: pass PERL=perl environment variable to configurator new cfe8461 xkbcomp: upgrade 1.4.2 -> 1.4.3 new 983733f netbase: Upgrade to 6.1 new e41c92c oeqa-runtime: add missing import os to ptest case new 03e6d0f pulseaudio: Fix inline assembly syntax for arm new bc9402d libdnf: fix deprecation warning 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/kernel-yocto.bbclass | 2 +- meta/classes/kernel.bbclass | 4 +- meta/conf/bitbake.conf | 5 +- meta/conf/distro/include/distro_alias.inc | 1 + meta/conf/distro/include/maintainers.inc | 1 + meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/lib/oe/utils.py | 5 +- meta/lib/oeqa/runtime/cases/ptest.py | 1 + .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- .../meta/buildtools-extended-tarball.bb | 1 + .../netbase/{netbase_6.0.bb => netbase_6.1.bb} | 4 +- .../packagegroup-core-tools-profile.bb | 2 + .../dnf/dnf/Fix-SyntaxWarning.patch | 34 ++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + .../libdnf/libdnf/fix-deprecation-warning.patch | 71 +++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + .../perl/libmodule-build-perl_0.4231.bb | 15 +- ...01-convert-shebang-from-python-to-python3.patch | 579 +++++++++++++++++++++ .../recipes-devtools/python-numpy/python-numpy.inc | 1 + ...Don-t-search-system-for-headers-libraries.patch | 29 ++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + meta/recipes-devtools/qemu/qemu.inc | 2 +- .../mesa/{mesa-gl_19.3.4.bb => mesa-gl_20.0.0.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- .../mesa/{mesa_19.3.4.bb => mesa_20.0.0.bb} | 4 +- .../{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb} | 4 +- .../blktrace/make-btt-scripts-python3-ready.patch | 197 +++++++ meta/recipes-kernel/blktrace/blktrace_git.bb | 1 + .../linux-firmware/linux-firmware_20200122.bb | 23 +- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 44 -- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 32 -- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 8 +- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 54 -- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +- ...s-do-not-run-test-applications-from-.libs.patch | 28 + .../lttng/{babeltrace => babeltrace2}/run-ptest | 2 +- .../{babeltrace_1.5.8.bb => babeltrace2_2.0.1.bb} | 72 ++- meta/recipes-kernel/lttng/babeltrace_1.5.8.bb | 2 +- ...1-remap-arm-Adjust-inline-asm-constraints.patch | 114 ++++ .../pulseaudio/pulseaudio_13.0.bb | 1 + meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 +- 42 files changed, 1154 insertions(+), 227 deletions(-) rename meta/recipes-core/netbase/{netbase_6.0.bb => netbase_6.1.bb} (82%) create mode 100644 meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch create mode 100644 meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch create mode 100644 meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch create mode 100644 meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch rename meta/recipes-graphics/mesa/{mesa-gl_19.3.4.bb => mesa-gl_20.0.0.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_19.3.4.bb => mesa_20.0.0.bb} (88%) rename meta/recipes-graphics/xorg-app/{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb} (79%) create mode 100644 meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_5.2.bb create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch copy meta/recipes-kernel/lttng/{babeltrace => babeltrace2}/run-ptest (70%) copy meta/recipes-kernel/lttng/{babeltrace_1.5.8.bb => babeltrace2_2.0.1.bb} (54%) create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-remap-arm-Adjust-inline-asm-constraints.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:47 +0000 Subject: [oe-commits] [openembedded-core] 04/28: bitbake.conf: omit XZ threads and RAM from sstate signatures In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.A0204232830@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7927d5f6eaab48578b23db9a4c38e2f87f011353 Author: Andr? Draszik AuthorDate: Tue Mar 3 16:05:12 2020 +0000 bitbake.conf: omit XZ threads and RAM from sstate signatures The number of threads used, and the amount of memory allowed to be used, should not affect sstate signatures, as they don't affect the outcome of the compression if xz operates in multi-threaded mode [1]. Otherwise, it becomes impossible to re-use sstate from automated builders on developer's machines (as the former might execute bitbake with certain constraints different compared to developer's machines). This is in particular a problem with the opkg package writing backend, as the OPKGBUILDCMD depends on XZ_DEFAULTS. Without the vardepexclude, there is no re-use possible of the package_write_ipk sstate. Whitelist the maximum number of threads and the memory limit given assumptions outlined in [2] below. Signed-off-by: Andr? Draszik [1] When starting out in multi-threaded mode, the output is always deterministic, as even if xz scales down to single-threaded later, the archives are still split into blocks and size information is still added, thus keeping them compatible with multi-threaded mode. Also, when starting out in multi-threaded mode, xz never scales down the compression level to accomodate memory usage restrictions, it just scales down the number of threads and errors out if it can not accomodate the memory limit. [2] Assumptions * We only support multi-threaded mode (threads >= 2), builds should not try to use xz in single-threaded mode * The thread limit should be set via XZ_THREADS, not via modifying XZ_DEFAULTS or XZ_OPTS, or any other way * The thread limit should not be set to xz's magic value zero (0), as that will lead to single-threaded mode on single-core systems. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 131ba29..4b544a2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -795,7 +795,10 @@ BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" # Default parallelism and resource usage for xz -XZ_DEFAULTS ?= "--memlimit=50% --threads=${@oe.utils.cpu_count(at_least=2)}" +XZ_MEMLIMIT ?= "50%" +XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" +XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" ################################################################## # Magic Cookie for SANITY CHECK -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:49 +0000 Subject: [oe-commits] [openembedded-core] 06/28: libmodule-build-perl: make it reproducible In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.BF3BB23283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7f58aed9d7b07d9f86717fc0c45b31b1887eb36a Author: Alexander Kanavin AuthorDate: Wed Mar 4 13:58:43 2020 +0100 libmodule-build-perl: make it reproducible Particularly, delete html docs as they have sysroot paths in them, and adjust build configuration to not refer to host paths either. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb index b1967c7..a6fd7b1 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb @@ -33,13 +33,26 @@ do_patch_module_build () { do_patch[postfuncs] += "do_patch_module_build" +EXTRA_CPAN_BUILD_FLAGS = "--create_packlist=0" + +do_install_append () { + rm -rf ${D}${docdir}/perl/html +} + do_install_ptest() { cp -r ${B}/inc ${D}${PTEST_PATH} cp -r ${B}/blib ${D}${PTEST_PATH} cp -r ${B}/_build ${D}${PTEST_PATH} cp -r ${B}/lib ${D}${PTEST_PATH} chown -R root:root ${D}${PTEST_PATH} - sed -i -e "s,'perl' => .*,'perl' => '/usr/bin/perl'\,,g" ${D}${PTEST_PATH}/_build/build_params + sed -i -e "s,'perl' => .*,'perl' => '/usr/bin/perl'\,,g" \ + -e "s,${STAGING_BINDIR_NATIVE}/perl-native/\.\.,${bindir}/,g" \ + -e "s,${S},,g" \ + -e "s,${D},,g" \ + ${D}${PTEST_PATH}/_build/build_params \ + ${D}${PTEST_PATH}/_build/runtime_params + rm -rf ${D}${PTEST_PATH}/blib/libhtml/site/lib/Module/ + rm -rf ${D}${PTEST_PATH}/_build/magicnum } RDEPENDS_${PN} += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:50 +0000 Subject: [oe-commits] [openembedded-core] 07/28: classes/kernel.bbclass: Fix parsing errors In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.C95DD23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9bff4d14693c1890fc181ec68c9f883dc4e4accf Author: Joshua Watt AuthorDate: Wed Mar 4 12:31:39 2020 -0600 classes/kernel.bbclass: Fix parsing errors legitimize_package_name wants the actual value of KERNEL_REVISION, so use d.getVar() to fetch it as is done elsewhere in the file. Failing to do so can result it weird errors at parsing time. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 15219c5..0eadd3e 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -570,9 +570,9 @@ RDEPENDS_${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base" # Allow machines to override this dependency if kernel image files are # not wanted in images as standard RDEPENDS_${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image" -PKG_${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name('${KERNEL_VERSION}')}" +PKG_${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" RDEPENDS_${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux', '', d)}" -PKG_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name('${KERNEL_VERSION}')}" +PKG_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}" RPROVIDES_${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION}" ALLOW_EMPTY_${KERNEL_PACKAGE_NAME} = "1" ALLOW_EMPTY_${KERNEL_PACKAGE_NAME}-base = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:51 +0000 Subject: [oe-commits] [openembedded-core] 08/28: buildtools-extended-tarball: add nativesdk-libxcrypt-dev In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.D50C9232891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit da948b25d5ef452fb35275d108e18d2a2829f4fb Author: Jeremy Puhlman AuthorDate: Wed Mar 4 11:39:36 2020 -0800 buildtools-extended-tarball: add nativesdk-libxcrypt-dev virtual/crypt-native is assume provided in bitbake.conf, so buildtools-extended-tarball shoud provide crypt since it doesn't use the host's headers/libraries. [YOCTO #13714] Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index d756036..4a79b09 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libstdc++-dev \ nativesdk-libtool \ nativesdk-pkgconfig \ + nativesdk-libxcrypt-dev \ " TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:52 +0000 Subject: [oe-commits] [openembedded-core] 09/28: kernel-yocto.bbclass: fix a wrong inter-task dependency In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.DF8882328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 965090f42bc0576e938a0575b7938a1ff60b0018 Author: Ming Liu AuthorDate: Wed Mar 4 14:55:43 2020 +0100 kernel-yocto.bbclass: fix a wrong inter-task dependency do_kernel_checkout and do_symlink_kernsrc are both modifying ${S}, they could conflict with eacher other, move do_kernel_checkout after do_symlink_kernsrc does fix that. Signed-off-by: Ming Liu Signed-off-by: Stefan Agner 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 44863ad..d71ce21 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -317,7 +317,7 @@ do_kernel_checkout() { } do_kernel_checkout[dirs] = "${S}" -addtask kernel_checkout before do_kernel_metadata after do_unpack +addtask kernel_checkout before do_kernel_metadata after do_symlink_kernsrc addtask kernel_metadata after do_validate_branches do_unpack before do_patch do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:53 +0000 Subject: [oe-commits] [openembedded-core] 10/28: linux-firmware: use 'make install' for installation In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.EAEBC2328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 8764cc85f3ef570f1c220c3c200d6e02d3e7a260 Author: Alexander Kanavin AuthorDate: Wed Mar 4 11:13:07 2020 +0100 linux-firmware: use 'make install' for installation Copying the source tree over was missing important symlinks that since recent updates can only be created with make install. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../linux-firmware/linux-firmware_20200122.bb | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 0d1422c..f7198cb 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -208,27 +208,7 @@ do_compile() { } do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ - cp -r * ${D}${nonarch_base_libdir}/firmware/ - - # Avoid Makefile to be deployed - rm ${D}${nonarch_base_libdir}/firmware/Makefile - - # Remove unbuild firmware which needs cmake and bash - rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf - - # Remove pointless bash script - rm ${D}${nonarch_base_libdir}/firmware/configure - - # Remove python script used to check the WHENCE file - rm ${D}${nonarch_base_libdir}/firmware/check_whence.py - - # Libertas sd8686 - ln -sf libertas/sd8686_v9.bin ${D}${nonarch_base_libdir}/firmware/sd8686.bin - ln -sf libertas/sd8686_v9_helper.bin ${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin - - # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it - ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) + oe_runmake 'DESTDIR=${D}' install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:48 +0000 Subject: [oe-commits] [openembedded-core] 05/28: blktrace: modify two scripts for python3 In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081944.B00F423283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2c0ca4632f6c2ce645412ca975a70b3088c27916 Author: Joe Slater AuthorDate: Tue Mar 3 14:56:41 2020 -0800 blktrace: modify two scripts for python3 Backport from git.kernel.dk. Changed shebangs to use python3. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- .../blktrace/make-btt-scripts-python3-ready.patch | 197 +++++++++++++++++++++ meta/recipes-kernel/blktrace/blktrace_git.bb | 1 + 2 files changed, 198 insertions(+) diff --git a/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch b/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch new file mode 100644 index 0000000..3b0c1c6 --- /dev/null +++ b/meta/recipes-kernel/blktrace/blktrace/make-btt-scripts-python3-ready.patch @@ -0,0 +1,197 @@ +From 70d5ca2d5f3d6b97c11c641b7e0c5836983219a0 Mon Sep 17 00:00:00 2001 +From: Eric Sandeen +Date: Wed, 28 Mar 2018 15:26:36 -0500 +Subject: [oe-core][PATCH 1/1] make btt scripts python3-ready + +Many distributions are moving to python3 by default. Here's +an attempt to make the python scripts in blktrace python3-ready. + +Most of this was done with automated tools. I hand fixed some +space-vs tab issues, and cast an array index to integer. It +passes rudimentary testing when run under python2.7 as well +as python3. + +This doesn't do anything with the shebangs, it leaves them both +invoking whatever "env python" coughs up on the system. + +Signed-off-by: Eric Sandeen +Signed-off-by: Jens Axboe + +Unchanged except to modify shebangs to use python3 since +oe-core does not support python2 anymore. + +Upstream-Status: Backport [git://git.kernel.dk/blktrace.git commit 70d5ca2d5...] + +Signed-off-by: Joe Slater + +--- + btt/bno_plot.py | 28 +++++++++++++++------------- + btt/btt_plot.py | 22 +++++++++++++--------- + 2 files changed, 28 insertions(+), 22 deletions(-) + +--- git.orig/btt/bno_plot.py ++++ git/btt/bno_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt blkno plotting interface + # +@@ -38,6 +38,8 @@ automatically push the keys under the gr + To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. + """ + ++from __future__ import absolute_import ++from __future__ import print_function + import getopt, glob, os, sys, tempfile + + verbose = 0 +@@ -60,14 +62,14 @@ def parse_args(in_args): + + try: + (opts, args) = getopt.getopt(in_args, s_opts, l_opts) +- except getopt.error, msg: +- print >>sys.stderr, msg +- print >>sys.stderr, __doc__ ++ except getopt.error as msg: ++ print(msg, file=sys.stderr) ++ print(__doc__, file=sys.stderr) + sys.exit(1) + + for (o, a) in opts: + if o in ('-h', '--help'): +- print __doc__ ++ print(__doc__) + sys.exit(0) + elif o in ('-v', '--verbose'): + verbose += 1 +@@ -84,10 +86,10 @@ if __name__ == '__main__': + (bnos, keys_below) = parse_args(sys.argv[1:]) + + if verbose: +- print 'Using files:', +- for bno in bnos: print bno, +- if keys_below: print '\nKeys are to be placed below graph' +- else: print '' ++ print('Using files:', end=' ') ++ for bno in bnos: print(bno, end=' ') ++ if keys_below: print('\nKeys are to be placed below graph') ++ else: print('') + + tmpdir = tempfile.mktemp() + os.mkdir(tmpdir) +@@ -99,7 +101,7 @@ if __name__ == '__main__': + fo = open(t, 'w') + for line in open(f, 'r'): + fld = line.split(None) +- print >>fo, fld[0], fld[1], int(fld[2])-int(fld[1]) ++ print(fld[0], fld[1], int(fld[2])-int(fld[1]), file=fo) + fo.close() + + t = t[t.rfind('/')+1:] +@@ -107,16 +109,16 @@ if __name__ == '__main__': + else: plot_cmd = "%s,'%s'" % (plot_cmd, t) + + fo = open('%s/plot.cmds' % tmpdir, 'w') +- print >>fo, cmds +- if len(bnos) > 10 or keys_below: print >>fo, 'set key below' +- print >>fo, plot_cmd ++ print(cmds, file=fo) ++ if len(bnos) > 10 or keys_below: print('set key below', file=fo) ++ print(plot_cmd, file=fo) + fo.close() + + pid = os.fork() + if pid == 0: + cmd = 'gnuplot %s/plot.cmds -' % tmpdir + +- if verbose: print 'Executing %s' % cmd ++ if verbose: print('Executing %s' % cmd) + + os.chdir(tmpdir) + os.system(cmd) +--- git.orig/btt/btt_plot.py ++++ git/btt/btt_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt_plot.py: Generate matplotlib plots for BTT generate data files + # +@@ -55,6 +55,10 @@ Arguments: + but the -o (--output) and -T (--title) options will be ignored. + """ + ++from __future__ import absolute_import ++from __future__ import print_function ++import six ++from six.moves import range + __author__ = 'Alan D. Brunelle ' + + #------------------------------------------------------------------------------ +@@ -82,7 +86,7 @@ get_base = lambda file: file[file.find( + def fatal(msg): + """Generate fatal error message and exit""" + +- print >>sys.stderr, 'FATAL: %s' % msg ++ print('FATAL: %s' % msg, file=sys.stderr) + sys.exit(1) + + #------------------------------------------------------------------------------ +@@ -163,7 +167,7 @@ def get_data(files): + if not os.path.exists(file): + fatal('%s not found' % file) + elif verbose: +- print 'Processing %s' % file ++ print('Processing %s' % file) + + xs = [] + ys = [] +@@ -214,8 +218,8 @@ def parse_args(args): + + try: + (opts, args) = getopt.getopt(args[1:], s_opts, l_opts) +- except getopt.error, msg: +- print >>sys.stderr, msg ++ except getopt.error as msg: ++ print(msg, file=sys.stderr) + fatal(__doc__) + + for (o, a) in opts: +@@ -293,15 +297,15 @@ def generate_output(type, db): + def color(idx, style): + """Returns a color/symbol type based upon the index passed.""" + +- colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ] ++ colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ] + l_styles = [ '-', ':', '--', '-.' ] + m_styles = [ 'o', '+', '.', ',', 's', 'v', 'x', '<', '>' ] + + color = colors[idx % len(colors)] + if style == 'line': +- style = l_styles[(idx / len(l_styles)) % len(l_styles)] ++ style = l_styles[int((idx / len(l_styles)) % len(l_styles))] + elif style == 'marker': +- style = m_styles[(idx / len(m_styles)) % len(m_styles)] ++ style = m_styles[int((idx / len(m_styles)) % len(m_styles))] + + return '%s%s' % (color, style) + +@@ -314,7 +318,7 @@ def generate_output(type, db): + ofile = '%s.png' % type + + if verbose: +- print 'Generating plot into %s' % ofile ++ print('Generating plot into %s' % ofile) + + fig = plt.figure(figsize=plot_size) + ax = fig.add_subplot(111) +@@ -329,7 +333,7 @@ def generate_output(type, db): + legends = None + + keys = [] +- for file in db.iterkeys(): ++ for file in six.iterkeys(db): + if not file in ['min_x', 'max_x', 'min_y', 'max_y']: + keys.append(file) + diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb index 2605ff9..6903053 100644 --- a/meta/recipes-kernel/blktrace/blktrace_git.bb +++ b/meta/recipes-kernel/blktrace/blktrace_git.bb @@ -12,6 +12,7 @@ PV = "1.2.0+git${SRCPV}" SRC_URI = "git://git.kernel.dk/blktrace.git \ file://ldflags.patch \ file://CVE-2018-10689.patch \ + file://make-btt-scripts-python3-ready.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 Mar 6 08:19:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:54 +0000 Subject: [oe-commits] [openembedded-core] 11/28: linux-firmware: install / package all license files again In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.00C3A2328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 456a1431dd7d8472830b8716e80e64a888617354 Author: Andr? Draszik AuthorDate: Thu Mar 5 20:27:39 2020 +0000 linux-firmware: install / package all license files again This doesn't happen with make install, hence all the -license packages are missing, since they'd otherwise be empty. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index f7198cb..6039dc9 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -209,6 +209,7 @@ do_compile() { do_install() { oe_runmake 'DESTDIR=${D}' install + cp GPL-2 LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/ } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:55 +0000 Subject: [oe-commits] [openembedded-core] 12/28: python3-native: Should not search the system for headers/libraries. In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.0C8A62328D0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f37dfc7907ae7bac08d40468ddde2e5b8bba030c Author: Jeremy Puhlman AuthorDate: Tue Mar 3 16:24:09 2020 -0800 python3-native: Should not search the system for headers/libraries. The specific issue here is rpc/rpc.h, but its likely more general. /usr/include is searched for rpc/rpc.h and if it exists on the system, it changes behavior. If you are using the extended buildtools tarball on a machine that has /usr/include/rpc/rpc.h, it will decide that is good enough and not continue to search. nis fails to build because /usr/include and /usr/lib are not part of the include/link paths for the buildtools tarball compiler(nor should they be). This makes it so python3-native will not build if you are using the extended buildtools tarball, but from a larger issue perspective it is building in likely different ways depending on what machine it is building on. libtirpc is already a depend so we shouldn't need the hosts rpc/rcp.h. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...Don-t-search-system-for-headers-libraries.patch | 29 ++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.8.1.bb | 1 + 2 files changed, 30 insertions(+) diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch new file mode 100644 index 0000000..acf8e1e --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch @@ -0,0 +1,29 @@ +From 85e8f86ad2b7dec0848cd55b8e810a5e2722b20a Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 4 Mar 2020 00:06:42 +0000 +Subject: [PATCH] Don't search system for headers/libraries + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 9da1b3a..59782c0 100644 +--- a/setup.py ++++ b/setup.py +@@ -674,8 +674,8 @@ class PyBuildExt(build_ext): + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + +- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] +- system_include_dirs = ['/usr/include'] ++ system_lib_dirs = [] ++ system_include_dirs = [] + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +-- +2.24.1 + diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.1.bb index 7796852..5e3c29c 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.1.bb @@ -37,6 +37,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ SRC_URI_append_class-native = " \ file://0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \ + file://0001-Don-t-search-system-for-headers-libraries.patch \ " SRC_URI[md5sum] = "b3fb85fd479c0bf950c626ef80cacb57" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:56 +0000 Subject: [oe-commits] [openembedded-core] 13/28: linux-yocto/5.2: backport perf build fix for latest binutils In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.1B54623282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 14a338dbbe2da5a022a916081b3aab9c7472c3ce Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:21 2020 -0500 linux-yocto/5.2: backport perf build fix for latest binutils [ Author: Changbin Du Date: Tue Jan 28 23:29:38 2020 +0800 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 Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 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 441545f..a23a5e6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_machine ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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 6d49e00..ac9904f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" -SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuarm ?= "e0a3a01b24070b15121e938ea19755091bf0d662" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" 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 44516dc..eab142e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -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_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" +SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" +SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:02 +0000 Subject: [oe-commits] [openembedded-core] 19/28: dnf: fix python3 syntax warning In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.703442328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0870009f3e87d181178b3f26374862797f342d3f Author: Joe Slater AuthorDate: Wed Mar 4 16:30:20 2020 -0800 dnf: fix python3 syntax warning Backport from dnf version 4.2.7. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- .../dnf/dnf/Fix-SyntaxWarning.patch | 34 ++++++++++++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + 2 files changed, 35 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch new file mode 100644 index 0000000..1bd8b09 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch @@ -0,0 +1,34 @@ +From 23c5b15efe42e5e6ee695e54798bac248532d8d6 Mon Sep 17 00:00:00 2001 + +Date: Tue, 28 May 2019 13:14:51 +0200 +Subject: [oe-core][PATCH 1/1] Fix SyntaxWarning: "is" with a literal. Did you + mean "=="? + +--- + dnf/cli/commands/repoquery.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +--- + +Unchanged. Appears in version 4.2.7. + +Upstream-Status: Backport [git://github.com/rpm-software-management/dnf.git] + +Signed-off-by: Joe Slater + + +diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py +index 941a470..63fc668 100644 +--- a/dnf/cli/commands/repoquery.py ++++ b/dnf/cli/commands/repoquery.py +@@ -611,7 +611,7 @@ class RepoQueryCommand(commands.Command): + + def tree_seed(self, query, aquery, opts, level=-1, usedpkgs=None): + for pkg in sorted(set(query.run()), key=lambda p: p.name): +- usedpkgs = set() if usedpkgs is None or level is -1 else usedpkgs ++ usedpkgs = set() if usedpkgs is None or level == -1 else usedpkgs + if pkg.name.startswith("rpmlib") or pkg.name.startswith("solvable"): + return + self.grow_tree(level, pkg, opts) +-- +2.7.4 + diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f6e616e..5244e10 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0005-Do-not-prepend-installroot-to-logdir.patch \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ + file://Fix-SyntaxWarning.patch \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:00 +0000 Subject: [oe-commits] [openembedded-core] 17/28: gdbm: Disable readlind In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.51B25232830@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5a9f81f73e9397b90e4d6d0eed859e53915cdb46 Author: Jeremy A. Puhlman AuthorDate: Wed Mar 4 16:33:10 2020 -0800 gdbm: Disable readlind Turns off readline for both native and target. Also corrected a typo with enable-libgdbm-compat Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/gdbm/gdbm_1.18.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/gdbm/gdbm_1.18.1.bb b/meta/recipes-support/gdbm/gdbm_1.18.1.bb index 7e2efe3..5cb7c55 100644 --- a/meta/recipes-support/gdbm/gdbm_1.18.1.bb +++ b/meta/recipes-support/gdbm/gdbm_1.18.1.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f74 inherit autotools gettext texinfo lib_package ptest # Needed for dbm python module -EXTRA_OECONF = "-enable-libgdbm-compat" +EXTRA_OECONF = "--enable-libgdbm-compat --without-readline" # Stop presence of dbm/nbdm on the host contaminating builds CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:57 +0000 Subject: [oe-commits] [openembedded-core] 14/28: linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.2786823282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit add2cd52e4bc638f1d8f5f669cbf9bcb83e39397 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:22 2020 -0500 linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT Integrating the following configuration tweak: [ Author: Alexander Kanavin Date: Mon Feb 24 10:34:00 2020 +0100 common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT This will allow testing libinput in particular: https://www.kernel.org/doc/html/latest/input/uinput.html https://wayland.freedesktop.org/libinput/doc/latest/test-suite.html Signed-off-by: Alexander Kanavin Signed-off-by: Bruce Ashfield ] 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 37282b2..964d2fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" 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-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 463451f..47fcc98 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" 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 5dd7b68..53d5652 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_machine_qemux86-64 ?= "f4d7dbafb103e4f782323017c239c548871c1567" SRCREV_machine_qemumips64 ?= "fcbec8b4f0f2f24a31ce5c6e6439c69f7512fb31" SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" +SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:59 +0000 Subject: [oe-commits] [openembedded-core] 16/28: linux-yocto: drop 5.2 recipes In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.43C1723282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e71cda699189d3762d8af88d3ccdc0b0430b973c Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:24 2020 -0500 linux-yocto: drop 5.2 recipes linux-yocto 5.4 will serve as the versioned reference kernel in the upcoming release, and -dev will serve as the "newer" kernel. As such, we drop v5.2 from master, but will continue to update and support it in released branches. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 44 ------------------ meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 32 -------------- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 54 ----------------------- 3 files changed, 130 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 deleted file mode 100644 index a23a5e6..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ /dev/null @@ -1,44 +0,0 @@ -KBRANCH ?= "v5.2/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 ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" -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.32" - -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_5.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb deleted file mode 100644 index ac9904f..0000000 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -KBRANCH ?= "v5.2/standard/tiny/base" -KBRANCH_qemuarm ?= "v5.2/standard/tiny/arm-versatile-926ejs" - -LINUX_KERNEL_TYPE = "tiny" -KCONFIG_MODE = "--allnoconfig" - -require recipes-kernel/linux/linux-yocto.inc - -LINUX_VERSION ?= "5.2.32" -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 ?= "e0a3a01b24070b15121e938ea19755091bf0d662" -SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" - -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.2;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.2.bb b/meta/recipes-kernel/linux/linux-yocto_5.2.bb deleted file mode 100644 index eab142e..0000000 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -KBRANCH ?= "v5.2/standard/base" - -require recipes-kernel/linux/linux-yocto.inc - -# board specific branches -KBRANCH_qemuarm ?= "v5.2/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.2/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.2/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.2/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.2/standard/base" -KBRANCH_qemux86 ?= "v5.2/standard/base" -KBRANCH_qemux86-64 ?= "v5.2/standard/base" -KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" -SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" -SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" -SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" -SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" - -# remap qemuarm to qemuarma15 for the 5.2 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.2;destsuffix=${KMETA}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.32" - -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|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 Fri Mar 6 08:20:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:05 +0000 Subject: [oe-commits] [openembedded-core] 22/28: mesa: updated to 20.0 release In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.A059A23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0ee03e11bc2ae3faa6a2fcfdfae2ea35f7ba70ba Author: Nathan Hartman AuthorDate: Thu Mar 5 07:41:19 2020 -0800 mesa: updated to 20.0 release Updated mesa and mesa-gl recipes to 20.0 release. The license checksum difference is due to a small change in the license formatting. The asterisk for footnotes was changed to a '[1]' See: https://gitlab.freedesktop.org/mesa/mesa/-/commit/199572b65b7a03ffc887783e7f0f96f95bf1f99d glxgears runs successfully at 60 fps on a rpi4. Signed-off-by: Nathan Hartman Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_19.3.4.bb => mesa-gl_20.0.0.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/{mesa_19.3.4.bb => mesa_20.0.0.bb} | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb b/meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_19.3.4.bb rename to meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 54d7ea8..b7ef496 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=3a4999caf82cc503ac8b9e37c235782e" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=c1843d93c460bbf778d6037ce324f9f7" PE = "2" diff --git a/meta/recipes-graphics/mesa/mesa_19.3.4.bb b/meta/recipes-graphics/mesa/mesa_20.0.0.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_19.3.4.bb rename to meta/recipes-graphics/mesa/mesa_20.0.0.bb index 5f456c2..2ed7ca2 100644 --- a/meta/recipes-graphics/mesa/mesa_19.3.4.bb +++ b/meta/recipes-graphics/mesa/mesa_20.0.0.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] = "09e7700d9af511384d131fb77b5802cb" -SRC_URI[sha256sum] = "1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4" +SRC_URI[md5sum] = "681229d992bbd6250a5be4f308708795" +SRC_URI[sha256sum] = "bb6db3e54b608d2536d4000b3de7dd3ae115fc114e8acbb5afff4b3bbed04b34" 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 Mar 6 08:20:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:06 +0000 Subject: [oe-commits] [openembedded-core] 23/28: openssl: pass PERL=perl environment variable to configurator In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.B1B7423283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2b087fef6820da8a6d86ca763bd7730dcac30849 Author: Ruslan Bilovol AuthorDate: Thu Mar 5 13:53:33 2020 +0200 openssl: pass PERL=perl environment variable to configurator In our build environment we use wrapper script for perl in non-standard configuration with extra variables set (provided by custom buildtools-tarball). In this case openssl fails to build because by default it's Configure script detects and uses perl executable directly (with absolute path) obviously missing extra settings from wrapper script. Pass PERL=perl environment variable to Configure, so it won't try to use perl executable directly but will use what is provided from environment. Signed-off-by: Ruslan Bilovol Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index c2ba005..d4871fe 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -123,7 +123,7 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ + PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target perl ${B}/configdata.pm --dump } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:19:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:19:58 +0000 Subject: [oe-commits] [openembedded-core] 15/28: linux-yocto/5.4: update to v5.4.23 In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.35EDF23281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit aef943886969fb4c411eb4dc2fd6fb5063ce0064 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:23 2020 -0500 linux-yocto/5.4: update to v5.4.23 Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: bfe3046ecafd Linux 5.4.23 bb7ffcbec227 ASoC: SOF: Intel: hda: Add iDisp4 DAI fb81480206ae bpf: Selftests build error in sockmap_basic.c 19be2b3eea34 s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range 148c8531b69c s390/kaslr: Fix casts in get_random e26be2667399 net/mlx5e: Fix crash in recovery flow without devlink reporter fca1cdd3417e net/mlx5: Fix sleep while atomic in mlx5_eswitch_get_vepa 06320052ee69 net/mlx5e: Reset RQ doorbell counter before moving RQ state from RST to RDY 773dfd2223e3 xen: Enable interrupts when calling _cond_resched() 9724b3f28dab ata: ahci: Add shutdown to freeze hardware resources of ahci 8eb92c122840 io_uring: prevent sq_thread from spinning when it should stop b0f5f25c5541 rxrpc: Fix call RCU cleanup using non-bh-safe locks 829e0a0ae2dc netfilter: xt_hashlimit: limit the max size of hashtable 86502c68b81e ALSA: seq: Fix concurrent access to queue current tick/time 2b550d1c7ac6 ALSA: seq: Avoid concurrent access to queue flags 84e041a5df79 ALSA: rawmidi: Avoid bit fields for state flags c7deb9612e35 io_uring: fix __io_iopoll_check deadlock in io_sq_thread d562fdad84dd arm64: lse: Fix LSE atomics with LLVM 8132323eb397 bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill 2463a30f6678 genirq/proc: Reject invalid affinity masks (again) c23074e20989 crypto: rename sm3-256 to sm3 in hash_algo_name 8278f34f6ca8 iommu/vt-d: Fix compile warning from intel-svm.h cfde4697ea4d ecryptfs: replace BUG_ON with error handling code 4c585d1e98d9 ASoC: fsl_sai: Fix exiting path on probing failure 59c723344aec ASoC: atmel: fix atmel_ssc_set_audio link failure 125b4a5345e2 staging: greybus: use after free in gb_audio_manager_remove_all() 2ca19dfafc04 staging: rtl8723bs: fix copy of overlapping memory e6535a8c5d98 usb: dwc2: Fix in ISOC request length checking ceb1997a2ec3 usb: gadget: composite: Fix bMaxPower for SuperSpeedPlus 826a43b22ce6 scsi: Revert "target: iscsi: Wait for all commands to finish before freeing a session" d92e714a463d scsi: Revert "RDMA/isert: Fix a recently introduced regression related to logout" 42b4f3c8ec0b drm/msm/dpu: fix BGR565 vs RGB565 confusion 337cbf3ea855 drm/i915/gt: Protect defer_request() from new waiters 93805d430c53 drm/bridge: tc358767: fix poll timeouts 7de50906e772 drm/i915/gvt: more locking for ppgtt mm LRU list 19f8fb273193 drm/i915/execlists: Always force a context reload when rewinding RING_TAIL 1e0175a15474 drm/i915/gt: Detect if we miss WaIdleLiteRestore 341c8e03a90a Revert "dmaengine: imx-sdma: Fix memory leak" 9ad7f8df34d2 Btrfs: fix deadlock during fast fsync when logging prealloc extents beyond eof 73e1f2663273 btrfs: don't set path->leave_spinning for truncate d3d0fb9d42d3 Btrfs: fix race between shrinking truncate and fiemap c383f8ad2a12 Btrfs: fix btrfs_wait_ordered_range() so that it waits for all ordered extents 9af8e258895f btrfs: do not check delayed items are empty for single transaction cleanup 6065ca5d013d btrfs: reset fs_root to NULL on error in open_ctree 37a2e704807a btrfs: fix bytes_may_use underflow in prealloc error condtition 40ea30638d20 btrfs: destroy qgroup extent records on transaction abort 7e946e30a46d KVM: apic: avoid calculating pending eoi from an uninitialized val dc5537061baf KVM: nVMX: handle nested posted interrupts when apicv is disabled for L1 16f8553f75b5 KVM: nVMX: clear PIN_BASED_POSTED_INTR from nested pinbased_ctls only when apicv is globally disabled 0f042f5e98f1 KVM: nVMX: Check IO instruction VM-exit conditions c4064f14f744 KVM: nVMX: Refactor IO bitmap checks into helper function e5d25003d059 ext4: fix race between writepages and enabling EXT4_EXTENTS_FL 5195dc6e9365 ext4: rename s_journal_flag_rwsem to s_writepages_rwsem 6ccdd6616a1c ext4: fix mount failure with quota configured as module eac2bb1042b2 ext4: fix potential race between s_flex_groups online resizing and access 58631f8cbc24 ext4: fix potential race between s_group_info online resizing and access bb43897de9b3 ext4: fix potential race between online resizing and write operations ded8c21ac49c ext4: add cond_resched() to __ext4_find_entry() 1673674ccd86 ext4: fix a data race in EXT4_I(inode)->i_disksize 56b3949a2b5f KVM: x86: don't notify userspace IOAPIC on edge-triggered interrupt EOI 24dfae91a23a KVM: nVMX: Don't emulate instructions in guest mode e61c236dcf34 sched/psi: Fix OOB write when writing 0 bytes to PSI files 26ae0493c181 drm/i915: Update drm/i915 bug filing URL 2104c4905a08 drm/i915: Wean off drm_pci_alloc/drm_pci_free 3e740fa80cc8 drm/nouveau/kms/gv100-: Re-set LUT after clearing for modesets 5e7dda6ddad1 drm/amdgpu/gfx10: disable gfxoff when reading rlc clock 7e482baf6d70 drm/amdgpu/gfx9: disable gfxoff when reading rlc clock f141fac489ee drm/amdgpu/soc15: fix xclk for raven 95236ae76bf8 mm: Avoid creating virtual address aliases in brk()/mmap()/mremap() 9bb971b33565 lib/stackdepot.c: fix global out-of-bounds in stack_slabs ef32399bf729 mm/sparsemem: pfn_to_page is not valid yet on SPARSEMEM 198f5aa0f73e mm/vmscan.c: don't round up scan size for online memory cgroup 8735a5b6e1fb genirq/irqdomain: Make sure all irq domain flags are distinct 6e304262e393 nvme-multipath: Fix memory leak with ana_log_buf e078c8d8971b mm/memcontrol.c: lost css_put in memcg_expand_shrinker_maps() aa4f749f8136 Revert "ipc,sem: remove uneeded sem_undo_list lock usage in exit_sem()" 7b77e5a08224 ACPI: PM: s2idle: Check fixed wakeup events in acpi_s2idle_wake() f18121a59b5a MAINTAINERS: Update drm/i915 bug filing URL cf3c30a7112c serdev: ttyport: restore client ops on deregistration 80990c30b776 tty: serial: qcom_geni_serial: Fix RX cancel command failure 5b0af5e58368 tty: serial: imx: setup the correct sg entry for tx dma 671ea19c3214 tty/serial: atmel: manage shutdown in case of RS485 or ISO7816 mode 5ae6e5683755 serial: 8250: Check UPF_IRQ_SHARED in advance e0253c422024 x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF 88e4901d3ebd x86/mce/amd: Fix kobject lifetime de2cce5ae563 x86/mce/amd: Publish the bank pointer only after setup has succeeded 6df12de90e74 x86/ima: use correct identifier for SetupMode variable 453692eb5a38 jbd2: fix ocfs2 corrupt when clearing block group bits 98583fb54c2b arm64: memory: Add missing brackets to untagged_addr() macro 9b9374cf1ea7 powerpc/hugetlb: Fix 8M hugepages on 8xx 723a44f2288e powerpc/hugetlb: Fix 512k hugepages on 8xx with 16k page size 2ffeef3db358 powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S 04e3f1d1e135 powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery a03b3cea86fd powerpc/eeh: Fix deadlock handling dead PHB 9e1fab44502c powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss 2558e71bbfc5 drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context 3b8edaada13e staging: rtl8723bs: Fix potential overuse of kernel memory 4113e08e75d3 staging: rtl8723bs: Fix potential security hole de63cd8b5521 staging: rtl8188eu: Fix potential overuse of kernel memory ddedb84fcdc8 staging: rtl8188eu: Fix potential security hole 91aa9e475827 scsi: Revert "target/core: Inline transport_lun_remove_cmd()" 24aeb16934e8 usb: dwc3: debug: fix string position formatting mixup with ret and len 6dbf3ea0f566 usb: dwc3: gadget: Check for IOC/LST bit in TRB->ctrl fields 256cc85f6f86 usb: dwc2: Fix SET/CLEAR_FEATURE and GET_STATUS flows c2f07cb7e317 USB: hub: Fix the broken detection of USB3 device in SMSC hub e5d078af8e5f USB: hub: Don't record a connect-change event during reset-resume 5af8add0167c USB: Fix novation SourceControl XL after suspend b3c64c8b2fab usb: uas: fix a plug & unplug racing e805982b13e3 USB: quirks: blacklist duplicate ep on Sound Devices USBPre2 4c02497e8f65 USB: core: add endpoint-blacklist quirk f9965af8e493 usb: host: xhci: update event ring dequeue pointer on purpose 5d0faf16f960 xhci: Fix memory leak when caching protocol extended capability PSI tables - take 2 ef69cf19bda8 xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms 02e326360053 xhci: fix runtime pm enabling for quirky Intel hosts 512dae7753cd xhci: Force Maximum Packet size for Full-speed bulk devices to valid range. 22ff13ac65cb staging: vt6656: fix sign of rx_dbm to bb_pre_ed_rssi. 41a53f5b68ec staging: android: ashmem: Disallow ashmem memory from being remapped 897d5aaf3397 vt: vt_ioctl: fix race in VT_RESIZEX 21275a431289 vt: selection, handle pending signals in paste_selection a2c3858faf3a vt: fix scrollback flushing on background consoles 1eb78bc92c84 floppy: check FDC index for errors before assigning it c5455e3fab20 e1000e: Use rtnl_lock to prevent race conditions between net and pci/pm 47a7a44650c1 USB: misc: iowarrior: add support for the 100 device 9b5e87086fa9 USB: misc: iowarrior: add support for the 28 and 28L devices c8e28d325c97 USB: misc: iowarrior: add support for 2 OEMed devices cfda8551dd59 thunderbolt: Prevent crash if non-active NVMem file is read 802a8369d21f btrfs: handle logged extent failure properly 3c4ef8ac8f4b ecryptfs: fix a memory leak bug in ecryptfs_init_messaging() 7e1dbc6656ff ecryptfs: fix a memory leak bug in parse_tag_1_packet() 909149bf61da tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST 9f83363875be ASoC: sun8i-codec: Fix setting DAI data format 3de0bbe21312 ASoC: codec2codec: avoid invalid/double-free of pcm runtime c45877ca9f62 ALSA: hda/realtek - Apply quirk for yet another MSI laptop 9dc3b7a5833a ALSA: hda/realtek - Apply quirk for MSI GP63, too 80c1e9c4c484 ALSA: hda: Use scnprintf() for printing texts for sysfs/procfs b76e00b67dc6 iommu/qcom: Fix bogus detach logic f22dcb31727e Linux 5.4.22 105542cea2ea rtc: Kconfig: select REGMAP_I2C when necessary cea9007ebb95 bcache: properly initialize 'path' and 'err' in register_bcache() 7967c3299e3f drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c (v2) 51c9c98a7bbe s390/pci: Recover handle in clp_set_pci_fn() 332c8b5bc358 mlxsw: spectrum_dpipe: Add missing error path 399ca7ee9130 fuse: don't overflow LLONG_MAX with end offset 77912b69a989 virtio_balloon: prevent pfn array overflow 9c80ae965082 cifs: log warning message (once) if out of disk space 3f14879fd6ce i40e: Relax i40e_xsk_wakeup's return value when PF is busy 6fa2bb0d06ca help_next should increase position index 6b851823ceaa NFS: Fix memory leaks 0562d37d143a drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage c3e3d17d0c5b drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency 17bddc85f980 brd: check and limit max_part par 7291351c00e1 microblaze: Prevent the overflow of the start 7ceb32672b1e asm-generic/tlb: add missing CONFIG symbol 7a48064a42e0 iwlwifi: mvm: Check the sta is not NULL in iwl_mvm_cfg_he_sta() 1656781d15c0 iwlwifi: mvm: Fix thermal zone registration 0448387729d9 nvme-pci: remove nvmeq->tags 1d0fbf3e2687 nvmet: Pass lockdep expression to RCU lists d5461fdd9645 irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL 793137b0511c bcache: fix incorrect data type usage in btree_flush_write() 57a180a630d8 bcache: explicity type cast in bset_bkey_last() 374eec821858 bcache: fix memory corruption in bch_cache_accounting_clear() dc8c75f35374 reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() 23b88b51de5c lib/scatterlist.c: adjust indentation in __sg_alloc_table 5a553bd43f59 ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans() 799c4c1e389f ocfs2: make local header paths relative to C files 7a97311de48d btrfs: do not do delalloc reservation under page lock a531e6ba85a0 powerpc: Do not consider weak unresolved symbol relocations as bad 528c36e14b17 radeon: insert 10ms sleep in dce5_crtc_load_lut 224c0751dfb7 trigger_next should increase position index e349287276c2 ftrace: fpid_next() should increase position index 8a7bfa3d97dc char: hpet: Fix out-of-bounds read bug 427f39e23326 drm/nouveau/disp/nv50-: prevent oops when no channel method map provided 39c6932240c5 irqchip/gic-v3: Only provision redistributors that are enabled in ACPI 074c4c43fce2 drm/amd/display: do not allocate display_mode_lib unnecessarily 1687b204ae83 rbd: work around -Wuninitialized warning bd4e1894166b ceph: check availability of mds cluster on mount after wait timeout 7288d5338c85 powerpc/mm: Don't log user reads to 0xffffffff 3ce3df5d00d0 bpf: map_seq_next should always increase position index 9a178494d05b cifs: fix NULL dereference in match_prepath 9c5ede115a6e cifs: Fix mount options set in automount 1d8e40cf86e4 cifs: fix unitialized variable poential problem with network I/O cache lock patch a2763f62baa4 iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop 034c5f26d2bf rtw88: fix potential NULL skb access in TX ISR e7e4d0eaa639 hostap: Adjust indentation in prism2_hostapd_add_sta 32662df2d0bc ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82 2ccaac382af0 ARM: 8951/1: Fix Kexec compilation issue. 16ec28640dc6 selftests/eeh: Bump EEH wait time to 60s 93df1b23b157 powerpc/pseries/lparcfg: Fix display of Maximum Memory 411327180703 jbd2: make sure ESHUTDOWN to be recorded in the journal superblock 314e25f4b0cf jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record b911c5e8686a selftests: bpf: Reset global state between reuseport test runs 251c53a92b54 alarmtimer: Make alarmtimer platform device child of RTC device 777baa1baf63 iommu/vt-d: Remove unnecessary WARN_ON_ONCE() b5f6bf0fdd71 bcache: fix use-after-free in register_bcache() 393b8509be33 bcache: rework error unwinding in register_bcache f7d8ebf26d23 bcache: cached_dev_free needs to put the sb page 714cd4a5127a btrfs: Fix split-brain handling when changing FSID to metadata uuid dc22bc8a8626 btrfs: separate definition of assertion failure handlers 3420f1b304b3 media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value 3f6c8de753ed powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV 9d5fc7f14ef2 drm/nouveau/mmu: fix comptag memory leak 707518c16ba4 sunrpc: Fix potential leaks in sunrpc_cache_unhash() 46503858e275 ALSA: hda - Add docking station support for Lenovo Thinkpad T420s ea038a5270b5 bpf, btf: Always output invariant hit in pahole DWARF to BTF transform f11aefc9961d driver core: platform: fix u32 greater or equal to zero comparison 843eb0a8cf53 s390/ftrace: generate traced function stack frame 68c3cc414e08 s390: adjust -mpacked-stack support check for clang 10 838bddc295a0 x86/decoder: Add TEST opcode to Group3-2 a4f6948e57f0 objtool: Fix ARCH=x86_64 build error 59e2355bdfc5 kbuild: use -S instead of -E for precise cc-option test in Kconfig ba6ad897c3dc spi: spi-fsl-qspi: Ensure width is respected in spi-mem operations dbdc1c12966e ALSA: hda/hdmi - add retry logic to parse_intel_hdmi() fa7d320dbbbe irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems 27f3dc35fd59 regulator: core: Fix exported symbols to the exported GPL version 18eca3cb5dd9 remoteproc: Initialize rproc_class before use 496d6c021828 module: avoid setting info->name early in case we can fall back to info->mod->name 7303a0b0a537 btrfs: device stats, log when stats are zeroed f9ab58f9a2ab btrfs: safely advance counter when looking up bio csums ebf8e5411888 btrfs: fix possible NULL-pointer dereference in integrity checks 50b93369668b pwm: Remove set but not set variable 'pwm' adf4ab6d8312 ide: serverworks: potential overflow in svwks_set_pio_mode() e5c8d3abd927 cmd64x: potential buffer overflow in cmd64x_program_timings() 419035d75dbe pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional e7e6b53fea10 x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd 225a5b5bee00 f2fs: fix memleak of kobject 337c7b95e16e regulator: vctrl-regulator: Avoid deadlock getting and setting the voltage bf754c88865d ASoC: SOF: Intel: hda: Fix SKL dai count 84255fe86d07 debugobjects: Fix various data races 0b2ecef39d8e watchdog/softlockup: Enforce that timestamp is valid on boot d8a6a443ff0a perf/x86/amd: Constrain Large Increment per Cycle events f2323c374e49 sched/topology: Assert non-NUMA topology masks don't (partially) overlap 5d13f62b9ef6 sched/core: Fix size of rq::uclamp initialization 8da6ae7dcb16 arm64: dts: ti: k3-j721e-main: Add missing power-domains for smmu 88cf251d3c0d KVM: PPC: Remove set but not used variable 'ra', 'rs', 'rt' d4870a4343f3 EDAC/sifive: Fix return value check in ecc_register() 0a8f90d5654d drm/amd/display: fixup DML dependencies 304982d21e2b arm64: fix alternatives with LLVM's integrated assembler f68668292496 arm64: lse: fix LSE atomics with LLVM's integrated assembler b04235f1e11d RDMA/mlx5: Don't fake udata for kernel path da2d50868e59 ALSA: usb-audio: add implicit fb quirk for MOTU M Series 5a6f5b327fce crypto: essiv - fix AEAD capitalization and preposition use in help text 817faa4ed433 scsi: iscsi: Don't destroy session if there are outstanding connections 12b685be50c7 scsi: ufs-mediatek: add apply_dev_quirks variant operation 4fa2dd4eebfd scsi: ufs: pass device information to apply_dev_quirks 0016939be0ee f2fs: free sysfs kobject 06c34c604b13 f2fs: set I_LINKABLE early to avoid wrong access by vfs f51caa62dea1 ALSA: usb-audio: unlock on error in probe 480494e28a51 iommu/arm-smmu-v3: Use WRITE_ONCE() when changing validity of an STE 23d3f191a576 kbuild: remove *.tmp file when filechk fails 1fc9746acbb2 usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue 9112d1ef5a1b perf/imx_ddr: Fix cpu hotplug state cleanup 994b203b619d drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add 13d368cd1e13 gpiolib: Set lockdep class for hierarchical irq domains 7f0d9ac2621e dm thin: don't allow changing data device during thin-pool reload 74f42a77318e drm/nouveau/fault/gv100-: fix memory leak on module unload 18792937b064 drm/nouveau/drm/ttm: Remove set but not used variable 'mem' a94c84c5c4bc drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler 93672fa5b9b3 drm/nouveau/gr/gk20a,gm200-: add terminators to method lists read from fw 63e00e2c80e5 drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new() 760baae7ab35 vme: bridges: reduce stack usage 76fac0e735c7 bpf: Return -EBADRQC for invalid map type in __bpf_tx_xdp_map be1113b4b415 ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare a8b37e32415e driver core: Print device when resources present in really_probe() 3f6af05d1d1b driver core: platform: Prevent resouce overflow from causing infinite loops 11c759264c32 visorbus: fix uninitialized variable access 83f964dd14a7 misc: xilinx_sdfec: fix xsdfec_poll()'s return type 9087af8639c2 tty: synclink_gt: Adjust indentation in several functions 71faeca11055 tty: synclinkmp: Adjust indentation in several functions a922fa72a860 raid6/test: fix a compilation warning 6cfe307b5be7 ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m 5bff3c470f84 ALSA: usb-audio: Add boot quirk for MOTU M Series d691d1e5836d ARM: dts: rockchip: add reg property to brcmf sub node for rk3188-bqedison2qc 7c32c479b1e0 arm64: dts: rockchip: add reg property to brcmf sub-nodes f9de6fb6e679 arm64: dts: rockchip: fix dwmmc clock name for px30 989a495ed9a3 clocksource: davinci: only enable clockevents once tim34 is initialized 48be6f9d2f7e wan: ixp4xx_hss: fix compile-testing on 64-bit 73f48c1004d4 x86/nmi: Remove irq_work from the long duration NMI handler b075c29e816c bnxt: Detach page from page pool before sending up the stack 1e703d621b9c Input: edt-ft5x06 - work around first register access error 2b1fd461067f rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls 5f0a4eba2a88 efi/x86: Don't panic or BUG() on non-critical error conditions 5cf01eacd5c2 soc/tegra: fuse: Correct straps' address for older Tegra124 device trees 75d916c3b393 IB/hfi1: Add RcvShortLengthErrCnt to hfi1stats 9cfe6c21ff17 IB/hfi1: Add software counter for ctxt0 seq drop 8689967be56d staging: rtl8188: avoid excessive stack usage bfe29951e250 drm/mediatek: Add gamma property according to hardware capability 6ceef50235d1 udf: Fix free space reporting for metadata and virtual partitions 03560e4a19fe usbip: Fix unsafe unaligned pointer usage e653e1c05423 ARM: dts: stm32: Add power-supply for DSI panel on stm32f469-disco 6e86c4ce5d3a usb: dwc3: use proper initializers for property entries ab7edf7fa651 drm: remove the newline for CRC source name. 9d89ff3d27e0 RDMA/hns: Avoid printing address of mtt page 5a2a529974e1 mlx5: work around high stack usage with gcc 010cdc1be053 drm/amdkfd: Fix permissions of hang_hws 960671ac5065 iommu/vt-d: Avoid sending invalid page response 2aab9e9d1f3d iommu/vt-d: Match CPU and IOMMU paging mode 4ffdfc414d81 ACPI: button: Add DMI quirk for Razer Blade Stealth 13 late 2019 lid switch e9e24f2ca9a6 ASoC: Intel: sof_rt5682: Ignore the speaker amp when there isn't one. d00a15040454 vfio/spapr/nvlink2: Skip unpinning pages on error exit e44b48f5bb64 tools lib api fs: Fix gcc9 stringop-truncation compilation error 3e32b1282b11 net: phy: fixed_phy: fix use-after-free when checking link GPIO 4070a491bfcf ALSA: sh: Fix compile warning wrt const cf24ed82438c ALSA: hda/realtek - Apply mic mute LED quirk for Dell E7xx laptops, too 2417ea1d07a5 clk: uniphier: Add SCSSI clock gate for each channel 6447bfe82922 clk: Use parent node pointer during registration if necessary 6c7984312d35 ALSA: sh: Fix unused variable warnings 9f87fff25159 clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock d1d92e97260f RDMA/rxe: Fix error type of mmap_offset c87c4d442b9f fbdev: fix numbering of fbcon options 67ca691658f5 ASoC: soc-topology: fix endianness issues 04361b8961d6 reset: uniphier: Add SCSSI reset control for each channel e39aac0e65f1 pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs 9ed73297980b drm/fbdev: Fallback to non tiled mode if all tiles not present d3db7b78e7d6 PM / devfreq: rk3399_dmc: Add COMPILE_TEST and HAVE_ARM_SMCCC dependency 704582e6a714 PM / devfreq: exynos-ppmu: Fix excessive stack usage bc866376d7cd x86/vdso: Provide missing include file b5fe09b676de crypto: chtls - Fixed memory leak a739564c4c53 net: phy: realtek: add logging for the RGMII TX delay configuration 4783bf08f8d2 bpf: Print error message for bpftool cgroup show 8a7aa4feeaea dmaengine: imx-sdma: Fix memory leak f99958a96c7f dmaengine: Store module owner in dma_device struct 93a3eff6fab3 clk: actually call the clock init before any other callback of the clock fa0150ba88fa iommu/iova: Silence warnings under memory pressure 8c358435459b iommu/amd: Only support x2APIC with IVHD type 11h/40h b1b7add9d2de iommu/amd: Check feature support bit before accessing MSI capability registers 0c09d9dc8440 arm64: dts: qcom: db845c: Enable ath10k 8bit host-cap quirk ce591c921944 scsi: lpfc: Fix: Rework setting of fdmi symbolic node name registration 111749fba968 selinux: ensure we cleanup the internal AVC counters on error in avc_update() 069d2385f381 ARM: dts: r8a7779: Add device node for ARM global timer f9b42cb09d8b clk: renesas: rcar-gen3: Allow changing the RPC[D2] clocks d80f9dfe47ce drm/mediatek: handle events when enabling/disabling crtc 57cd234da28c crypto: inside-secure - add unspecified HAS_IOMEM dependency df0f4455a12f scsi: aic7xxx: Adjust indentation in ahc_find_syncrate f6ebbf46c3a8 scsi: ufs: Complete pending requests in host reset and restore path 8728001e1e41 nfsd: Clone should commit src file metadata too d67d31cb0e92 ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1 3fa5ba7b1912 clk: qcom: smd: Add missing bimc clock 43ef7ad610dc drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV 75423fdad259 orinoco: avoid assertion in case of NULL pointer 5a14db967b72 rtlwifi: rtl_pci: Fix -Wcast-function-type f20bc906af52 iwlegacy: Fix -Wcast-function-type 3acea3092a33 ipw2x00: Fix -Wcast-function-type bc8746721cdf b43legacy: Fix -Wcast-function-type 90053ff023da PCI: Add DMA alias quirk for PLX PEX NTB 27a35f09367f PCI: Add nr_devfns parameter to pci_add_dma_alias() dd77f77004b6 ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status b6c857e5e500 netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy 1e2b6e5f32aa fore200e: Fix incorrect checks of NULL pointer dereference 58bc57b373e0 r8169: check that Realtek PHY driver module is loaded cdd5b09bcbc0 samples/bpf: Set -fno-stack-protector when building BPF programs af77e76625be reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling 6107a895e383 media: v4l2-device.h: Explicitly compare grp{id,mask} to zero in v4l2_device macros cf03458ab2cf selftests/net: make so_txtime more robust to timer variance 687ef9c269b6 gpu/drm: ingenic: Avoid null pointer deference in plane atomic update e07c107a2483 Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace" 6a05af0b718a PCI: Increase D3 delay for AMD Ryzen5/7 XHCI controllers 5700b8073f03 PCI: Add generic quirk for increasing D3hot delay 1e7b1684de37 media: cx23885: Add support for AVerMedia CE310B a3a7f90936d7 PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in 76ce0e269b4a bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO 2fc336213605 ARM: dts: imx6: rdu2: Limit USBH1 to Full Speed f3e63a4ddf19 ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3 dbe3806c7191 ARM: exynos_defconfig: Bring back explicitly wanted options 4ece124849a2 clk: imx: Add correct failure handling for clk based helpers 0685dfa0a2ff padata: validate cpumask without removed CPU during offline c3a007435359 arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core 0e44cd879ba1 selinux: ensure we cleanup the internal AVC counters on error in avc_insert() 5fed8c513adb opp: Free static OPPs on errors while adding them ef6b35dfe142 arm: dts: allwinner: H3: Add PMU node 5a241d7bf1e6 arm64: dts: allwinner: H5: Add PMU node 02dfae36b03f arm64: dts: allwinner: H6: Add PMU mode 5f0a50b0a37d NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). 53d9b08dc80d net/wan/fsl_ucc_hdlc: reject muram offsets above 64K 12ba455b1d28 regulator: rk808: Lower log level on optional GPIOs being not available bae02d239a38 ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682 fa54ae038c95 ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's 4c50665fc968 modules: lockdep: Suppress suspicious RCU usage warning fa0316aaf094 arm64: dts: rockchip: Fix NanoPC-T4 cooling maps 3a28e0701264 drm/panel: simple: Add Logic PD Type 28 display support c3c3f3449b8c drm/amdgpu: Ensure ret is always initialized when using SOC15_WAIT_ON_RREG ddbdf757a7ef ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start 69c12b79e9e2 drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table ad9728b377a6 bpf, sockhash: Synchronize_rcu before free'ing map 25c85d8574d8 drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode dff5d0fc77a5 clk: qcom: rcg2: Don't crash if our parent can't be found; return an error 8d122cd0d266 clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq() 8ba34cdadba3 kconfig: fix broken dependency in randconfig-generated .config 39a708219509 block, bfq: do not plug I/O for bfq_queues with no proc refs b0d5c881d36e drivers/block/zram/zram_drv.c: fix error return codes not being returned in writeback_store 53aaa9f1a638 Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker 3aa694d0e112 KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups 25cbba5d4e14 nbd: add a flush_workqueue in nbd_start_device 201fdd62bb23 tracing: Simplify assignment parsing for hist triggers 7bc84d854017 drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero 806f57ec2b52 rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed b752d473b1fb selftests: settings: tests can be in subsubdirs 6f65dd66ea6f brcmfmac: sdio: Fix OOB interrupt initialization on brcm43362 abf8d588e3b1 rtw88: fix rate mask for 1SS chip 3eee03d0ffb8 ath10k: Correct the DMA direction for management tx buffers 494c30b80550 ext4, jbd2: ensure panic when aborting with zero errno 8343f165f3d4 ARM: 8952/1: Disable kmemleak on XIP kernels 8c72748e9f6a tracing: Fix very unlikely race of registering two stat tracers 75225eee8715 tracing: Fix tracing_stat return values in error handling paths 8be3ac46ef80 powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() 256e52a1a915 s390/pci: Fix possible deadlock in recover_store() 37ea6d15b197 wan/hdlc_x25: fix skb handling 77b131f652d4 dmaengine: fsl-qdma: fix duplicated argument to && d30a4882e630 udf: Allow writing to 'Rewritable' partitions a3536e5589c7 pwm: omap-dmtimer: Simplify error handling 971579fae1b4 x86/sysfb: Fix check for bad VRAM size 7828a927b850 clk: ti: dra7: fix parent for gmac_clkctrl 2d7fa7564bc4 ext4: fix deadlock allocating bio_post_read_ctx from mempool c982320078dd jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal 56953ccd7f00 kselftest: Minimise dependency of get_size on C library interfaces 6aa96ec9c196 drm/amd/display: Clear state after exiting fixed active VRR state c7fc72092134 clocksource/drivers/bcm2835_timer: Fix memory leak of timer 9f0414eed212 usb: dwc2: Fix IN FIFO allocation 2cea5895b69d usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe() 531d0ac5fbbd drm/nouveau/nouveau: fix incorrect sizeof on args.src an args.dst d34ecf4949de spi: fsl-lpspi: fix only one cs-gpio working 9f3a2e147f0e drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov 750a95d63746 uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol() b2f28d11f2a1 raid6/test: fix a compilation error 448563605d98 net: ethernet: ixp4xx: Standard module init b5d649f14470 sparc: Add .exit.data section. c09d0bd924ac MIPS: Loongson: Fix potential NULL dereference in loongson3_platform_init() ed140997f80c efi/x86: Map the entire EFI vendor string before copying it 04a5bebd7789 pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins 9ad79d4fa032 IB/core: Let IB core distribute cache update events f606721660a6 kernel/module: Fix memleak in module_add_modinfo_attrs() fc3c0fc85d69 media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run() bc4730880281 char/random: silence a lockdep splat with printk() 0b455673e7c4 x86/fpu: Deactivate FPU state after failure during state load 9b743915bd00 iommu/vt-d: Fix off-by-one in PASID allocation 739abce96dd0 gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap() e715aa99c502 clk: meson: meson8b: make the CCF use the glitch-free mali mux 271b18405eb0 powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number 2f812301bacf clk: at91: sam9x60: fix programmable clock prescaler e1e1cdbc646f media: sun4i-csi: Fix [HV]sync polarity handling 65fbde986aef media: sun4i-csi: Fix data sampling polarity handling f5076ea1bc9d media: sun4i-csi: Deal with DRAM offset cb514c01f6e4 media: i2c: mt9v032: fix enum mbus codes and frame sizes ecb8ea6f93e5 media: ov5640: Fix check for PLL1 exceeding max allowed rate 9c76a7b28edc pxa168fb: Fix the function used to release some memory in an error handling path 4a8bb7ce9f0b drm/msm/adreno: fix zap vs no-zap handling 4aa148666a70 drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank() d21cc4ea7a82 printk: fix exclusive_console replaying f46afae807aa pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs fcc0000109b0 gianfar: Fix TX timestamping with a stacked DSA driver c324effa6d9d ALSA: ctl: allow TLV read operation for callback type of element in locked case 4125714ce1d6 ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT 348a7ccdb9f0 leds: pca963x: Fix open-drain initialization 4e2d5e3eb865 drm/amd/display: Map ODM memory correctly when doing ODM combine b3224bf30709 PCI: Fix pci_add_dma_alias() bitmask size 071963d37143 brcmfmac: Fix use after free in brcmf_sdio_readframes() 55195593a8c6 brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev() c4d0a90b5029 cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order 4d7f8ca608b2 clk: meson: pll: Fix by 0 division in __pll_params_to_rate() 343fc9a26887 media: meson: add missing allocation failure check on new_buf 85275286d118 f2fs: call f2fs_balance_fs outside of locked page 678b25bfd983 f2fs: preallocate DIO blocks when forcing buffered_io 255edefeb0b8 rcu: Fix data-race due to atomic_t copy-by-value b7725deb9d61 rcu: Fix missed wakeup of exp_wq waiters 3ece067c12e1 rcu/nocb: Fix dump_tree hierarchy print always active 2339f7a55c84 drm/qxl: Complete exception handling in qxl_device_init() 3deb6e993ec4 wil6210: fix break that is never reached because of zero'ing of a retry counter 281ebbcdee49 ath10k: Fix qmi init error handling 726196728c2c drm/gma500: Fixup fbdev stolen size usage evaluation 60e055d59d0e net/sched: flower: add missing validation of TCA_FLOWER_FLAGS 58cd462bc5b1 net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS d9bc012b4a47 net: dsa: tag_qca: Make sure there is headroom for tag 42dd56266b9f net/smc: fix leak of kernel memory to user space f1f2eea30d19 enic: prevent waking up stopped tx queues over watchdog reset 8f22873582a7 core: Don't skip generic XDP program execution for cloned SKBs 2d636a1263be Linux 5.4.21 c10cfc131c0b mmc: core: Rework wp-gpio handling b0ad23142a2a gpio: add gpiod_toggle_active_low() 2cbbe28c734b KVM: x86/mmu: Fix struct guest_walker arrays for 5-level paging ac3aea49cc35 ext4: choose hardlimit when softlimit is larger than hardlimit in ext4_statfs_project() 9275ae515385 jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer f09998f7a11f jbd2: move the clearing of b_modified flag to the journal_unmap_buffer() 0e365eafbcaa Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode config" 590d35beddcc NFSv4.1 make cachethis=no for writes 7bee7eabf0ed perf stat: Don't report a null stalled cycles per insn metric 1164c3380958 KVM: x86: Mask off reserved bit from #DB exception payload ec86856b4672 arm64: dts: fast models: Fix FVP PCI interrupt-map property 51a610a5c88d cifs: fix mount option display for sec=krb5i db5a68ffad2a mac80211: fix quiet mode activation in action frames 671338889e8f hwmon: (pmbus/ltc2978) Fix PMBus polling of MFR_COMMON definitions. 98509dfe6f25 perf/x86/intel: Fix inaccurate period in context switch for auto-reload 1d2a31baf6b6 spmi: pmic-arb: Set lockdep class for hierarchical irq domains 9f6f61c61a84 sched/uclamp: Reject negative values in cpu_uclamp_write() 115402ee80ce s390/time: Fix clk type in get_tod_clock ae88de70c254 RDMA/core: Fix protection fault in get_pkey_idx_qp_list 2c753af06f23 RDMA/rxe: Fix soft lockup problem due to using tasklets in softirq 8662e612ae4c RDMA/hfi1: Fix memory leak in _dev_comp_vect_mappings_create b860a4524217 RDMA/iw_cxgb4: initiate CLOSE when entering TERM c60c4b4b6bf2 RDMA/core: Fix invalid memory access in spec_filter_size 8a14f01c4d0f IB/umad: Fix kernel crash while unloading ib_umad 6603342a6060 IB/rdmavt: Reset all QPs when the device is shut down b16dfda32ca5 IB/hfi1: Close window for pq and request coliding 327f33e54c7f IB/hfi1: Acquire lock to release TID entries when user file is closed e30e30c042fe IB/mlx5: Return failure when rts2rts_qp_counters_set_id is not supported cf0ea974b6a2 drivers: ipmi: fix off-by-one bounds check that leads to a out-of-bounds write 5e9f573dc8e7 nvme: fix the parameter order for nvme_get_log in nvme_get_fw_slot_info fa3c053b8313 bus: moxtet: fix potential stack buffer overflow 279c15b917ec drm/panfrost: Make sure the shrinker does not reclaim referenced BOs 3ea7f138cec1 drm/vgem: Close use-after-free race in vgem_gem_create 9ea66515918e s390/uv: Fix handling of length extensions 9e6874da9446 s390/pkey: fix missing length of protected key on return ebc3ddc1a255 perf/x86/amd: Add missing L2 misses event spec to AMD Family 17h's event map db6f68908bce KVM: nVMX: Use correct root level for nested EPT shadow page tables ce8b9b8032bd EDAC/mc: Fix use-after-free and memleaks during device removal b2e977a9731f EDAC/sysfs: Remove csrow objects on errors 03f6c2bf9562 cifs: make sure we do not overflow the max EA buffer size ff04f342f8c4 xprtrdma: Fix DMA scatter-gather list mapping imbalance 22f15745c4e7 arm64: ssbs: Fix context-switch when SSBS is present on all CPUs 4267ba3bac6d gpio: xilinx: Fix bug where the wrong GPIO register is written to 8791bb8f8471 ARM: npcm: Bring back GPIOLIB support cafaf6bcce60 btrfs: log message when rw remount is attempted with unclean tree-log 2655c88c03e8 btrfs: print message when tree-log replay starts f3cdf024ed19 btrfs: ref-verify: fix memory leaks bf4a9715a914 Btrfs: fix race between using extent maps and merging them c43f560acc85 ext4: improve explanation of a mount failure caused by a misconfigured kernel 94f0fe04da78 ext4: add cond_resched() to ext4_protect_reserved_inode 5b0a26514d6c ext4: fix checksum errors with indexed dirs 449e607322d7 ext4: fix support for inode sizes > 1024 bytes f080204b677d ext4: don't assume that mmp_nodename/bdevname have NUL 86c30da1b684 ALSA: usb-audio: Add clock validity quirk for Denon MC7000/MCX8000 67d49871f8e4 ALSA: usb-audio: sound: usb: usb true/false for bool return type c3b35c87e5b6 ACPI: PM: s2idle: Prevent spurious SCIs from waking up the system 303740645567 ACPICA: Introduce acpi_any_gpe_status_set() 0671627a5faa ACPI: PM: s2idle: Avoid possible race related to the EC GPE b9f78af90d92 ACPI: EC: Fix flushing of pending work 25487999ca3a ALSA: usb-audio: Apply sample rate quirk for Audioengine D1 2b7e7004970a ALSA: hda/realtek - Fix silent output on MSI-GL73 1e73c5eae8c6 ALSA: hda/realtek - Add more codec supported Headset Button c28273b42c95 ALSA: usb-audio: Fix UAC2/3 effect unit parsing 2323beb68436 Input: synaptics - remove the LEN0049 dmi id from topbuttonpad list efca0d73501a Input: synaptics - enable SMBus on ThinkPad L470 c6426ba5731b Input: synaptics - switch T470s to RMI4 by default 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 964d2fe..1c238c9 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 ?= "e3a0470f1ebedce56d1c924f8ac8d3638f52304c" -SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine ?= "f617c0993374d56792e266e37606d424166b1edd" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" 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.20" +LINUX_VERSION ?= "5.4.23" 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 47fcc98..193bd9b 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.20" +LINUX_VERSION ?= "5.4.23" 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 ?= "f0aeaeffb8ba6d0c24f9f0212fd7a11866c918b8" -SRCREV_machine ?= "f4d7dbafb103e4f782323017c239c548871c1567" -SRCREV_meta ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine_qemuarm ?= "d361ce4ddedafa6d504d726c5da098d32f46886e" +SRCREV_machine ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" 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 53d5652..ab7c646 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 ?= "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 ?= "13a856e7e5df0d8f951bd4060ac441cf35925c9e" +SRCREV_machine_qemuarm ?= "3745c440f4781ffaab809f999c14da1abd3457bb" +SRCREV_machine_qemuarm64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemumips ?= "eb0e84ae58eb7a88a48bdbddfb53095228840974" +SRCREV_machine_qemuppc ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemuriscv64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemux86 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemux86-64 ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_machine_qemumips64 ?= "7ca67eee407193dff5132da8bacc036f670faaea" +SRCREV_machine ?= "06356153574af37fccb30f5e632edeb54ddd1f7b" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" # 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.20" +LINUX_VERSION ?= "5.4.23" 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 Mar 6 08:20:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:07 +0000 Subject: [oe-commits] [openembedded-core] 24/28: xkbcomp: upgrade 1.4.2 -> 1.4.3 In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.C3590232891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cfe8461a2b161d277906458186294c21f2827f70 Author: Zheng Ruoqin AuthorDate: Wed Mar 4 18:15:07 2020 +0800 xkbcomp: upgrade 1.4.2 -> 1.4.3 Signed-off-by: Zheng Ruoqin Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-app/{xkbcomp_1.4.2.bb => xkbcomp_1.4.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb similarity index 79% rename from meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb rename to meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb index ed1eed8..2fa79c8 100644 --- a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.2.bb +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb @@ -15,5 +15,5 @@ BBCLASSEXTEND = "native" EXTRA_OECONF += "--disable-selective-werror" -SRC_URI[md5sum] = "12610df19df2af3797f2c130ee2bce97" -SRC_URI[sha256sum] = "6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424" +SRC_URI[md5sum] = "6e4751d99373f85d459ab4dff28893f5" +SRC_URI[sha256sum] = "06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:03 +0000 Subject: [oe-commits] [openembedded-core] 20/28: qemu: update Xen packages names for the xen-tools recipe In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.830EF232902@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e7a7ce0999de3c562e7288538641087cf6d55d1f Author: Christopher Clark AuthorDate: Wed Mar 4 15:17:24 2020 -0800 qemu: update Xen packages names for the xen-tools recipe The Xen recipe has been divided into separate recipes for the hypervisor and tools in meta-virtualization commit 545461ba, so the package name references in the qemu recipe need to be updated to the new xen-tools packages. This change allows the temporary bbappend applied to qemu in meta-virtualization in that change to be retired. Signed-off-by: Christopher Clark Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f26e722..f3342ea 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -136,7 +136,7 @@ PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," -PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen,xen-libxenstore xen-libxenctrl xen-libxenguest" +PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen-tools,xen-tools-libxenstore xen-tools-libxenctrl xen-tools-libxenguest" PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl," PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg," PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:01 +0000 Subject: [oe-commits] [openembedded-core] 18/28: python-numpy: convert shebang from python to python3 In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.5F5C32328D2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit dc1e84d343a47d67b5aed28542031b173828cc71 Author: Changqing Li AuthorDate: Thu Mar 5 12:58:25 2020 +0800 python-numpy: convert shebang from python to python3 Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- ...01-convert-shebang-from-python-to-python3.patch | 579 +++++++++++++++++++++ .../recipes-devtools/python-numpy/python-numpy.inc | 1 + 2 files changed, 580 insertions(+) diff --git a/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch b/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch new file mode 100644 index 0000000..b86e131 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch @@ -0,0 +1,579 @@ +From c53237f90e4a3a435a20517552186d394d6d09c8 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 5 Mar 2020 12:02:35 +0800 +Subject: [PATCH] convert shebang from python to python3 + +Upstream-Status: Backport +[https://github.com/numpy/numpy/commit/583901a074dc65145d3d6136ba7dcd02634d680b] + +Signed-off-by: Changqing Li +--- + doc/DISTUTILS.rst.txt | 2 +- + doc/cdoc/numpyfilter.py | 2 +- + doc/postprocess.py | 2 +- + doc/summarize.py | 2 +- + numpy/distutils/conv_template.py | 2 +- + numpy/distutils/cpuinfo.py | 2 +- + numpy/distutils/from_template.py | 2 +- + numpy/distutils/setup.py | 2 +- + numpy/distutils/system_info.py | 2 +- + numpy/f2py/__init__.py | 2 +- + numpy/f2py/auxfuncs.py | 2 +- + numpy/f2py/capi_maps.py | 2 +- + numpy/f2py/cb_rules.py | 2 +- + numpy/f2py/cfuncs.py | 2 +- + numpy/f2py/common_rules.py | 2 +- + numpy/f2py/crackfortran.py | 2 +- + numpy/f2py/diagnose.py | 2 +- + numpy/f2py/f2py2e.py | 2 +- + numpy/f2py/f90mod_rules.py | 2 +- + numpy/f2py/func2subr.py | 2 +- + numpy/f2py/rules.py | 2 +- + numpy/f2py/setup.py | 2 +- + numpy/f2py/use_rules.py | 2 +- + numpy/linalg/lapack_lite/clapack_scrub.py | 2 +- + numpy/linalg/lapack_lite/make_lite.py | 2 +- + numpy/ma/bench.py | 2 +- + numpy/ma/setup.py | 2 +- + numpy/matrixlib/setup.py | 2 +- + numpy/random/examples/cython/extending.pyx | 2 +- + numpy/random/examples/cython/extending_distributions.pyx | 2 +- + numpy/setup.py | 2 +- + numpy/testing/print_coercion_tables.py | 2 +- + numpy/testing/setup.py | 2 +- + runtests.py | 2 +- + setup.py | 2 +- + tools/c_coverage/c_coverage_report.py | 2 +- + tools/changelog.py | 2 +- + tools/ci/push_docs_to_repo.py | 2 +- + tools/cythonize.py | 2 +- + tools/find_deprecated_escaped_characters.py | 2 +- + tools/refguide_check.py | 2 +- + tools/swig/test/setup.py | 2 +- + tools/swig/test/testArray.py | 2 +- + tools/swig/test/testFarray.py | 2 +- + tools/swig/test/testFlat.py | 2 +- + tools/swig/test/testFortran.py | 2 +- + tools/swig/test/testMatrix.py | 2 +- + tools/swig/test/testSuperTensor.py | 2 +- + tools/swig/test/testTensor.py | 2 +- + tools/swig/test/testVector.py | 2 +- + tools/test-installed-numpy.py | 2 +- + 51 files changed, 51 insertions(+), 51 deletions(-) + +diff --git a/doc/DISTUTILS.rst.txt b/doc/DISTUTILS.rst.txt +index eadde63..2402110 100644 +--- a/doc/DISTUTILS.rst.txt ++++ b/doc/DISTUTILS.rst.txt +@@ -59,7 +59,7 @@ SciPy pure Python package example + + Below is an example of a minimal ``setup.py`` file for a pure SciPy package:: + +- #!/usr/bin/env python ++ #!/usr/bin/env python3 + def configuration(parent_package='',top_path=None): + from numpy.distutils.misc_util import Configuration + config = Configuration('mypackage',parent_package,top_path) +diff --git a/doc/cdoc/numpyfilter.py b/doc/cdoc/numpyfilter.py +index 0ec5069..067bd36 100755 +--- a/doc/cdoc/numpyfilter.py ++++ b/doc/cdoc/numpyfilter.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + numpyfilter.py INPUTFILE + +diff --git a/doc/postprocess.py b/doc/postprocess.py +index 2e50c11..1be6f39 100755 +--- a/doc/postprocess.py ++++ b/doc/postprocess.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + %prog MODE FILES... + +diff --git a/doc/summarize.py b/doc/summarize.py +index cfce271..563af02 100755 +--- a/doc/summarize.py ++++ b/doc/summarize.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + summarize.py + +diff --git a/numpy/distutils/conv_template.py b/numpy/distutils/conv_template.py +index 3bcb7b8..88432c8 100644 +--- a/numpy/distutils/conv_template.py ++++ b/numpy/distutils/conv_template.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + takes templated file .xxx.src and produces .xxx file where .xxx is + .i or .c or .h, using the following template rules +diff --git a/numpy/distutils/cpuinfo.py b/numpy/distutils/cpuinfo.py +index 5802993..7f6742e 100644 +--- a/numpy/distutils/cpuinfo.py ++++ b/numpy/distutils/cpuinfo.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + cpuinfo + +diff --git a/numpy/distutils/from_template.py b/numpy/distutils/from_template.py +index c5c1163..af75971 100644 +--- a/numpy/distutils/from_template.py ++++ b/numpy/distutils/from_template.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + process_file(filename) +diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py +index 82a53bd..646921b 100644 +--- a/numpy/distutils/setup.py ++++ b/numpy/distutils/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + def configuration(parent_package='',top_path=None): +diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py +index f94dce1..df526f6 100644 +--- a/numpy/distutils/system_info.py ++++ b/numpy/distutils/system_info.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + This file defines a set of system_info classes for getting + information about various resources (libraries, library directories, +diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py +index d146739..0a83b99 100644 +--- a/numpy/f2py/__init__.py ++++ b/numpy/f2py/__init__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Fortran to Python Interface Generator. + + """ +diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py +index 404bdbd..d23d959 100644 +--- a/numpy/f2py/auxfuncs.py ++++ b/numpy/f2py/auxfuncs.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Auxiliary functions for f2py2e. +diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py +index c41dd77..a3e2dc2 100644 +--- a/numpy/f2py/capi_maps.py ++++ b/numpy/f2py/capi_maps.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Copyright 1999,2000 Pearu Peterson all rights reserved, +diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py +index 183d7c2..93e93fe 100644 +--- a/numpy/f2py/cb_rules.py ++++ b/numpy/f2py/cb_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build call-back mechanism for f2py2e. +diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py +index d59b630..3847745 100644 +--- a/numpy/f2py/cfuncs.py ++++ b/numpy/f2py/cfuncs.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + C declarations, CPP macros, and C functions for f2py2e. +diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py +index 62c1ba2..c1825d4 100644 +--- a/numpy/f2py/common_rules.py ++++ b/numpy/f2py/common_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build common block mechanism for f2py2e. +diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py +index 2aaf5d7..fb5ef2f 100755 +--- a/numpy/f2py/crackfortran.py ++++ b/numpy/f2py/crackfortran.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + crackfortran --- read fortran (77,90) code and extract declaration information. + +diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py +index 0241fed..6c0304c 100644 +--- a/numpy/f2py/diagnose.py ++++ b/numpy/f2py/diagnose.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + import os +diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py +index 110337f..c0789f6 100755 +--- a/numpy/f2py/f2py2e.py ++++ b/numpy/f2py/f2py2e.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + f2py2e - Fortran to Python C/API generator. 2nd Edition. +diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py +index 85eae80..70be128 100644 +--- a/numpy/f2py/f90mod_rules.py ++++ b/numpy/f2py/f90mod_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build F90 module support for f2py2e. +diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py +index 6010d5a..fdea0c2 100644 +--- a/numpy/f2py/func2subr.py ++++ b/numpy/f2py/func2subr.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Rules for building C/API module with f2py2e. +diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py +index 1b41498..790d197 100755 +--- a/numpy/f2py/rules.py ++++ b/numpy/f2py/rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Rules for building C/API module with f2py2e. +diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py +index c0c50ce..044c9f2 100644 +--- a/numpy/f2py/setup.py ++++ b/numpy/f2py/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + setup.py for installing F2PY + +diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py +index 6f44f16..8214f42 100644 +--- a/numpy/f2py/use_rules.py ++++ b/numpy/f2py/use_rules.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + + Build 'use others module data' mechanism for f2py2e. +diff --git a/numpy/linalg/lapack_lite/clapack_scrub.py b/numpy/linalg/lapack_lite/clapack_scrub.py +index 4345861..91e66e7 100644 +--- a/numpy/linalg/lapack_lite/clapack_scrub.py ++++ b/numpy/linalg/lapack_lite/clapack_scrub.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + import sys, os +diff --git a/numpy/linalg/lapack_lite/make_lite.py b/numpy/linalg/lapack_lite/make_lite.py +index 61102d6..0211f4e 100755 +--- a/numpy/linalg/lapack_lite/make_lite.py ++++ b/numpy/linalg/lapack_lite/make_lite.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + Usage: make_lite.py + +diff --git a/numpy/ma/bench.py b/numpy/ma/bench.py +index a9ba42d..a377436 100644 +--- a/numpy/ma/bench.py ++++ b/numpy/ma/bench.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from __future__ import division, print_function +diff --git a/numpy/ma/setup.py b/numpy/ma/setup.py +index d1d6c89..a04b79b 100644 +--- a/numpy/ma/setup.py ++++ b/numpy/ma/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + def configuration(parent_package='',top_path=None): +diff --git a/numpy/matrixlib/setup.py b/numpy/matrixlib/setup.py +index d0981d6..57534d1 100644 +--- a/numpy/matrixlib/setup.py ++++ b/numpy/matrixlib/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + def configuration(parent_package='', top_path=None): +diff --git a/numpy/random/examples/cython/extending.pyx b/numpy/random/examples/cython/extending.pyx +index a6a4ba4..33f28f9 100644 +--- a/numpy/random/examples/cython/extending.pyx ++++ b/numpy/random/examples/cython/extending.pyx +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + #cython: language_level=3 + + from libc.stdint cimport uint32_t +diff --git a/numpy/random/examples/cython/extending_distributions.pyx b/numpy/random/examples/cython/extending_distributions.pyx +index 3cefec9..7a526ab 100644 +--- a/numpy/random/examples/cython/extending_distributions.pyx ++++ b/numpy/random/examples/cython/extending_distributions.pyx +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + #cython: language_level=3 + """ + This file shows how the distributions that are accessed through +diff --git a/numpy/setup.py b/numpy/setup.py +index 4ccdaee..db06c82 100644 +--- a/numpy/setup.py ++++ b/numpy/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + +diff --git a/numpy/testing/print_coercion_tables.py b/numpy/testing/print_coercion_tables.py +index 3a359f4..a9c5363 100755 +--- a/numpy/testing/print_coercion_tables.py ++++ b/numpy/testing/print_coercion_tables.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Prints type-coercion tables for the built-in NumPy types + + """ +diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py +index 7c3f2fb..bd315ee 100755 +--- a/numpy/testing/setup.py ++++ b/numpy/testing/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + +diff --git a/runtests.py b/runtests.py +index 23245ae..cafdb92 100755 +--- a/runtests.py ++++ b/runtests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + runtests.py [OPTIONS] [-- ARGS] + +diff --git a/setup.py b/setup.py +index a205913..010884f 100755 +--- a/setup.py ++++ b/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ NumPy is the fundamental package for array computing with Python. + + It provides: +diff --git a/tools/c_coverage/c_coverage_report.py b/tools/c_coverage/c_coverage_report.py +index 327f6dc..8837684 100755 +--- a/tools/c_coverage/c_coverage_report.py ++++ b/tools/c_coverage/c_coverage_report.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + A script to create C code-coverage reports based on the output of + valgrind's callgrind tool. +diff --git a/tools/changelog.py b/tools/changelog.py +index b135b14..5d8b33c 100755 +--- a/tools/changelog.py ++++ b/tools/changelog.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- encoding:utf-8 -*- + """ + Script to generate contributor and pull request lists +diff --git a/tools/ci/push_docs_to_repo.py b/tools/ci/push_docs_to_repo.py +index a989668..ae53054 100755 +--- a/tools/ci/push_docs_to_repo.py ++++ b/tools/ci/push_docs_to_repo.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + import argparse + import subprocess +diff --git a/tools/cythonize.py b/tools/cythonize.py +index c81b72d..c1d4384 100755 +--- a/tools/cythonize.py ++++ b/tools/cythonize.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ cythonize + + Cythonize pyx files into C files as needed. +diff --git a/tools/find_deprecated_escaped_characters.py b/tools/find_deprecated_escaped_characters.py +index 6f90001..10e0378 100644 +--- a/tools/find_deprecated_escaped_characters.py ++++ b/tools/find_deprecated_escaped_characters.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + r""" + Look for escape sequences deprecated in Python 3.6. + +diff --git a/tools/refguide_check.py b/tools/refguide_check.py +index c208072..798e322 100644 +--- a/tools/refguide_check.py ++++ b/tools/refguide_check.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + refguide_check.py [OPTIONS] [-- ARGS] + +diff --git a/tools/swig/test/setup.py b/tools/swig/test/setup.py +index 4ff870e..f8f05e6 100755 +--- a/tools/swig/test/setup.py ++++ b/tools/swig/test/setup.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + # System imports +diff --git a/tools/swig/test/testArray.py b/tools/swig/test/testArray.py +index 8d9c797..54ffe71 100755 +--- a/tools/swig/test/testArray.py ++++ b/tools/swig/test/testArray.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testFarray.py b/tools/swig/test/testFarray.py +index 0037dc9..bedf384 100755 +--- a/tools/swig/test/testFarray.py ++++ b/tools/swig/test/testFarray.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testFlat.py b/tools/swig/test/testFlat.py +index 71be277..55034bf 100755 +--- a/tools/swig/test/testFlat.py ++++ b/tools/swig/test/testFlat.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testFortran.py b/tools/swig/test/testFortran.py +index 426e894..0f7d0e6 100644 +--- a/tools/swig/test/testFortran.py ++++ b/tools/swig/test/testFortran.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testMatrix.py b/tools/swig/test/testMatrix.py +index 065be0d..854a23c 100755 +--- a/tools/swig/test/testMatrix.py ++++ b/tools/swig/test/testMatrix.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testSuperTensor.py b/tools/swig/test/testSuperTensor.py +index 97fe80c..31b63d0 100644 +--- a/tools/swig/test/testSuperTensor.py ++++ b/tools/swig/test/testSuperTensor.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, print_function + + # System imports +diff --git a/tools/swig/test/testTensor.py b/tools/swig/test/testTensor.py +index ac1b749..f47d9e8 100755 +--- a/tools/swig/test/testTensor.py ++++ b/tools/swig/test/testTensor.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/swig/test/testVector.py b/tools/swig/test/testVector.py +index 45e763b..067b922 100755 +--- a/tools/swig/test/testVector.py ++++ b/tools/swig/test/testVector.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # System imports +diff --git a/tools/test-installed-numpy.py b/tools/test-installed-numpy.py +index 5240253..fd7541c 100755 +--- a/tools/test-installed-numpy.py ++++ b/tools/test-installed-numpy.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + from __future__ import division, absolute_import, print_function + + # A simple script to test the installed version of numpy by calling +-- +2.7.4 + diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc index 8413434..42032a0 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy.inc +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc @@ -8,6 +8,7 @@ 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 \ + file://0001-convert-shebang-from-python-to-python3.patch \ " SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0" SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:08 +0000 Subject: [oe-commits] [openembedded-core] 25/28: netbase: Upgrade to 6.1 In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.D76C323282B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 983733fa2e84db81c4a1e9bb8e3e22c43d2f8a5e Author: Mingli Yu AuthorDate: Thu Mar 5 18:02:57 2020 +0800 netbase: Upgrade to 6.1 Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-core/netbase/{netbase_6.0.bb => netbase_6.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/netbase/netbase_6.0.bb b/meta/recipes-core/netbase/netbase_6.1.bb similarity index 82% rename from meta/recipes-core/netbase/netbase_6.0.bb rename to meta/recipes-core/netbase/netbase_6.1.bb index 2fb5762..bc0049c 100644 --- a/meta/recipes-core/netbase/netbase_6.0.bb +++ b/meta/recipes-core/netbase/netbase_6.1.bb @@ -8,8 +8,8 @@ PE = "1" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" -SRC_URI[md5sum] = "3417b0487161f1a2b070a3308cd7f957" -SRC_URI[sha256sum] = "692baeb7b76eba5580c7edbc97ce1784a06b5aa4b367c5ed0b39e0ce7a97d594" +SRC_URI[md5sum] = "e5871a3a5c8390557b8033cf19316a55" +SRC_URI[sha256sum] = "084d743bd84d4d9380bac4c71c51e57406dce44f5a69289bb823c903e9b035d8" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" do_install () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:04 +0000 Subject: [oe-commits] [openembedded-core] 21/28: babeltrace2: added first version, 2.0.1 In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.936A123283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit be52889ba5e5a2cf02f50b3f3acee8ca72ec494d Author: Anders Wallin AuthorDate: Thu Mar 5 13:06:29 2020 +0100 babeltrace2: added first version, 2.0.1 Babeltrace 1 vs. Babeltrace 2 The Babeltrace project exists since 2010. In 2020, Babeltrace 2 was released. Babeltrace 2 is a complete rewrite of the library, Python bindings, and CLI. It is plugin based and offers much more features and potential than Babeltrace 1. Because Babeltrace 2 is still a young released project, some distributions still provide packages for the Babeltrace 1 project. Both projects can coexist on the same system as there are no common installed files. Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 1 + meta/conf/distro/include/maintainers.inc | 1 + meta/conf/distro/include/ptest-packagelists.inc | 1 + .../packagegroup-core-tools-profile.bb | 2 + ...s-do-not-run-test-applications-from-.libs.patch | 28 +++++++ meta/recipes-kernel/lttng/babeltrace2/run-ptest | 9 +++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 92 ++++++++++++++++++++++ 7 files changed, 134 insertions(+) diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 79ebcae..0e4a9a9 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -15,6 +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-babeltrace2 = "OSPDT" 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" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 10095ff..adb1822 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -59,6 +59,7 @@ RECIPE_MAINTAINER_pn-automake = "Robert Yang " RECIPE_MAINTAINER_pn-avahi = "Yi Zhao " RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao " RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-babeltrace2 = "Alexander Kanavin " RECIPE_MAINTAINER_pn-base-files = "Anuj Mittal " RECIPE_MAINTAINER_pn-base-passwd = "Anuj Mittal " RECIPE_MAINTAINER_pn-bash = "Hongxu Jia " diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 4afac58..d6f3aaf 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -64,6 +64,7 @@ PTESTS_FAST = "\ PTESTS_SLOW = "\ babeltrace-ptest \ + babeltrace2-ptest \ busybox-ptest \ dbus-test-ptest \ e2fsprogs-ptest \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 984c2fa..ac180b5 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -46,6 +46,7 @@ LTTNGMODULES = "lttng-modules" LTTNGMODULES_arc = "" BABELTRACE = "babeltrace" +BABELTRACE2 = "babeltrace2" # valgrind does not work on the following configurations/architectures @@ -69,6 +70,7 @@ RDEPENDS_${PN} = "\ ${LTTNGTOOLS} \ ${LTTNGMODULES} \ ${BABELTRACE} \ + ${BABELTRACE2} \ ${SYSTEMTAP} \ ${VALGRIND} \ " diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch new file mode 100644 index 0000000..805dde8 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-tests-do-not-run-test-applications-from-.libs.patch @@ -0,0 +1,28 @@ +From 582713cc9a013481eeef253195d644020f637ec4 Mon Sep 17 00:00:00 2001 +Message-Id: <582713cc9a013481eeef253195d644020f637ec4.1583403622.git.wallinux at gmail.com> +From: Anders Wallin +Date: Thu, 5 Mar 2020 11:20:04 +0100 +Subject: [PATCH] tests: do not run test applications from .libs + +Cross compile specific change + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Anders Wallin +--- + tests/lib/test_plugin | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin +index 652c90cc..1f817c50 100755 +--- a/tests/lib/test_plugin ++++ b/tests/lib/test_plugin +@@ -26,4 +26,4 @@ fi + # shellcheck source=../utils/utils.sh + source "$UTILSSH" + +-"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" ++"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins" +-- +2.25.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2/run-ptest b/meta/recipes-kernel/lttng/babeltrace2/run-ptest new file mode 100755 index 0000000..72fe223 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/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 abs_top_srcdir=$PWD abs_top_builddir=$PWD GREP=grep SED=sed PYTHON=python3" + +exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb new file mode 100644 index 0000000..16953d6 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -0,0 +1,92 @@ +SUMMARY = "Babeltrace2 - 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://babeltrace.org/" +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" +LICENSE = "MIT & GPLv2 & LGPLv2.1 & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" + +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" + +SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ + file://run-ptest \ + file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + " +SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +EXTRA_OECONF = "--disable-debug-info" + +PACKAGECONFIG ??= "manpages" +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" + +FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" +FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" + +ASNEEDED = "" + +RDEPENDS_${PN}-ptest += "bash gawk python3" + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + install -d "${D}${PTEST_PATH}/tests" + + # Copy required files from source directory + for d in $(find "${S}/tests" -type d -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${S}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + find "${S}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.py \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.expect \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" + cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/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 + + # 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 '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Substitute links to installed binaries. + install -d "${D}${PTEST_PATH}/src/cli/" + ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/ + + # Remove architechture specific testfiles + rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:09 +0000 Subject: [oe-commits] [openembedded-core] 26/28: oeqa-runtime: add missing import os to ptest case In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081945.E6A6723282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e41c92c60694052c8292c1ea6b3d0b427aafafd7 Author: Stefan Kral AuthorDate: Thu Mar 5 20:30:00 2020 +0100 oeqa-runtime: add missing import os to ptest case Add missing import os statement to the oeqa runtime ptest.py Signed-off-by: Stefan Kral Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/ptest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py index 5626f70..99a44f0 100644 --- a/meta/lib/oeqa/runtime/cases/ptest.py +++ b/meta/lib/oeqa/runtime/cases/ptest.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: MIT # +import os import unittest import pprint import datetime -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:10 +0000 Subject: [oe-commits] [openembedded-core] 27/28: pulseaudio: Fix inline assembly syntax for arm In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081946.0176523282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 03e6d0f787cbd62156a163bfbcaed68bfcd379e8 Author: Khem Raj AuthorDate: Thu Mar 5 13:18:55 2020 -0800 pulseaudio: Fix inline assembly syntax for arm Ensures that gcc can use right operand constraints Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...1-remap-arm-Adjust-inline-asm-constraints.patch | 114 +++++++++++++++++++++ .../pulseaudio/pulseaudio_13.0.bb | 1 + 2 files changed, 115 insertions(+) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-remap-arm-Adjust-inline-asm-constraints.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-remap-arm-Adjust-inline-asm-constraints.patch new file mode 100644 index 0000000..95133fd --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-remap-arm-Adjust-inline-asm-constraints.patch @@ -0,0 +1,114 @@ +From 3450d1fcfe8a8f84553ab299cd96ae0705ddffbe Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 5 Mar 2020 11:48:28 -0800 +Subject: [PATCH] remap/arm: Adjust inline asm constraints + +gcc10 can effectively emit single precision registers if right +operand modifier constraint is not in use + +This results in assembler rejecting the code + +/tmp/ccEG4QpI.s:646: Error: VFP/Neon double precision register expected -- `vtbl.8 d3,{d0,d1},s8' +/tmp/ccEG4QpI.s:678: Error: invalid instruction shape -- `vmul.f32 d0,d0,s8' + +Therefore add %P qualifier to request double registers sinece 'w' could +mean variable could be stored in s0..s14 and GCC defaults to printing out s0..s14. +Note those registers map to d0..d7 also. + +Output generated is exactly same with gcc9, and it also now compiles +with gcc10 + +Its not documented well in gcc docs and there is a ticket for that +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84343 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/261] +Signed-off-by: Khem Raj +--- + src/pulsecore/remap_neon.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/pulsecore/remap_neon.c b/src/pulsecore/remap_neon.c +index 41208986d..ca3b95b48 100644 +--- a/src/pulsecore/remap_neon.c ++++ b/src/pulsecore/remap_neon.c +@@ -189,7 +189,7 @@ static void remap_ch4_to_mono_float32ne_neon(pa_remap_t *m, float *dst, const fl + "vadd.f32 d0, d0, d1 \n\t" + "vadd.f32 d2, d2, d3 \n\t" + "vadd.f32 d0, d0, d2 \n\t" +- "vmul.f32 d0, d0, %[quart] \n\t" ++ "vmul.f32 d0, d0, %P[quart] \n\t" + "vst1.32 {d0}, [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [quart] "w" (quart) /* input operands */ +@@ -276,7 +276,7 @@ static void remap_arrange_stereo_s16ne_neon(pa_remap_t *m, int16_t *dst, const i + for (; n >= 2; n -= 2) { + __asm__ __volatile__ ( + "vld1.s16 d0, [%[src]]! \n\t" +- "vtbl.8 d0, {d0}, %[t] \n\t" ++ "vtbl.8 d0, {d0}, %P[t] \n\t" + "vst1.s16 d0, [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [t] "w" (t) /* input operands */ +@@ -287,7 +287,7 @@ static void remap_arrange_stereo_s16ne_neon(pa_remap_t *m, int16_t *dst, const i + if (n > 0) { + __asm__ __volatile__ ( + "vld1.32 d0[0], [%[src]]! \n\t" +- "vtbl.8 d0, {d0}, %[t] \n\t" ++ "vtbl.8 d0, {d0}, %P[t] \n\t" + "vst1.32 d0[0], [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [t] "w" (t) /* input operands */ +@@ -302,8 +302,8 @@ static void remap_arrange_ch2_ch4_s16ne_neon(pa_remap_t *m, int16_t *dst, const + for (; n > 0; n--) { + __asm__ __volatile__ ( + "vld1.32 d0[0], [%[src]]! \n\t" +- "vtbl.8 d0, {d0}, %[t] \n\t" +- "vst1.s16 d0, [%[dst]]! \n\t" ++ "vtbl.8 d0, {d0}, %P[t] \n\t" ++ "vst1.s16 d0, [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [t] "w" (t) /* input operands */ + : "memory", "d0" /* clobber list */ +@@ -317,7 +317,7 @@ static void remap_arrange_ch4_s16ne_neon(pa_remap_t *m, int16_t *dst, const int1 + for (; n > 0; n--) { + __asm__ __volatile__ ( + "vld1.s16 d0, [%[src]]! \n\t" +- "vtbl.8 d0, {d0}, %[t] \n\t" ++ "vtbl.8 d0, {d0}, %P[t] \n\t" + "vst1.s16 d0, [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [t] "w" (t) /* input operands */ +@@ -332,7 +332,7 @@ static void remap_arrange_stereo_float32ne_neon(pa_remap_t *m, float *dst, const + for (; n > 0; n--) { + __asm__ __volatile__ ( + "vld1.f32 d0, [%[src]]! \n\t" +- "vtbl.8 d0, {d0}, %[t] \n\t" ++ "vtbl.8 d0, {d0}, %P[t] \n\t" + "vst1.s16 {d0}, [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [t] "w" (t) /* input operands */ +@@ -349,8 +349,8 @@ static void remap_arrange_ch2_ch4_any32ne_neon(pa_remap_t *m, float *dst, const + for (; n > 0; n--) { + __asm__ __volatile__ ( + "vld1.f32 d0, [%[src]]! \n\t" +- "vtbl.8 d1, {d0}, %[t0] \n\t" +- "vtbl.8 d2, {d0}, %[t1] \n\t" ++ "vtbl.8 d1, {d0}, %P[t0] \n\t" ++ "vtbl.8 d2, {d0}, %P[t1] \n\t" + "vst1.s16 {d1,d2}, [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [t0] "w" (t0), [t1] "w" (t1) /* input operands */ +@@ -366,8 +366,8 @@ static void remap_arrange_ch4_float32ne_neon(pa_remap_t *m, float *dst, const fl + for (; n > 0; n--) { + __asm__ __volatile__ ( + "vld1.f32 {d0,d1}, [%[src]]! \n\t" +- "vtbl.8 d2, {d0,d1}, %[t0] \n\t" +- "vtbl.8 d3, {d0,d1}, %[t1] \n\t" ++ "vtbl.8 d2, {d0,d1}, %P[t0] \n\t" ++ "vtbl.8 d3, {d0,d1}, %P[t1] \n\t" + "vst1.s16 {d2,d3}, [%[dst]]! \n\t" + : [dst] "+r" (dst), [src] "+r" (src) /* output operands */ + : [t0] "w" (t0), [t1] "w" (t1) /* input operands */ +-- +2.25.1 + diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb index 7f8ebc2..601499b 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_13.0.bb @@ -3,6 +3,7 @@ require pulseaudio.inc SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-client-conf-Add-allow-autospawn-for-root.patch \ file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \ + file://0001-remap-arm-Adjust-inline-asm-constraints.patch \ file://volatiles.04_pulse \ " SRC_URI[md5sum] = "e41d606f90254ed45c90520faf83d95c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:11 +0000 Subject: [oe-commits] [openembedded-core] 28/28: libdnf: fix deprecation warning In-Reply-To: <158348278390.9210.10318185258038528641@git.openembedded.org> References: <158348278390.9210.10318185258038528641@git.openembedded.org> Message-ID: <20200306081946.0D2B123281B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bc9402d77a982ff71bd919837b4736f586aa04cf Author: Joe Slater AuthorDate: Thu Mar 5 14:04:54 2020 -0800 libdnf: fix deprecation warning Backport from libdnf. Fix is in version 0.35.2. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- .../libdnf/libdnf/fix-deprecation-warning.patch | 71 ++++++++++++++++++++++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 2 files changed, 72 insertions(+) diff --git a/meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch b/meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch new file mode 100644 index 0000000..3a3e02f --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch @@ -0,0 +1,71 @@ +From 66d9b2ba3fbc7b04f2b5ad9d0e5371340c037b5f Mon Sep 17 00:00:00 2001 +From: Marek Blaha +Date: Wed, 10 Jul 2019 10:11:01 +0200 +Subject: [oe-core][PATCH 1/1] Fix Python 3.8 deprecation warning + (RhBug:1724244) + +This deprecation warning was introduced in Python 3.8 by +https://bugs.python.org/issue36381: + +/usr/lib/python3.8/site-packages/dnf/package.py:57: DeprecationWarning: PY_SSIZE_T_CLEAN will be required for '#' formats + return super(Package, self).chksum + +https://bugzilla.redhat.com/show_bug.cgi?id=1724244 +--- + python/hawkey/package-py.cpp | 3 ++- + python/hawkey/packagedelta-py.cpp | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) +--- + +Unchanged. Appears in version 0.35.2. + +Upstream-Status: Backport [git://github.com/rpm-software-management/libdnf.git] + +Signed-off-by: Joe Slater + + +diff --git a/python/hawkey/package-py.cpp b/python/hawkey/package-py.cpp +index 5102bba..68e03cb 100644 +--- a/python/hawkey/package-py.cpp ++++ b/python/hawkey/package-py.cpp +@@ -18,6 +18,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#define PY_SSIZE_T_CLEAN + #include + #include + +@@ -251,7 +252,7 @@ get_chksum(_PackageObject *self, void *closure) + #if PY_MAJOR_VERSION < 3 + res = Py_BuildValue("is#", type, cs, checksum_length); + #else +- res = Py_BuildValue("iy#", type, cs, checksum_length); ++ res = Py_BuildValue("iy#", type, cs, (Py_ssize_t)checksum_length); + #endif + + return res; +diff --git a/python/hawkey/packagedelta-py.cpp b/python/hawkey/packagedelta-py.cpp +index ca1cb7d..1a64836 100644 +--- a/python/hawkey/packagedelta-py.cpp ++++ b/python/hawkey/packagedelta-py.cpp +@@ -18,6 +18,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#define PY_SSIZE_T_CLEAN + #include + + // hawkey +@@ -92,7 +93,7 @@ get_chksum(_PackageDeltaObject *self, void *closure) + #if PY_MAJOR_VERSION < 3 + res = Py_BuildValue("is#", type, cs, checksum_length); + #else +- res = Py_BuildValue("iy#", type, cs, checksum_length); ++ res = Py_BuildValue("iy#", type, cs, (Py_ssize_t)checksum_length); + #endif + + return res; +-- +2.7.4 + diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index d498347..163a2ee 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -8,6 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://0001-Add-WITH_TESTS-option.patch \ file://0001-include-stdexcept-for-runtime_error.patch \ + file://fix-deprecation-warning.patch \ " SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:33 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (9ab928d4 -> ca5b82d) Message-ID: <158348283359.11953.16618898863050409243@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 9ab928d4 netbase: Upgrade to 6.1 discard c6bd6ed xkbcomp: upgrade 1.4.2 -> 1.4.3 discard 48fcfcc openssl: pass PERL=perl environment variable to configurator discard 7b5ca3d mesa: updated to 20.0 release discard e9e3f0d babeltrace2: added first version, 2.0.1 discard a450261 qemu: update Xen packages names for the xen-tools recipe discard eea77ff dnf: fix python3 syntax warning discard c8282627 python-numpy: convert shebang from python to python3 discard a764f25 gdbm: Disable readlind discard 3d9f7d3 sstate: Drop obsolete check in hash validation discard 17e1ec4 linux-yocto: drop 5.2 recipes discard c4cdb45 linux-yocto/5.4: update to v5.4.23 discard d198ef8 linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT discard f34002a linux-yocto/5.2: backport perf build fix for latest binutils discard b97a56a python3-native: Should not search the system for headers/libraries. discard b069032 linux-firmware: use 'make install' for installation discard 541cd92 kernel-yocto.bbclass: fix a wrong inter-task dependency discard e9cc06f buildtools-extended-tarball: add nativesdk-libxcrypt-dev discard f87052a classes/kernel.bbclass: Fix parsing errors discard 21ed74e libmodule-build-perl: make it reproducible discard 72deeb7 blktrace: modify two scripts for python3 discard 9ff819b libuv: move from meta-oe to core for bind update discard 7689182 bitbake.conf: omit XZ threads and RAM from sstate signatures discard 08e7c4b bitbake.conf: more deterministic xz compression (threads) discard 3b91800 lib/oe/utils: allow to set a lower bound on returned cpu_count() discard 30823ad babeltrace: only check latest git tag version for 1.x.x discard 4ac97e5 test discard c620df9 qemuarm64: Add -machine gic-version=3 with kvm discard 3a7fc96 HACK: extra debug discard c1a8f46 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 93e3af1 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 29cfcdd HACK: signing: Add extra test debug discard b5f595b glew/curl: specify exclusive package configs discard b5bfee3 base.bbclass: extend PACKAGECONFIG for conflict package configs add 0616a5d babeltrace: only check latest git tag version for 1.x.x add c6dda20 lib/oe/utils: allow to set a lower bound on returned cpu_count() add d96aa85 bitbake.conf: more deterministic xz compression (threads) add 7927d5f bitbake.conf: omit XZ threads and RAM from sstate signatures add 2c0ca46 blktrace: modify two scripts for python3 add 7f58aed libmodule-build-perl: make it reproducible add 9bff4d1 classes/kernel.bbclass: Fix parsing errors add da948b2 buildtools-extended-tarball: add nativesdk-libxcrypt-dev add 965090f kernel-yocto.bbclass: fix a wrong inter-task dependency add 8764cc8 linux-firmware: use 'make install' for installation add 456a143 linux-firmware: install / package all license files again add f37dfc7 python3-native: Should not search the system for headers/libraries. add 14a338d linux-yocto/5.2: backport perf build fix for latest binutils add add2cd5 linux-yocto: common-pc-drivers.cfg: add CONFIG_INPUT_UINPUT add aef9438 linux-yocto/5.4: update to v5.4.23 add e71cda6 linux-yocto: drop 5.2 recipes add 5a9f81f gdbm: Disable readlind add dc1e84d python-numpy: convert shebang from python to python3 add 0870009 dnf: fix python3 syntax warning add e7a7ce0 qemu: update Xen packages names for the xen-tools recipe add be52889 babeltrace2: added first version, 2.0.1 add 0ee03e1 mesa: updated to 20.0 release add 2b087fe openssl: pass PERL=perl environment variable to configurator add cfe8461 xkbcomp: upgrade 1.4.2 -> 1.4.3 add 983733f netbase: Upgrade to 6.1 add e41c92c oeqa-runtime: add missing import os to ptest case add 03e6d0f pulseaudio: Fix inline assembly syntax for arm add bc9402d libdnf: fix deprecation warning new 2d3028e base.bbclass: extend PACKAGECONFIG for conflict package configs new 0a16ba6 glew/curl: specify exclusive package configs new 85927c9 HACK: signing: Add extra test debug new e0ca4c7 sstatesig: Log timestamps for hashequiv in reprodubile builds new 3a85171 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 8aacc70 HACK: extra debug new d2ac043 qemuarm64: Add -machine gic-version=3 with kvm new 520b748 test new 9248bca libuv: move from meta-oe to core for bind update new ca5b82d sstate: Drop obsolete check in hash validation 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 (9ab928d4) \ N -- N -- N refs/heads/master-next (ca5b82d) 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/lib/oeqa/runtime/cases/ptest.py | 1 + .../libdnf/libdnf/fix-deprecation-warning.patch | 71 +++++++++++++ meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + .../linux-firmware/linux-firmware_20200122.bb | 1 + ...1-remap-arm-Adjust-inline-asm-constraints.patch | 114 +++++++++++++++++++++ .../pulseaudio/pulseaudio_13.0.bb | 1 + 6 files changed, 189 insertions(+) create mode 100644 meta/recipes-devtools/libdnf/libdnf/fix-deprecation-warning.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-remap-arm-Adjust-inline-asm-constraints.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:36 +0000 Subject: [oe-commits] [openembedded-core] 03/10: HACK: signing: Add extra test debug In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082033.F103C232830@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 85927c965cbe6885668343409200fe96c05caf90 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 Mar 6 08:20:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:34 +0000 Subject: [oe-commits] [openembedded-core] 01/10: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082033.DC24923282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2d3028e41c22a3f7823340bbc37b80de5864f2e7 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 Mar 6 08:20:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:37 +0000 Subject: [oe-commits] [openembedded-core] 04/10: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082034.0884323283B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e0ca4c79b07f3dc7ace585caf99a111bf93994d2 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 Mar 6 08:20:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:35 +0000 Subject: [oe-commits] [openembedded-core] 02/10: glew/curl: specify exclusive package configs In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082033.E45B023282F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0a16ba6863875602d958feb5a08dada97da4b840 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 Mar 6 08:20:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:39 +0000 Subject: [oe-commits] [openembedded-core] 06/10: HACK: extra debug In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082034.213E823283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8aacc70f80548fb536371b935017743c34b6fbad 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 Mar 6 08:20:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:40 +0000 Subject: [oe-commits] [openembedded-core] 07/10: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082034.2E5A9232891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d2ac04352d19399eb8b330ad0daed27b247f4d74 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 Fri Mar 6 08:20:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:42 +0000 Subject: [oe-commits] [openembedded-core] 09/10: libuv: move from meta-oe to core for bind update In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082034.463C42328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9248bca02f40334a09fa88c9d1b9668c927e439b Author: Armin Kuster AuthorDate: Tue Mar 3 13:09:03 2020 -0800 libuv: move from meta-oe to core for bind update Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-connectivity/libuv/libuv_1.34.2.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..1468b16 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -393,6 +393,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin " RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling " RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal " RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic " +RECIPE_MAINTAINER_pn-libuv = "Armin Kuster " RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.2.bb b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb new file mode 100644 index 0000000..234cec3 --- /dev/null +++ b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv" +BUGTRACKER = "https://github.com/libuv/libuv/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:43 +0000 Subject: [oe-commits] [openembedded-core] 10/10: sstate: Drop obsolete check in hash validation In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082034.572522328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ca5b82df52403e681025e14391404c43ef2e7c72 Author: Richard Purdie AuthorDate: Thu Mar 5 15:27:41 2020 +0000 sstate: Drop obsolete check in hash validation Now this function has a summary parameter we can drop this check. It could well be why the mysterious "locked sigs" selftest fails interemittently if this function were called with a single hash to check. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 0beeb33..c73c3b4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -966,10 +966,6 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, if len(tasklist) >= min_tasks: bb.event.fire(bb.event.ProcessFinished(msg), d) - # Likely checking an individual task hash again for multiconfig sharing of sstate tasks so skip reporting - if len(sq_data['hash']) == 1: - return found - inheritlist = d.getVar("INHERIT") if "toaster" in inheritlist: evdata = {'missed': [], 'found': []}; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 08:20:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:38 +0000 Subject: [oe-commits] [openembedded-core] 05/10: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082034.1756C23283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3a85171d62dbdef3b7d4be4bc0883bc532fed32e 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 Mar 6 08:20:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 08:20:41 +0000 Subject: [oe-commits] [openembedded-core] 08/10: test In-Reply-To: <158348283359.11953.16618898863050409243@git.openembedded.org> References: <158348283359.11953.16618898863050409243@git.openembedded.org> Message-ID: <20200306082034.3B06B2328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 520b74872c6ef4956318d2edfcc63355ca4284ec Author: Richard Purdie AuthorDate: Mon Mar 2 15:52:25 2020 +0000 test Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..61f1931 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 156400c..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase): extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) ret2 = bitbake(test_recipe) found_warn2 = re.search(patt, ret2.output) extradebug += "\nFound %s\n\n" % str(found_warn2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 09:00:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 09:00:41 +0000 Subject: [oe-commits] [openembedded-core] 01/01: sstate: Drop obsolete check in hash validation In-Reply-To: <158348524024.15815.2398979108092226068@git.openembedded.org> References: <158348524024.15815.2398979108092226068@git.openembedded.org> Message-ID: <20200306090040.6CB8223282C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 03de6680463bb764ad985119b3898530b198e12c Author: Richard Purdie AuthorDate: Thu Mar 5 15:27:41 2020 +0000 sstate: Drop obsolete check in hash validation Now this function has a summary parameter we can drop this check. It could well be why the mysterious "locked sigs" selftest fails intermittently if this function were called with a single hash to check. [YOCTO #13605] (with luck) Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 0beeb33..c73c3b4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -966,10 +966,6 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, if len(tasklist) >= min_tasks: bb.event.fire(bb.event.ProcessFinished(msg), d) - # Likely checking an individual task hash again for multiconfig sharing of sstate tasks so skip reporting - if len(sq_data['hash']) == 1: - return found - inheritlist = d.getVar("INHERIT") if "toaster" in inheritlist: evdata = {'missed': [], 'found': []}; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 09:00:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 09:00:40 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ca5b82d -> 03de668) Message-ID: <158348524024.15815.2398979108092226068@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 ca5b82d sstate: Drop obsolete check in hash validation new 03de668 sstate: Drop obsolete check in hash validation 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 (ca5b82d) \ N -- N -- N refs/heads/master-next (03de668) 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 Mar 6 15:27:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 15:27:29 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: exfat-utils: fix upstream version check In-Reply-To: <158350844852.12100.1858793959471156723@git.openembedded.org> References: <158350844852.12100.1858793959471156723@git.openembedded.org> Message-ID: <20200306152728.C523423283D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4a23729cdd4bcc0e06ea9ae9dde61002786655ac Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 21:05:49 2020 +0000 exfat-utils: fix upstream version check Fixes: INFO: Skip package exfat-utils (status = UNKNOWN_BROKEN, current version = 1.3.0, next version = N/A) After this commit: INFO: Skip package exfat-utils (status = MATCH, current version = 1.3.0, next version = 1.3.0) Signed-off-by: Pierre-Jean Texier --- meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb index 1f2bfa6..7f804a7 100644 --- a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb +++ b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb @@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" +UPSTREAM_CHECK_URI = "https://github.com/relan/exfat/releases" + DEPENDS = "virtual/libc" inherit pkgconfig autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 15:27:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 15:27:28 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (8317488 -> ba0e770) Message-ID: <158350844852.12100.1858793959471156723@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 8317488 layer.conf: add meta-python to LAYERDEPENDS new 4a23729 exfat-utils: fix upstream version check new 1228d2c babeld: add UPSTREAM_CHECK_GITTAGREGEX new 78a38cb abseil-cpp: set PV in the recipe new a6c2f4b pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX new ba0e770 python3-django: fix UPSTREAM_CHECK_REGEX 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-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb | 2 ++ meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb | 2 ++ meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb | 2 ++ meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + meta-python/recipes-devtools/python/python-django.inc | 2 +- 5 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 Fri Mar 6 15:27:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 15:27:30 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: babeld: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158350844852.12100.1858793959471156723@git.openembedded.org> References: <158350844852.12100.1858793959471156723@git.openembedded.org> Message-ID: <20200306152728.D273B23283E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1228d2c9a7f5fee2391929d71e49839ebf1bf478 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 20:05:25 2020 +0000 babeld: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: babeld, 1.9.1, 20110804, None, 794863e90f81ee38b9dddd72dfabcba634b2fc07 After this commit: INFO: Skip package babeld (status = MATCH, current version = 1.9.1, next version = 1.9.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb index 27e7b43..6dd15ad 100644 --- a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb +++ b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "git://github.com/jech/babeld.git;protocol=git" SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" +UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" + S = "${WORKDIR}/git" do_compile () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 15:27:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 15:27:31 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: abseil-cpp: set PV in the recipe In-Reply-To: <158350844852.12100.1858793959471156723@git.openembedded.org> References: <158350844852.12100.1858793959471156723@git.openembedded.org> Message-ID: <20200306152728.E2266232891@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 78a38cb40d6dabd4d4dbc0ccf51e72e3aa1ecb12 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:23:46 2020 +0000 abseil-cpp: set PV in the recipe Fixes: INFO: Skip package abseil-cpp (status = UNKNOWN_BROKEN, current version = git, next version = 20200225.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + 1 file changed, 1 insertion(+) 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 4d16361..115ffc6 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,6 +7,7 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" +PV = "20190808+git${SRCPV}" SRCREV = "aa844899c937bde5d2b24f276b59997e5b668bde" BRANCH = "lts_2019_08_08" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 15:27:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 15:27:32 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158350844852.12100.1858793959471156723@git.openembedded.org> References: <158350844852.12100.1858793959471156723@git.openembedded.org> Message-ID: <20200306152728.F16F82328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a6c2f4bacf1a18dd6972145cc93c2dff89237255 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:09:35 2020 +0000 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: pkcs11-helper, 1.26, 11, None, c7a0cfa08ddc75d963a835d3588170af0e5f1115 After this commit: INFO: Skip package pkcs11-helper (status = MATCH, current version = 1.26, next version = 1.26) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb index 4f383d1..9b6e7cc 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb @@ -21,6 +21,8 @@ S = "${WORKDIR}/git" # v1.26 SRCREV = "c7a0cfa08ddc75d963a835d3588170af0e5f1115" +UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P\d+(\.\d+)+)" + DEPENDS = "zlib nettle gnutls gmp openssl nss nspr" 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 Mar 6 15:27:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 15:27:33 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: python3-django: fix UPSTREAM_CHECK_REGEX In-Reply-To: <158350844852.12100.1858793959471156723@git.openembedded.org> References: <158350844852.12100.1858793959471156723@git.openembedded.org> Message-ID: <20200306152729.0BC432328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ba0e770c08401c3d3648e3a41ab0c556c840acc6 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 16:56:38 2020 +0000 python3-django: fix UPSTREAM_CHECK_REGEX Fixes: INFO: Skip package python3-django (status = UNKNOWN_BROKEN, current version = 2.2.7, next version = 1.15) After this commit: INFO: python3-django, 2.2.7, 3.0.4, None, N/A Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-django.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc index 63d025d..54c77c8 100644 --- a/meta-python/recipes-devtools/python/python-django.inc +++ b/meta-python/recipes-devtools/python/python-django.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" PYPI_PACKAGE = "Django" inherit pypi -UPSTREAM_CHECK_REGEX = "(?P1(\.\d+)+)" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" FILES_${PN} += "${datadir}/django" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 16:13:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 16:13:46 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (ba0e770 -> af6adb7) Message-ID: <158351122625.16137.5279542626519948078@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 ba0e770 python3-django: fix UPSTREAM_CHECK_REGEX discard a6c2f4b pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX discard 78a38cb abseil-cpp: set PV in the recipe discard 1228d2c babeld: add UPSTREAM_CHECK_GITTAGREGEX discard 4a23729 exfat-utils: fix upstream version check discard 8317488 layer.conf: add meta-python to LAYERDEPENDS new 9966a72 exfat-utils: fix upstream version check new 42ac9f5 babeld: add UPSTREAM_CHECK_GITTAGREGEX new 0d68b0c abseil-cpp: set PV in the recipe new 46d3d41 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX new af6adb7 python3-django: fix UPSTREAM_CHECK_REGEX 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 (ba0e770) \ N -- N -- N refs/heads/master-next (af6adb7) 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-oe/conf/layer.conf | 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 Fri Mar 6 16:13:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 16:13:47 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: exfat-utils: fix upstream version check In-Reply-To: <158351122625.16137.5279542626519948078@git.openembedded.org> References: <158351122625.16137.5279542626519948078@git.openembedded.org> Message-ID: <20200306161346.7649C2328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9966a722b9c98615e09220f6a8aa345d41724ab5 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 21:05:49 2020 +0000 exfat-utils: fix upstream version check Fixes: INFO: Skip package exfat-utils (status = UNKNOWN_BROKEN, current version = 1.3.0, next version = N/A) After this commit: INFO: Skip package exfat-utils (status = MATCH, current version = 1.3.0, next version = 1.3.0) Signed-off-by: Pierre-Jean Texier --- meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb index 1f2bfa6..7f804a7 100644 --- a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb +++ b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb @@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" +UPSTREAM_CHECK_URI = "https://github.com/relan/exfat/releases" + DEPENDS = "virtual/libc" inherit pkgconfig autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 16:13:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 16:13:48 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: babeld: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158351122625.16137.5279542626519948078@git.openembedded.org> References: <158351122625.16137.5279542626519948078@git.openembedded.org> Message-ID: <20200306161346.83F2D2328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 42ac9f5cadd66b122c7e5ae21ed0f83228e54a3f Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 20:05:25 2020 +0000 babeld: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: babeld, 1.9.1, 20110804, None, 794863e90f81ee38b9dddd72dfabcba634b2fc07 After this commit: INFO: Skip package babeld (status = MATCH, current version = 1.9.1, next version = 1.9.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb index 27e7b43..6dd15ad 100644 --- a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb +++ b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "git://github.com/jech/babeld.git;protocol=git" SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" +UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" + S = "${WORKDIR}/git" do_compile () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 16:13:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 16:13:49 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: abseil-cpp: set PV in the recipe In-Reply-To: <158351122625.16137.5279542626519948078@git.openembedded.org> References: <158351122625.16137.5279542626519948078@git.openembedded.org> Message-ID: <20200306161346.96B142328D0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0d68b0cdf12dc7a89c85e8534d7cd59a2e82ad5b Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:23:46 2020 +0000 abseil-cpp: set PV in the recipe Fixes: INFO: Skip package abseil-cpp (status = UNKNOWN_BROKEN, current version = git, next version = 20200225.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + 1 file changed, 1 insertion(+) 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 4d16361..115ffc6 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,6 +7,7 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" +PV = "20190808+git${SRCPV}" SRCREV = "aa844899c937bde5d2b24f276b59997e5b668bde" BRANCH = "lts_2019_08_08" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 16:13:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 16:13:50 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158351122625.16137.5279542626519948078@git.openembedded.org> References: <158351122625.16137.5279542626519948078@git.openembedded.org> Message-ID: <20200306161346.AA7762328D2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 46d3d411ce172f5151d8609506daa38dcf3f4a99 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:09:35 2020 +0000 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: pkcs11-helper, 1.26, 11, None, c7a0cfa08ddc75d963a835d3588170af0e5f1115 After this commit: INFO: Skip package pkcs11-helper (status = MATCH, current version = 1.26, next version = 1.26) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb index 4f383d1..9b6e7cc 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb @@ -21,6 +21,8 @@ S = "${WORKDIR}/git" # v1.26 SRCREV = "c7a0cfa08ddc75d963a835d3588170af0e5f1115" +UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P\d+(\.\d+)+)" + DEPENDS = "zlib nettle gnutls gmp openssl nss nspr" 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 Mar 6 16:13:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 16:13:51 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: python3-django: fix UPSTREAM_CHECK_REGEX In-Reply-To: <158351122625.16137.5279542626519948078@git.openembedded.org> References: <158351122625.16137.5279542626519948078@git.openembedded.org> Message-ID: <20200306161346.BC4DD2328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit af6adb77112a58fad0370d13db4b6e1f09ff8153 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 16:56:38 2020 +0000 python3-django: fix UPSTREAM_CHECK_REGEX Fixes: INFO: Skip package python3-django (status = UNKNOWN_BROKEN, current version = 2.2.7, next version = 1.15) After this commit: INFO: python3-django, 2.2.7, 3.0.4, None, N/A Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-django.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc index 63d025d..54c77c8 100644 --- a/meta-python/recipes-devtools/python/python-django.inc +++ b/meta-python/recipes-devtools/python/python-django.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" PYPI_PACKAGE = "Django" inherit pypi -UPSTREAM_CHECK_REGEX = "(?P1(\.\d+)+)" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" FILES_${PN} += "${datadir}/django" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:40 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: sstate: Drop obsolete check in hash validation Message-ID: <158351488053.32295.9693567637304427688@git.openembedded.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 02aabe0 sstate: Drop obsolete check in hash validation 02aabe0 is described below commit 02aabe0e59f73bf206d9bada1e7089832ceed254 Author: Richard Purdie AuthorDate: Thu Mar 5 15:27:41 2020 +0000 sstate: Drop obsolete check in hash validation Now this function has a summary parameter we can drop this check. It could well be why the mysterious "locked sigs" selftest fails intermittently if this function were called with a single hash to check. [YOCTO #13605] (with luck) Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 0beeb33..c73c3b4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -966,10 +966,6 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, if len(tasklist) >= min_tasks: bb.event.fire(bb.event.ProcessFinished(msg), d) - # Likely checking an individual task hash again for multiconfig sharing of sstate tasks so skip reporting - if len(sq_data['hash']) == 1: - return found - inheritlist = d.getVar("INHERIT") if "toaster" in inheritlist: evdata = {'missed': [], 'found': []}; -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:46 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (03de668 -> 2f9d6d5) Message-ID: <158351488600.32635.6398231816635614089@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 03de668 sstate: Drop obsolete check in hash validation discard 9248bca libuv: move from meta-oe to core for bind update discard 520b748 test discard d2ac043 qemuarm64: Add -machine gic-version=3 with kvm discard 8aacc70 HACK: extra debug discard 3a85171 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard e0ca4c7 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 85927c9 HACK: signing: Add extra test debug discard 0a16ba6 glew/curl: specify exclusive package configs discard 2d3028e base.bbclass: extend PACKAGECONFIG for conflict package configs add 02aabe0 sstate: Drop obsolete check in hash validation new e64ed89 base.bbclass: extend PACKAGECONFIG for conflict package configs new 66504b1 glew/curl: specify exclusive package configs new 073899f HACK: signing: Add extra test debug new 0ad98f0 sstatesig: Log timestamps for hashequiv in reprodubile builds new d7da40b rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 375cd19 HACK: extra debug new e559e4d qemuarm64: Add -machine gic-version=3 with kvm new 7f623b0 test new 6e4c568 libuv: move from meta-oe to core for bind update new a065195 parselogs.py: ignore rdrand initialization failure new d4db835 linux-firmware: Fix usrmerge builds new da4af46 populate_sdk_ext: enable custom templateconf.cfg new 2f9d6d5 populate_sdk_ext: add option to append lines into local.conf 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 (03de668) \ N -- N -- N refs/heads/master-next (2f9d6d5) 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: meta/classes/buildhistory.bbclass | 4 ++-- meta/classes/populate_sdk_ext.bbclass | 22 ++++++++++++++++++---- meta/lib/oeqa/runtime/cases/parselogs.py | 3 ++- .../linux-firmware/linux-firmware_20200122.bb | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:49 +0000 Subject: [oe-commits] [openembedded-core] 03/13: HACK: signing: Add extra test debug In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.399D72328D0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 073899f9ea96117038c81efafbab9118e75acffe 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 Mar 6 17:14:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:50 +0000 Subject: [oe-commits] [openembedded-core] 04/13: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.41F9B2328D2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0ad98f0ca8c2fecb3d9c98d5f70142c844aea51f 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 Mar 6 17:14:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:47 +0000 Subject: [oe-commits] [openembedded-core] 01/13: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.2755A2328B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e64ed89a10b2d8ac23f0d19a67532073ff490053 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 Mar 6 17:14:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:48 +0000 Subject: [oe-commits] [openembedded-core] 02/13: glew/curl: specify exclusive package configs In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.30A622328BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 66504b1c289c759ed1c201a8d0d59fed73f6b31a 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 Mar 6 17:14:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:52 +0000 Subject: [oe-commits] [openembedded-core] 06/13: HACK: extra debug In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.568B0232902@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 375cd19ed864ec21bc5953e98eee42ae3d15cc1a 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 Mar 6 17:14:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:53 +0000 Subject: [oe-commits] [openembedded-core] 07/13: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.6046E232912@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e559e4d45832bee379be9fb021fa355f1670b3f6 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 Fri Mar 6 17:14:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:55 +0000 Subject: [oe-commits] [openembedded-core] 09/13: libuv: move from meta-oe to core for bind update In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.770F7232920@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6e4c568caa26ab1a45ceef3e0e2b2c9fefbb45e3 Author: Armin Kuster AuthorDate: Tue Mar 3 13:09:03 2020 -0800 libuv: move from meta-oe to core for bind update Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-connectivity/libuv/libuv_1.34.2.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..1468b16 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -393,6 +393,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin " RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling " RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal " RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic " +RECIPE_MAINTAINER_pn-libuv = "Armin Kuster " RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.2.bb b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb new file mode 100644 index 0000000..234cec3 --- /dev/null +++ b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv" +BUGTRACKER = "https://github.com/libuv/libuv/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:51 +0000 Subject: [oe-commits] [openembedded-core] 05/13: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.4C5B62328D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d7da40b2067f39eb893d1cbbbd91546a4f9bc177 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 Mar 6 17:14:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:56 +0000 Subject: [oe-commits] [openembedded-core] 10/13: parselogs.py: ignore rdrand initialization failure In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.81B1123292D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a0651954974b5f5f8a00eb70f4fd4347fc82ad8d Author: Mingli Yu AuthorDate: Fri Mar 6 19:25:16 2020 +0800 parselogs.py: ignore rdrand initialization failure On the system whose cpu doesn't support rdrand, there comes below message when start rngd service #systemctl status rngd [snip] Feb 25 05:08:14 qemux86-64 rngd[133]: [rdrand]: Initialization Failed [snip] Actually the failed message doesn't matter as it only indicates one entropy source as rdrand fails to initialize and won't affect rngd function. So add to ignore the failure message to fix below error during do_testimage: NOTE: ====================================================================== NOTE: FAIL: test_parselogs (parselogs.ParseLogsTest) NOTE: ---------------------------------------------------------------------- NOTE: Traceback (most recent call last): File "/buildarea/layers/oe-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/buildarea/layers/oe-core/meta/lib/oeqa/runtime/cases/parselogs.py", line 370, in test_parselogs self.assertEqual(errcount, 0, msg=self.msg) AssertionError: 1 != 0 : Log: /buildarea/tmp/work/qemux86-64-wrs-linux/wrlinux-image-std/1.0-r5/target_logs/daemon.log Central error: 2020-03-06T09:45:12.774286+00:00 qemux86-64 rngd[134]: [rdrand]: Initialization Failed Reference: https://github.com/nhorman/rng-tools/pull/84 Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/parselogs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 3cad070..6444fe8 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -56,7 +56,8 @@ common_errors = [ "error retry time-out =", "logind: cannot setup systemd-logind helper (-61), using legacy fallback", "Error changing net interface name 'eth0' to ", - "Cannot find a map file" + "Cannot find a map file", + "[rdrand]: Initialization Failed" ] video_related = [ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:58 +0000 Subject: [oe-commits] [openembedded-core] 12/13: populate_sdk_ext: enable custom templateconf.cfg In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.92E6423292F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit da4af46705a48c5e7117e55d7c7670feb0a43562 Author: Andrej Valek AuthorDate: Fri Mar 6 16:32:33 2020 +0100 populate_sdk_ext: enable custom templateconf.cfg Do not always override templateconf.cfg content. Add option to use already existing file. Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 57fd29b..9f26cfc 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -388,9 +388,13 @@ python copy_buildsystem () { bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache')) shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat') - # Write a templateconf.cfg - with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: - f.write('meta/conf\n') + # Use templateconf.cfg file from builddir if exists + if os.path.exists(builddir + '/conf/templateconf.cfg'): + shutil.copyfile(builddir + '/conf/templateconf.cfg', baseoutpath + '/conf/templateconf.cfg') + else: + # Write a templateconf.cfg + with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: + f.write('meta/conf\n') # Ensure any variables set from the external environment (by way of # BB_ENV_EXTRAWHITE) are set in the SDK's configuration -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:57 +0000 Subject: [oe-commits] [openembedded-core] 11/13: linux-firmware: Fix usrmerge builds In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.8A33F23292E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d4db8353e630cde83116b647024eca153818df7e Author: Alex Kiernan AuthorDate: Fri Mar 6 14:35:18 2020 +0000 linux-firmware: Fix usrmerge builds FIRMWAREDIR defaults to /lib, failing when usrmerge is enabled: ERROR: linux-firmware-1_20200122-r0 do_install: Execution of '/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/temp/run.do_install.31218' failed with exit code 1: mkdir -p /home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/lib/firmware ./copy-firmware.sh /home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/lib/firmware cp: target '/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/usr/lib/firmware/' is not a directory Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 6039dc9..8f963f4 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -208,7 +208,7 @@ do_compile() { } do_install() { - oe_runmake 'DESTDIR=${D}' install + oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install cp GPL-2 LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/ } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:54 +0000 Subject: [oe-commits] [openembedded-core] 08/13: test In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.6CBFA232916@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7f623b0d525a13c7ce311fea5acc26083c2c9211 Author: Richard Purdie AuthorDate: Mon Mar 2 15:52:25 2020 +0000 test Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..61f1931 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 156400c..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase): extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) ret2 = bitbake(test_recipe) found_warn2 = re.search(patt, ret2.output) extradebug += "\nFound %s\n\n" % str(found_warn2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:14:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:14:59 +0000 Subject: [oe-commits] [openembedded-core] 13/13: populate_sdk_ext: add option to append lines into local.conf In-Reply-To: <158351488600.32635.6398231816635614089@git.openembedded.org> References: <158351488600.32635.6398231816635614089@git.openembedded.org> Message-ID: <20200306171446.9E5732328B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2f9d6d5970faf852e10f190862d44cae18547c01 Author: Andrej Valek AuthorDate: Fri Mar 6 16:32:34 2020 +0100 populate_sdk_ext: add option to append lines into local.conf Add option to add new lines into local.conf content in ext_sdk case via SDK_LOCAL_CONF_EXTRALIST variable. Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 4 ++-- meta/classes/populate_sdk_ext.bbclass | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index eb72955..a347811 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -757,8 +757,8 @@ def buildhistory_get_sdkvars(d): sdkvars = "DISTRO DISTRO_VERSION SDK_NAME SDK_VERSION SDKMACHINE SDKIMAGE_FEATURES BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE" if d.getVar('BB_CURRENTTASK') == 'populate_sdk_ext': # Extensible SDK uses some additional variables - sdkvars += " SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST SDK_UPDATE_URL SDK_EXT_TYPE SDK_RECRDEP_TASKS SDK_INCLUDE_PKGDATA SDK_INCLUDE_TOOLCHAIN" - listvars = "SDKIMAGE_FEATURES BAD_RECOMMENDATIONS PACKAGE_EXCLUDE SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST" + sdkvars += " SDK_LOCAL_CONF_EXTRALIST SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST SDK_UPDATE_URL SDK_EXT_TYPE SDK_RECRDEP_TASKS SDK_INCLUDE_PKGDATA SDK_INCLUDE_TOOLCHAIN" + listvars = "SDKIMAGE_FEATURES BAD_RECOMMENDATIONS PACKAGE_EXCLUDE SDK_LOCAL_CONF_EXTRALIST SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST" return outputvars(sdkvars, listvars, d) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9f26cfc..2eccf52 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -25,6 +25,7 @@ SDK_INCLUDE_BUILDTOOLS ?= '1' SDK_RECRDEP_TASKS ?= "" +SDK_LOCAL_CONF_EXTRALIST ?= "" SDK_LOCAL_CONF_WHITELIST ?= "" SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ BB_NUMBER_THREADS \ @@ -372,7 +373,16 @@ python copy_buildsystem () { for line in xf: f.write(line) - # If you define a sdk_extraconf() function then it can contain additional config + # Allow additional config through SDK_LOCAL_CONF_EXTRALIST + local_conf_extralist = (d.getVar('SDK_LOCAL_CONF_EXTRALIST') or '').split() + if local_conf_extralist: + for var in local_conf_extralist: + value = d.getVar(var) or "" + if value: + f.write('%s = "%s"\n' % (var, value)) + f.write('\n') + + # If you define a sdk_extraconf variable then it can contain additional config # (Though this is awkward; sdk-extra.conf should probably be used instead) extraconf = (d.getVar('sdk_extraconf') or '').strip() if extraconf: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:24:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:24:03 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (df2c9e0 -> 8325611) Message-ID: <158351544348.23017.7633805918022473375@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 df2c9e0 runqueue: Possible tid handling optimisation new 95bb446 command: Add mc parameter to findProviders command new ea0b68a cooker: Respect multiconfig parameter new d515481 tinfoil: Add multiconfig support new 8325611 bblayers: query: Add multiconfig option 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 (df2c9e0) \ N -- N -- N refs/heads/master-next (8325611) 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: lib/bb/command.py | 6 +++++- lib/bb/cooker.py | 6 +++--- lib/bb/runqueue.py | 19 +++---------------- lib/bb/tinfoil.py | 38 ++++++++++++++++++++------------------ lib/bblayers/query.py | 20 +++++++++++++------- 5 files changed, 44 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:24:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:24:04 +0000 Subject: [oe-commits] [bitbake] 01/04: command: Add mc parameter to findProviders command In-Reply-To: <158351544348.23017.7633805918022473375@git.openembedded.org> References: <158351544348.23017.7633805918022473375@git.openembedded.org> Message-ID: <20200306172403.A15C22328D8@git.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 95bb446137734865f3fe04fe97681d90250deb11 Author: Joshua Watt AuthorDate: Wed Mar 4 14:02:23 2020 -0600 command: Add mc parameter to findProviders command Adds a multiconfig selection parameter to the findProviders command. This allows a client to find the providers for a specific multiconfig instead of the base configuration. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/command.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bb/command.py b/lib/bb/command.py index c8e1352..b38c151 100644 --- a/lib/bb/command.py +++ b/lib/bb/command.py @@ -414,7 +414,11 @@ class CommandsSync: getAllAppends.readonly = True def findProviders(self, command, params): - return command.cooker.findProviders() + try: + mc = params[0] + except IndexError: + mc = '' + return command.cooker.findProviders(mc) findProviders.readonly = True def findBestProvider(self, command, params): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:24:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:24:05 +0000 Subject: [oe-commits] [bitbake] 02/04: cooker: Respect multiconfig parameter In-Reply-To: <158351544348.23017.7633805918022473375@git.openembedded.org> References: <158351544348.23017.7633805918022473375@git.openembedded.org> Message-ID: <20200306172403.B2493232902@git.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 ea0b68ac2b77676ed1c63f0ee1ae5d300f2b4696 Author: Joshua Watt AuthorDate: Wed Mar 4 14:02:24 2020 -0600 cooker: Respect multiconfig parameter The cooker had a multiconfig parameter for the findProviders() and findBestProviders() API, but it was being ignored. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index bda6d1b..e527e23 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -1023,16 +1023,16 @@ class BBCooker: bb.event.fire(bb.event.FilesMatchingFound(filepattern, matches), self.data) def findProviders(self, mc=''): - return bb.providers.findProviders(self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) + return bb.providers.findProviders(self.databuilder.mcdata[mc], self.recipecaches[mc], self.recipecaches[mc].pkg_pn) def findBestProvider(self, pn, mc=''): if pn in self.recipecaches[mc].providers: filenames = self.recipecaches[mc].providers[pn] - eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.data, self.recipecaches[mc]) + eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.databuilder.mcdata[mc], self.recipecaches[mc]) filename = eligible[0] return None, None, None, filename elif pn in self.recipecaches[mc].pkg_pn: - return bb.providers.findBestProvider(pn, self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) + return bb.providers.findBestProvider(pn, self.databuilder.mcdata[mc], self.recipecaches[mc], self.recipecaches[mc].pkg_pn) else: return None, None, None, None -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:24:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:24:06 +0000 Subject: [oe-commits] [bitbake] 03/04: tinfoil: Add multiconfig support In-Reply-To: <158351544348.23017.7633805918022473375@git.openembedded.org> References: <158351544348.23017.7633805918022473375@git.openembedded.org> Message-ID: <20200306172403.C8BC3232912@git.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 d515481681dca4a0bc733c6ad8a8498a82e3d9b9 Author: Joshua Watt AuthorDate: Wed Mar 4 14:02:25 2020 -0600 tinfoil: Add multiconfig support Adds support for the Tinfoil cache adaptor to be bound to a specific multiconfig and invoke the appropriate commands for that multiconfig instead of the default. The cooker adapter now creates a cache adapter for each multiconfig specified in BBMULTICONFIG so that each multiconfig is present. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 0bd7836..9560eb5 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -127,12 +127,13 @@ class TinfoilCookerAdapter: class TinfoilRecipeCacheAdapter: """ cooker.recipecache adapter """ - def __init__(self, tinfoil): + def __init__(self, tinfoil, mc=''): self.tinfoil = tinfoil + self.mc = mc self._cache = {} def get_pkg_pn_fn(self): - pkg_pn = defaultdict(list, self.tinfoil.run_command('getRecipes') or []) + pkg_pn = defaultdict(list, self.tinfoil.run_command('getRecipes', self.mc) or []) pkg_fn = {} for pn, fnlist in pkg_pn.items(): for fn in fnlist: @@ -151,27 +152,27 @@ class TinfoilCookerAdapter: self.get_pkg_pn_fn() return self._cache[name] elif name == 'deps': - attrvalue = defaultdict(list, self.tinfoil.run_command('getRecipeDepends') or []) + attrvalue = defaultdict(list, self.tinfoil.run_command('getRecipeDepends', self.mc) or []) elif name == 'rundeps': - attrvalue = defaultdict(lambda: defaultdict(list), self.tinfoil.run_command('getRuntimeDepends') or []) + attrvalue = defaultdict(lambda: defaultdict(list), self.tinfoil.run_command('getRuntimeDepends', self.mc) or []) elif name == 'runrecs': - attrvalue = defaultdict(lambda: defaultdict(list), self.tinfoil.run_command('getRuntimeRecommends') or []) + attrvalue = defaultdict(lambda: defaultdict(list), self.tinfoil.run_command('getRuntimeRecommends', self.mc) or []) elif name == 'pkg_pepvpr': - attrvalue = self.tinfoil.run_command('getRecipeVersions') or {} + attrvalue = self.tinfoil.run_command('getRecipeVersions', self.mc) or {} elif name == 'inherits': - attrvalue = self.tinfoil.run_command('getRecipeInherits') or {} + attrvalue = self.tinfoil.run_command('getRecipeInherits', self.mc) or {} elif name == 'bbfile_priority': - attrvalue = self.tinfoil.run_command('getBbFilePriority') or {} + attrvalue = self.tinfoil.run_command('getBbFilePriority', self.mc) or {} elif name == 'pkg_dp': - attrvalue = self.tinfoil.run_command('getDefaultPreference') or {} + attrvalue = self.tinfoil.run_command('getDefaultPreference', self.mc) or {} elif name == 'fn_provides': - attrvalue = self.tinfoil.run_command('getRecipeProvides') or {} + attrvalue = self.tinfoil.run_command('getRecipeProvides', self.mc) or {} elif name == 'packages': - attrvalue = self.tinfoil.run_command('getRecipePackages') or {} + attrvalue = self.tinfoil.run_command('getRecipePackages', self.mc) or {} elif name == 'packages_dynamic': - attrvalue = self.tinfoil.run_command('getRecipePackagesDynamic') or {} + attrvalue = self.tinfoil.run_command('getRecipePackagesDynamic', self.mc) or {} elif name == 'rproviders': - attrvalue = self.tinfoil.run_command('getRProviders') or {} + attrvalue = self.tinfoil.run_command('getRProviders', self.mc) or {} else: raise AttributeError("%s instance has no attribute '%s'" % (self.__class__.__name__, name)) @@ -182,8 +183,9 @@ class TinfoilCookerAdapter: self.tinfoil = tinfoil self.collection = self.TinfoilCookerCollectionAdapter(tinfoil) self.recipecaches = {} - # FIXME all machines self.recipecaches[''] = self.TinfoilRecipeCacheAdapter(tinfoil) + for mc in (tinfoil.config_data.getVar('BBMULTICONFIG') or '').split(): + self.recipecaches[mc] = self.TinfoilRecipeCacheAdapter(tinfoil, mc) self._cache = {} def __getattr__(self, name): # Grab these only when they are requested since they aren't always used @@ -501,11 +503,11 @@ class Tinfoil: """ return OrderedDict(self.run_command('getSkippedRecipes')) - def get_all_providers(self): - return defaultdict(list, self.run_command('allProviders')) + def get_all_providers(self, mc=''): + return defaultdict(list, self.run_command('allProviders', mc)) - def find_providers(self): - return self.run_command('findProviders') + def find_providers(self, mc=''): + return self.run_command('findProviders', mc) def find_best_provider(self, pn): return self.run_command('findBestProvider', pn) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:24:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:24:07 +0000 Subject: [oe-commits] [bitbake] 04/04: bblayers: query: Add multiconfig option In-Reply-To: <158351544348.23017.7633805918022473375@git.openembedded.org> References: <158351544348.23017.7633805918022473375@git.openembedded.org> Message-ID: <20200306172403.E1EF9232916@git.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 83256115c7b1fdf3fa5129cfba6b9e7cba2ae0da Author: Joshua Watt AuthorDate: Wed Mar 4 14:02:26 2020 -0600 bblayers: query: Add multiconfig option Adds an option to the show-recipes subcommand that allows the user to specify which multiconfig should be shown. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bblayers/query.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/bblayers/query.py b/lib/bblayers/query.py index 7db49c8..e2cc310 100644 --- a/lib/bblayers/query.py +++ b/lib/bblayers/query.py @@ -46,7 +46,7 @@ layer, with the preferred version first. Note that skipped recipes that are overlayed will also be listed, with a " (skipped)" suffix. """ - items_listed = self.list_recipes('Overlayed recipes', None, True, args.same_version, args.filenames, False, True, None, False, None) + items_listed = self.list_recipes('Overlayed recipes', None, True, args.same_version, args.filenames, False, True, None, False, None, args.mc) # Check for overlayed .bbclass files classes = collections.defaultdict(list) @@ -112,9 +112,9 @@ skipped recipes will also be listed, with a " (skipped)" suffix. title = 'Matching recipes:' else: title = 'Available recipes:' - self.list_recipes(title, args.pnspec, False, False, args.filenames, args.recipes_only, args.multiple, args.layer, args.bare, inheritlist) + self.list_recipes(title, args.pnspec, False, False, args.filenames, args.recipes_only, args.multiple, args.layer, args.bare, inheritlist, args.mc) - def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_recipes_only, show_multi_provider_only, selected_layer, bare, inherits): + def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_recipes_only, show_multi_provider_only, selected_layer, bare, inherits, mc): if inherits: bbpath = str(self.tinfoil.config_data.getVar('BBPATH')) for classname in inherits: @@ -123,14 +123,18 @@ skipped recipes will also be listed, with a " (skipped)" suffix. logger.error('No class named %s found in BBPATH', classfile) sys.exit(1) - pkg_pn = self.tinfoil.cooker.recipecaches[''].pkg_pn - (latest_versions, preferred_versions) = self.tinfoil.find_providers() - allproviders = self.tinfoil.get_all_providers() + pkg_pn = self.tinfoil.cooker.recipecaches[mc].pkg_pn + (latest_versions, preferred_versions) = self.tinfoil.find_providers(mc) + allproviders = self.tinfoil.get_all_providers(mc) # Ensure we list skipped recipes # We are largely guessing about PN, PV and the preferred version here, # but we have no choice since skipped recipes are not fully parsed skiplist = list(self.tinfoil.cooker.skiplist.keys()) + mcspec = 'mc:%s:' % mc + if mc: + skiplist = [s[len(mcspec):] for s in skiplist if s.startswith(mcspec)] + for fn in skiplist: recipe_parts = os.path.splitext(os.path.basename(fn))[0].split('_') p = recipe_parts[0] @@ -187,7 +191,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix. # We only display once per recipe, we should prefer non extended versions of the # recipe if present (so e.g. in OpenEmbedded, openssl rather than nativesdk-openssl # which would otherwise sort first). - if realfn[1] and realfn[0] in self.tinfoil.cooker.recipecaches[''].pkg_fn: + if realfn[1] and realfn[0] in self.tinfoil.cooker.recipecaches[mc].pkg_fn: continue if inherits: @@ -496,6 +500,7 @@ NOTE: .bbappend files can impact the dependencies. parser_show_overlayed = self.add_command(sp, 'show-overlayed', self.do_show_overlayed) parser_show_overlayed.add_argument('-f', '--filenames', help='instead of the default formatting, list filenames of higher priority recipes with the ones they overlay indented underneath', action='store_true') parser_show_overlayed.add_argument('-s', '--same-version', help='only list overlayed recipes where the version is the same', action='store_true') + parser_show_overlayed.add_argument('--mc', help='use specified multiconfig', default='') parser_show_recipes = self.add_command(sp, 'show-recipes', self.do_show_recipes) parser_show_recipes.add_argument('-f', '--filenames', help='instead of the default formatting, list filenames of higher priority recipes with the ones they overlay indented underneath', action='store_true') @@ -504,6 +509,7 @@ NOTE: .bbappend files can impact the dependencies. parser_show_recipes.add_argument('-i', '--inherits', help='only list recipes that inherit the named class(es) - separate multiple classes using , (without spaces)', metavar='CLASS', default='') parser_show_recipes.add_argument('-l', '--layer', help='only list recipes from the selected layer', default='') parser_show_recipes.add_argument('-b', '--bare', help='output just names without the "(skipped)" marker', action='store_true') + parser_show_recipes.add_argument('--mc', help='use specified multiconfig', default='') parser_show_recipes.add_argument('pnspec', nargs='*', help='optional recipe name specification (wildcards allowed, enclose in quotes to avoid shell expansion)') parser_show_appends = self.add_command(sp, 'show-appends', self.do_show_appends) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:26:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:26:43 +0000 Subject: [oe-commits] [bitbake] branch 1.42 updated: lib/bb/utils.py: Preserve ownership of symlink Message-ID: <158351560391.28693.11507396565960628903@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 7f71262 lib/bb/utils.py: Preserve ownership of symlink 7f71262 is described below commit 7f7126211170439ac1d7d72e980786ce0edb7bb7 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 7aaf930..95e73f2 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -855,7 +855,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 Fri Mar 6 17:26:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:26:44 +0000 Subject: [oe-commits] [bitbake] branch 1.44 updated: lib/bb/utils.py: Preserve ownership of symlink Message-ID: <158351560392.28693.4700874819151577993@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 6836184 lib/bb/utils.py: Preserve ownership of symlink 6836184 is described below commit 6836184ef5220488a1127413c7d2e523fc37e2e9 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 d65265c..0b6bb04 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -851,7 +851,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 Fri Mar 6 17:28:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:28:44 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (8325611 -> 26ff7fa) Message-ID: <158351572407.32623.15799402948631553904@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 8325611 bblayers: query: Add multiconfig option new 694904b runqueue: teach runonly/runall to accept "do_task" as well as "task" new 26ff7fa ui/teamcity: add a TeamCity service message frontend 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: lib/bb/runqueue.py | 8 +- lib/bb/ui/teamcity.py | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 404 insertions(+), 2 deletions(-) create mode 100644 lib/bb/ui/teamcity.py -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:28:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:28:45 +0000 Subject: [oe-commits] [bitbake] 01/02: runqueue: teach runonly/runall to accept "do_task" as well as "task" In-Reply-To: <158351572407.32623.15799402948631553904@git.openembedded.org> References: <158351572407.32623.15799402948631553904@git.openembedded.org> Message-ID: <20200306172844.51B5A232938@git.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 694904bde980606dc67c201da61f4fb685679b17 Author: Chris Laplante AuthorDate: Mon Feb 24 10:44:01 2020 -0500 runqueue: teach runonly/runall to accept "do_task" as well as "task" Previously --runonly=do_task would give a misleading error like: ERROR: Could not find any tasks with the tasknames ['do_task'] to run within the recipes of the taskgraphs of the targets... The problem is that BitBake tried to find "do_do_task". So teach it to only add the do_ prefix if it's not already there. Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 71108ee..32966b4 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -920,9 +920,11 @@ class RunQueueData: runq_build = {} for task in self.cooker.configuration.runall: + if not task.startswith("do_"): + task = "do_{0}".format(task) runall_tids = set() for tid in list(self.runtaskentries): - wanttid = fn_from_tid(tid) + ":do_%s" % task + wanttid = "{0}:{1}".format(fn_from_tid(tid), task) if wanttid in delcount: self.runtaskentries[wanttid] = delcount[wanttid] if wanttid in self.runtaskentries: @@ -949,7 +951,9 @@ class RunQueueData: runq_build = {} for task in self.cooker.configuration.runonly: - runonly_tids = { k: v for k, v in self.runtaskentries.items() if taskname_from_tid(k) == "do_%s" % task } + if not task.startswith("do_"): + task = "do_{0}".format(task) + runonly_tids = { k: v for k, v in self.runtaskentries.items() if taskname_from_tid(k) == task } for tid in list(runonly_tids): mark_active(tid,1) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:28:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:28:46 +0000 Subject: [oe-commits] [bitbake] 02/02: ui/teamcity: add a TeamCity service message frontend In-Reply-To: <158351572407.32623.15799402948631553904@git.openembedded.org> References: <158351572407.32623.15799402948631553904@git.openembedded.org> Message-ID: <20200306172844.5A929232939@git.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 26ff7fa314d0f84f2557b183fb71fa873d914ee0 Author: Chris Laplante AuthorDate: Fri Jan 24 10:16:23 2020 -0500 ui/teamcity: add a TeamCity service message frontend Exposes build status via TeamCity service messages, see https://www.jetbrains.com/help/teamcity/build-script-interaction-with-teamcity.html. Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie --- lib/bb/ui/teamcity.py | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 398 insertions(+) diff --git a/lib/bb/ui/teamcity.py b/lib/bb/ui/teamcity.py new file mode 100644 index 0000000..1854292 --- /dev/null +++ b/lib/bb/ui/teamcity.py @@ -0,0 +1,398 @@ +# +# TeamCity UI Implementation +# +# Implements a TeamCity frontend for the BitBake utility, via service messages. +# See https://www.jetbrains.com/help/teamcity/build-script-interaction-with-teamcity.html +# +# Based on ncurses.py and knotty.py, variously by Michael Lauer and Richard Purdie +# +# Copyright (C) 2006 Michael 'Mickey' Lauer +# Copyright (C) 2006-2012 Richard Purdie +# Copyright (C) 2018-2020 Agilent Technologies, Inc. +# +# SPDX-License-Identifier: GPL-2.0-only +# +# Author: Chris Laplante + +from __future__ import division + +import datetime +import logging +import math +import os +import re +import sys +import xmlrpc.client +from collections import deque + +import bb +import bb.build +import bb.command +import bb.cooker +import bb.event +import bb.exceptions +import bb.runqueue +from bb.ui import uihelper + +logger = logging.getLogger("BitBake") + + +class TeamCityUI: + def __init__(self): + self._block_stack = [] + self._last_progress_state = None + + @classmethod + def escape_service_value(cls, value): + """ + Escape a value for inclusion in a service message. TeamCity uses the vertical pipe character for escaping. + See: https://confluence.jetbrains.com/display/TCD10/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-Escapedvalues + """ + return re.sub(r"(['|\[\]])", r"|\1", value).replace("\n", "|n").replace("\r", "|r") + + @classmethod + def emit_service_message(cls, message_type, **kwargs): + print(cls.format_service_message(message_type, **kwargs), flush=True) + + @classmethod + def format_service_message(cls, message_type, **kwargs): + payload = " ".join(["{0}='{1}'".format(k, cls.escape_service_value(v)) for k, v in kwargs.items()]) + return "##teamcity[{0} {1}]".format(message_type, payload) + + @classmethod + def emit_simple_service_message(cls, message_type, message): + print(cls.format_simple_service_message(message_type, message), flush=True) + + @classmethod + def format_simple_service_message(cls, message_type, message): + return "##teamcity[{0} '{1}']".format(message_type, cls.escape_service_value(message)) + + @classmethod + def format_build_message(cls, text, status): + return cls.format_service_message("message", text=text, status=status) + + def block_start(self, name): + self._block_stack.append(name) + self.emit_service_message("blockOpened", name=name) + + def block_end(self): + if self._block_stack: + name = self._block_stack.pop() + self.emit_service_message("blockClosed", name=name) + + def progress(self, message, percent, extra=None): + now = datetime.datetime.now() + percent = "{0: >3.0f}".format(percent) + + report = False + if not self._last_progress_state \ + or (self._last_progress_state[0] == message + and self._last_progress_state[1] != percent + and (now - self._last_progress_state[2]).microseconds >= 5000) \ + or self._last_progress_state[0] != message: + report = True + self._last_progress_state = (message, percent, now) + + if report or percent in [0, 100]: + self.emit_simple_service_message("progressMessage", "{0}: {1}%{2}".format(message, percent, extra or "")) + + +class TeamcityLogFormatter(logging.Formatter): + def format(self, record): + details = "" + if hasattr(record, 'bb_exc_formatted'): + details = ''.join(record.bb_exc_formatted) + elif hasattr(record, 'bb_exc_info'): + etype, value, tb = record.bb_exc_info + formatted = bb.exceptions.format_exception(etype, value, tb, limit=5) + details = ''.join(formatted) + + if record.levelno in [bb.msg.BBLogFormatter.ERROR, bb.msg.BBLogFormatter.CRITICAL]: + # ERROR gets a separate errorDetails field + msg = TeamCityUI.format_service_message("message", text=record.getMessage(), status="ERROR", + errorDetails=details) + else: + payload = record.getMessage() + if details: + payload += "\n" + details + if record.levelno == bb.msg.BBLogFormatter.PLAIN: + msg = payload + elif record.levelno == bb.msg.BBLogFormatter.WARNING: + msg = TeamCityUI.format_service_message("message", text=payload, status="WARNING") + else: + msg = TeamCityUI.format_service_message("message", text=payload, status="NORMAL") + + return msg + + +_evt_list = ["bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.LogRecord", + "bb.build.TaskFailed", "bb.build.TaskBase", "bb.event.ParseStarted", + "bb.event.ParseProgress", "bb.event.ParseCompleted", "bb.event.CacheLoadStarted", + "bb.event.CacheLoadProgress", "bb.event.CacheLoadCompleted", "bb.command.CommandFailed", + "bb.command.CommandExit", "bb.command.CommandCompleted", "bb.cooker.CookerExit", + "bb.event.MultipleProviders", "bb.event.NoProvider", "bb.runqueue.sceneQueueTaskStarted", + "bb.runqueue.runQueueTaskStarted", "bb.runqueue.runQueueTaskFailed", "bb.runqueue.sceneQueueTaskFailed", + "bb.event.BuildBase", "bb.build.TaskStarted", "bb.build.TaskSucceeded", "bb.build.TaskFailedSilent", + "bb.build.TaskProgress", "bb.event.ProcessStarted", "bb.event.ProcessProgress", "bb.event.ProcessFinished"] + + +def _log_settings_from_server(server): + # Get values of variables which control our output + includelogs, error = server.runCommand(["getVariable", "BBINCLUDELOGS"]) + if error: + logger.error("Unable to get the value of BBINCLUDELOGS variable: %s" % error) + raise BaseException(error) + loglines, error = server.runCommand(["getVariable", "BBINCLUDELOGS_LINES"]) + if error: + logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s" % error) + raise BaseException(error) + return includelogs, loglines + + +def main(server, eventHandler, params): + params.updateToServer(server, os.environ.copy()) + + includelogs, loglines = _log_settings_from_server(server) + + ui = TeamCityUI() + + helper = uihelper.BBUIHelper() + + console = logging.StreamHandler(sys.stdout) + errconsole = logging.StreamHandler(sys.stderr) + format = TeamcityLogFormatter() + if params.options.quiet == 0: + forcelevel = None + elif params.options.quiet > 2: + forcelevel = bb.msg.BBLogFormatter.ERROR + else: + forcelevel = bb.msg.BBLogFormatter.WARNING + bb.msg.addDefaultlogFilter(console, bb.msg.BBLogFilterStdOut, forcelevel) + bb.msg.addDefaultlogFilter(errconsole, bb.msg.BBLogFilterStdErr) + console.setFormatter(format) + errconsole.setFormatter(format) + if not bb.msg.has_console_handler(logger): + logger.addHandler(console) + logger.addHandler(errconsole) + + if params.options.remote_server and params.options.kill_server: + server.terminateServer() + return + + if params.observe_only: + logger.error("Observe-only mode not supported in this UI") + return 1 + + llevel, debug_domains = bb.msg.constructLogOptions() + server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) + + try: + params.updateFromServer(server) + cmdline = params.parseActions() + if not cmdline: + logger.error("No task given") + return 1 + if 'msg' in cmdline and cmdline['msg']: + logger.error(cmdline['msg']) + return 1 + cmdline = cmdline['action'] + ret, error = server.runCommand(cmdline) + if error: + logger.error("{0}: {1}".format(cmdline, error)) + return 1 + elif not ret: + logger.error("Couldn't get default commandline: {0}".format(re)) + return 1 + except xmlrpc.client.Fault as x: + logger.error("XMLRPC Fault getting commandline: {0}".format(x)) + return 1 + + active_process_total = None + is_tasks_running = False + + while True: + try: + event = eventHandler.waitEvent(0.25) + if not event: + continue + + helper.eventHandler(event) + + if isinstance(event, bb.build.TaskBase): + logger.info(event._message) + if isinstance(event, logging.LogRecord): + # Don't report sstate failures as errors, since Yocto will just run the tasks for real + if event.msg == "No suitable staging package found" or (event.msg.startswith( + "Fetcher failure: Unable to find file") and "downloadfilename" in event.msg and "sstate" in event.msg): + event.levelno = bb.msg.BBLogFormatter.WARNING + if event.taskpid != 0: + # For "normal" logging conditions, don't show note logs from tasks + # but do show them if the user has changed the default log level to + # include verbose/debug messages + if event.levelno <= bb.msg.BBLogFormatter.NOTE and (event.levelno < llevel or ( + event.levelno == bb.msg.BBLogFormatter.NOTE and llevel != bb.msg.BBLogFormatter.VERBOSE)): + continue + + # Prefix task messages with recipe/task + if event.taskpid in helper.running_tasks and event.levelno != bb.msg.BBLogFormatter.PLAIN: + taskinfo = helper.running_tasks[event.taskpid] + event.msg = taskinfo['title'] + ': ' + event.msg + if hasattr(event, 'fn'): + event.msg = event.fn + ': ' + event.msg + logger.handle(event) + if isinstance(event, bb.build.TaskFailedSilent): + logger.warning("Logfile for failed setscene task is %s" % event.logfile) + continue + if isinstance(event, bb.build.TaskFailed): + rt = "{0}-{1}:{2}".format(event.pn, event.pv.replace("AUTOINC", "0"), event.task) + + logfile = event.logfile + if not logfile or not os.path.exists(logfile): + TeamCityUI.emit_service_message("buildProblem", description="{0}\nUnknown failure (no log file available)".format(rt)) + if not event.task.endswith("_setscene"): + server.runCommand(["stateForceShutdown"]) + continue + + details = deque(maxlen=loglines) + error_lines = [] + if includelogs and not event.errprinted: + with open(logfile, "r") as f: + while True: + line = f.readline() + if not line: + break + line = line.rstrip() + details.append(' | %s' % line) + # TODO: a less stupid check for errors + if (event.task == "do_compile") and ("error:" in line): + error_lines.append(line) + + if error_lines: + TeamCityUI.emit_service_message("compilationStarted", compiler=rt) + for line in error_lines: + TeamCityUI.emit_service_message("message", text=line, status="ERROR") + TeamCityUI.emit_service_message("compilationFinished", compiler=rt) + else: + TeamCityUI.emit_service_message("buildProblem", description=rt) + + err = "Logfile of failure stored in: %s" % logfile + if details: + ui.block_start("{0} task log".format(rt)) + # TeamCity seems to choke on service messages longer than about 63800 characters, so if error + # details is longer than, say, 60000, batch it up into several messages. + first_message = True + while details: + detail_len = 0 + batch = deque() + while details and detail_len < 60000: + # TODO: This code doesn't bother to handle lines that themselves are extremely long. + line = details.popleft() + batch.append(line) + detail_len += len(line) + + if first_message: + batch.appendleft("Log data follows:") + first_message = False + TeamCityUI.emit_service_message("message", text=err, status="ERROR", + errorDetails="\n".join(batch)) + else: + TeamCityUI.emit_service_message("message", text="[continued]", status="ERROR", + errorDetails="\n".join(batch)) + ui.block_end() + else: + TeamCityUI.emit_service_message("message", text=err, status="ERROR", errorDetails="") + + if not event.task.endswith("_setscene"): + server.runCommand(["stateForceShutdown"]) + + if isinstance(event, bb.event.ProcessStarted): + if event.processname in ["Initialising tasks", "Checking sstate mirror object availability"]: + active_process_total = event.total + ui.block_start(event.processname) + if isinstance(event, bb.event.ProcessFinished): + if event.processname in ["Initialising tasks", "Checking sstate mirror object availability"]: + ui.progress(event.processname, 100) + ui.block_end() + if isinstance(event, bb.event.ProcessProgress): + if event.processname in ["Initialising tasks", + "Checking sstate mirror object availability"] and active_process_total != 0: + ui.progress(event.processname, event.progress * 100 / active_process_total) + if isinstance(event, bb.event.CacheLoadStarted): + ui.block_start("Loading cache") + if isinstance(event, bb.event.CacheLoadProgress): + if event.total != 0: + ui.progress("Loading cache", math.floor(event.current * 100 / event.total)) + if isinstance(event, bb.event.CacheLoadCompleted): + ui.progress("Loading cache", 100) + ui.block_end() + if isinstance(event, bb.event.ParseStarted): + ui.block_start("Parsing recipes and checking upstream revisions") + if isinstance(event, bb.event.ParseProgress): + if event.total != 0: + ui.progress("Parsing recipes", math.floor(event.current * 100 / event.total)) + if isinstance(event, bb.event.ParseCompleted): + ui.progress("Parsing recipes", 100) + ui.block_end() + if isinstance(event, bb.command.CommandCompleted): + return + if isinstance(event, bb.command.CommandFailed): + logger.error(str(event)) + return 1 + if isinstance(event, bb.event.MultipleProviders): + logger.warning(str(event)) + continue + if isinstance(event, bb.event.NoProvider): + logger.error(str(event)) + continue + if isinstance(event, bb.command.CommandExit): + return + if isinstance(event, bb.cooker.CookerExit): + return + if isinstance(event, bb.runqueue.sceneQueueTaskStarted): + if not is_tasks_running: + is_tasks_running = True + ui.block_start("Running tasks") + if event.stats.total != 0: + ui.progress("Running setscene tasks", ( + event.stats.completed + event.stats.active + event.stats.failed + 1) * 100 / event.stats.total) + if isinstance(event, bb.runqueue.runQueueTaskStarted): + if not is_tasks_running: + is_tasks_running = True + ui.block_start("Running tasks") + if event.stats.total != 0: + pseudo_total = event.stats.total - event.stats.skipped + pseudo_complete = event.stats.completed + event.stats.active - event.stats.skipped + event.stats.failed + 1 + # TODO: sometimes this gives over 100% + ui.progress("Running runqueue tasks", (pseudo_complete) * 100 / pseudo_total, + " ({0}/{1})".format(pseudo_complete, pseudo_total)) + if isinstance(event, bb.runqueue.sceneQueueTaskFailed): + logger.warning(str(event)) + continue + if isinstance(event, bb.runqueue.runQueueTaskFailed): + logger.error(str(event)) + return 1 + if isinstance(event, bb.event.LogExecTTY): + pass + except EnvironmentError as ioerror: + # ignore interrupted io + if ioerror.args[0] == 4: + pass + except Exception as ex: + logger.error(str(ex)) + + # except KeyboardInterrupt: + # if shutdown == 2: + # mw.appendText("Third Keyboard Interrupt, exit.\n") + # exitflag = True + # if shutdown == 1: + # mw.appendText("Second Keyboard Interrupt, stopping...\n") + # _, error = server.runCommand(["stateForceShutdown"]) + # if error: + # print("Unable to cleanly stop: %s" % error) + # if shutdown == 0: + # mw.appendText("Keyboard Interrupt, closing down...\n") + # _, error = server.runCommand(["stateShutdown"]) + # if error: + # print("Unable to cleanly shutdown: %s" % error) + # shutdown = shutdown + 1 + # pass -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:29:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:29:51 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: build.py: augment TaskBase to capture PN and PV Message-ID: <158351579143.3183.17282694310422418608@git.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 2885034 build.py: augment TaskBase to capture PN and PV 2885034 is described below commit 2885034f42a1dce7586e081a0461b8932a3593bf Author: Chris Laplante AuthorDate: Wed Jan 22 12:26:04 2020 -0500 build.py: augment TaskBase to capture PN and PV PF is already captured, but it's a pain to try to parse out PN and PV, which can be helpful to have available. Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie --- lib/bb/build.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bb/build.py b/lib/bb/build.py index b6d23e6..23b6ee4 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -65,6 +65,8 @@ class TaskBase(event.Event): self.taskname = self._task self.logfile = logfile self.time = time.time() + self.pn = d.getVar("PN") + self.pv = d.getVar("PV") event.Event.__init__(self) self._message = "recipe %s: task %s: %s" % (d.getVar("PF"), t, self.getDisplayName()) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:30:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:30:42 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (2f9d6d5 -> 1aaec71) Message-ID: <158351584289.4945.14508774515167867058@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 2f9d6d5 populate_sdk_ext: add option to append lines into local.conf new 54f74a1 cve-check: show whitelisted status new e1533b0 linux-firmware: drop remnants of pre-2.6.37 support (TI) new 1aaec71 linux-firmware: TI: fix wl18xx support 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/classes/cve-check.bbclass | 12 +++++++----- .../recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 12 +++++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:30:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:30:43 +0000 Subject: [oe-commits] [openembedded-core] 01/03: cve-check: show whitelisted status In-Reply-To: <158351584289.4945.14508774515167867058@git.openembedded.org> References: <158351584289.4945.14508774515167867058@git.openembedded.org> Message-ID: <20200306173043.0CE61232939@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 54f74a102d755c29e6982244a3401cefb2712c96 Author: Chee Yang Lee AuthorDate: Fri Mar 6 10:27:26 2020 +0800 cve-check: show whitelisted status change whitelisted CVE status from "Patched" to "Whitelisted". [Yocto #13687] Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- meta/classes/cve-check.bbclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 7412436..7f98da6 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -56,10 +56,10 @@ python do_cve_check () { patched_cves = get_patches_cves(d) except FileNotFoundError: bb.fatal("Failure in searching patches") - patched, unpatched = check_cves(d, patched_cves) + whitelisted, patched, unpatched = check_cves(d, patched_cves) if patched or unpatched: cve_data = get_cve_info(d, patched + unpatched) - cve_write_data(d, patched, unpatched, cve_data) + cve_write_data(d, patched, unpatched, whitelisted, cve_data) else: bb.note("No CVE database found, skipping CVE check") @@ -263,7 +263,7 @@ def check_cves(d, patched_cves): conn.close() - return (list(patched_cves), cves_unpatched) + return (list(cve_whitelist), list(patched_cves), cves_unpatched) def get_cve_info(d, cves): """ @@ -287,7 +287,7 @@ def get_cve_info(d, cves): conn.close() return cve_data -def cve_write_data(d, patched, unpatched, cve_data): +def cve_write_data(d, patched, unpatched, whitelisted, cve_data): """ Write CVE information in WORKDIR; and to CVE_CHECK_DIR, and CVE manifest if enabled. @@ -303,7 +303,9 @@ def cve_write_data(d, patched, unpatched, cve_data): write_string += "PACKAGE NAME: %s\n" % d.getVar("PN") write_string += "PACKAGE VERSION: %s\n" % d.getVar("PV") write_string += "CVE: %s\n" % cve - if cve in patched: + if cve in whitelisted: + write_string += "CVE STATUS: Whitelisted\n" + elif cve in patched: write_string += "CVE STATUS: Patched\n" else: unpatched_cves.append(cve) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:30:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:30:44 +0000 Subject: [oe-commits] [openembedded-core] 02/03: linux-firmware: drop remnants of pre-2.6.37 support (TI) In-Reply-To: <158351584289.4945.14508774515167867058@git.openembedded.org> References: <158351584289.4945.14508774515167867058@git.openembedded.org> Message-ID: <20200306173043.18FC2232949@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e1533b0c255b50c8f9cc2b299870d8e66094caad Author: Andr? Draszik AuthorDate: Fri Mar 6 09:35:14 2020 +0000 linux-firmware: drop remnants of pre-2.6.37 support (TI) Now that this recipe uses make install, we don't manually create symlinks for firmware files for older kernel in do_install(). As such, the FILES statement can be updated as well. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 8f963f4..4f90084 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -512,15 +512,12 @@ LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" FILES_${PN}-wlcommon = " \ - ${nonarch_base_libdir}/firmware/TI* \ ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ " FILES_${PN}-wl12xx = " \ - ${nonarch_base_libdir}/firmware/wl12* \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ " FILES_${PN}-wl18xx = " \ - ${nonarch_base_libdir}/firmware/wl18* \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:30:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:30:45 +0000 Subject: [oe-commits] [openembedded-core] 03/03: linux-firmware: TI: fix wl18xx support In-Reply-To: <158351584289.4945.14508774515167867058@git.openembedded.org> References: <158351584289.4945.14508774515167867058@git.openembedded.org> Message-ID: <20200306173043.25C4123294A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1aaec71e8faff892310b9d19c3356597dfdf66bf Author: Andr? Draszik AuthorDate: Fri Mar 6 09:35:15 2020 +0000 linux-firmware: TI: fix wl18xx support wl1271-nvs.bin belongs to the wl18xx driver (and respective package created here), see kernel source. Due to the way packages are assembled here it ends up in the wrong package, though. Fix by placing it in the -common package as it's merely a symlink to wl127x-nvs.bin (which does belong to the wl12xx), so that both drivers have access to it. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 4f90084..a7406e4 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -511,8 +511,17 @@ LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" +# wl18xx optionally needs wl1271-nvs.bin (which itself is a symlink to +# wl127x-nvs.bin) - see linux/drivers/net/wireless/ti/wlcore/sdio.c +# and drivers/net/wireless/ti/wlcore/spi.c. +# While they're optional and actually only used to override the MAC +# address on wl18xx, driver loading will delay (by udev timout - 60s) +# if not there. So let's make it available always. Because it's a +# symlink, both need to go to wlcommon. FILES_${PN}-wlcommon = " \ ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin \ " FILES_${PN}-wl12xx = " \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:31:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:31:23 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: curl: upgrade 7.68.0 -> 7.69.0 Message-ID: <158351588328.6853.3762963251628669443@git.openembedded.org> 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 0a77143 curl: upgrade 7.68.0 -> 7.69.0 0a77143 is described below commit 0a771433f782e4bf3b5282529b4e999b619c9502 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 17:33:53 2020 +0100 curl: upgrade 7.68.0 -> 7.69.0 Bugfix release. For details, see full changelog - https://curl.haxx.se/changes.html#7_69_0 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-support/curl/{curl_7.68.0.bb => curl_7.69.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb similarity index 95% rename from meta/recipes-support/curl/curl_7.68.0.bb rename to meta/recipes-support/curl/curl_7.69.0.bb index a80bb77..2e9b512 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.69.0.bb @@ -9,8 +9,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ " -SRC_URI[md5sum] = "40d6784bd1a86e079d63cc668ba9bd8f" -SRC_URI[sha256sum] = "207f54917dd6a2dc733065ccf18d61bb5bebeaceb5df49cd9445483e8623eeb9" +SRC_URI[md5sum] = "04eb86d1138c2ff3dbfd497f7de85daa" +SRC_URI[sha256sum] = "668d451108a7316cff040b23c79bc766e7ed84122074e44f662b8982f2e76739" CVE_PRODUCT = "curl libcurl" inherit autotools pkgconfig binconfig multilib_header -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:45 +0000 Subject: [oe-commits] [meta-openembedded] 01/14: mraa_git.bb: update to v2.1.0 In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173744.D1AFA232951@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d9fd04ba32a05b864a3f63ac83fc841ef5391aa1 Author: Propanu AuthorDate: Wed Feb 26 12:45:36 2020 -0800 mraa_git.bb: update to v2.1.0 Update SRCREV to latest v2.1.0 and SRC_URI to reflect new Eclipse Foundation project location. Signed-off-by: Mihai Tudor Panu Signed-off-by: Khem Raj --- meta-oe/recipes-extended/mraa/mraa_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index 6d42c67..a663039 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/intel-iot-devkit/mraa" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2" +LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" -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 Fri Mar 6 17:37:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:46 +0000 Subject: [oe-commits] [meta-openembedded] 02/14: quagga: fix reproducibily issue. In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173744.DF1D9232952@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1d4356c6ef6201bd41a129d42b1db747c610df6b Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:31 2020 -0800 quagga: fix reproducibily issue. version.h contains the options passed to configure, which includes the path to the recipe-sysroot on the build host. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 310bc7e..3494a43 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -106,6 +106,7 @@ do_install () { sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* + sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h # For PAM for feature in ${DISTRO_FEATURES}; do -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:44 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (af6adb7 -> 37c045b) Message-ID: <158351626457.20308.6787741362416830606@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 af6adb7 python3-django: fix UPSTREAM_CHECK_REGEX discard 46d3d41 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX discard 0d68b0c abseil-cpp: set PV in the recipe discard 42ac9f5 babeld: add UPSTREAM_CHECK_GITTAGREGEX discard 9966a72 exfat-utils: fix upstream version check discard a511084 python3-pygobject: remove this recipe discard 58325f9 proftpd: make prxs a mulitlib script discard d135d8d proftpd: remove macro-prefix-map from prxs discard ea6cf8c net-snmp: multilib fixes discard 854c1db net-snmp: fix reproducibilty issues in net-snmp-config discard 0d4dbfb libdnet: make dnet-config a multilib_script discard ef402b5 quagga: make version.h a multilib header discard c562cfd quagga: fix reproducibily issue. discard a14de53 mraa_git.bb: update to v2.1.0 discard 9e27bb2 networkmanager: Upgrade 1.18.4 -> 1.22.8 new d9fd04b mraa_git.bb: update to v2.1.0 new 1d4356c quagga: fix reproducibily issue. new d67a35b quagga: make version.h a multilib header new a0e6cd3 libdnet: make dnet-config a multilib_script new 2abfc6a net-snmp: fix reproducibilty issues in net-snmp-config new 38688f9 net-snmp: multilib fixes new 6c7b01c proftpd: remove macro-prefix-map from prxs new 78a712c proftpd: make prxs a mulitlib script new 69a740c python3-pygobject: remove this recipe new 12c0c60 exfat-utils: fix upstream version check new 8189c69 babeld: add UPSTREAM_CHECK_GITTAGREGEX new 07882ee abseil-cpp: set PV in the recipe new 4906055 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX new 37c045b python3-django: fix UPSTREAM_CHECK_REGEX 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 (af6adb7) \ N -- N -- N refs/heads/master-next (37c045b) 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: ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 6 ++-- ...te-settings-settings-property-documentati.patch | 23 ++++++------ ...0001-Fix-build-with-musl-systemd-specific.patch | 26 +++++++------- .../musl/0002-Fix-build-with-musl.patch | 30 ++++++++-------- ...kmanager_1.22.8.bb => networkmanager_1.18.4.bb} | 42 ++++++++-------------- 5 files changed, 57 insertions(+), 70 deletions(-) rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.22.8.bb => networkmanager_1.18.4.bb} (77%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:47 +0000 Subject: [oe-commits] [meta-openembedded] 03/14: quagga: make version.h a multilib header In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173744.EF7BB232953@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d67a35bcb1ed3712e7fe8eef0ad2fd88d34b391b Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:32 2020 -0800 quagga: make version.h a multilib header version.h contains the configure options passed during the build which differs between multilibs Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/quagga.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc index 3494a43..134a33d 100644 --- a/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-networking/recipes-protocols/quagga/quagga.inc @@ -40,7 +40,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" -inherit autotools update-rc.d useradd systemd pkgconfig +inherit autotools update-rc.d useradd systemd pkgconfig multilib_header SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" @@ -108,6 +108,8 @@ do_install () { sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h + oe_multilib_header quagga/version.h + # For PAM for feature in ${DISTRO_FEATURES}; do if [ "$feature" = "pam" ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:48 +0000 Subject: [oe-commits] [meta-openembedded] 04/14: libdnet: make dnet-config a multilib_script In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.10CBC232956@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a0e6cd3b6ea03ca995d9f4ef5fbdf0fc08207661 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:33 2020 -0800 libdnet: make dnet-config a multilib_script Script encodes library paths. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb index 5b6e45c..5b27cfe 100644 --- a/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb +++ b/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb @@ -11,8 +11,10 @@ UPSTREAM_CHECK_GITTAGREGEX = "libdnet-(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -inherit autotools +inherit autotools multilib_script acpaths = "-I ./config/" BBCLASSEXTEND = "native" + +MULTILIB_SCRIPTS = "${PN}:${bindir}/dnet-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:49 +0000 Subject: [oe-commits] [meta-openembedded] 05/14: net-snmp: fix reproducibilty issues in net-snmp-config In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.2080E232957@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2abfc6a7c7e0df4d39881b1343bd1c2b2937d8ac Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:34 2020 -0800 net-snmp: fix reproducibilty issues in net-snmp-config Both STAGING_HOST_DIR and -fmacro-prefix-map path to WORKDIR were encoded in the config. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 2 ++ 1 file changed, 2 insertions(+) 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 317350e..91c50c4 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 @@ -124,11 +124,13 @@ do_install_append() { -i ${D}${bindir}/net-snmp-create-v3-user sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g' \ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*--sysroot=[^ "]*@@g' \ -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \ -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ + -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/net-snmp-config if [ "${HAS_PERL}" = "1" ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:50 +0000 Subject: [oe-commits] [meta-openembedded] 06/14: net-snmp: multilib fixes In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.31617232959@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 38688f9b77f732c6e3cb2d0f6df40ad80fcb6b68 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:35 2020 -0800 net-snmp: multilib fixes net-snmp/net-snmp-config.h: - encodes type sizes - encodes pathing into the libdir net-snmp-config: - encodes build configuration data and lib pathing. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 91c50c4..762dec4 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 @@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" UPSTREAM_CHECK_REGEX = "/net-snmp/(?P\d+(\.\d+)+)/" -inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest +inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest multilib_script multilib_header EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" @@ -138,6 +138,8 @@ do_install_append() { -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ -i ${D}${bindir}/net-snmp-config fi + + oe_multilib_header net-snmp/net-snmp-config.h } do_install_ptest() { @@ -270,3 +272,5 @@ RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" LEAD_SONAME = "libnetsnmp.so" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/net-snmp-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:51 +0000 Subject: [oe-commits] [meta-openembedded] 07/14: proftpd: remove macro-prefix-map from prxs In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.4053023295A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6c7b01cfa1c0dbebd4d689d1e860937013617060 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:36 2020 -0800 proftpd: remove macro-prefix-map from prxs macro-prefix-map points to build WORKDIR which will cause reproducibilty failures. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb index 4099472..a080bec 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb @@ -110,6 +110,7 @@ do_install () { sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ -e 's|${STAGING_DIR_NATIVE}||g' \ -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -e 's|-fmacro-prefix-map=[^ ]*||g' \ -i ${D}/${bindir}/prxs # ftpmail perl script, which reads the proftpd log file and sends -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:52 +0000 Subject: [oe-commits] [meta-openembedded] 08/14: proftpd: make prxs a mulitlib script In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.4C0D023295B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 78a712cb3063246ecf5448efd8c5c7788b82fdb3 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:37 2020 -0800 proftpd: make prxs a mulitlib script Script encodes compiler settings and compiler name. my $compiler = q(x86_64-poky-linux-gcc -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 ); Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb index a080bec..d5bbdd3 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb @@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b" SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf" -inherit autotools-brokensep useradd update-rc.d systemd +inherit autotools-brokensep useradd update-rc.d systemd multilib_script PACKAGECONFIG ??= "shadow \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ @@ -134,6 +134,8 @@ GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}" USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ --shell /bin/false ${FTPUSER}" +MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs" + FILES_${PN} += "/home/${FTPUSER}" RDEPENDS_${PN} += "perl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:54 +0000 Subject: [oe-commits] [meta-openembedded] 10/14: exfat-utils: fix upstream version check In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.67C8323295C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 12c0c606a7df3cfe665668d19305baea032009f2 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 21:05:49 2020 +0000 exfat-utils: fix upstream version check Fixes: INFO: Skip package exfat-utils (status = UNKNOWN_BROKEN, current version = 1.3.0, next version = N/A) After this commit: INFO: Skip package exfat-utils (status = MATCH, current version = 1.3.0, next version = 1.3.0) Signed-off-by: Pierre-Jean Texier --- meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb index 1f2bfa6..7f804a7 100644 --- a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb +++ b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb @@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" +UPSTREAM_CHECK_URI = "https://github.com/relan/exfat/releases" + DEPENDS = "virtual/libc" inherit pkgconfig autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:55 +0000 Subject: [oe-commits] [meta-openembedded] 11/14: babeld: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.75699232950@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8189c6928d9022b160ed9f44b3a4ba5ba838d0a9 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 20:05:25 2020 +0000 babeld: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: babeld, 1.9.1, 20110804, None, 794863e90f81ee38b9dddd72dfabcba634b2fc07 After this commit: INFO: Skip package babeld (status = MATCH, current version = 1.9.1, next version = 1.9.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb index 27e7b43..6dd15ad 100644 --- a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb +++ b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "git://github.com/jech/babeld.git;protocol=git" SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" +UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" + S = "${WORKDIR}/git" do_compile () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:53 +0000 Subject: [oe-commits] [meta-openembedded] 09/14: python3-pygobject: remove this recipe In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.5D046232951@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 69a740cd4ebe406bcd5f402a3987df771888aa4d Author: Changqing Li AuthorDate: Fri Mar 6 12:34:35 2020 +0800 python3-pygobject: remove this recipe python3-pygobject already in oe-core, previously, we have python-pygobject in meta-oe, but recently, in order to drop python2, we transfer python-pygobject to python3-pygobject, so duplicated with oe-core, meantime, this will cause test_signature failure when do yocto-check-layer for layer meta-oe. Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../0001-python-pyobject-fix-install-dir.patch | 121 --------------------- .../python/python3-pygobject_3.34.0.bb | 33 ------ 2 files changed, 154 deletions(-) diff --git a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch b/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch deleted file mode 100644 index 848cda5..0000000 --- a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 8b4648d5bc50cb1c14961ed38bf97d5a693f5237 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 24 Jun 2019 14:51:52 +0800 -Subject: [PATCH] python-pyobject: fix the wrong install dir for python2 - -* after upgrade to 3.32.1, pygobject switch to build with meson, and - default python option is python3, switch to python2 - -* default install dir get by python.install_sources and -python.get_install_dir is get from python's sysconfig info, -not like python3, for python2, the install dir include the basedir of -recipe-sysroot-native, add stagedir option for user to config -correct install dir. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li ---- - gi/meson.build | 7 +++---- - gi/overrides/meson.build | 4 ++-- - gi/repository/meson.build | 4 ++-- - meson.build | 4 +++- - meson_options.txt | 1 + - pygtkcompat/meson.build | 4 ++-- - 6 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/gi/meson.build b/gi/meson.build -index c1afd68..249c23d 100644 ---- a/gi/meson.build -+++ b/gi/meson.build -@@ -60,9 +60,8 @@ python_sources = [ - 'types.py', - ] - --python.install_sources(python_sources, -- pure : false, -- subdir : 'gi' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi') - ) - - # https://github.com/mesonbuild/meson/issues/4117 -@@ -76,7 +75,7 @@ giext = python.extension_module('_gi', sources, - dependencies : [python_ext_dep, glib_dep, gi_dep, ffi_dep], - include_directories: include_directories('..'), - install: true, -- subdir : 'gi', -+ install_dir: join_paths(stagedir, 'gi'), - c_args: pyext_c_args + main_c_args - ) - -diff --git a/gi/overrides/meson.build b/gi/overrides/meson.build -index 6ff073f..964fef1 100644 ---- a/gi/overrides/meson.build -+++ b/gi/overrides/meson.build -@@ -10,6 +10,6 @@ python_sources = [ - 'keysyms.py', - '__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'overrides') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'overrides') - ) -diff --git a/gi/repository/meson.build b/gi/repository/meson.build -index fdc136b..fc88adf 100644 ---- a/gi/repository/meson.build -+++ b/gi/repository/meson.build -@@ -1,5 +1,5 @@ - python_sources = ['__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'repository') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'repository') - ) -diff --git a/meson.build b/meson.build -index d27a005..ecd55d5 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,12 +165,14 @@ else - py_version = pygobject_version - endif - -+stagedir = get_option('stagedir') -+ - pkginfo_conf = configuration_data() - pkginfo_conf.set('VERSION', py_version) - configure_file(input : 'PKG-INFO.in', - output : 'PyGObject- at 0@.egg-info'.format(py_version), - configuration : pkginfo_conf, -- install_dir : python.get_install_dir(pure : false)) -+ install_dir : stagedir) - - subdir('gi') - subdir('pygtkcompat') -diff --git a/meson_options.txt b/meson_options.txt -index 5dd4cbc..21def16 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ - option('python', type : 'string', value : 'python3') - option('pycairo', type : 'boolean', value : true, description : 'build with pycairo integration') - option('tests', type : 'boolean', value : true, description : 'build unit tests') -+option('stagedir', type : 'string', value : '') -diff --git a/pygtkcompat/meson.build b/pygtkcompat/meson.build -index 9e43c44..ef3322d 100644 ---- a/pygtkcompat/meson.build -+++ b/pygtkcompat/meson.build -@@ -3,6 +3,6 @@ python_sources = [ - 'generictreemodel.py', - 'pygtkcompat.py'] - --python.install_sources(python_sources, -- subdir : 'pygtkcompat' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'pygtkcompat') - ) --- -2.7.4 - diff --git a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb b/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb deleted file mode 100644 index e06f4dc..0000000 --- a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Python GObject bindings" -HOMEPAGE = "http://www.pygtk.org/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection distutils3-base upstream-version-is-even - -DEPENDS += "python3 glib-2.0" - -SRCNAME = "pygobject" -SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ -" - -SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6" -SRC_URI[sha256sum] = "87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -UNKNOWN_CONFIGURE_WHITELIST = "introspection" - -PACKAGECONFIG ??= "" - -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python-pycairo, python-pycairo" -PACKAGECONFIG[tests] = "-Dtests=true, -Dtests=false, , " - -EXTRA_OEMESON_append = " -Dpython=python3" - -BBCLASSEXTEND = "native" -RDEPENDS_${PN} = "python3-pkgutil" -RDEPENDS_${PN}_class-native = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:56 +0000 Subject: [oe-commits] [meta-openembedded] 12/14: abseil-cpp: set PV in the recipe In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.81D8E232952@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 07882eee752df688a01862cf042f21335c73aa6e Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:23:46 2020 +0000 abseil-cpp: set PV in the recipe Fixes: INFO: Skip package abseil-cpp (status = UNKNOWN_BROKEN, current version = git, next version = 20200225.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + 1 file changed, 1 insertion(+) 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 4d16361..115ffc6 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,6 +7,7 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" +PV = "20190808+git${SRCPV}" SRCREV = "aa844899c937bde5d2b24f276b59997e5b668bde" BRANCH = "lts_2019_08_08" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:37:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:57 +0000 Subject: [oe-commits] [meta-openembedded] 13/14: pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.8E831232953@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4906055bfefda425e06b892420b85080ebc516cb Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:09:35 2020 +0000 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: pkcs11-helper, 1.26, 11, None, c7a0cfa08ddc75d963a835d3588170af0e5f1115 After this commit: INFO: Skip package pkcs11-helper (status = MATCH, current version = 1.26, next version = 1.26) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb index 4f383d1..9b6e7cc 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb @@ -21,6 +21,8 @@ S = "${WORKDIR}/git" # v1.26 SRCREV = "c7a0cfa08ddc75d963a835d3588170af0e5f1115" +UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P\d+(\.\d+)+)" + DEPENDS = "zlib nettle gnutls gmp openssl nss nspr" 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 Mar 6 17:37:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:37:58 +0000 Subject: [oe-commits] [meta-openembedded] 14/14: python3-django: fix UPSTREAM_CHECK_REGEX In-Reply-To: <158351626457.20308.6787741362416830606@git.openembedded.org> References: <158351626457.20308.6787741362416830606@git.openembedded.org> Message-ID: <20200306173745.97A22232956@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 37c045bbae59aa5f9a929966f0a5dd708b537d3e Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 16:56:38 2020 +0000 python3-django: fix UPSTREAM_CHECK_REGEX Fixes: INFO: Skip package python3-django (status = UNKNOWN_BROKEN, current version = 2.2.7, next version = 1.15) After this commit: INFO: python3-django, 2.2.7, 3.0.4, None, N/A Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-django.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc index 63d025d..54c77c8 100644 --- a/meta-python/recipes-devtools/python/python-django.inc +++ b/meta-python/recipes-devtools/python/python-django.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" PYPI_PACKAGE = "Django" inherit pypi -UPSTREAM_CHECK_REGEX = "(?P1(\.\d+)+)" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" FILES_${PN} += "${datadir}/django" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 17:39:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 17:39:07 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: daemontools: remove native BBCLASSEXTEND Message-ID: <158351634754.23958.3931105497557390974@git.openembedded.org> 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 639ccd5 daemontools: remove native BBCLASSEXTEND 639ccd5 is described below commit 639ccd58165361cd23b80dedc38b456a00e27878 Author: Martin Jansa AuthorDate: Fri Mar 6 18:36:46 2020 +0100 daemontools: remove native BBCLASSEXTEND * it was used only to provide chkshsgr which is now replaced with no-op call since commit 50d526d06a742fa69ff698d7c2eefffb56e13afa Author: Khem Raj Date: Tue Jan 28 11:28:52 2020 -0800 daemontools: Disable the chkshsgr tests Running the chkhsgr test during cross compile fails ./chkshsgr || ( cat warn-shsgr; exit 1 ) Oops. Your getgroups() returned 0, and setgroups() failed; this means that I can't reliably do my shsgr test. Please either ``make'' as root or ``make'' while you're in one or more supplementary groups. All OE based targets have working getgroups()/setgroups() implementation, so its a safe assumption and therefore make the test to be a dummy * the native chkshsgr from daemontools-native was actually being called only because of this chunk of cross-compile.patch: - ./chkshsgr || ( cat warn-shsgr; exit 1 ) + chkshsgr || ( cat warn-shsgr; exit 1 ) but all chkshsgr does is: short x[4]; x[0] = x[1] = 0; if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); _exit(0); which running on host system, doesn't say anything useful about the cross compile target, so it's easier to just remove the call in cross-compile.patch and simplify all this nonsense * I came across this because daemontools-native was failing for me in "bitbake world" with zeus, which might be the same case as what Khem was seeing - just the final commit message doesn't reflect that * daemontools-native fails to build without the above commit in zeus as well, when building inside docker container where my build user is in fewer groups (just 1) so the getgroups(1,x) call doesn't fail, but on more average OS the user will be in more than 4 groups and getgroups(1,x) would fail with errno 22 EINVAL - so setgroups isn't even called to return 1 error when chkshsgr is called http://man7.org/linux/man-pages/man2/setgroups.2.html If the calling process is a member of more than size supplementary groups, then an error results. if I increase the size of x enough for x to hold all groups, then setgroups will fail with errno 1 EPERM, which is the same error as shown under docker container where getgroups doesn't fail, because in both cases I'm using unprivileged user for builds Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../0001-daemontools-native-Fix-a-warning.patch | 26 ---------------------- .../daemontools/daemontools/cross-compile.patch | 4 ++-- .../daemontools/daemontools_0.76.bb | 24 +++++--------------- 3 files changed, 8 insertions(+), 46 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch deleted file mode 100644 index 8d9577d..0000000 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a43a3327ccd4b06a3bcf0c87d518a97c6b39ac02 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Sat, 6 Aug 2016 02:09:53 +0900 -Subject: [PATCH] daemontools: Fix a warning - -To fix the warning as following: - -WARNING: daemontools-native-0.76-r0 do_populate_sysroot: File '/build-poky/tmp/sysroots/x86_64-linux/usr/bin/chkshsgr' from daemontools-native was already stripped, this will prevent future debugging! - -Signed-off-by: Lei Maohui ---- - src/conf-ld | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf-ld b/src/conf-ld -index 59a0de7..1d0518a 100644 ---- a/src/conf-ld -+++ b/src/conf-ld -@@ -1,3 +1,3 @@ --gcc -s -+gcc - - This will be used to link .o files into an executable. --- -2.7.4 - diff --git a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch index f164c2d..9c07d75 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch @@ -30,7 +30,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ tryshsgr.c warn-shsgr - ./chkshsgr || ( cat warn-shsgr; exit 1 ) -+ chkshsgr || ( cat warn-shsgr; exit 1 ) ++ echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )" ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c @@ -39,7 +39,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile readproctitle rts.tests setlock setuidgid softlimit supervise svc \ svok svscan svscanboot svstat tai64n tai64nlocal - env - /bin/sh rts.tests 2>&1 | cat -v > rts -+ echo "Warning: We can not run test on cross target." ++ echo "Warning: We can not run test on cross target. - ignoring env - /bin/sh rts.tests 2>&1 | cat -v > rts" scan_ulong.o: compile scan.h scan_ulong.c ./compile scan_ulong.c diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index d674e03..b99116d 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -16,24 +16,18 @@ LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c LICENSE = "PD" SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ - file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ - file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff " - -SRC_URI_append_class-target = "file://cross-compile.patch \ - file://0001-daemontools-Fix-QA-Issue.patch " - -SRC_URI_append_class-native = "file://0001-daemontools-native-Fix-a-warning.patch " + file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ + file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \ + file://cross-compile.patch \ + file://0001-daemontools-Fix-QA-Issue.patch \ +" SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" -S = "${WORKDIR}/admin/${BPN}-${PV}" - -DEPENDS += "daemontools-native" -DEPENDS_class-native = "" +S = "${WORKDIR}/admin/${BP}" do_compile() { - echo "int main() { return 0; }" >${S}/src/chkshsgr.c ./package/compile } @@ -41,12 +35,6 @@ do_install() { install -d ${D}/${bindir} } -do_install_append_class-native() { - install -m 755 ${S}/compile/chkshsgr ${D}/${bindir} -} - do_install_append_class-target() { install -m755 ${S}/command/* ${D}/${bindir} } - -BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 22:01:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 22:01:39 +0000 Subject: [oe-commits] [openembedded-core] 01/02: mesa: updated to mesa 20.0.1 release In-Reply-To: <158353209826.20727.9472281848537853541@git.openembedded.org> References: <158353209826.20727.9472281848537853541@git.openembedded.org> Message-ID: <20200306220138.967C7232959@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e7222b5231f83561d979a82262b77e49c84e2f05 Author: Nathan Hartman AuthorDate: Fri Mar 6 12:19:36 2020 -0800 mesa: updated to mesa 20.0.1 release Updated to 20.0.1 release: https://www.mesa3d.org/relnotes/20.0.1.html Signed-off-by: Nathan Hartman Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_20.0.0.bb => mesa-gl_20.0.1.bb} | 0 meta/recipes-graphics/mesa/{mesa_20.0.0.bb => mesa_20.0.1.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_20.0.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb rename to meta/recipes-graphics/mesa/mesa-gl_20.0.1.bb diff --git a/meta/recipes-graphics/mesa/mesa_20.0.0.bb b/meta/recipes-graphics/mesa/mesa_20.0.1.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_20.0.0.bb rename to meta/recipes-graphics/mesa/mesa_20.0.1.bb index 2ed7ca2..e18c00b 100644 --- a/meta/recipes-graphics/mesa/mesa_20.0.0.bb +++ b/meta/recipes-graphics/mesa/mesa_20.0.1.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] = "681229d992bbd6250a5be4f308708795" -SRC_URI[sha256sum] = "bb6db3e54b608d2536d4000b3de7dd3ae115fc114e8acbb5afff4b3bbed04b34" +SRC_URI[md5sum] = "428ac511e4b05647a00b3778f1279da7" +SRC_URI[sha256sum] = "6153ba3f8cb0524bbfc08e4db76b408126b2d1be8f789dffe28d1a0461eedde4" 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 Mar 6 22:01:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 22:01:38 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (0a77143 -> 5f6a5e8) Message-ID: <158353209826.20727.9472281848537853541@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 0a77143 curl: upgrade 7.68.0 -> 7.69.0 new e7222b5 mesa: updated to mesa 20.0.1 release new 5f6a5e8 gettext: fix ptest package reproducibilty 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: ...1-init-env.in-do-not-add-C-CXX-parameters.patch | 29 ++++++++++++++++++++++ meta/recipes-core/gettext/gettext_0.20.1.bb | 1 + .../mesa/{mesa-gl_20.0.0.bb => mesa-gl_20.0.1.bb} | 0 .../mesa/{mesa_20.0.0.bb => mesa_20.0.1.bb} | 4 +-- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch rename meta/recipes-graphics/mesa/{mesa-gl_20.0.0.bb => mesa-gl_20.0.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_20.0.0.bb => mesa_20.0.1.bb} (88%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 6 22:01:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 06 Mar 2020 22:01:40 +0000 Subject: [oe-commits] [openembedded-core] 02/02: gettext: fix ptest package reproducibilty In-Reply-To: <158353209826.20727.9472281848537853541@git.openembedded.org> References: <158353209826.20727.9472281848537853541@git.openembedded.org> Message-ID: <20200306220138.A154723295A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5f6a5e8c17d9767cee14a7f553d47e658a7ee0a1 Author: Alexander Kanavin AuthorDate: Fri Mar 6 22:51:38 2020 +0100 gettext: fix ptest package reproducibilty Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...1-init-env.in-do-not-add-C-CXX-parameters.patch | 29 ++++++++++++++++++++++ meta/recipes-core/gettext/gettext_0.20.1.bb | 1 + 2 files changed, 30 insertions(+) diff --git a/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch new file mode 100644 index 0000000..d45b758 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch @@ -0,0 +1,29 @@ +From 9b912a47f790a7b282ec0c2295a188c5d8fb6a7c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 6 Mar 2020 21:04:05 +0000 +Subject: [PATCH] init-env.in: do not add C/CXX parameters + +These are taken from the cross environment and include +sysroot paths, so are not reproducible. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + gettext-tools/tests/init-env.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in +index cc84ffd..b69c990 100644 +--- a/gettext-tools/tests/init-env.in ++++ b/gettext-tools/tests/init-env.in +@@ -3,10 +3,6 @@ top_builddir=../.. + + OBJEXT="@OBJEXT@" + EXEEXT="@EXEEXT@" +-CC="@CC@" +-CFLAGS="@CFLAGS@" +-CXX="@CXX@" +-CXXFLAGS="@CXXFLAGS@" + CPPFLAGS="@CPPFLAGS@" + LDFLAGS="@LDFLAGS@" + LTLIBINTL="@LTLIBINTL@" diff --git a/meta/recipes-core/gettext/gettext_0.20.1.bb b/meta/recipes-core/gettext/gettext_0.20.1.bb index 214803f..85493e7 100644 --- a/meta/recipes-core/gettext/gettext_0.20.1.bb +++ b/meta/recipes-core/gettext/gettext_0.20.1.bb @@ -25,6 +25,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://serial-tests-config.patch \ file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ + file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ " SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:24 +0000 Subject: [oe-commits] [meta-openembedded] 01/10: proftpd: remove macro-prefix-map from prxs In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013724.8ED4223295C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8bfb1ff1a6d50cb241bd5a6d326eed76284f4818 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:36 2020 -0800 proftpd: remove macro-prefix-map from prxs macro-prefix-map points to build WORKDIR which will cause reproducibilty failures. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb index 4099472..a080bec 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb @@ -110,6 +110,7 @@ do_install () { sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ -e 's|${STAGING_DIR_NATIVE}||g' \ -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -e 's|-fmacro-prefix-map=[^ ]*||g' \ -i ${D}/${bindir}/prxs # ftpmail perl script, which reads the proftpd log file and sends -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:23 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (639ccd5 -> 49e6052) Message-ID: <158354504386.10582.15925322028153444502@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 639ccd5 daemontools: remove native BBCLASSEXTEND discard 37c045b python3-django: fix UPSTREAM_CHECK_REGEX discard 4906055 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX discard 07882ee abseil-cpp: set PV in the recipe discard 8189c69 babeld: add UPSTREAM_CHECK_GITTAGREGEX discard 12c0c60 exfat-utils: fix upstream version check discard 69a740c python3-pygobject: remove this recipe discard 78a712c proftpd: make prxs a mulitlib script discard 6c7b01c proftpd: remove macro-prefix-map from prxs discard 38688f9 net-snmp: multilib fixes discard 2abfc6a net-snmp: fix reproducibilty issues in net-snmp-config new 8bfb1ff proftpd: remove macro-prefix-map from prxs new fd2e895 proftpd: make prxs a mulitlib script new 311f98f python3-pygobject: remove this recipe new ee15c67 exfat-utils: fix upstream version check new 1725078 babeld: add UPSTREAM_CHECK_GITTAGREGEX new 19f08ef abseil-cpp: set PV in the recipe new 4d85c3a pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX new 01e4b86 python3-django: fix UPSTREAM_CHECK_REGEX new 088ca60 daemontools: remove native BBCLASSEXTEND new 49e6052 net-snmp: multilib fixes 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 (639ccd5) \ N -- N -- N refs/heads/master-next (49e6052) 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-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 2 -- 1 file changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:25 +0000 Subject: [oe-commits] [meta-openembedded] 02/10: proftpd: make prxs a mulitlib script In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013724.A2A3223295D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fd2e895c9c28e8593cd7e21f090f56cc8cbeda58 Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:37 2020 -0800 proftpd: make prxs a mulitlib script Script encodes compiler settings and compiler name. my $compiler = q(x86_64-poky-linux-gcc -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 ); Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb index a080bec..d5bbdd3 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb @@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b" SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf" -inherit autotools-brokensep useradd update-rc.d systemd +inherit autotools-brokensep useradd update-rc.d systemd multilib_script PACKAGECONFIG ??= "shadow \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ @@ -134,6 +134,8 @@ GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}" USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ --shell /bin/false ${FTPUSER}" +MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs" + FILES_${PN} += "/home/${FTPUSER}" RDEPENDS_${PN} += "perl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:26 +0000 Subject: [oe-commits] [meta-openembedded] 03/10: python3-pygobject: remove this recipe In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013724.B915A23295E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 311f98fd03268cff343cf9ecb85de8092ef56b9b Author: Changqing Li AuthorDate: Fri Mar 6 12:34:35 2020 +0800 python3-pygobject: remove this recipe python3-pygobject already in oe-core, previously, we have python-pygobject in meta-oe, but recently, in order to drop python2, we transfer python-pygobject to python3-pygobject, so duplicated with oe-core, meantime, this will cause test_signature failure when do yocto-check-layer for layer meta-oe. Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../0001-python-pyobject-fix-install-dir.patch | 121 --------------------- .../python/python3-pygobject_3.34.0.bb | 33 ------ 2 files changed, 154 deletions(-) diff --git a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch b/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch deleted file mode 100644 index 848cda5..0000000 --- a/meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 8b4648d5bc50cb1c14961ed38bf97d5a693f5237 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Mon, 24 Jun 2019 14:51:52 +0800 -Subject: [PATCH] python-pyobject: fix the wrong install dir for python2 - -* after upgrade to 3.32.1, pygobject switch to build with meson, and - default python option is python3, switch to python2 - -* default install dir get by python.install_sources and -python.get_install_dir is get from python's sysconfig info, -not like python3, for python2, the install dir include the basedir of -recipe-sysroot-native, add stagedir option for user to config -correct install dir. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li ---- - gi/meson.build | 7 +++---- - gi/overrides/meson.build | 4 ++-- - gi/repository/meson.build | 4 ++-- - meson.build | 4 +++- - meson_options.txt | 1 + - pygtkcompat/meson.build | 4 ++-- - 6 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/gi/meson.build b/gi/meson.build -index c1afd68..249c23d 100644 ---- a/gi/meson.build -+++ b/gi/meson.build -@@ -60,9 +60,8 @@ python_sources = [ - 'types.py', - ] - --python.install_sources(python_sources, -- pure : false, -- subdir : 'gi' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi') - ) - - # https://github.com/mesonbuild/meson/issues/4117 -@@ -76,7 +75,7 @@ giext = python.extension_module('_gi', sources, - dependencies : [python_ext_dep, glib_dep, gi_dep, ffi_dep], - include_directories: include_directories('..'), - install: true, -- subdir : 'gi', -+ install_dir: join_paths(stagedir, 'gi'), - c_args: pyext_c_args + main_c_args - ) - -diff --git a/gi/overrides/meson.build b/gi/overrides/meson.build -index 6ff073f..964fef1 100644 ---- a/gi/overrides/meson.build -+++ b/gi/overrides/meson.build -@@ -10,6 +10,6 @@ python_sources = [ - 'keysyms.py', - '__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'overrides') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'overrides') - ) -diff --git a/gi/repository/meson.build b/gi/repository/meson.build -index fdc136b..fc88adf 100644 ---- a/gi/repository/meson.build -+++ b/gi/repository/meson.build -@@ -1,5 +1,5 @@ - python_sources = ['__init__.py'] - --python.install_sources(python_sources, -- subdir : join_paths('gi', 'repository') -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'gi', 'repository') - ) -diff --git a/meson.build b/meson.build -index d27a005..ecd55d5 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,12 +165,14 @@ else - py_version = pygobject_version - endif - -+stagedir = get_option('stagedir') -+ - pkginfo_conf = configuration_data() - pkginfo_conf.set('VERSION', py_version) - configure_file(input : 'PKG-INFO.in', - output : 'PyGObject- at 0@.egg-info'.format(py_version), - configuration : pkginfo_conf, -- install_dir : python.get_install_dir(pure : false)) -+ install_dir : stagedir) - - subdir('gi') - subdir('pygtkcompat') -diff --git a/meson_options.txt b/meson_options.txt -index 5dd4cbc..21def16 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ - option('python', type : 'string', value : 'python3') - option('pycairo', type : 'boolean', value : true, description : 'build with pycairo integration') - option('tests', type : 'boolean', value : true, description : 'build unit tests') -+option('stagedir', type : 'string', value : '') -diff --git a/pygtkcompat/meson.build b/pygtkcompat/meson.build -index 9e43c44..ef3322d 100644 ---- a/pygtkcompat/meson.build -+++ b/pygtkcompat/meson.build -@@ -3,6 +3,6 @@ python_sources = [ - 'generictreemodel.py', - 'pygtkcompat.py'] - --python.install_sources(python_sources, -- subdir : 'pygtkcompat' -+install_data(python_sources, -+ install_dir: join_paths(stagedir, 'pygtkcompat') - ) --- -2.7.4 - diff --git a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb b/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb deleted file mode 100644 index e06f4dc..0000000 --- a/meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Python GObject bindings" -HOMEPAGE = "http://www.pygtk.org/" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection distutils3-base upstream-version-is-even - -DEPENDS += "python3 glib-2.0" - -SRCNAME = "pygobject" -SRC_URI = " \ - http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz \ -" - -SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6" -SRC_URI[sha256sum] = "87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -UNKNOWN_CONFIGURE_WHITELIST = "introspection" - -PACKAGECONFIG ??= "" - -PACKAGECONFIG[cairo] = "-Dpycairo=true,-Dpycairo=false, cairo python-pycairo, python-pycairo" -PACKAGECONFIG[tests] = "-Dtests=true, -Dtests=false, , " - -EXTRA_OEMESON_append = " -Dpython=python3" - -BBCLASSEXTEND = "native" -RDEPENDS_${PN} = "python3-pkgutil" -RDEPENDS_${PN}_class-native = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:27 +0000 Subject: [oe-commits] [meta-openembedded] 04/10: exfat-utils: fix upstream version check In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013724.CD16D23295F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ee15c67c5834cba021cca53fca34ac8ba980759c Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 21:05:49 2020 +0000 exfat-utils: fix upstream version check Fixes: INFO: Skip package exfat-utils (status = UNKNOWN_BROKEN, current version = 1.3.0, next version = N/A) After this commit: INFO: Skip package exfat-utils (status = MATCH, current version = 1.3.0, next version = 1.3.0) Signed-off-by: Pierre-Jean Texier --- meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb index 1f2bfa6..7f804a7 100644 --- a/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb +++ b/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb @@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" +UPSTREAM_CHECK_URI = "https://github.com/relan/exfat/releases" + DEPENDS = "virtual/libc" inherit pkgconfig autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:29 +0000 Subject: [oe-commits] [meta-openembedded] 06/10: abseil-cpp: set PV in the recipe In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013725.03385232963@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 19f08efb422f1972892e76dd5e630e4ab036b339 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:23:46 2020 +0000 abseil-cpp: set PV in the recipe Fixes: INFO: Skip package abseil-cpp (status = UNKNOWN_BROKEN, current version = git, next version = 20200225.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + 1 file changed, 1 insertion(+) 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 4d16361..115ffc6 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,6 +7,7 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" +PV = "20190808+git${SRCPV}" SRCREV = "aa844899c937bde5d2b24f276b59997e5b668bde" BRANCH = "lts_2019_08_08" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:28 +0000 Subject: [oe-commits] [meta-openembedded] 05/10: babeld: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013724.E313F232961@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 17250785719c89616c8fa6f4200892973e0fdefc Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 20:05:25 2020 +0000 babeld: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: babeld, 1.9.1, 20110804, None, 794863e90f81ee38b9dddd72dfabcba634b2fc07 After this commit: INFO: Skip package babeld (status = MATCH, current version = 1.9.1, next version = 1.9.1) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb index 27e7b43..6dd15ad 100644 --- a/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb +++ b/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb @@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" SRC_URI = "git://github.com/jech/babeld.git;protocol=git" SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" +UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" + S = "${WORKDIR}/git" do_compile () { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:30 +0000 Subject: [oe-commits] [meta-openembedded] 07/10: pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013725.18096232964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4d85c3a5121bfbb67bf811ddb94f1bfbdb810fbb Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 18:09:35 2020 +0000 pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX Fixes: INFO: pkcs11-helper, 1.26, 11, None, c7a0cfa08ddc75d963a835d3588170af0e5f1115 After this commit: INFO: Skip package pkcs11-helper (status = MATCH, current version = 1.26, next version = 1.26) Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb index 4f383d1..9b6e7cc 100644 --- a/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb +++ b/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.26.bb @@ -21,6 +21,8 @@ S = "${WORKDIR}/git" # v1.26 SRCREV = "c7a0cfa08ddc75d963a835d3588170af0e5f1115" +UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P\d+(\.\d+)+)" + DEPENDS = "zlib nettle gnutls gmp openssl nss nspr" inherit autotools pkgconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:31 +0000 Subject: [oe-commits] [meta-openembedded] 08/10: python3-django: fix UPSTREAM_CHECK_REGEX In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013725.2F1E623295B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 01e4b86ca1b9202744b81447b153244e8139ad6c Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 16:56:38 2020 +0000 python3-django: fix UPSTREAM_CHECK_REGEX Fixes: INFO: Skip package python3-django (status = UNKNOWN_BROKEN, current version = 2.2.7, next version = 1.15) After this commit: INFO: python3-django, 2.2.7, 3.0.4, None, N/A Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-django.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc index 63d025d..54c77c8 100644 --- a/meta-python/recipes-devtools/python/python-django.inc +++ b/meta-python/recipes-devtools/python/python-django.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa" PYPI_PACKAGE = "Django" inherit pypi -UPSTREAM_CHECK_REGEX = "(?P1(\.\d+)+)" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" FILES_${PN} += "${datadir}/django" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:32 +0000 Subject: [oe-commits] [meta-openembedded] 09/10: daemontools: remove native BBCLASSEXTEND In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013725.43BDF23295C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 088ca6035626ad6f38515bad963a84cf266bb169 Author: Martin Jansa AuthorDate: Fri Mar 6 18:36:46 2020 +0100 daemontools: remove native BBCLASSEXTEND * it was used only to provide chkshsgr which is now replaced with no-op call since commit 50d526d06a742fa69ff698d7c2eefffb56e13afa Author: Khem Raj Date: Tue Jan 28 11:28:52 2020 -0800 daemontools: Disable the chkshsgr tests Running the chkhsgr test during cross compile fails ./chkshsgr || ( cat warn-shsgr; exit 1 ) Oops. Your getgroups() returned 0, and setgroups() failed; this means that I can't reliably do my shsgr test. Please either ``make'' as root or ``make'' while you're in one or more supplementary groups. All OE based targets have working getgroups()/setgroups() implementation, so its a safe assumption and therefore make the test to be a dummy * the native chkshsgr from daemontools-native was actually being called only because of this chunk of cross-compile.patch: - ./chkshsgr || ( cat warn-shsgr; exit 1 ) + chkshsgr || ( cat warn-shsgr; exit 1 ) but all chkshsgr does is: short x[4]; x[0] = x[1] = 0; if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); _exit(0); which running on host system, doesn't say anything useful about the cross compile target, so it's easier to just remove the call in cross-compile.patch and simplify all this nonsense * I came across this because daemontools-native was failing for me in "bitbake world" with zeus, which might be the same case as what Khem was seeing - just the final commit message doesn't reflect that * daemontools-native fails to build without the above commit in zeus as well, when building inside docker container where my build user is in fewer groups (just 1) so the getgroups(1,x) call doesn't fail, but on more average OS the user will be in more than 4 groups and getgroups(1,x) would fail with errno 22 EINVAL - so setgroups isn't even called to return 1 error when chkshsgr is called http://man7.org/linux/man-pages/man2/setgroups.2.html If the calling process is a member of more than size supplementary groups, then an error results. if I increase the size of x enough for x to hold all groups, then setgroups will fail with errno 1 EPERM, which is the same error as shown under docker container where getgroups doesn't fail, because in both cases I'm using unprivileged user for builds Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../0001-daemontools-native-Fix-a-warning.patch | 26 ---------------------- .../daemontools/daemontools/cross-compile.patch | 4 ++-- .../daemontools/daemontools_0.76.bb | 24 +++++--------------- 3 files changed, 8 insertions(+), 46 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch deleted file mode 100644 index 8d9577d..0000000 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a43a3327ccd4b06a3bcf0c87d518a97c6b39ac02 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Sat, 6 Aug 2016 02:09:53 +0900 -Subject: [PATCH] daemontools: Fix a warning - -To fix the warning as following: - -WARNING: daemontools-native-0.76-r0 do_populate_sysroot: File '/build-poky/tmp/sysroots/x86_64-linux/usr/bin/chkshsgr' from daemontools-native was already stripped, this will prevent future debugging! - -Signed-off-by: Lei Maohui ---- - src/conf-ld | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf-ld b/src/conf-ld -index 59a0de7..1d0518a 100644 ---- a/src/conf-ld -+++ b/src/conf-ld -@@ -1,3 +1,3 @@ --gcc -s -+gcc - - This will be used to link .o files into an executable. --- -2.7.4 - diff --git a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch index f164c2d..9c07d75 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch @@ -30,7 +30,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ tryshsgr.c warn-shsgr - ./chkshsgr || ( cat warn-shsgr; exit 1 ) -+ chkshsgr || ( cat warn-shsgr; exit 1 ) ++ echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )" ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c @@ -39,7 +39,7 @@ diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile readproctitle rts.tests setlock setuidgid softlimit supervise svc \ svok svscan svscanboot svstat tai64n tai64nlocal - env - /bin/sh rts.tests 2>&1 | cat -v > rts -+ echo "Warning: We can not run test on cross target." ++ echo "Warning: We can not run test on cross target. - ignoring env - /bin/sh rts.tests 2>&1 | cat -v > rts" scan_ulong.o: compile scan.h scan_ulong.c ./compile scan_ulong.c diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index d674e03..b99116d 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -16,24 +16,18 @@ LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c LICENSE = "PD" SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ - file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ - file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff " - -SRC_URI_append_class-target = "file://cross-compile.patch \ - file://0001-daemontools-Fix-QA-Issue.patch " - -SRC_URI_append_class-native = "file://0001-daemontools-native-Fix-a-warning.patch " + file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ + file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \ + file://cross-compile.patch \ + file://0001-daemontools-Fix-QA-Issue.patch \ +" SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" -S = "${WORKDIR}/admin/${BPN}-${PV}" - -DEPENDS += "daemontools-native" -DEPENDS_class-native = "" +S = "${WORKDIR}/admin/${BP}" do_compile() { - echo "int main() { return 0; }" >${S}/src/chkshsgr.c ./package/compile } @@ -41,12 +35,6 @@ do_install() { install -d ${D}/${bindir} } -do_install_append_class-native() { - install -m 755 ${S}/compile/chkshsgr ${D}/${bindir} -} - do_install_append_class-target() { install -m755 ${S}/command/* ${D}/${bindir} } - -BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 01:37:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 01:37:33 +0000 Subject: [oe-commits] [meta-openembedded] 10/10: net-snmp: multilib fixes In-Reply-To: <158354504386.10582.15925322028153444502@git.openembedded.org> References: <158354504386.10582.15925322028153444502@git.openembedded.org> Message-ID: <20200307013725.5B30723295D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 49e60520ccf90bcaa9943aa253a8031634803ebf Author: Jeremy Puhlman AuthorDate: Thu Mar 5 14:39:35 2020 -0800 net-snmp: multilib fixes net-snmp/net-snmp-config.h: - encodes type sizes - encodes pathing into the libdir net-snmp-config: - encodes build configuration data and lib pathing. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 317350e..9c2ffb2 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 @@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" UPSTREAM_CHECK_REGEX = "/net-snmp/(?P\d+(\.\d+)+)/" -inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest +inherit autotools-brokensep update-rc.d siteinfo systemd pkgconfig perlnative ptest multilib_script multilib_header EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" @@ -136,6 +136,8 @@ do_install_append() { -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ -i ${D}${bindir}/net-snmp-config fi + + oe_multilib_header net-snmp/net-snmp-config.h } do_install_ptest() { @@ -268,3 +270,5 @@ RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" LEAD_SONAME = "libnetsnmp.so" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/net-snmp-config" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 07:32:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 07:32:32 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: net-snmp: fix reproducibilty issues in net-snmp-config Message-ID: <158356635234.12497.709788519897469190@git.openembedded.org> 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 cd6b342 net-snmp: fix reproducibilty issues in net-snmp-config cd6b342 is described below commit cd6b342f18e3b65283596fd87eab47a7234a7051 Author: Jeremy Puhlman AuthorDate: Fri Mar 6 20:06:07 2020 -0800 net-snmp: fix reproducibilty issues in net-snmp-config Both STAGING_HOST_DIR and -fmacro-prefix-map path to WORKDIR were encoded in the config. Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 3 +++ 1 file changed, 3 insertions(+) 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 9c2ffb2..5466649 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 @@ -124,11 +124,14 @@ do_install_append() { -i ${D}${bindir}/net-snmp-create-v3-user sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=. at g' \ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*--sysroot=[^ "]*@@g' \ -e 's@[^ ]*--with-libtool-sysroot=[^ "]*@@g' \ -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ + -e 's at -L${STAGING_DIR_HOST}${libdir}@@g' \ + -e 's at -I${STAGING_DIR_HOST}${includedir}@@g' \ -i ${D}${bindir}/net-snmp-config if [ "${HAS_PERL}" = "1" ]; then -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:39 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (02aabe0 -> 15fe7de) Message-ID: <158357559941.28730.14055194744812176142@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 02aabe0 sstate: Drop obsolete check in hash validation new 09c4f90 parselogs.py: ignore rdrand initialization failure new e51b82b linux-firmware: Fix usrmerge builds new e524e49 populate_sdk_ext: enable custom templateconf.cfg new 181bdd6 cve-check: show whitelisted status new 4c60fa1 linux-firmware: drop remnants of pre-2.6.37 support (TI) new e0cc3cb linux-firmware: TI: fix wl18xx support new 2d6a990 curl: upgrade 7.68.0 -> 7.69.0 new ba61205 mesa: updated to mesa 20.0.1 release new 15fe7de gettext: fix ptest package reproducibilty 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/cve-check.bbclass | 12 +++++---- meta/classes/populate_sdk_ext.bbclass | 10 +++++--- meta/lib/oeqa/runtime/cases/parselogs.py | 3 ++- ...1-init-env.in-do-not-add-C-CXX-parameters.patch | 29 ++++++++++++++++++++++ meta/recipes-core/gettext/gettext_0.20.1.bb | 1 + .../mesa/{mesa-gl_20.0.0.bb => mesa-gl_20.0.1.bb} | 0 .../mesa/{mesa_20.0.0.bb => mesa_20.0.1.bb} | 4 +-- .../linux-firmware/linux-firmware_20200122.bb | 14 ++++++++--- .../curl/{curl_7.68.0.bb => curl_7.69.0.bb} | 4 +-- 9 files changed, 60 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch rename meta/recipes-graphics/mesa/{mesa-gl_20.0.0.bb => mesa-gl_20.0.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_20.0.0.bb => mesa_20.0.1.bb} (88%) rename meta/recipes-support/curl/{curl_7.68.0.bb => curl_7.69.0.bb} (95%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:41 +0000 Subject: [oe-commits] [openembedded-core] 02/09: linux-firmware: Fix usrmerge builds In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100639.BB518232961@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e51b82b05678a2602afce0ad892d84125620cf73 Author: Alex Kiernan AuthorDate: Fri Mar 6 14:35:18 2020 +0000 linux-firmware: Fix usrmerge builds FIRMWAREDIR defaults to /lib, failing when usrmerge is enabled: ERROR: linux-firmware-1_20200122-r0 do_install: Execution of '/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/temp/run.do_install.31218' failed with exit code 1: mkdir -p /home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/lib/firmware ./copy-firmware.sh /home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/lib/firmware cp: target '/home/akiernan/poky/build/tmp/work/core2-64-poky-linux/linux-firmware/1_20200122-r0/image/usr/lib/firmware/' is not a directory Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 6039dc9..8f963f4 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -208,7 +208,7 @@ do_compile() { } do_install() { - oe_runmake 'DESTDIR=${D}' install + oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install cp GPL-2 LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/ } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:42 +0000 Subject: [oe-commits] [openembedded-core] 03/09: populate_sdk_ext: enable custom templateconf.cfg In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100639.C7C2A232963@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e524e49ef22fd69882d5d2d01cd84db790e9cb88 Author: Andrej Valek AuthorDate: Fri Mar 6 16:32:33 2020 +0100 populate_sdk_ext: enable custom templateconf.cfg Do not always override templateconf.cfg content. Add option to use already existing file. Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 57fd29b..9f26cfc 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -388,9 +388,13 @@ python copy_buildsystem () { bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache')) shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat') - # Write a templateconf.cfg - with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: - f.write('meta/conf\n') + # Use templateconf.cfg file from builddir if exists + if os.path.exists(builddir + '/conf/templateconf.cfg'): + shutil.copyfile(builddir + '/conf/templateconf.cfg', baseoutpath + '/conf/templateconf.cfg') + else: + # Write a templateconf.cfg + with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: + f.write('meta/conf\n') # Ensure any variables set from the external environment (by way of # BB_ENV_EXTRAWHITE) are set in the SDK's configuration -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:40 +0000 Subject: [oe-commits] [openembedded-core] 01/09: parselogs.py: ignore rdrand initialization failure In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100639.B28A723295F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 09c4f9068858bf59eb60584a497f987bdd1e196e Author: Mingli Yu AuthorDate: Fri Mar 6 19:25:16 2020 +0800 parselogs.py: ignore rdrand initialization failure On the system whose cpu doesn't support rdrand, there comes below message when start rngd service #systemctl status rngd [snip] Feb 25 05:08:14 qemux86-64 rngd[133]: [rdrand]: Initialization Failed [snip] Actually the failed message doesn't matter as it only indicates one entropy source as rdrand fails to initialize and won't affect rngd function. So add to ignore the failure message to fix below error during do_testimage: NOTE: ====================================================================== NOTE: FAIL: test_parselogs (parselogs.ParseLogsTest) NOTE: ---------------------------------------------------------------------- NOTE: Traceback (most recent call last): File "/buildarea/layers/oe-core/meta/lib/oeqa/core/decorator/__init__.py", line 36, in wrapped_f return func(*args, **kwargs) File "/buildarea/layers/oe-core/meta/lib/oeqa/runtime/cases/parselogs.py", line 370, in test_parselogs self.assertEqual(errcount, 0, msg=self.msg) AssertionError: 1 != 0 : Log: /buildarea/tmp/work/qemux86-64-wrs-linux/wrlinux-image-std/1.0-r5/target_logs/daemon.log Central error: 2020-03-06T09:45:12.774286+00:00 qemux86-64 rngd[134]: [rdrand]: Initialization Failed Reference: https://github.com/nhorman/rng-tools/pull/84 Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/parselogs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 3cad070..6444fe8 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -56,7 +56,8 @@ common_errors = [ "error retry time-out =", "logind: cannot setup systemd-logind helper (-61), using legacy fallback", "Error changing net interface name 'eth0' to ", - "Cannot find a map file" + "Cannot find a map file", + "[rdrand]: Initialization Failed" ] video_related = [ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:44 +0000 Subject: [oe-commits] [openembedded-core] 05/09: linux-firmware: drop remnants of pre-2.6.37 support (TI) In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100639.D95FC232965@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 4c60fa1d71eb40fb36fb336b55579979308be0a6 Author: Andr? Draszik AuthorDate: Fri Mar 6 09:35:14 2020 +0000 linux-firmware: drop remnants of pre-2.6.37 support (TI) Now that this recipe uses make install, we don't manually create symlinks for firmware files for older kernel in do_install(). As such, the FILES statement can be updated as well. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 8f963f4..4f90084 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -512,15 +512,12 @@ LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" FILES_${PN}-wlcommon = " \ - ${nonarch_base_libdir}/firmware/TI* \ ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ " FILES_${PN}-wl12xx = " \ - ${nonarch_base_libdir}/firmware/wl12* \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ " FILES_${PN}-wl18xx = " \ - ${nonarch_base_libdir}/firmware/wl18* \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:43 +0000 Subject: [oe-commits] [openembedded-core] 04/09: cve-check: show whitelisted status In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100639.D09D0232964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 181bdd670492525f9488d52c3ebb9a1b142e35ea Author: Chee Yang Lee AuthorDate: Fri Mar 6 10:27:26 2020 +0800 cve-check: show whitelisted status change whitelisted CVE status from "Patched" to "Whitelisted". [Yocto #13687] Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- meta/classes/cve-check.bbclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 7412436..7f98da6 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -56,10 +56,10 @@ python do_cve_check () { patched_cves = get_patches_cves(d) except FileNotFoundError: bb.fatal("Failure in searching patches") - patched, unpatched = check_cves(d, patched_cves) + whitelisted, patched, unpatched = check_cves(d, patched_cves) if patched or unpatched: cve_data = get_cve_info(d, patched + unpatched) - cve_write_data(d, patched, unpatched, cve_data) + cve_write_data(d, patched, unpatched, whitelisted, cve_data) else: bb.note("No CVE database found, skipping CVE check") @@ -263,7 +263,7 @@ def check_cves(d, patched_cves): conn.close() - return (list(patched_cves), cves_unpatched) + return (list(cve_whitelist), list(patched_cves), cves_unpatched) def get_cve_info(d, cves): """ @@ -287,7 +287,7 @@ def get_cve_info(d, cves): conn.close() return cve_data -def cve_write_data(d, patched, unpatched, cve_data): +def cve_write_data(d, patched, unpatched, whitelisted, cve_data): """ Write CVE information in WORKDIR; and to CVE_CHECK_DIR, and CVE manifest if enabled. @@ -303,7 +303,9 @@ def cve_write_data(d, patched, unpatched, cve_data): write_string += "PACKAGE NAME: %s\n" % d.getVar("PN") write_string += "PACKAGE VERSION: %s\n" % d.getVar("PV") write_string += "CVE: %s\n" % cve - if cve in patched: + if cve in whitelisted: + write_string += "CVE STATUS: Whitelisted\n" + elif cve in patched: write_string += "CVE STATUS: Patched\n" else: unpatched_cves.append(cve) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:46 +0000 Subject: [oe-commits] [openembedded-core] 07/09: curl: upgrade 7.68.0 -> 7.69.0 In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100639.ECDD0232968@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2d6a9904a838c5e498c0e2a2e34169cd2877a785 Author: Pierre-Jean Texier AuthorDate: Thu Mar 5 17:33:53 2020 +0100 curl: upgrade 7.68.0 -> 7.69.0 Bugfix release. For details, see full changelog - https://curl.haxx.se/changes.html#7_69_0 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-support/curl/{curl_7.68.0.bb => curl_7.69.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.68.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb similarity index 95% rename from meta/recipes-support/curl/curl_7.68.0.bb rename to meta/recipes-support/curl/curl_7.69.0.bb index 0a1547c..cf4f4bc 100644 --- a/meta/recipes-support/curl/curl_7.68.0.bb +++ b/meta/recipes-support/curl/curl_7.69.0.bb @@ -9,8 +9,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ " -SRC_URI[md5sum] = "40d6784bd1a86e079d63cc668ba9bd8f" -SRC_URI[sha256sum] = "207f54917dd6a2dc733065ccf18d61bb5bebeaceb5df49cd9445483e8623eeb9" +SRC_URI[md5sum] = "04eb86d1138c2ff3dbfd497f7de85daa" +SRC_URI[sha256sum] = "668d451108a7316cff040b23c79bc766e7ed84122074e44f662b8982f2e76739" CVE_PRODUCT = "curl libcurl" inherit autotools pkgconfig binconfig multilib_header -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:45 +0000 Subject: [oe-commits] [openembedded-core] 06/09: linux-firmware: TI: fix wl18xx support In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100639.E42D7232967@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e0cc3cb406efedad8673ff48fae7c9288172fc6d Author: Andr? Draszik AuthorDate: Fri Mar 6 09:35:15 2020 +0000 linux-firmware: TI: fix wl18xx support wl1271-nvs.bin belongs to the wl18xx driver (and respective package created here), see kernel source. Due to the way packages are assembled here it ends up in the wrong package, though. Fix by placing it in the -common package as it's merely a symlink to wl127x-nvs.bin (which does belong to the wl12xx), so that both drivers have access to it. Signed-off-by: Andr? Draszik Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb index 4f90084..a7406e4 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb @@ -511,8 +511,17 @@ LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" +# wl18xx optionally needs wl1271-nvs.bin (which itself is a symlink to +# wl127x-nvs.bin) - see linux/drivers/net/wireless/ti/wlcore/sdio.c +# and drivers/net/wireless/ti/wlcore/spi.c. +# While they're optional and actually only used to override the MAC +# address on wl18xx, driver loading will delay (by udev timout - 60s) +# if not there. So let's make it available always. Because it's a +# symlink, both need to go to wlcommon. FILES_${PN}-wlcommon = " \ ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin \ " FILES_${PN}-wl12xx = " \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:48 +0000 Subject: [oe-commits] [openembedded-core] 09/09: gettext: fix ptest package reproducibilty In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100640.0A61B23296A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 15fe7de55b90293a588703700b3de72cf95ecd79 Author: Alexander Kanavin AuthorDate: Fri Mar 6 22:51:38 2020 +0100 gettext: fix ptest package reproducibilty Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...1-init-env.in-do-not-add-C-CXX-parameters.patch | 29 ++++++++++++++++++++++ meta/recipes-core/gettext/gettext_0.20.1.bb | 1 + 2 files changed, 30 insertions(+) diff --git a/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch new file mode 100644 index 0000000..d45b758 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.20.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch @@ -0,0 +1,29 @@ +From 9b912a47f790a7b282ec0c2295a188c5d8fb6a7c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 6 Mar 2020 21:04:05 +0000 +Subject: [PATCH] init-env.in: do not add C/CXX parameters + +These are taken from the cross environment and include +sysroot paths, so are not reproducible. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + gettext-tools/tests/init-env.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/gettext-tools/tests/init-env.in b/gettext-tools/tests/init-env.in +index cc84ffd..b69c990 100644 +--- a/gettext-tools/tests/init-env.in ++++ b/gettext-tools/tests/init-env.in +@@ -3,10 +3,6 @@ top_builddir=../.. + + OBJEXT="@OBJEXT@" + EXEEXT="@EXEEXT@" +-CC="@CC@" +-CFLAGS="@CFLAGS@" +-CXX="@CXX@" +-CXXFLAGS="@CXXFLAGS@" + CPPFLAGS="@CPPFLAGS@" + LDFLAGS="@LDFLAGS@" + LTLIBINTL="@LTLIBINTL@" diff --git a/meta/recipes-core/gettext/gettext_0.20.1.bb b/meta/recipes-core/gettext/gettext_0.20.1.bb index 214803f..85493e7 100644 --- a/meta/recipes-core/gettext/gettext_0.20.1.bb +++ b/meta/recipes-core/gettext/gettext_0.20.1.bb @@ -25,6 +25,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://serial-tests-config.patch \ file://0001-msgmerge-Fix-behaviour-of-for-msgfmt-on-PO-files-wit.patch \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ + file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ " SRC_URI[md5sum] = "bb5b0c0caa028105f3ca1905ddc306e2" SRC_URI[sha256sum] = "66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:06:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:47 +0000 Subject: [oe-commits] [openembedded-core] 08/09: mesa: updated to mesa 20.0.1 release In-Reply-To: <158357559941.28730.14055194744812176142@git.openembedded.org> References: <158357559941.28730.14055194744812176142@git.openembedded.org> Message-ID: <20200307100640.01693232969@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ba61205eecf6b6712aa9168942155398929e16db Author: Nathan Hartman AuthorDate: Fri Mar 6 12:19:36 2020 -0800 mesa: updated to mesa 20.0.1 release Updated to 20.0.1 release: https://www.mesa3d.org/relnotes/20.0.1.html Signed-off-by: Nathan Hartman Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/{mesa-gl_20.0.0.bb => mesa-gl_20.0.1.bb} | 0 meta/recipes-graphics/mesa/{mesa_20.0.0.bb => mesa_20.0.1.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb b/meta/recipes-graphics/mesa/mesa-gl_20.0.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_20.0.0.bb rename to meta/recipes-graphics/mesa/mesa-gl_20.0.1.bb diff --git a/meta/recipes-graphics/mesa/mesa_20.0.0.bb b/meta/recipes-graphics/mesa/mesa_20.0.1.bb similarity index 88% rename from meta/recipes-graphics/mesa/mesa_20.0.0.bb rename to meta/recipes-graphics/mesa/mesa_20.0.1.bb index 2ed7ca2..e18c00b 100644 --- a/meta/recipes-graphics/mesa/mesa_20.0.0.bb +++ b/meta/recipes-graphics/mesa/mesa_20.0.1.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] = "681229d992bbd6250a5be4f308708795" -SRC_URI[sha256sum] = "bb6db3e54b608d2536d4000b3de7dd3ae115fc114e8acbb5afff4b3bbed04b34" +SRC_URI[md5sum] = "428ac511e4b05647a00b3778f1279da7" +SRC_URI[sha256sum] = "6153ba3f8cb0524bbfc08e4db76b408126b2d1be8f789dffe28d1a0461eedde4" 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 Mar 7 10:07:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:00 +0000 Subject: [oe-commits] [openembedded-core] 03/12: HACK: signing: Add extra test debug In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.9E101232963@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7fa1ba0ceb0a1a0edd88b8a2afd8a00437414f0d 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 Mar 7 10:06:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:57 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (5f6a5e8 -> 65fc7ab) Message-ID: <158357561727.29255.13443431179167263544@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 5f6a5e8 gettext: fix ptest package reproducibilty discard e7222b5 mesa: updated to mesa 20.0.1 release discard 0a77143 curl: upgrade 7.68.0 -> 7.69.0 discard 1aaec71 linux-firmware: TI: fix wl18xx support discard e1533b0 linux-firmware: drop remnants of pre-2.6.37 support (TI) discard 54f74a1 cve-check: show whitelisted status discard 2f9d6d5 populate_sdk_ext: add option to append lines into local.conf discard da4af46 populate_sdk_ext: enable custom templateconf.cfg discard d4db835 linux-firmware: Fix usrmerge builds discard a065195 parselogs.py: ignore rdrand initialization failure discard 6e4c568 libuv: move from meta-oe to core for bind update discard 7f623b0 test discard e559e4d qemuarm64: Add -machine gic-version=3 with kvm discard 375cd19 HACK: extra debug discard d7da40b rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 0ad98f0 sstatesig: Log timestamps for hashequiv in reprodubile builds discard 073899f HACK: signing: Add extra test debug discard 66504b1 glew/curl: specify exclusive package configs discard e64ed89 base.bbclass: extend PACKAGECONFIG for conflict package configs add 09c4f90 parselogs.py: ignore rdrand initialization failure add e51b82b linux-firmware: Fix usrmerge builds add e524e49 populate_sdk_ext: enable custom templateconf.cfg add 181bdd6 cve-check: show whitelisted status add 4c60fa1 linux-firmware: drop remnants of pre-2.6.37 support (TI) add e0cc3cb linux-firmware: TI: fix wl18xx support add 2d6a990 curl: upgrade 7.68.0 -> 7.69.0 add ba61205 mesa: updated to mesa 20.0.1 release add 15fe7de gettext: fix ptest package reproducibilty new 2a79dda base.bbclass: extend PACKAGECONFIG for conflict package configs new 24bb412 glew/curl: specify exclusive package configs new 7fa1ba0 HACK: signing: Add extra test debug new 3efc0bc sstatesig: Log timestamps for hashequiv in reprodubile builds new dcbe2c3 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new c8aab6a HACK: extra debug new 3c96865 qemuarm64: Add -machine gic-version=3 with kvm new 4fd7196 test new 8322e64 libuv: move from meta-oe to core for bind update new 143c743 populate_sdk_ext: add option to append lines into local.conf new 1949a40 openssl: recommend cryptodev-module for corresponding PACKAGECONFIG new 65fc7ab make: Fix build on arm/clang 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 (5f6a5e8) \ N -- N -- N refs/heads/master-next (65fc7ab) 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 12 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/openssl/openssl_1.1.1d.bb | 2 +- ...-makeinst-Do-not-undef-POSIX-on-clang-arm.patch | 38 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.3.bb | 1 + 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:07:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:01 +0000 Subject: [oe-commits] [openembedded-core] 04/12: sstatesig: Log timestamps for hashequiv in reprodubile builds In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.AA5D3232964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3efc0bc7ae06edb62c2f07c111c0a0de47ac8b85 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 Mar 7 10:06:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:58 +0000 Subject: [oe-commits] [openembedded-core] 01/12: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.8A35C23295F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2a79dda9dea1f94474e93502981aee937c488187 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 Mar 7 10:06:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:06:59 +0000 Subject: [oe-commits] [openembedded-core] 02/12: glew/curl: specify exclusive package configs In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.9288F232961@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 24bb412ab5d38ded8963dc921aaa5f091e0020c9 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.69.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.69.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb index cf4f4bc..2e9b512 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.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 Mar 7 10:07:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:03 +0000 Subject: [oe-commits] [openembedded-core] 06/12: HACK: extra debug In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.C1F33232967@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c8aab6a3fb4fab01276c74780a868b7ff88cf692 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 Mar 7 10:07:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:04 +0000 Subject: [oe-commits] [openembedded-core] 07/12: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.CD637232968@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3c9686530421d63ec5753b904067effaa6ed7522 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 Mar 7 10:07:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:06 +0000 Subject: [oe-commits] [openembedded-core] 09/12: libuv: move from meta-oe to core for bind update In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.E1E1623296A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8322e6469821c0904f9e27a126a970ebfebe62a8 Author: Armin Kuster AuthorDate: Tue Mar 3 13:09:03 2020 -0800 libuv: move from meta-oe to core for bind update Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 + meta/recipes-connectivity/libuv/libuv_1.34.2.bb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..1468b16 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -393,6 +393,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin " RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling " RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal " RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic " +RECIPE_MAINTAINER_pn-libuv = "Armin Kuster " RECIPE_MAINTAINER_pn-libva = "Anuj Mittal " RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal " RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen " diff --git a/meta/recipes-connectivity/libuv/libuv_1.34.2.bb b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb new file mode 100644 index 0000000..234cec3 --- /dev/null +++ b/meta/recipes-connectivity/libuv/libuv_1.34.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "A multi-platform support library with a focus on asynchronous I/O" +HOMEPAGE = "https://github.com/libuv/libuv" +BUGTRACKER = "https://github.com/libuv/libuv/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" + +SRCREV = "f868c9ab0c307525a16fff99fd21e32a6ebc3837" +SRC_URI = "git://github.com/libuv/libuv;branch=v1.x" + +S = "${WORKDIR}/git" + +inherit autotools + +do_configure() { + ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh" + oe_runconf +} + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:07:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:08 +0000 Subject: [oe-commits] [openembedded-core] 11/12: openssl: recommend cryptodev-module for corresponding PACKAGECONFIG In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100658.0164823296E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1949a400d0f2968a8993c6f13dfbfe1a5e8d030e Author: Denys Dmytriyenko AuthorDate: Tue Mar 3 18:45:09 2020 -0500 openssl: recommend cryptodev-module for corresponding PACKAGECONFIG Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index d4871fe..a429b0a 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -34,7 +34,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux" +PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" B = "${WORKDIR}/build" 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 Mar 7 10:07:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:02 +0000 Subject: [oe-commits] [openembedded-core] 05/12: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.B79D3232965@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dcbe2c3fbd197139b5718d3091ff0e13832a2169 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 Mar 7 10:07:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:05 +0000 Subject: [oe-commits] [openembedded-core] 08/12: test In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.D7874232969@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4fd7196a3e4c0a46808777de658fd1eee7f2fbb7 Author: Richard Purdie AuthorDate: Mon Mar 2 15:52:25 2020 +0000 test Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 4fc75a9..61f1931 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 156400c..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -227,6 +228,8 @@ class LockedSignatures(OESelftestTestCase): extradebug = runCmd('cat bitbake-cookerdaemon.log').output extradebug += bitbake(test_recipe + " -S none").output extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) ret2 = bitbake(test_recipe) found_warn2 = re.search(patt, ret2.output) extradebug += "\nFound %s\n\n" % str(found_warn2) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:07:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:07 +0000 Subject: [oe-commits] [openembedded-core] 10/12: populate_sdk_ext: add option to append lines into local.conf In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100657.EC84D23296D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 143c743554231929063af4f52c139bf4e8cc0feb Author: Andrej Valek AuthorDate: Fri Mar 6 16:32:34 2020 +0100 populate_sdk_ext: add option to append lines into local.conf Add option to add new lines into local.conf content in ext_sdk case via SDK_LOCAL_CONF_EXTRALIST variable. Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 4 ++-- meta/classes/populate_sdk_ext.bbclass | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index eb72955..a347811 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -757,8 +757,8 @@ def buildhistory_get_sdkvars(d): sdkvars = "DISTRO DISTRO_VERSION SDK_NAME SDK_VERSION SDKMACHINE SDKIMAGE_FEATURES BAD_RECOMMENDATIONS NO_RECOMMENDATIONS PACKAGE_EXCLUDE" if d.getVar('BB_CURRENTTASK') == 'populate_sdk_ext': # Extensible SDK uses some additional variables - sdkvars += " SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST SDK_UPDATE_URL SDK_EXT_TYPE SDK_RECRDEP_TASKS SDK_INCLUDE_PKGDATA SDK_INCLUDE_TOOLCHAIN" - listvars = "SDKIMAGE_FEATURES BAD_RECOMMENDATIONS PACKAGE_EXCLUDE SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST" + sdkvars += " SDK_LOCAL_CONF_EXTRALIST SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST SDK_UPDATE_URL SDK_EXT_TYPE SDK_RECRDEP_TASKS SDK_INCLUDE_PKGDATA SDK_INCLUDE_TOOLCHAIN" + listvars = "SDKIMAGE_FEATURES BAD_RECOMMENDATIONS PACKAGE_EXCLUDE SDK_LOCAL_CONF_EXTRALIST SDK_LOCAL_CONF_WHITELIST SDK_LOCAL_CONF_BLACKLIST SDK_INHERIT_BLACKLIST" return outputvars(sdkvars, listvars, d) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 9f26cfc..2eccf52 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -25,6 +25,7 @@ SDK_INCLUDE_BUILDTOOLS ?= '1' SDK_RECRDEP_TASKS ?= "" +SDK_LOCAL_CONF_EXTRALIST ?= "" SDK_LOCAL_CONF_WHITELIST ?= "" SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ BB_NUMBER_THREADS \ @@ -372,7 +373,16 @@ python copy_buildsystem () { for line in xf: f.write(line) - # If you define a sdk_extraconf() function then it can contain additional config + # Allow additional config through SDK_LOCAL_CONF_EXTRALIST + local_conf_extralist = (d.getVar('SDK_LOCAL_CONF_EXTRALIST') or '').split() + if local_conf_extralist: + for var in local_conf_extralist: + value = d.getVar(var) or "" + if value: + f.write('%s = "%s"\n' % (var, value)) + f.write('\n') + + # If you define a sdk_extraconf variable then it can contain additional config # (Though this is awkward; sdk-extra.conf should probably be used instead) extraconf = (d.getVar('sdk_extraconf') or '').strip() if extraconf: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:07:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:07:09 +0000 Subject: [oe-commits] [openembedded-core] 12/12: make: Fix build on arm/clang In-Reply-To: <158357561727.29255.13443431179167263544@git.openembedded.org> References: <158357561727.29255.13443431179167263544@git.openembedded.org> Message-ID: <20200307100658.0B99E23296F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 65fc7ab0aa2c96ebd69b5141b0b0fcea9c3f141d Author: Khem Raj AuthorDate: Fri Mar 6 23:29:04 2020 -0800 make: Fix build on arm/clang clang defines __arm which is interpreted as non-posix by make build system but thats not correct when using clang so patch addresses that Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-makeinst-Do-not-undef-POSIX-on-clang-arm.patch | 38 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.3.bb | 1 + 2 files changed, 39 insertions(+) diff --git a/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch new file mode 100644 index 0000000..2da7c98 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch @@ -0,0 +1,38 @@ +From 86b7947156a0c33e768d0a265e38f2881a70a7e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 6 Mar 2020 23:19:37 -0800 +Subject: [PATCH] makeinst: Do not undef POSIX on clang/arm + +if __arm internal compiler macro is defined then make assumes that the +system is not posix and goes ahead and undefs POSIX, which results in +miscompiling make with clang, since clang does define __arm unlike gcc +which does not, but they both support posix just fine, so here check for +compiler not being clang when __arm is defined before undefining posix + +Fixes error like +../make-4.3/src/job.c:507:27: error: too many arguments to function call, expected 0, have 1 + sigsetmask (siggetmask (0) & ~fatal_signal_mask) + ~~~~~~~~~~ ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/makeint.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/makeint.h b/src/makeint.h +index c428a36..fadf963 100644 +--- a/src/makeint.h ++++ b/src/makeint.h +@@ -115,7 +115,7 @@ extern int errno; + #endif + + /* Some systems define _POSIX_VERSION but are not really POSIX.1. */ +-#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) ++#if (defined (butterfly) || (defined (__arm) && !defined(__clang__)) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) + # undef POSIX + #endif + +-- +2.25.1 + diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index cd0ecd4..3e0eb54 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -8,6 +8,7 @@ SRC_URI += "\ 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 \ + file://0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch \ " EXTRA_OECONF += "--without-guile" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:17 +0000 Subject: [oe-commits] [openembedded-core] 02/22: glibc-testsuite: Exclude this recipe from world builds In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.9DD04232961@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 2b3235f10bb1759d651d28b41825ad53192c841a 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 (cherry picked from commit eadbe01bb8232de79e0827e6c6b3411f69ea7303) Signed-off-by: Armin Kuster --- meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb b/meta/recipes-core/glibc/glibc-testsuite_2.30.bb index c44f30b..d887aef 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.30.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 Mar 7 10:57:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:16 +0000 Subject: [oe-commits] [openembedded-core] 01/22: glibc-testsuite: Remove the do_install task In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.92D0923295F@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 a02934484605e5f81e67798d4d8eeb24e70591e6 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 (cherry picked from commit 2b51252cb8bd9badfa28794f9ef9431b48752e3d) Signed-off-by: Armin Kuster --- meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb b/meta/recipes-core/glibc/glibc-testsuite_2.30.bb index 657fd4d..c44f30b 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.30.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.30.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 Mar 7 10:57:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:18 +0000 Subject: [oe-commits] [openembedded-core] 03/22: qemurunner.py: add try/except for pid handling race In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.A84F1232963@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 0e94cfb4aa718b4842f608879b77d5671b5bf338 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 (cherry picked from commit eadb899e23b18eb9eaff145c3bf5b20fb417c3e8) Signed-off-by: Armin Kuster --- 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 fe8b77d..0d63e44 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -396,7 +396,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 Mar 7 10:57:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:15 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated (f39285b -> c781409) Message-ID: <158357863507.6622.11835873969104386063@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 f39285b Revert "bash: Fix CVE-2019-18276" new a029344 glibc-testsuite: Remove the do_install task new 2b3235f glibc-testsuite: Exclude this recipe from world builds new 0e94cfb qemurunner.py: add try/except for pid handling race new fec05cd xserver-nodm-init: Fix the start failure for non-root user new 1cacb30 openssh: backport patch to fix "cert not yet valid" test new 5c45a08 linux-yocto/5.2: update to v5.2.29 new df86f5d perl: update to 5.30.1 new 2d5fae9 perl: package Config.pm from arch directory into the main perl package new c95832d perl: install typemap and other extutils metadata as part of perl-core new 559fd36 libmodule-build-perl: fix ptests new 4ee9c60 perl: improve reproducibility new b84f305 perl: fix failing ptests new 4b41afe perl: Fix encode module reproducibility issues new 1589115 perl: Fix makefile race causing configuration differences new 8856aa9 liberror-perl: upgrade 0.17028 -> 0.17029 new 2d61ef9 toolchain-shar-extract: ignore timestamp on decompress new 3e65ad6 qemu: Fix CVE-2020-1711 new 53b94d0 ncurses: add CVE_VERSION new f0c7e7d ppp: Security fix CVE-2020-8597 new 72a747f libxml2: fix CVE-2020-7595 new 4913190 libxml2: Fix CVE-2019-20388 new c781409 linux-yocto/5.2: update to v5.2.32 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/files/toolchain-shar-extract.sh | 2 +- meta/lib/oeqa/utils/qemurunner.py | 5 +- ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++ meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + .../0001-pppd-Fix-bounds-check-in-EAP-code.patch | 47 ++++++++++++++++ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 + meta/recipes-core/glibc/glibc-testsuite_2.30.bb | 3 + .../libxml/libxml2/CVE-2019-20388.patch | 37 +++++++++++++ .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.bb | 2 + meta/recipes-core/ncurses/ncurses_6.1+20190803.bb | 2 + ...t-to-correctly-exclude-unbuilt-extensions.patch | 27 +++++++++ meta/recipes-devtools/perl/files/encodefix.patch | 20 +++++++ .../recipes-devtools/perl/files/fix-setgroup.patch | 49 ----------------- .../perl/files/perl-configpm-switch.patch | 4 +- meta/recipes-devtools/perl/files/racefix.patch | 24 ++++++++ ...or-perl_0.17028.bb => liberror-perl_0.17029.bb} | 4 +- .../perl/libmodule-build-perl/run-ptest | 2 - .../perl/libmodule-build-perl_0.4229.bb | 3 + .../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 31 ++++++++--- meta/recipes-devtools/qemu/qemu.inc | 3 +- .../recipes-devtools/qemu/qemu/CVE-2020-1711.patch | 64 ++++++++++++++++++++++ .../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 ++- 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 ++++---- 28 files changed, 379 insertions(+), 87 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch create mode 100644 meta/recipes-connectivity/ppp/ppp/0001-pppd-Fix-bounds-check-in-EAP-code.patch create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2019-20388.patch create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2020-7595.patch create mode 100644 meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch create mode 100644 meta/recipes-devtools/perl/files/encodefix.patch delete mode 100644 meta/recipes-devtools/perl/files/fix-setgroup.patch create mode 100644 meta/recipes-devtools/perl/files/racefix.patch rename meta/recipes-devtools/perl/{liberror-perl_0.17028.bb => liberror-perl_0.17029.bb} (89%) rename meta/recipes-devtools/perl/{perl_5.30.0.bb => perl_5.30.1.bb} (93%) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-1711.patch 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 Mar 7 10:57:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:19 +0000 Subject: [oe-commits] [openembedded-core] 04/22: xserver-nodm-init: Fix the start failure for non-root user In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.B345C232964@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 fec05cd1eaaad41fd72a29d7792f1c37d2a82f3e 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 (cherry picked from commit cfd71a68a4931c8bda15357ebb1e9ebcf0e302dc) Signed-off-by: Armin Kuster --- .../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 a77c564..7f4e1e2 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 distro_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 Mar 7 10:57:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:23 +0000 Subject: [oe-commits] [openembedded-core] 08/22: perl: package Config.pm from arch directory into the main perl package In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.DDE56232969@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 2d5fae94a889cd9558e3946ecec2362c94e1c1e9 Author: Alexander Kanavin AuthorDate: Wed Jan 8 14:27:57 2020 +0100 perl: package Config.pm from arch directory into the main perl package Otherwise, some modules such as libmodule-build-perl fail to work properly. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit e4072d53a7fb4fbbdacce9a20968e71ef6cff307) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 996f631..c79a725 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -201,6 +201,7 @@ require perl-ptest.inc FILES_${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/libperl.so* \ ${libdir}/perl5/site_perl \ ${libdir}/perl5/${PV}/Config.pm \ + ${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/Config.pm \ ${libdir}/perl5/${PV}/*/Config_git.pl \ ${libdir}/perl5/${PV}/*/Config_heavy-target.pl \ ${libdir}/perl5/config.sh \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:24 +0000 Subject: [oe-commits] [openembedded-core] 09/22: perl: install typemap and other extutils metadata as part of perl-core In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.E9B1723296A@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 c95832dbfe4f375dadbffc8ee678052dbf7b3913 Author: Alexander Kanavin AuthorDate: Wed Jan 8 14:27:58 2020 +0100 perl: install typemap and other extutils metadata as part of perl-core Modules actually make use of these files, so they belong in perl-core other than perl-doc (the immediate failure was ptests for libmodule-build-perl failing). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 829e8c49833e4cb8de5db869769eb492c827e8c9) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl_5.30.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index c79a725..c68ffb1 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -210,6 +210,9 @@ FILES_${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/ ${libdir}/perl5/${PV}/warnings \ ${libdir}/perl5/${PV}/vars.pm \ ${libdir}/perl5/site_perl \ + ${libdir}/perl5/${PV}/ExtUtils/MANIFEST.SKIP \ + ${libdir}/perl5/${PV}/ExtUtils/xsubpp \ + ${libdir}/perl5/${PV}/ExtUtils/typemap \ " RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ perl-module-warnings-register" @@ -220,9 +223,6 @@ FILES_${PN}-dev_append = " ${libdir}/perl5/${PV}/*/CORE" FILES_${PN}-doc_append = " ${libdir}/perl5/${PV}/Unicode/Collate/*.txt \ ${libdir}/perl5/${PV}/*/.packlist \ - ${libdir}/perl5/${PV}/ExtUtils/MANIFEST.SKIP \ - ${libdir}/perl5/${PV}/ExtUtils/xsubpp \ - ${libdir}/perl5/${PV}/ExtUtils/typemap \ ${libdir}/perl5/${PV}/Encode/encode.h \ " PACKAGES += "${PN}-misc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:25 +0000 Subject: [oe-commits] [openembedded-core] 10/22: libmodule-build-perl: fix ptests In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.01B4423296D@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 559fd361440898479937c887a0e4f8cfb8c46891 Author: Alexander Kanavin AuthorDate: Wed Jan 8 14:27:59 2020 +0100 libmodule-build-perl: fix ptests Particularly remove a broken detection of skipped tests (which was marking tests that actually passed), and install additional artefacts needed for testing. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit dbbce0918617c21d0e43e9727d38372c22dff3dc) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/libmodule-build-perl/run-ptest | 2 -- meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest b/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest index 0d63d15..d802781 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest +++ b/meta/recipes-devtools/perl/libmodule-build-perl/run-ptest @@ -6,8 +6,6 @@ for case in `find t -type f -name '*.t'`; do cat $case.output if [ $ret -ne 0 ]; then echo "FAIL: ${case%.t}" - elif grep -i 'SKIP' $case.output; then - echo "SKIP: ${case%.t}" else echo "PASS: ${case%.t}" fi diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb index f759f86..e3ba40d 100644 --- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb +++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4229.bb @@ -36,7 +36,10 @@ do_patch[postfuncs] += "do_patch_module_build" do_install_ptest() { cp -r ${B}/inc ${D}${PTEST_PATH} cp -r ${B}/blib ${D}${PTEST_PATH} + cp -r ${B}/_build ${D}${PTEST_PATH} + cp -r ${B}/lib ${D}${PTEST_PATH} chown -R root:root ${D}${PTEST_PATH} + sed -i -e "s,'perl' => .*,'perl' => '/usr/bin/perl'\,,g" ${D}${PTEST_PATH}/_build/build_params } RDEPENDS_${PN} += " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:21 +0000 Subject: [oe-commits] [openembedded-core] 06/22: linux-yocto/5.2: update to v5.2.29 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.C846E232967@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 5c45a080ae140dfe890ac07f3c6914abfc35faa2 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 (cherry picked from commit d320a03b697679dfe223883b23480b70f89ad649) Signed-off-by: Armin Kuster --- 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 Mar 7 10:57:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:22 +0000 Subject: [oe-commits] [openembedded-core] 07/22: perl: update to 5.30.1 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.D2653232968@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 df86f5d32dc18f25c5c4788b65cceae8905a6ef3 Author: Alexander Kanavin AuthorDate: Thu Dec 5 16:43:44 2019 +0100 perl: update to 5.30.1 Drop fix-setgroup.patch as the upstream has fixed the issue. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 45edc6d23e20f7634c50db71e419c7e3bb7f393e) [Bug fix only update] Signed-off-by: Armin Kuster --- .../recipes-devtools/perl/files/fix-setgroup.patch | 49 ---------------------- .../perl/{perl_5.30.0.bb => perl_5.30.1.bb} | 11 +++-- 2 files changed, 5 insertions(+), 55 deletions(-) diff --git a/meta/recipes-devtools/perl/files/fix-setgroup.patch b/meta/recipes-devtools/perl/files/fix-setgroup.patch deleted file mode 100644 index 2b490e6..0000000 --- a/meta/recipes-devtools/perl/files/fix-setgroup.patch +++ /dev/null @@ -1,49 +0,0 @@ -Test script to reproduce the problem: - -#!/usr/bin/env perl -$) = "2 2"; -print $!; - -Result from perl 5.28 under strace: - -setgroups(1, [2]) = 0 -setresgid(-1, 2, -1) = 0 - -Result from perl 5.30 under strace: - -setgroups(1, [-1]) = -1 EINVAL (Invalid argument) -setresgid(-1, 2, -1) = 0 - -Patch which broke this upstream: -https://perl5.git.perl.org/perl.git/commitdiff/5d4a52b5c68a11bfc97c2e24806993b84a61eade - -Issue is that the new function changes the endptr to the end of the -scanned number and needs to be reset to the end of the string for -each iteration of the loop. - -[YOCTO #13391] - -RP -2019/6/14 -Upstream-Status: Pending - -Index: perl-5.30.0/mg.c -=================================================================== ---- perl-5.30.0.orig/mg.c -+++ perl-5.30.0/mg.c -@@ -3179,6 +3256,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - const char *p = SvPV_const(sv, len); - Groups_t *gary = NULL; - const char* endptr = p + len; -+ const char* realend = p + len; - UV uv; - #ifdef _SC_NGROUPS_MAX - int maxgrp = sysconf(_SC_NGROUPS_MAX); -@@ -3209,6 +3287,7 @@ Perl_magic_set(pTHX_ SV *sv, MAGIC *mg) - Newx(gary, i + 1, Groups_t); - else - Renew(gary, i + 1, Groups_t); -+ endptr = realend; - if (grok_atoUV(p, &uv, &endptr)) - gary[i] = (Groups_t)uv; - else { diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb similarity index 97% rename from meta/recipes-devtools/perl/perl_5.30.0.bb rename to meta/recipes-devtools/perl/perl_5.30.1.bb index 838e52c..996f631 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ - https://github.com/arsv/perl-cross/releases/download/1.3/perl-cross-1.3.tar.gz;name=perl-cross \ + https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.tar.gz;name=perl-cross \ file://perl-rdepends.txt \ file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \ file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \ @@ -18,7 +18,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch \ file://perl-dynloader.patch \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ - file://fix-setgroup.patch \ file://0001-enc2xs-Add-environment-variable-to-suppress-comments.patch \ file://0002-Constant-Fix-up-shebang.patch \ file://determinism.patch \ @@ -27,10 +26,10 @@ SRC_URI_append_class-native = " \ file://perl-configpm-switch.patch \ " -SRC_URI[perl.md5sum] = "9770584cdf9b5631c38097645ce33549" -SRC_URI[perl.sha256sum] = "851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2" -SRC_URI[perl-cross.md5sum] = "4dda3daf9c4fe42b3d6a5dd052852a48" -SRC_URI[perl-cross.sha256sum] = "49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703" +SRC_URI[perl.md5sum] = "6438eb7b8db9bbde28e01086de376a46" +SRC_URI[perl.sha256sum] = "bf3d25571ff1ee94186177c2cdef87867fd6a14aa5a84f0b1fb7bf798f42f964" +SRC_URI[perl-cross.md5sum] = "1e463b105cfa56d251a86979af23e3a7" +SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d" S = "${WORKDIR}/perl-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:26 +0000 Subject: [oe-commits] [openembedded-core] 11/22: perl: improve reproducibility In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.0E73723296E@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 4ee9c60797e95674ae138245b3a4de063b2e95db Author: Ross Burton AuthorDate: Fri Jan 10 17:24:21 2020 +0000 perl: improve reproducibility Occasionally the reproducibility selftest fails because perl-pod differs, specifically that the perltoc.pod file was sometimes missing modules. Debugging revealed that there are missing dependencies so there is a build race: building perltoc.pod from an clean build tree results in no modules being listed at all. A bug has been filed at https://github.com/arsv/perl-cross/issues/86 to solve this properly, but for now we can just delete perltoc.pod after make has finished and re-generate it. [ YOCTO #13726 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 7e0f6c9ea4f824f29dc30c6631fd8039ebe83a0b) Signed-off-by: Armin Kuster --- meta/recipes-devtools/perl/perl_5.30.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index c68ffb1..15bc5a4 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -112,6 +112,14 @@ print(datetime.fromtimestamp($SOURCE_DATE_EPOCH, timezone.utc).strftime('%a %b % do_compile() { oe_runmake + # This isn't generated reliably so delete and re-generate. + # https://github.com/arsv/perl-cross/issues/86 + + if [ -e pod/perltoc.pod ]; then + bbnote Rebuilding perltoc.pod + rm -f pod/perltoc.pod + oe_runmake pod/perltoc.pod + fi } do_install() { -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:20 +0000 Subject: [oe-commits] [openembedded-core] 05/22: openssh: backport patch to fix "cert not yet valid" test In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105715.BD250232965@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 1cacb300369fb062ad45b0460ed93bfc800d7323 Author: Anuj Mittal AuthorDate: Fri Feb 21 11:29:27 2020 +0800 openssh: backport patch to fix "cert not yet valid" test Fixes [YOCTO #13796] Signed-off-by: Anuj Mittal Signed-off-by: Armin Kuster --- ...at-bozo-decided-to-use-2020-as-a-future-d.patch | 46 ++++++++++++++++++++++ meta/recipes-connectivity/openssh/openssh_8.0p1.bb | 1 + 2 files changed, 47 insertions(+) diff --git a/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch new file mode 100644 index 0000000..e2930c3 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch @@ -0,0 +1,46 @@ +From 3cccc0a2ab597b8273bddf08e9a3cc5551d7e530 Mon Sep 17 00:00:00 2001 +From: "djm at openbsd.org" +Date: Fri, 3 Jan 2020 03:02:26 +0000 +Subject: [PATCH] upstream: what bozo decided to use 2020 as a future date in a + regress + +test? + +OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a + +Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/ff31f15773ee173502eec4d7861ec56f26bba381] + +[Dropped the script version and copyright year change at the top] + +Signed-off-by: Anuj Mittal +--- + regress/cert-hostkey.sh | 2 +- + regress/cert-userkey.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh +index 3ce7779..74d5a53 100644 +--- a/regress/cert-hostkey.sh ++++ b/regress/cert-hostkey.sh +@@ -248,7 +248,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 6849e99..de455b8 100644 +--- a/regress/cert-userkey.sh ++++ b/regress/cert-userkey.sh +@@ -327,7 +327,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" diff --git a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb index 2ffbc9a..3d16f9d 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.0p1.bb @@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ file://0001-upstream-fix-integer-overflow-in-XMSS-private-key-pa.patch \ + file://0001-upstream-what-bozo-decided-to-use-2020-as-a-future-d.patch \ " SRC_URI[md5sum] = "bf050f002fe510e1daecd39044e1122d" SRC_URI[sha256sum] = "bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:28 +0000 Subject: [oe-commits] [openembedded-core] 13/22: perl: Fix encode module reproducibility issues In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.26B67232989@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 4b41afeea632f33a490d75621e2c0d6bb2bb6aca 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 (cherry picked from commit 71cdbf426e46e3ca1b5038f40e9f7ba958abc537) Signed-off-by: Armin Kuster --- 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 96f0326..e3915a5 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 Sat Mar 7 10:57:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:29 +0000 Subject: [oe-commits] [openembedded-core] 14/22: perl: Fix makefile race causing configuration differences In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.3214223295F@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 1589115ff42e8c211bc0784bd8aca7d3a5b8f566 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 (cherry picked from commit fe97845a45434902c5a994e253a127a462d7d3b4) Signed-off-by: Armin Kuster --- 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 e3915a5..32746c7 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 Sat Mar 7 10:57:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:27 +0000 Subject: [oe-commits] [openembedded-core] 12/22: perl: fix failing ptests In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.1AFF123296F@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 b84f3056591c16fa3e2bba2e4fa936390a76ee9a Author: Alexander Kanavin AuthorDate: Tue Jan 14 15:00:04 2020 +0100 perl: fix failing ptests Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit f1da6355f13e707b3ffa5025067e509e0120784d) [Fixup for zeus context] Signed-off-by: Armin Kuster --- ...t-to-correctly-exclude-unbuilt-extensions.patch | 27 ++++++++++++++++++++++ .../perl/files/perl-configpm-switch.patch | 4 ++-- meta/recipes-devtools/perl/perl_5.30.1.bb | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch b/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch new file mode 100644 index 0000000..0f3a2c6 --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-tests-adjust-to-correctly-exclude-unbuilt-extensions.patch @@ -0,0 +1,27 @@ +From b0d53cfd785f64002128ac5eecc4aed0663d9c30 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 9 Jan 2020 17:26:55 +0100 +Subject: [PATCH] tests: adjust to correctly exclude unbuilt extensions + +Issue is reported here: +https://github.com/arsv/perl-cross/issues/85 + +Upstream-Status: Inappropriate [issue caused by perl-cross] +Signed-off-by: Alexander Kanavin +--- + t/TEST | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/TEST b/t/TEST +index a9c844f..8d3505f 100755 +--- a/t/TEST ++++ b/t/TEST +@@ -419,7 +419,7 @@ sub _tests_from_manifest { + while () { + if (m!^((?:cpan|dist|ext)/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) { + my $t = $1; +- my $extension = $2; ++ my $extension = $1."/".$2; + + # XXX Generates way too many error lines currently. Skip for + # v5.22 diff --git a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch index 3c2cecb..80ce4a6 100644 --- a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch +++ b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch @@ -1,4 +1,4 @@ -From 7f313cac31c55cbe62a4d0cdfa8321cc05a8eb3a Mon Sep 17 00:00:00 2001 +From 5120acaa2be5787d9657f6b91bc8ee3c2d664fbe Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 27 May 2007 21:04:11 +0000 Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE) @@ -20,7 +20,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/configpm b/configpm -index 09c4a3b..6a0a680 100755 +index c8de8bf..204613c 100755 --- a/configpm +++ b/configpm @@ -687,7 +687,7 @@ sub FETCH { diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb index 15bc5a4..96f0326 100644 --- a/meta/recipes-devtools/perl/perl_5.30.1.bb +++ b/meta/recipes-devtools/perl/perl_5.30.1.bb @@ -20,6 +20,7 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \ file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ 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 = " \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 10:57:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:30 +0000 Subject: [oe-commits] [openembedded-core] 15/22: liberror-perl: upgrade 0.17028 -> 0.17029 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.3E3F2232961@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 8856aa960ff4c9c833e958082466d19259915d5f 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 (cherry picked from commit f4a520cc827187d83f2997614d893bba7d74a152) Signed-off-by: Armin Kuster --- .../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 Sat Mar 7 10:57:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:31 +0000 Subject: [oe-commits] [openembedded-core] 16/22: toolchain-shar-extract: ignore timestamp on decompress In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.49E0423295E@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 2d61ef93383d49db43af144aa17a88dd250ceb95 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 (cherry picked from commit 319ca22ea4465c56c63730847378a7aee4f5935a) Signed-off-by: Armin Kuster --- 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 Mar 7 10:57:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:36 +0000 Subject: [oe-commits] [openembedded-core] 21/22: libxml2: Fix CVE-2019-20388 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.7E6F123299E@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 49131908e3510dc69e0f278889803a461c2d96c0 Author: Lee Chee Yang AuthorDate: Fri Feb 21 23:00:32 2020 +0200 libxml2: Fix CVE-2019-20388 see: https://gitlab.gnome.org/GNOME/libxml2/merge_requests/68 (From OE-Core rev: 12a5eb0ea6f530ad7be2e58d4091b4edadbf461b) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- .../libxml/libxml2/CVE-2019-20388.patch | 37 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.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.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index 5797dd6..1d898ab 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.bb @@ -22,6 +22,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://fix-execution-of-ptests.patch \ file://Fix-CVE-2019-19956.patch \ file://CVE-2020-7595.patch \ + file://CVE-2019-20388.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 Sat Mar 7 10:57:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:35 +0000 Subject: [oe-commits] [openembedded-core] 20/22: libxml2: fix CVE-2020-7595 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.7393B23299D@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 72a747f77f9fd051e054e679deacf537b4b7116f Author: Anuj Mittal AuthorDate: Fri Feb 21 23:00:31 2020 +0200 libxml2: fix CVE-2020-7595 (From OE-Core rev: f2f7aa9a495774fe5a2e3947584cb3503bd1eaf1) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- .../libxml/libxml2/CVE-2020-7595.patch | 36 ++++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.9.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.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index c44a90b..5797dd6 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.9.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://Fix-CVE-2019-19956.patch \ + file://CVE-2020-7595.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 Sat Mar 7 10:57:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:37 +0000 Subject: [oe-commits] [openembedded-core] 22/22: linux-yocto/5.2: update to v5.2.32 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.8A1802329B8@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 c78140941f8a98e013932023a63501ba3b7e975a 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: Anuj Mittal (cherry picked from commit c37bf8287072ddf6005d5c3f419a6a77f673164c) Signed-off-by: Anuj Mittal --- 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 Mar 7 10:57:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:34 +0000 Subject: [oe-commits] [openembedded-core] 19/22: ppp: Security fix CVE-2020-8597 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.6919123299C@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 f0c7e7d03d1e9f7426031acdde3f7452118edd8c Author: Yi Zhao AuthorDate: Fri Feb 21 22:59:42 2020 +0200 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 (From OE-Core rev: b01505e018ff46f1af34f98219d55f4ca700cd5a) Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- .../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 Sat Mar 7 10:57:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:33 +0000 Subject: [oe-commits] [openembedded-core] 18/22: ncurses: add CVE_VERSION In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.5EDEE232964@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 53b94d0bc839eda408d90e15937746871b7546e3 Author: Anuj Mittal AuthorDate: Fri Feb 21 22:59:41 2020 +0200 ncurses: add CVE_VERSION Include the version number in a format that is comparable to what we get from NVD. (From OE-Core rev: fdb2a95d5e0265de1172940b6dc71fc7d602e8d1) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- meta/recipes-core/ncurses/ncurses_6.1+20190803.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb b/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb index e638a37..c3a89f1 100644 --- a/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb +++ b/meta/recipes-core/ncurses/ncurses_6.1+20190803.bb @@ -10,3 +10,5 @@ SRCREV = "3c9b2677c96c645496997321bf2fe465a5e7e21f" 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 Sat Mar 7 10:57:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 10:57:32 +0000 Subject: [oe-commits] [openembedded-core] 17/22: qemu: Fix CVE-2020-1711 In-Reply-To: <158357863507.6622.11835873969104386063@git.openembedded.org> References: <158357863507.6622.11835873969104386063@git.openembedded.org> Message-ID: <20200307105716.547E7232963@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 3e65ad67995874c363863280e40457acc3f479e9 Author: Lee Chee Yang AuthorDate: Mon Feb 24 14:14:15 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: Armin Kuster --- 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 bb444b6..d394db8 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://CVE-2019-15890.patch \ file://CVE-2019-12068.patch \ - " + file://CVE-2020-1711.patch \ + " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "cdf2b5ca52b9abac9bacb5842fa420f8" 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 Sat Mar 7 13:46:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 13:46:33 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: files/toolchain-shar-extract.sh: Rework PATH cleaning Message-ID: <158358879320.31899.9521171480197542251@git.openembedded.org> 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 f9be358 files/toolchain-shar-extract.sh: Rework PATH cleaning f9be358 is described below commit f9be3588605a944f1f54f7f98785ee04a4fb920c Author: Richard Purdie AuthorDate: Sat Mar 7 13:43:44 2020 +0000 files/toolchain-shar-extract.sh: Rework PATH cleaning Trying to create a clean PATH breaks cases where we install a buildtools tarball on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up directories in PATH which don't exist isntead. Do it with python as the shell version was too fraught with corner cases. Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4c4b4de..0002c9d 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,13 +1,7 @@ #!/bin/sh -[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ - LC_ALL=en_US.UTF-8 \ - TERM=$TERM \ - ICECC_PATH="$ICECC_PATH" \ - http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ - no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" -[ -f /etc/environment ] && . /etc/environment -export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted +PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:49 +0000 Subject: [oe-commits] [openembedded-core] 03/13: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.31337232967@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cc79e63d3f42503bd6a66d66fe08c0abce1ca40a 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 Mar 7 16:07:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:46 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f9be358 -> ec94ff5) Message-ID: <158359726674.3803.6115222323233366513@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 f9be358 files/toolchain-shar-extract.sh: Rework PATH cleaning discard 65fc7ab make: Fix build on arm/clang discard 1949a40 openssl: recommend cryptodev-module for corresponding PACKAGECONFIG discard 143c743 populate_sdk_ext: add option to append lines into local.conf discard 8322e64 libuv: move from meta-oe to core for bind update discard 4fd7196 test discard 3c96865 qemuarm64: Add -machine gic-version=3 with kvm discard c8aab6a HACK: extra debug discard dcbe2c3 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 3efc0bc sstatesig: Log timestamps for hashequiv in reprodubile builds discard 7fa1ba0 HACK: signing: Add extra test debug new 1478cf0 HACK: signing: Add extra test debug new 24a5034 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new cc79e63 qemuarm64: Add -machine gic-version=3 with kvm new 32a65c4 openssl: recommend cryptodev-module for corresponding PACKAGECONFIG new ab75a6c make: Fix build on arm/clang new 7cbac66 openssl: fix perl shebang in c_rehash new 5476b20 xserver-xorg: make manpage mutlilib identical new a4e5ff3 xinit: make manpages multilib identical new 16d57f9 groff: Make manpages binary identical new aa81bbd runqemu: support multiple NICs new bef44fc files/toolchain-shar-extract.sh: Rework PATH cleaning new 4184b6b nss: Move to meta-oe new ec94ff5 nspr: Move to meta-oe 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 (f9be358) \ N -- N -- N refs/heads/master-next (ec94ff5) 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: meta/classes/buildhistory.bbclass | 4 +- meta/classes/populate_sdk_ext.bbclass | 12 +- meta/conf/distro/include/maintainers.inc | 3 - meta/lib/oe/sstatesig.py | 4 - meta/recipes-connectivity/libuv/libuv_1.34.2.bb | 19 -- .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- .../0001-Make-manpages-mulitlib-identical.patch | 27 ++ meta/recipes-extended/groff/groff_1.22.4.bb | 1 + .../0001-Make-manpage-multilib-identical.patch | 28 +++ meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 + .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 --- .../nspr/nspr/0002-Add-nios2-support.patch | 102 -------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 -------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ---- meta/recipes-support/nspr/nspr/nspr.pc.in | 11 - .../nspr/nspr/remove-rpath-from-tests.patch | 26 -- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------- ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- scripts/runqemu | 2 +- 33 files changed, 64 insertions(+), 1219 deletions(-) delete mode 100644 meta/recipes-connectivity/libuv/libuv_1.34.2.bb create mode 100644 meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch create mode 100644 meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch delete mode 100644 meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch delete mode 100644 meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch delete mode 100644 meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch delete mode 100644 meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch delete mode 100644 meta/recipes-support/nspr/nspr/nspr.pc.in delete mode 100644 meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch delete mode 100644 meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch delete mode 100644 meta/recipes-support/nspr/nspr_4.25.bb delete mode 100644 meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch delete mode 100644 meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch delete mode 100644 meta/recipes-support/nss/nss/blank-cert9.db delete mode 100644 meta/recipes-support/nss/nss/blank-key4.db delete mode 100644 meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch delete mode 100644 meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch delete mode 100644 meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch delete mode 100644 meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch delete mode 100644 meta/recipes-support/nss/nss/nss.pc.in delete mode 100644 meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch delete mode 100644 meta/recipes-support/nss/nss/signlibs.sh delete mode 100644 meta/recipes-support/nss/nss/system-pkcs11.txt delete mode 100644 meta/recipes-support/nss/nss_3.50.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:48 +0000 Subject: [oe-commits] [openembedded-core] 02/13: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.251A4232965@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 24a503461470083e1ccf9f163762b76ac09bbbaa 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 Mar 7 16:07:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:47 +0000 Subject: [oe-commits] [openembedded-core] 01/13: HACK: signing: Add extra test debug In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.16421232964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1478cf0ef4721eea1e4082ecad18c09d014adcdf 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/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..9db1a20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -221,4 +222,17 @@ 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 = runCmd('cat bitbake-cookerdaemon.log').output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) + 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 Mar 7 16:07:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:50 +0000 Subject: [oe-commits] [openembedded-core] 04/13: openssl: recommend cryptodev-module for corresponding PACKAGECONFIG In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.40CB7232968@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 32a65c47705233c16dadc598f4a748797f73edb5 Author: Denys Dmytriyenko AuthorDate: Tue Mar 3 18:45:09 2020 -0500 openssl: recommend cryptodev-module for corresponding PACKAGECONFIG Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index d4871fe..a429b0a 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -34,7 +34,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux" +PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" B = "${WORKDIR}/build" 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 Mar 7 16:07:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:52 +0000 Subject: [oe-commits] [openembedded-core] 06/13: openssl: fix perl shebang in c_rehash In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.624D523296A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7cbac66434e3b22373605dc6b83e1e537ce8157a Author: Martin Jansa AuthorDate: Sat Mar 7 14:30:06 2020 +0100 openssl: fix perl shebang in c_rehash * passing PERL=perl breaks c_rehash calls from dash (works fine with bash) dash doesn't like #!perl shebang PERL="/usr/bin/env perl" unfortunately just passing PERL like this doesn't pass do_configure: Creating Makefile sh: 1: /usr/bin/env perl: not found WARNING: exit code 1 from a shell command. But passing it as: HASHBANGPERL="/usr/bin/env perl" PERL=perl seems to work. Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index a429b0a..4653d8a 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -123,7 +123,7 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ + HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target perl ${B}/configdata.pm --dump } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:53 +0000 Subject: [oe-commits] [openembedded-core] 07/13: xserver-xorg: make manpage mutlilib identical In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.7310423296D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5476b2094f68b081db785c89409d94a798d14f7a Author: Jeremy Puhlman AuthorDate: Sat Mar 7 05:51:04 2020 -0800 xserver-xorg: make manpage mutlilib identical Signed-off-by: Jeremy A. Puhlman 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 14ba6bf..b4f0760 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -152,6 +152,7 @@ PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" do_install_append () { # Its assumed base-files creates this for us rmdir ${D}${localstatedir}/log/ + sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5 } # Add runtime provides for the ABI versions of the video and input subsystems, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:54 +0000 Subject: [oe-commits] [openembedded-core] 08/13: xinit: make manpages multilib identical In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.8016923296E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a4e5ff338ebb9d35c78088f7926536af43f727e5 Author: Jeremy Puhlman AuthorDate: Sat Mar 7 05:51:05 2020 -0800 xinit: make manpages multilib identical Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Make-manpage-multilib-identical.patch | 28 ++++++++++++++++++++++ meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 ++ 2 files changed, 30 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch new file mode 100644 index 0000000..6499055 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch @@ -0,0 +1,28 @@ +From d642e60d8963f1b90569cd0ab5c29ac2c9bfe939 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Fri, 6 Mar 2020 22:28:14 +0000 +Subject: [PATCH] Make manpage multilib identical + +Upstream-Status: Submitted + +Signed-off-by: Jeremy Puhlman +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 9c6569f..608e933 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -12,7 +12,7 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \ + -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \ + -e 's|__xinitdir__|$(XINITDIR)|g' \ + -e 's|__bindir__|$(bindir)|g' \ +- -e 's|__libdir__|$(libdir)|g' \ ++ -e 's|__libdir__|$(prefix)/lib*|g' \ + -e 's|__configdir__|$(XINITDIR)|g' + + +-- +2.23.0 + diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb index 5626ebb..c9e28d9 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" PE = "1" +SRC_URI += "file://0001-Make-manpage-multilib-identical.patch" + SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37" SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:55 +0000 Subject: [oe-commits] [openembedded-core] 09/13: groff: Make manpages binary identical In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.8DA6723296F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 16d57f9a7557803f82a38ef98789c95946b0f6b4 Author: Jeremy Puhlman AuthorDate: Sat Mar 7 06:05:48 2020 -0800 groff: Make manpages binary identical Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Make-manpages-mulitlib-identical.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.4.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch new file mode 100644 index 0000000..9105da6 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch @@ -0,0 +1,27 @@ +From e738f9185ba90f2083c846ade3551234bb5a7cbc Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 7 Mar 2020 00:59:13 +0000 +Subject: [PATCH] Make manpages mulitlib identical + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d18c49b..6175fe9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -917,7 +917,7 @@ SUFFIXES += .man + -e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \ + -e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f $(makevarescape)`|g" \ + -e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f $(makevarescape)`|g" \ +- -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f $(makevarescape)`|g" \ ++ -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e 's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \ + -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \ + -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \ + -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \ +-- +2.23.0 + diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb index 082597f..e398478 100644 --- a/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/meta/recipes-extended/groff/groff_1.22.4.bb @@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-not-search-fonts-on-build-host.patch \ file://0001-support-musl.patch \ file://0001-Include-config.h.patch \ + file://0001-Make-manpages-mulitlib-identical.patch \ " SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:56 +0000 Subject: [oe-commits] [openembedded-core] 10/13: runqemu: support multiple NICs In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.9CA2C232989@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aa81bbd4b1c48cd612b02a4fcfe0466e0be47716 Author: Adrian Freihofer AuthorDate: Sat Mar 7 16:01:45 2020 +0100 runqemu: support multiple NICs Emulating more than one network interface with runqemu is sometimes a bit tricky, but possible. For example, this leads to an emulated device with eth0 and eth1: QB_NETWORK_DEVICE_prepend = " \ -device virtio-net-device,mac=52:54:00:12:34:03 \ " Note: On some emulated NIC types, Qemu and the kernel enumerate the eths in the guest in reverse order to how the device parameters are passed to Qemu. So in this case it is important that the additional NICs are prepended to the -device parameter, which gets automatically added by Qemu. Otherwise, the interface eth1 will be connected to the host, but eth0 will be assigned the IP address 192.168.7.x, which obviously does not work. When booting Qemu with two NICs, but only one set of network configuration parameters gets passed to the kernel, the kernel seems to search for a configuration for all NICs. This delays the boot process for a very long time. This change solves the timeout problem. Tested with: oe-selftest --run-tests runqemu Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie --- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index dd0aa4b..d34f8ee 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1147,7 +1147,7 @@ class BaseConfig(object): client = gateway + 1 if self.fstype == 'nfs': self.setup_nfs() - netconf = "192.168.7.%s::192.168.7.%s:255.255.255.0" % (client, gateway) + netconf = "192.168.7.%s::192.168.7.%s:255.255.255.0::eth0" % (client, gateway) logger.info("Network configuration: %s", netconf) self.kernel_cmdline_script += " ip=%s" % netconf mac = "%s%02x" % (self.mac_tap, client) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:51 +0000 Subject: [oe-commits] [openembedded-core] 05/13: make: Fix build on arm/clang In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.5193F232969@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ab75a6c76d3b02aaaf087c0f2b9ac461510231f6 Author: Khem Raj AuthorDate: Fri Mar 6 23:29:04 2020 -0800 make: Fix build on arm/clang clang defines __arm which is interpreted as non-posix by make build system but thats not correct when using clang so patch addresses that Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-makeinst-Do-not-undef-POSIX-on-clang-arm.patch | 38 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.3.bb | 1 + 2 files changed, 39 insertions(+) diff --git a/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch new file mode 100644 index 0000000..2da7c98 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch @@ -0,0 +1,38 @@ +From 86b7947156a0c33e768d0a265e38f2881a70a7e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 6 Mar 2020 23:19:37 -0800 +Subject: [PATCH] makeinst: Do not undef POSIX on clang/arm + +if __arm internal compiler macro is defined then make assumes that the +system is not posix and goes ahead and undefs POSIX, which results in +miscompiling make with clang, since clang does define __arm unlike gcc +which does not, but they both support posix just fine, so here check for +compiler not being clang when __arm is defined before undefining posix + +Fixes error like +../make-4.3/src/job.c:507:27: error: too many arguments to function call, expected 0, have 1 + sigsetmask (siggetmask (0) & ~fatal_signal_mask) + ~~~~~~~~~~ ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/makeint.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/makeint.h b/src/makeint.h +index c428a36..fadf963 100644 +--- a/src/makeint.h ++++ b/src/makeint.h +@@ -115,7 +115,7 @@ extern int errno; + #endif + + /* Some systems define _POSIX_VERSION but are not really POSIX.1. */ +-#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) ++#if (defined (butterfly) || (defined (__arm) && !defined(__clang__)) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) + # undef POSIX + #endif + +-- +2.25.1 + diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index cd0ecd4..3e0eb54 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -8,6 +8,7 @@ SRC_URI += "\ 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 \ + file://0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch \ " EXTRA_OECONF += "--without-guile" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:57 +0000 Subject: [oe-commits] [openembedded-core] 11/13: files/toolchain-shar-extract.sh: Rework PATH cleaning In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.ABDC3232967@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bef44fc27c848109edc290114ce4095724dc3a7a Author: Richard Purdie AuthorDate: Sat Mar 7 13:43:44 2020 +0000 files/toolchain-shar-extract.sh: Rework PATH cleaning Trying to create a clean PATH breaks cases where we install a buildtools tarball on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up directories in PATH which don't exist isntead. Do it with python as the shell version was too fraught with corner cases. Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4c4b4de..0002c9d 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,13 +1,7 @@ #!/bin/sh -[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ - LC_ALL=en_US.UTF-8 \ - TERM=$TERM \ - ICECC_PATH="$ICECC_PATH" \ - http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ - no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" -[ -f /etc/environment ] && . /etc/environment -export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted +PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 16:07:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:58 +0000 Subject: [oe-commits] [openembedded-core] 12/13: nss: Move to meta-oe In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.C2342232963@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 4184b6b8bbf516a08a8e0eb4e8d5558925ec1eeb Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:07 2020 +0200 nss: Move to meta-oe rpm was the last user in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 14 files changed, 638 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..f6a2936 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -527,7 +527,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " 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 deleted file mode 100644 index c380c14..0000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d540339..0000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2..0000000 Binary files a/meta/recipes-support/nss/nss/blank-cert9.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db deleted file mode 100644 index d47f08d..0000000 Binary files a/meta/recipes-support/nss/nss/blank-key4.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d2..0000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d1..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc9..0000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ec..0000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817fa..0000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499..0000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9..0000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7..0000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -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" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "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 Sat Mar 7 16:07:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:07:59 +0000 Subject: [oe-commits] [openembedded-core] 13/13: nspr: Move to meta-oe In-Reply-To: <158359726674.3803.6115222323233366513@git.openembedded.org> References: <158359726674.3803.6115222323233366513@git.openembedded.org> Message-ID: <20200307160747.D5014232964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ec94ff59f0e5490426d27dbd3e64430b68b30d39 Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:08 2020 +0200 nspr: Move to meta-oe It was used only by nss. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 ---- .../nspr/nspr/0002-Add-nios2-support.patch | 102 ----------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ----------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ------ meta/recipes-support/nspr/nspr/nspr.pc.in | 11 -- .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- 9 files changed, 542 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f6a2936..33f8044 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670..0000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d42..0000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f..0000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8..0000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19..0000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed..0000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1..0000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -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 Mar 7 16:08:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 16:08:27 +0000 Subject: [oe-commits] [bitbake] branch master updated (e667591 -> 2885034) Message-ID: <158359730718.4480.53008175546944359@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 e667591 cooker: Reset parse status unpon clientComplete add 95bb446 command: Add mc parameter to findProviders command add ea0b68a cooker: Respect multiconfig parameter add d515481 tinfoil: Add multiconfig support add 8325611 bblayers: query: Add multiconfig option add 694904b runqueue: teach runonly/runall to accept "do_task" as well as "task" add 26ff7fa ui/teamcity: add a TeamCity service message frontend add 2885034 build.py: augment TaskBase to capture PN and PV No new revisions were added by this update. Summary of changes: lib/bb/build.py | 2 + lib/bb/command.py | 6 +- lib/bb/cooker.py | 6 +- lib/bb/runqueue.py | 8 +- lib/bb/tinfoil.py | 38 ++--- lib/bb/ui/teamcity.py | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/bblayers/query.py | 20 ++- 7 files changed, 447 insertions(+), 31 deletions(-) create mode 100644 lib/bb/ui/teamcity.py -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 18:13:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:13:14 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ec94ff5 -> e8911ff) Message-ID: <158360479454.12910.11135917252902962386@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 ec94ff5 nspr: Move to meta-oe discard 4184b6b nss: Move to meta-oe discard bef44fc files/toolchain-shar-extract.sh: Rework PATH cleaning discard aa81bbd runqemu: support multiple NICs new 02106d0 files/toolchain-shar-extract.sh: Rework PATH cleaning new d054028 nss: Move to meta-oe new 91c6429 nspr: Move to meta-oe new d218666 testsdk: Add dependency of xz-native for eSDK testing new 16d3943 glibc: Explicitly disable msgfmt new e8911ff reproducibile_build: Fix SDE file generation when unpack reruns 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 (ec94ff5) \ N -- N -- N refs/heads/master-next (e8911ff) 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/reproducible_build.bbclass | 9 +++++---- meta/classes/testsdk.bbclass | 1 + meta/recipes-core/glibc/glibc.inc | 3 +++ scripts/runqemu | 2 +- 4 files changed, 10 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 Mar 7 18:13:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:13:15 +0000 Subject: [oe-commits] [openembedded-core] 01/06: files/toolchain-shar-extract.sh: Rework PATH cleaning In-Reply-To: <158360479454.12910.11135917252902962386@git.openembedded.org> References: <158360479454.12910.11135917252902962386@git.openembedded.org> Message-ID: <20200307181314.B71D4232964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 02106d0551450b38a599a2b9a2fd10bc5a30be0f Author: Richard Purdie AuthorDate: Sat Mar 7 13:43:44 2020 +0000 files/toolchain-shar-extract.sh: Rework PATH cleaning Trying to create a clean PATH breaks cases where we install a buildtools tarball on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up directories in PATH which don't exist isntead. Do it with python as the shell version was too fraught with corner cases. Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4c4b4de..0002c9d 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,13 +1,7 @@ #!/bin/sh -[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ - LC_ALL=en_US.UTF-8 \ - TERM=$TERM \ - ICECC_PATH="$ICECC_PATH" \ - http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ - no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" -[ -f /etc/environment ] && . /etc/environment -export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted +PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 18:13:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:13:16 +0000 Subject: [oe-commits] [openembedded-core] 02/06: nss: Move to meta-oe In-Reply-To: <158360479454.12910.11135917252902962386@git.openembedded.org> References: <158360479454.12910.11135917252902962386@git.openembedded.org> Message-ID: <20200307181314.C8A8E232965@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d054028e8cacff187200bbc62a59c193fef5122e Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:07 2020 +0200 nss: Move to meta-oe rpm was the last user in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 14 files changed, 638 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..f6a2936 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -527,7 +527,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " 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 deleted file mode 100644 index c380c14..0000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d540339..0000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2..0000000 Binary files a/meta/recipes-support/nss/nss/blank-cert9.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db deleted file mode 100644 index d47f08d..0000000 Binary files a/meta/recipes-support/nss/nss/blank-key4.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d2..0000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d1..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc9..0000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ec..0000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817fa..0000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499..0000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9..0000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7..0000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -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" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "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 Sat Mar 7 18:13:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:13:18 +0000 Subject: [oe-commits] [openembedded-core] 04/06: testsdk: Add dependency of xz-native for eSDK testing In-Reply-To: <158360479454.12910.11135917252902962386@git.openembedded.org> References: <158360479454.12910.11135917252902962386@git.openembedded.org> Message-ID: <20200307181314.E93F1232968@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d218666d183d539c0830c2e2e50f48ce7bcf4406 Author: Richard Purdie AuthorDate: Sat Mar 7 18:11:57 2020 +0000 testsdk: Add dependency of xz-native for eSDK testing Signed-off-by: Richard Purdie --- meta/classes/testsdk.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 758a23a..3688112 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -42,6 +42,7 @@ python do_testsdkext() { } addtask testsdkext do_testsdkext[nostamp] = "1" +do_testsdkext[depends] += "xz-native:do_populate_sysroot" python () { if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 18:13:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:13:17 +0000 Subject: [oe-commits] [openembedded-core] 03/06: nspr: Move to meta-oe In-Reply-To: <158360479454.12910.11135917252902962386@git.openembedded.org> References: <158360479454.12910.11135917252902962386@git.openembedded.org> Message-ID: <20200307181314.D9A7A232967@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 91c6429f5484c5ae513be918286c63eca24d4205 Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:08 2020 +0200 nspr: Move to meta-oe It was used only by nss. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 ---- .../nspr/nspr/0002-Add-nios2-support.patch | 102 ----------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ----------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ------ meta/recipes-support/nspr/nspr/nspr.pc.in | 11 -- .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- 9 files changed, 542 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f6a2936..33f8044 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670..0000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d42..0000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f..0000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8..0000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19..0000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed..0000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1..0000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -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 Mar 7 18:13:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:13:19 +0000 Subject: [oe-commits] [openembedded-core] 05/06: glibc: Explicitly disable msgfmt In-Reply-To: <158360479454.12910.11135917252902962386@git.openembedded.org> References: <158360479454.12910.11135917252902962386@git.openembedded.org> Message-ID: <20200307181315.07316232969@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 16d3943c56a66ddad6b6ea17e18a26bc40ec1b9e Author: Richard Purdie AuthorDate: Sat Mar 7 17:20:16 2020 +0000 glibc: Explicitly disable msgfmt If configure is rerun it finds msgfmt from gettext-native which is installed during package_write_ipk|deb and means builds are not determinisic. Whether msgfmt is needed is debatable (libc.mo files arne't generated without it) however we should at least be consistent which this patch ensures. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 58d2ba7..23a6ca9 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -9,8 +9,11 @@ inherit autotools texinfo features_check systemd LEAD_SONAME = "libc.so" +# msgfmt could come from gettext-native but we don't depend on that and +# disable for reproducibility CACHED_CONFIGUREVARS += " \ ac_cv_path_BASH_SHELL=${base_bindir}/bash \ + ac_cv_prog_MSGFMT= \ libc_cv_slibdir=${base_libdir} \ libc_cv_rootsbindir=${base_sbindir} \ libc_cv_localedir=${localedir} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 18:13:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:13:20 +0000 Subject: [oe-commits] [openembedded-core] 06/06: reproducibile_build: Fix SDE file generation when unpack reruns In-Reply-To: <158360479454.12910.11135917252902962386@git.openembedded.org> References: <158360479454.12910.11135917252902962386@git.openembedded.org> Message-ID: <20200307181315.152EB23296A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e8911ff67be92cc49646b55c58410c3d552aa213 Author: Richard Purdie AuthorDate: Sat Mar 7 18:03:40 2020 +0000 reproducibile_build: Fix SDE file generation when unpack reruns Currently, if an existing TMPDIR is rebuilt, do_fetch/do_unpack can rerun but SDE would remain unchanged. This leads to different results compared to a fresh build. An example change which triggered this is: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=cb4e69e6346a9fbeebf83a5d5397cacbd41d48b5 Instead, delete any existing SDE and recalculate if we're reunning. Also rename and drop the do_ prefix since these are for tasks, not functions. Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 750eb95..8da40f6 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -150,11 +150,12 @@ def fixed_source_date_epoch(): bb.debug(1, "No tarball or git repo found to determine SOURCE_DATE_EPOCH") return 0 -python do_create_source_date_epoch_stamp() { +python create_source_date_epoch_stamp() { epochfile = d.getVar('SDE_FILE') + # If it exists we need to regenerate as the sources may have changed if os.path.isfile(epochfile): - bb.debug(1, "Reusing SOURCE_DATE_EPOCH from: %s" % epochfile) - return + bb.debug(1, "Deleting existing SOURCE_DATE_EPOCH from: %s" % epochfile) + os.remove(epochfile) sourcedir = d.getVar('S') source_date_epoch = ( @@ -197,5 +198,5 @@ 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") + d.appendVarFlag("do_unpack", "postfuncs", " create_source_date_epoch_stamp") } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 18:15:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:15:30 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (e8911ff -> d2b8636) Message-ID: <158360493016.13803.16315051109896010485@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 e8911ff reproducibile_build: Fix SDE file generation when unpack reruns new bfba92c coreutils: add ptest new d2b8636 ptest-packagelists.inc: add coreutils to SLOW list 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/ptest-packagelists.inc | 1 + meta/recipes-core/coreutils/coreutils/run-ptest | 17 ++++++++++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 37 +++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 18:15:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:15:32 +0000 Subject: [oe-commits] [openembedded-core] 02/02: ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <158360493016.13803.16315051109896010485@git.openembedded.org> References: <158360493016.13803.16315051109896010485@git.openembedded.org> Message-ID: <20200307181530.6A5A8232965@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d2b8636378ac9786c9f38c07981d0dd46cc5d1e4 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 d6f3aaf..c13ff72 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -66,6 +66,7 @@ PTESTS_SLOW = "\ babeltrace-ptest \ babeltrace2-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 Sat Mar 7 18:15:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 18:15:31 +0000 Subject: [oe-commits] [openembedded-core] 01/02: coreutils: add ptest In-Reply-To: <158360493016.13803.16315051109896010485@git.openembedded.org> References: <158360493016.13803.16315051109896010485@git.openembedded.org> Message-ID: <20200307181530.617A4232964@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bfba92cde0b11213d4eb082a271f320a7f37d4b4 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 Sat Mar 7 23:19:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:35 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d2b8636 -> d968ff7) Message-ID: <158362317509.7254.1627114898057608864@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 d2b8636 ptest-packagelists.inc: add coreutils to SLOW list discard bfba92c coreutils: add ptest discard e8911ff reproducibile_build: Fix SDE file generation when unpack reruns discard 16d3943 glibc: Explicitly disable msgfmt discard d218666 testsdk: Add dependency of xz-native for eSDK testing discard 91c6429 nspr: Move to meta-oe discard d054028 nss: Move to meta-oe discard 02106d0 files/toolchain-shar-extract.sh: Rework PATH cleaning new d9bd105 nss: Move to meta-oe new f2be921 nspr: Move to meta-oe new ca8cfb1 testsdk: Add dependency of xz-native for eSDK testing new 961321d coreutils: add ptest new b8b7169 ptest-packagelists.inc: add coreutils to SLOW list new cca0ca1 glibc: Explicitly disable msgfmt new d968ff7 reproducibile_build: Fix SDE file generation when unpack reruns 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 (d2b8636) \ N -- N -- N refs/heads/master-next (d968ff7) 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/files/toolchain-shar-extract.sh | 10 ++++++++-- 1 file 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 Sat Mar 7 23:19:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:38 +0000 Subject: [oe-commits] [openembedded-core] 03/07: testsdk: Add dependency of xz-native for eSDK testing In-Reply-To: <158362317509.7254.1627114898057608864@git.openembedded.org> References: <158362317509.7254.1627114898057608864@git.openembedded.org> Message-ID: <20200307231935.584AA232968@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ca8cfb17a3af56673f56e219c85a9d0ed9e8ec55 Author: Richard Purdie AuthorDate: Sat Mar 7 18:11:57 2020 +0000 testsdk: Add dependency of xz-native for eSDK testing Signed-off-by: Richard Purdie --- meta/classes/testsdk.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 758a23a..3688112 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -42,6 +42,7 @@ python do_testsdkext() { } addtask testsdkext do_testsdkext[nostamp] = "1" +do_testsdkext[depends] += "xz-native:do_populate_sysroot" python () { if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 23:19:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:36 +0000 Subject: [oe-commits] [openembedded-core] 01/07: nss: Move to meta-oe In-Reply-To: <158362317509.7254.1627114898057608864@git.openembedded.org> References: <158362317509.7254.1627114898057608864@git.openembedded.org> Message-ID: <20200307231935.431A8232965@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d9bd105a075ca02f4237f98bd377d623ab5924f2 Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:07 2020 +0200 nss: Move to meta-oe rpm was the last user in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 14 files changed, 638 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..f6a2936 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -527,7 +527,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " 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 deleted file mode 100644 index c380c14..0000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d540339..0000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2..0000000 Binary files a/meta/recipes-support/nss/nss/blank-cert9.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db deleted file mode 100644 index d47f08d..0000000 Binary files a/meta/recipes-support/nss/nss/blank-key4.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d2..0000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d1..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc9..0000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ec..0000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817fa..0000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499..0000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9..0000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7..0000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -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" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "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 Sat Mar 7 23:19:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:37 +0000 Subject: [oe-commits] [openembedded-core] 02/07: nspr: Move to meta-oe In-Reply-To: <158362317509.7254.1627114898057608864@git.openembedded.org> References: <158362317509.7254.1627114898057608864@git.openembedded.org> Message-ID: <20200307231935.4FEDB232967@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f2be9213bd2d9c278aa9c76c1aad6710743e0b34 Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:08 2020 +0200 nspr: Move to meta-oe It was used only by nss. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 ---- .../nspr/nspr/0002-Add-nios2-support.patch | 102 ----------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ----------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ------ meta/recipes-support/nspr/nspr/nspr.pc.in | 11 -- .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- 9 files changed, 542 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f6a2936..33f8044 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670..0000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d42..0000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f..0000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8..0000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19..0000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed..0000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1..0000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -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 Mar 7 23:19:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:39 +0000 Subject: [oe-commits] [openembedded-core] 04/07: coreutils: add ptest In-Reply-To: <158362317509.7254.1627114898057608864@git.openembedded.org> References: <158362317509.7254.1627114898057608864@git.openembedded.org> Message-ID: <20200307231935.63A09232969@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 961321d1fa253619f02ebf2f9dca057c08a229c7 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 Sat Mar 7 23:19:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:41 +0000 Subject: [oe-commits] [openembedded-core] 06/07: glibc: Explicitly disable msgfmt In-Reply-To: <158362317509.7254.1627114898057608864@git.openembedded.org> References: <158362317509.7254.1627114898057608864@git.openembedded.org> Message-ID: <20200307231935.75B6623296D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cca0ca1946fa204c0dfabd2dfe2918d6f3dae1e5 Author: Richard Purdie AuthorDate: Sat Mar 7 17:20:16 2020 +0000 glibc: Explicitly disable msgfmt If configure is rerun it finds msgfmt from gettext-native which is installed during package_write_ipk|deb and means builds are not determinisic. Whether msgfmt is needed is debatable (libc.mo files arne't generated without it) however we should at least be consistent which this patch ensures. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 58d2ba7..23a6ca9 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -9,8 +9,11 @@ inherit autotools texinfo features_check systemd LEAD_SONAME = "libc.so" +# msgfmt could come from gettext-native but we don't depend on that and +# disable for reproducibility CACHED_CONFIGUREVARS += " \ ac_cv_path_BASH_SHELL=${base_bindir}/bash \ + ac_cv_prog_MSGFMT= \ libc_cv_slibdir=${base_libdir} \ libc_cv_rootsbindir=${base_sbindir} \ libc_cv_localedir=${localedir} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 7 23:19:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:40 +0000 Subject: [oe-commits] [openembedded-core] 05/07: ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <158362317509.7254.1627114898057608864@git.openembedded.org> References: <158362317509.7254.1627114898057608864@git.openembedded.org> Message-ID: <20200307231935.6CF0423296A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b8b716973945e98daea39a901b51ac45dd334951 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 d6f3aaf..c13ff72 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -66,6 +66,7 @@ PTESTS_SLOW = "\ babeltrace-ptest \ babeltrace2-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 Sat Mar 7 23:19:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 07 Mar 2020 23:19:42 +0000 Subject: [oe-commits] [openembedded-core] 07/07: reproducibile_build: Fix SDE file generation when unpack reruns In-Reply-To: <158362317509.7254.1627114898057608864@git.openembedded.org> References: <158362317509.7254.1627114898057608864@git.openembedded.org> Message-ID: <20200307231935.7E32C23296E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d968ff72300b652054845d38d422eb1f644c84ec Author: Richard Purdie AuthorDate: Sat Mar 7 18:03:40 2020 +0000 reproducibile_build: Fix SDE file generation when unpack reruns Currently, if an existing TMPDIR is rebuilt, do_fetch/do_unpack can rerun but SDE would remain unchanged. This leads to different results compared to a fresh build. An example change which triggered this is: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=cb4e69e6346a9fbeebf83a5d5397cacbd41d48b5 Instead, delete any existing SDE and recalculate if we're reunning. Also rename and drop the do_ prefix since these are for tasks, not functions. Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 750eb95..8da40f6 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -150,11 +150,12 @@ def fixed_source_date_epoch(): bb.debug(1, "No tarball or git repo found to determine SOURCE_DATE_EPOCH") return 0 -python do_create_source_date_epoch_stamp() { +python create_source_date_epoch_stamp() { epochfile = d.getVar('SDE_FILE') + # If it exists we need to regenerate as the sources may have changed if os.path.isfile(epochfile): - bb.debug(1, "Reusing SOURCE_DATE_EPOCH from: %s" % epochfile) - return + bb.debug(1, "Deleting existing SOURCE_DATE_EPOCH from: %s" % epochfile) + os.remove(epochfile) sourcedir = d.getVar('S') source_date_epoch = ( @@ -197,5 +198,5 @@ 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") + d.appendVarFlag("do_unpack", "postfuncs", " create_source_date_epoch_stamp") } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:34 +0000 Subject: [oe-commits] [openembedded-core] 01/09: qemuarm64: Add -machine gic-version=3 with kvm In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.70EDF23296E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 17e93c6464184d137b9590f17bfa879ae79d0cfc 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 Sun Mar 8 08:21:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:35 +0000 Subject: [oe-commits] [openembedded-core] 02/09: openssl: recommend cryptodev-module for corresponding PACKAGECONFIG In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.7A9D023296F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 57fcf9b517fe95e871122946cb99fe7fa9fd2e26 Author: Denys Dmytriyenko AuthorDate: Tue Mar 3 18:45:09 2020 -0500 openssl: recommend cryptodev-module for corresponding PACKAGECONFIG Signed-off-by: Denys Dmytriyenko Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index d4871fe..a429b0a 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -34,7 +34,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux" +PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" B = "${WORKDIR}/build" 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 Sun Mar 8 08:21:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:33 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (15fe7de -> 5d579fc) Message-ID: <158365569312.17996.16445070375473435020@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 15fe7de gettext: fix ptest package reproducibilty new 17e93c6 qemuarm64: Add -machine gic-version=3 with kvm new 57fcf9b openssl: recommend cryptodev-module for corresponding PACKAGECONFIG new e225278 make: Fix build on arm/clang new 7935082 openssl: fix perl shebang in c_rehash new cf9759b xserver-xorg: make manpage mutlilib identical new 282ca52 xinit: make manpages multilib identical new b78a0cf groff: Make manpages binary identical new 9ffd08c glibc: Explicitly disable msgfmt new 5d579fc reproducibile_build: Fix SDE file generation when unpack reruns 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 | 9 ++--- meta/conf/machine/qemuarm64.conf | 2 +- .../recipes-connectivity/openssl/openssl_1.1.1d.bb | 4 +-- meta/recipes-core/glibc/glibc.inc | 3 ++ ...-makeinst-Do-not-undef-POSIX-on-clang-arm.patch | 38 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.3.bb | 1 + .../0001-Make-manpages-mulitlib-identical.patch | 27 +++++++++++++++ meta/recipes-extended/groff/groff_1.22.4.bb | 1 + .../0001-Make-manpage-multilib-identical.patch | 28 ++++++++++++++++ meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 ++ .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 11 files changed, 109 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch create mode 100644 meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch create mode 100644 meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:37 +0000 Subject: [oe-commits] [openembedded-core] 04/09: openssl: fix perl shebang in c_rehash In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.92C5723299C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 79350826396a882d115caafd88b0a49c91a4fa6c Author: Martin Jansa AuthorDate: Sat Mar 7 14:30:06 2020 +0100 openssl: fix perl shebang in c_rehash * passing PERL=perl breaks c_rehash calls from dash (works fine with bash) dash doesn't like #!perl shebang PERL="/usr/bin/env perl" unfortunately just passing PERL like this doesn't pass do_configure: Creating Makefile sh: 1: /usr/bin/env perl: not found WARNING: exit code 1 from a shell command. But passing it as: HASHBANGPERL="/usr/bin/env perl" PERL=perl seems to work. Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index a429b0a..4653d8a 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb @@ -123,7 +123,7 @@ do_configure () { fi # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the # environment variables set by bitbake. Adjust the environment variables instead. - PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ + HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target perl ${B}/configdata.pm --dump } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:36 +0000 Subject: [oe-commits] [openembedded-core] 03/09: make: Fix build on arm/clang In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.866F3232989@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e225278a8a894389add56d14908398c14512f6c9 Author: Khem Raj AuthorDate: Fri Mar 6 23:29:04 2020 -0800 make: Fix build on arm/clang clang defines __arm which is interpreted as non-posix by make build system but thats not correct when using clang so patch addresses that Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-makeinst-Do-not-undef-POSIX-on-clang-arm.patch | 38 ++++++++++++++++++++++ meta/recipes-devtools/make/make_4.3.bb | 1 + 2 files changed, 39 insertions(+) diff --git a/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch new file mode 100644 index 0000000..2da7c98 --- /dev/null +++ b/meta/recipes-devtools/make/make/0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch @@ -0,0 +1,38 @@ +From 86b7947156a0c33e768d0a265e38f2881a70a7e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 6 Mar 2020 23:19:37 -0800 +Subject: [PATCH] makeinst: Do not undef POSIX on clang/arm + +if __arm internal compiler macro is defined then make assumes that the +system is not posix and goes ahead and undefs POSIX, which results in +miscompiling make with clang, since clang does define __arm unlike gcc +which does not, but they both support posix just fine, so here check for +compiler not being clang when __arm is defined before undefining posix + +Fixes error like +../make-4.3/src/job.c:507:27: error: too many arguments to function call, expected 0, have 1 + sigsetmask (siggetmask (0) & ~fatal_signal_mask) + ~~~~~~~~~~ ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/makeint.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/makeint.h b/src/makeint.h +index c428a36..fadf963 100644 +--- a/src/makeint.h ++++ b/src/makeint.h +@@ -115,7 +115,7 @@ extern int errno; + #endif + + /* Some systems define _POSIX_VERSION but are not really POSIX.1. */ +-#if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) ++#if (defined (butterfly) || (defined (__arm) && !defined(__clang__)) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) + # undef POSIX + #endif + +-- +2.25.1 + diff --git a/meta/recipes-devtools/make/make_4.3.bb b/meta/recipes-devtools/make/make_4.3.bb index cd0ecd4..3e0eb54 100644 --- a/meta/recipes-devtools/make/make_4.3.bb +++ b/meta/recipes-devtools/make/make_4.3.bb @@ -8,6 +8,7 @@ SRC_URI += "\ 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 \ + file://0001-makeinst-Do-not-undef-POSIX-on-clang-arm.patch \ " EXTRA_OECONF += "--without-guile" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:38 +0000 Subject: [oe-commits] [openembedded-core] 05/09: xserver-xorg: make manpage mutlilib identical In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.9CF6823299D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit cf9759b27bca5bb1dfa99fc79b4651bfebe2da52 Author: Jeremy Puhlman AuthorDate: Sat Mar 7 05:51:04 2020 -0800 xserver-xorg: make manpage mutlilib identical Signed-off-by: Jeremy A. Puhlman 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 14ba6bf..b4f0760 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -152,6 +152,7 @@ PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" do_install_append () { # Its assumed base-files creates this for us rmdir ${D}${localstatedir}/log/ + sed -i -e 's,${libdir}/xorg/modules,${prefix}/lib*/xorg/modules,' ${D}${mandir}/man5/xorg.conf.5 } # Add runtime provides for the ABI versions of the video and input subsystems, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:40 +0000 Subject: [oe-commits] [openembedded-core] 07/09: groff: Make manpages binary identical In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.B0CEE2329B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit b78a0cf49a4efb02cffc12e199de526e13391482 Author: Jeremy Puhlman AuthorDate: Sat Mar 7 06:05:48 2020 -0800 groff: Make manpages binary identical Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Make-manpages-mulitlib-identical.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.4.bb | 1 + 2 files changed, 28 insertions(+) diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch new file mode 100644 index 0000000..9105da6 --- /dev/null +++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch @@ -0,0 +1,27 @@ +From e738f9185ba90f2083c846ade3551234bb5a7cbc Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Sat, 7 Mar 2020 00:59:13 +0000 +Subject: [PATCH] Make manpages mulitlib identical + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d18c49b..6175fe9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -917,7 +917,7 @@ SUFFIXES += .man + -e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \ + -e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f $(makevarescape)`|g" \ + -e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f $(makevarescape)`|g" \ +- -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f $(makevarescape)`|g" \ ++ -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e 's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \ + -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \ + -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \ + -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \ +-- +2.23.0 + diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb index 082597f..e398478 100644 --- a/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/meta/recipes-extended/groff/groff_1.22.4.bb @@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-not-search-fonts-on-build-host.patch \ file://0001-support-musl.patch \ file://0001-Include-config.h.patch \ + file://0001-Make-manpages-mulitlib-identical.patch \ " SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:39 +0000 Subject: [oe-commits] [openembedded-core] 06/09: xinit: make manpages multilib identical In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.A740723299E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 282ca525c411e03391520c0c5950ed3418f6bc2e Author: Jeremy Puhlman AuthorDate: Sat Mar 7 05:51:05 2020 -0800 xinit: make manpages multilib identical Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Make-manpage-multilib-identical.patch | 28 ++++++++++++++++++++++ meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 ++ 2 files changed, 30 insertions(+) diff --git a/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch new file mode 100644 index 0000000..6499055 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xinit/0001-Make-manpage-multilib-identical.patch @@ -0,0 +1,28 @@ +From d642e60d8963f1b90569cd0ab5c29ac2c9bfe939 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Fri, 6 Mar 2020 22:28:14 +0000 +Subject: [PATCH] Make manpage multilib identical + +Upstream-Status: Submitted + +Signed-off-by: Jeremy Puhlman +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 9c6569f..608e933 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -12,7 +12,7 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \ + -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \ + -e 's|__xinitdir__|$(XINITDIR)|g' \ + -e 's|__bindir__|$(bindir)|g' \ +- -e 's|__libdir__|$(libdir)|g' \ ++ -e 's|__libdir__|$(prefix)/lib*|g' \ + -e 's|__configdir__|$(XINITDIR)|g' + + +-- +2.23.0 + diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb index 5626ebb..c9e28d9 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" PE = "1" +SRC_URI += "file://0001-Make-manpage-multilib-identical.patch" + SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37" SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:42 +0000 Subject: [oe-commits] [openembedded-core] 09/09: reproducibile_build: Fix SDE file generation when unpack reruns In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.C32922329BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5d579fc2fe71637fc6e071aa66542befa39ac8bb Author: Richard Purdie AuthorDate: Sat Mar 7 18:03:40 2020 +0000 reproducibile_build: Fix SDE file generation when unpack reruns Currently, if an existing TMPDIR is rebuilt, do_fetch/do_unpack can rerun but SDE would remain unchanged. This leads to different results compared to a fresh build. An example change which triggered this is: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=cb4e69e6346a9fbeebf83a5d5397cacbd41d48b5 Instead, delete any existing SDE and recalculate if we're reunning. Also rename and drop the do_ prefix since these are for tasks, not functions. Signed-off-by: Richard Purdie --- meta/classes/reproducible_build.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/reproducible_build.bbclass b/meta/classes/reproducible_build.bbclass index 750eb95..8da40f6 100644 --- a/meta/classes/reproducible_build.bbclass +++ b/meta/classes/reproducible_build.bbclass @@ -150,11 +150,12 @@ def fixed_source_date_epoch(): bb.debug(1, "No tarball or git repo found to determine SOURCE_DATE_EPOCH") return 0 -python do_create_source_date_epoch_stamp() { +python create_source_date_epoch_stamp() { epochfile = d.getVar('SDE_FILE') + # If it exists we need to regenerate as the sources may have changed if os.path.isfile(epochfile): - bb.debug(1, "Reusing SOURCE_DATE_EPOCH from: %s" % epochfile) - return + bb.debug(1, "Deleting existing SOURCE_DATE_EPOCH from: %s" % epochfile) + os.remove(epochfile) sourcedir = d.getVar('S') source_date_epoch = ( @@ -197,5 +198,5 @@ 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") + d.appendVarFlag("do_unpack", "postfuncs", " create_source_date_epoch_stamp") } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:41 +0000 Subject: [oe-commits] [openembedded-core] 08/09: glibc: Explicitly disable msgfmt In-Reply-To: <158365569312.17996.16445070375473435020@git.openembedded.org> References: <158365569312.17996.16445070375473435020@git.openembedded.org> Message-ID: <20200308082133.BA0FE2329B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9ffd08cf7d472e6572ee8f04781f410c9d657188 Author: Richard Purdie AuthorDate: Sat Mar 7 17:20:16 2020 +0000 glibc: Explicitly disable msgfmt If configure is rerun it finds msgfmt from gettext-native which is installed during package_write_ipk|deb and means builds are not determinisic. Whether msgfmt is needed is debatable (libc.mo files aren't generated without it), however, we should at least be consistent which this patch ensures. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 58d2ba7..23a6ca9 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -9,8 +9,11 @@ inherit autotools texinfo features_check systemd LEAD_SONAME = "libc.so" +# msgfmt could come from gettext-native but we don't depend on that and +# disable for reproducibility CACHED_CONFIGUREVARS += " \ ac_cv_path_BASH_SHELL=${base_bindir}/bash \ + ac_cv_prog_MSGFMT= \ libc_cv_slibdir=${base_libdir} \ libc_cv_rootsbindir=${base_sbindir} \ libc_cv_localedir=${localedir} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:50 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (d968ff7 -> c596de4) Message-ID: <158365571019.18519.8127057465286184470@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 d968ff7 reproducibile_build: Fix SDE file generation when unpack reruns discard cca0ca1 glibc: Explicitly disable msgfmt discard b8b7169 ptest-packagelists.inc: add coreutils to SLOW list discard 961321d coreutils: add ptest discard ca8cfb1 testsdk: Add dependency of xz-native for eSDK testing discard f2be921 nspr: Move to meta-oe discard d9bd105 nss: Move to meta-oe discard 16d57f9 groff: Make manpages binary identical discard a4e5ff3 xinit: make manpages multilib identical discard 5476b20 xserver-xorg: make manpage mutlilib identical discard 7cbac66 openssl: fix perl shebang in c_rehash discard ab75a6c make: Fix build on arm/clang discard 32a65c4 openssl: recommend cryptodev-module for corresponding PACKAGECONFIG discard cc79e63 qemuarm64: Add -machine gic-version=3 with kvm discard 24a5034 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 1478cf0 HACK: signing: Add extra test debug discard 24bb412 glew/curl: specify exclusive package configs discard 2a79dda base.bbclass: extend PACKAGECONFIG for conflict package configs add 17e93c6 qemuarm64: Add -machine gic-version=3 with kvm add 57fcf9b openssl: recommend cryptodev-module for corresponding PACKAGECONFIG add e225278 make: Fix build on arm/clang add 7935082 openssl: fix perl shebang in c_rehash add cf9759b xserver-xorg: make manpage mutlilib identical add 282ca52 xinit: make manpages multilib identical add b78a0cf groff: Make manpages binary identical add 9ffd08c glibc: Explicitly disable msgfmt add 5d579fc reproducibile_build: Fix SDE file generation when unpack reruns new b35ea40 base.bbclass: extend PACKAGECONFIG for conflict package configs new 835accd glew/curl: specify exclusive package configs new 06b4977 HACK: signing: Add extra test debug new 9ca7fab rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new c2727fa nss: Move to meta-oe new f288e92 nspr: Move to meta-oe new 869b1a5 testsdk: Add dependency of xz-native for eSDK testing new 740e75f coreutils: add ptest new c596de4 ptest-packagelists.inc: add coreutils to SLOW list 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 (d968ff7) \ N -- N -- N refs/heads/master-next (c596de4) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:51 +0000 Subject: [oe-commits] [openembedded-core] 01/09: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.5291D232989@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b35ea4034136272e97ca7e087d63f828633062d9 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 Mar 8 08:21:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:52 +0000 Subject: [oe-commits] [openembedded-core] 02/09: glew/curl: specify exclusive package configs In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.5ABA423299C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 835accdd9208e03a4b50b01f91918177035663ed 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.69.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.69.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb index cf4f4bc..2e9b512 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.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 Mar 8 08:21:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:53 +0000 Subject: [oe-commits] [openembedded-core] 03/09: HACK: signing: Add extra test debug In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.634D223299D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 06b497703af74847b912dd93abd6bf85cfa88eab 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/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..9db1a20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -221,4 +222,17 @@ 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 = runCmd('cat bitbake-cookerdaemon.log').output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) + 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 Mar 8 08:21:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:54 +0000 Subject: [oe-commits] [openembedded-core] 04/09: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.6B37923299E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9ca7fab3527f2a526724f974257fcaf29addcfa9 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 Mar 8 08:21:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:57 +0000 Subject: [oe-commits] [openembedded-core] 07/09: testsdk: Add dependency of xz-native for eSDK testing In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.8C15A2329BA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 869b1a5b868fd9d10f3d4fa98893b2447a030563 Author: Richard Purdie AuthorDate: Sat Mar 7 18:11:57 2020 +0000 testsdk: Add dependency of xz-native for eSDK testing Signed-off-by: Richard Purdie --- meta/classes/testsdk.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 758a23a..3688112 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -42,6 +42,7 @@ python do_testsdkext() { } addtask testsdkext do_testsdkext[nostamp] = "1" +do_testsdkext[depends] += "xz-native:do_populate_sysroot" python () { if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 08:21:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:59 +0000 Subject: [oe-commits] [openembedded-core] 09/09: ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.A2DFC2329CA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c596de43c8328c8a5bcf34cb0f7c28dca1ec3530 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 d6f3aaf..c13ff72 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -66,6 +66,7 @@ PTESTS_SLOW = "\ babeltrace-ptest \ babeltrace2-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 Sun Mar 8 08:21:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:56 +0000 Subject: [oe-commits] [openembedded-core] 06/09: nspr: Move to meta-oe In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.831212329B9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f288e920f056144d5a674885b664c01495a8c27f Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:08 2020 +0200 nspr: Move to meta-oe It was used only by nss. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 ---- .../nspr/nspr/0002-Add-nios2-support.patch | 102 ----------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ----------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ------ meta/recipes-support/nspr/nspr/nspr.pc.in | 11 -- .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- 9 files changed, 542 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f6a2936..33f8044 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670..0000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d42..0000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f..0000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8..0000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19..0000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed..0000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1..0000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -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 Mar 8 08:21:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:55 +0000 Subject: [oe-commits] [openembedded-core] 05/09: nss: Move to meta-oe In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.775362329B8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c2727facf2779b5b33a760e3c7afe08c3a2f415e Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:07 2020 +0200 nss: Move to meta-oe rpm was the last user in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 14 files changed, 638 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..f6a2936 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -527,7 +527,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " 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 deleted file mode 100644 index c380c14..0000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d540339..0000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2..0000000 Binary files a/meta/recipes-support/nss/nss/blank-cert9.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db deleted file mode 100644 index d47f08d..0000000 Binary files a/meta/recipes-support/nss/nss/blank-key4.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d2..0000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d1..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc9..0000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ec..0000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817fa..0000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499..0000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9..0000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7..0000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -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" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "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 Sun Mar 8 08:21:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 08:21:58 +0000 Subject: [oe-commits] [openembedded-core] 08/09: coreutils: add ptest In-Reply-To: <158365571019.18519.8127057465286184470@git.openembedded.org> References: <158365571019.18519.8127057465286184470@git.openembedded.org> Message-ID: <20200308082150.996142329BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 740e75f39c60218da83a10a5e5a3ecb0d6d41ae6 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 Sun Mar 8 10:21:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 10:21:39 +0000 Subject: [oe-commits] [openembedded-core] 02/03: ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <158366289783.32037.166996891830832635@git.openembedded.org> References: <158366289783.32037.166996891830832635@git.openembedded.org> Message-ID: <20200308102138.08D1A23299C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d31fadb7050d32c5f42fbaf9826d8dc822d3a8b9 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 d6f3aaf..c13ff72 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -66,6 +66,7 @@ PTESTS_SLOW = "\ babeltrace-ptest \ babeltrace2-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 Sun Mar 8 10:21:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 10:21:37 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (c596de4 -> 8ad285b) Message-ID: <158366289783.32037.166996891830832635@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 c596de4 ptest-packagelists.inc: add coreutils to SLOW list discard 740e75f coreutils: add ptest discard 869b1a5 testsdk: Add dependency of xz-native for eSDK testing new caec70b coreutils: add ptest new d31fadb ptest-packagelists.inc: add coreutils to SLOW list new 8ad285b oeqa/testsdk: Use original PATH 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 (c596de4) \ N -- N -- N refs/heads/master-next (8ad285b) 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/classes/testsdk.bbclass | 1 - meta/lib/oeqa/sdkext/testsdk.py | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 10:21:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 10:21:40 +0000 Subject: [oe-commits] [openembedded-core] 03/03: oeqa/testsdk: Use original PATH In-Reply-To: <158366289783.32037.166996891830832635@git.openembedded.org> References: <158366289783.32037.166996891830832635@git.openembedded.org> Message-ID: <20200308102138.1408023299D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8ad285b1d729af36a8c5fb1c424a14206c83f6a0 Author: Richard Purdie AuthorDate: Sun Mar 8 10:20:12 2020 +0000 oeqa/testsdk: Use original PATH Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdkext/testsdk.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index 785b5dd..c5c46df 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py @@ -25,11 +25,8 @@ class TestSDKExt(TestSDKBase): subprocesstweak.errors_have_output() - # extensible sdk can be contaminated if native programs are - # in PATH, i.e. use perl-native instead of eSDK one. - paths_to_avoid = [d.getVar('STAGING_DIR'), - d.getVar('BASE_WORKDIR')] - os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) + # We need the original PATH for testing the eSDK, not with our manipulations + os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH") tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") if not os.path.exists(tcname): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 10:21:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 10:21:38 +0000 Subject: [oe-commits] [openembedded-core] 01/03: coreutils: add ptest In-Reply-To: <158366289783.32037.166996891830832635@git.openembedded.org> References: <158366289783.32037.166996891830832635@git.openembedded.org> Message-ID: <20200308102137.F1179232989@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit caec70b56a9af2ea3c287cfd501938a638e607f5 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 Sun Mar 8 13:14:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 13:14:48 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: files/toolchain-shar-extract.sh: Rework PATH cleaning Message-ID: <158367328833.24621.7438350243083153341@git.openembedded.org> 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 03c1b74 files/toolchain-shar-extract.sh: Rework PATH cleaning 03c1b74 is described below commit 03c1b74574d58ffd763e69cb6158cc0882093773 Author: Richard Purdie AuthorDate: Sat Mar 7 13:43:44 2020 +0000 files/toolchain-shar-extract.sh: Rework PATH cleaning Trying to create a clean PATH breaks cases where we install a buildtools tarball on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up directories in PATH which don't exist isntead. Do it with python as the shell version was too fraught with corner cases. (From OE-Core rev: 02106d0551450b38a599a2b9a2fd10bc5a30be0f) Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4c4b4de..776e24d 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,13 +1,8 @@ #!/bin/sh -[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ - LC_ALL=en_US.UTF-8 \ - TERM=$TERM \ - ICECC_PATH="$ICECC_PATH" \ - http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ - no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" -[ -f /etc/environment ] && . /etc/environment -export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +LC_ALL=en_US.UTF-8 +# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted +PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 14:36:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 14:36:31 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: coreutils hack Message-ID: <158367819162.15868.1448822714053539477@git.openembedded.org> 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 2ad7a29 coreutils hack 2ad7a29 is described below commit 2ad7a29dedaadac0daacfc1bce15360bd2819bae Author: Richard Purdie AuthorDate: Sun Mar 8 14:35:58 2020 +0000 coreutils hack Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 04a0522..c661d7c 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -147,7 +147,7 @@ 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" +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-module-file-stat python3-core sed shadow" do_install_ptest () { install -d ${D}${PTEST_PATH}/tests -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 15:15:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 15:15:34 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (cd6b342 -> d62b225) Message-ID: <158368053435.26091.8535599728251923139@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 cd6b342 net-snmp: fix reproducibilty issues in net-snmp-config new 3be47e7 networkmanager: Upgrade 1.18.4 -> 1.22.8 new a367e54 kronosnet: Add recipe new 5c051f8 corosync: Update to 3.0.3 new e15b04f libqb: Build native version as well new d62b225 nss,nspr: Add recipes 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: ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 6 +- ...te-settings-settings-property-documentati.patch | 23 +- ...0001-Fix-build-with-musl-systemd-specific.patch | 26 +- .../musl/0002-Fix-build-with-musl.patch | 30 ++- .../0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 +++++ ...0004-Fix-build-with-musl-systemd-specific.patch | 26 ++ ...kmanager_1.18.4.bb => networkmanager_1.22.8.bb} | 44 ++-- ...-configure.ac-fix-pkgconfig-issue-of-rdma.patch | 32 --- .../{corosync_2.4.5.bb => corosync_3.0.3.bb} | 23 +- .../recipes-extended/kronosnet/kronosnet_1.15.bb | 17 ++ meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 2 + .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 +++ .../nspr/nspr/0002-Add-nios2-support.patch | 102 ++++++++ ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ++++++++ .../nspr/nspr/fix-build-on-x86_64.patch | 52 ++++ meta-oe/recipes-support/nspr/nspr/nspr.pc.in | 11 + .../nspr/nspr/remove-rpath-from-tests.patch | 26 ++ .../nspr/remove-srcdir-from-configure-in.patch | 19 ++ meta-oe/recipes-support/nspr/nspr_4.25.bb | 197 +++++++++++++++ ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ++++ .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ++++ meta-oe/recipes-support/nss/nss/blank-cert9.db | Bin 0 -> 28672 bytes meta-oe/recipes-support/nss/nss/blank-key4.db | Bin 0 -> 36864 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 +++ .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 +++++++++ .../nss/nss/nss-fix-nsinstall-build.patch | 36 +++ .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 ++ meta-oe/recipes-support/nss/nss/nss.pc.in | 11 + .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 ++ meta-oe/recipes-support/nss/nss/signlibs.sh | 20 ++ meta-oe/recipes-support/nss/nss/system-pkcs11.txt | 5 + meta-oe/recipes-support/nss/nss_3.50.bb | 273 +++++++++++++++++++++ 32 files changed, 1364 insertions(+), 104 deletions(-) create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.4.bb => networkmanager_1.22.8.bb} (76%) delete mode 100644 meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch rename meta-networking/recipes-extended/corosync/{corosync_2.4.5.bb => corosync_3.0.3.bb} (82%) create mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb create mode 100644 meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/nspr.pc.in create mode 100644 meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch create mode 100644 meta-oe/recipes-support/nspr/nspr_4.25.bb create mode 100644 meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch create mode 100644 meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch create mode 100644 meta-oe/recipes-support/nss/nss/blank-cert9.db create mode 100644 meta-oe/recipes-support/nss/nss/blank-key4.db create mode 100644 meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss.pc.in create mode 100644 meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch create mode 100644 meta-oe/recipes-support/nss/nss/signlibs.sh create mode 100644 meta-oe/recipes-support/nss/nss/system-pkcs11.txt create mode 100644 meta-oe/recipes-support/nss/nss_3.50.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 15:15:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 15:15:36 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: kronosnet: Add recipe In-Reply-To: <158368053435.26091.8535599728251923139@git.openembedded.org> References: <158368053435.26091.8535599728251923139@git.openembedded.org> Message-ID: <20200308151534.E9C762329CD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a367e54deb7c388a60cfddc356a695180bb67954 Author: Khem Raj AuthorDate: Fri Mar 6 18:06:48 2020 -0800 kronosnet: Add recipe Signed-off-by: Khem Raj --- .../recipes-extended/kronosnet/kronosnet_1.15.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb new file mode 100644 index 0000000..24aa27a --- /dev/null +++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb @@ -0,0 +1,17 @@ +# Copyright (C) 2020 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = " Kronosnet, often referred to as knet, is a network abstraction layer designed for High Availability use cases, where redundancy, security, fault tolerance and fast fail-over are the core requirements of your application." +HOMEPAGE = "https://kronosnet.org/" +LICENSE = "GPL-2.0+ & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "libs" +DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" + +SRCREV = "0ba5985c3ddec8429b989f0e7bd3324f53e0a9b0" +SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" + +inherit autotools + +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 Mar 8 15:15:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 15:15:38 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: libqb: Build native version as well In-Reply-To: <158368053435.26091.8535599728251923139@git.openembedded.org> References: <158368053435.26091.8535599728251923139@git.openembedded.org> Message-ID: <20200308151535.097E12329D8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e15b04fa10d67d73424218ca5486c474fcc70cae Author: Khem Raj AuthorDate: Fri Mar 6 18:08:36 2020 -0800 libqb: Build native version as well Signed-off-by: Khem Raj --- meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb index 82503a1..cd40196 100644 --- a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb @@ -33,3 +33,5 @@ do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) } + +BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 15:15:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 15:15:35 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: networkmanager: Upgrade 1.18.4 -> 1.22.8 In-Reply-To: <158368053435.26091.8535599728251923139@git.openembedded.org> References: <158368053435.26091.8535599728251923139@git.openembedded.org> Message-ID: <20200308151534.DFEB92329CB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3be47e74240d48c72ff0c51ab8b152a07b615db5 Author: Adrian AuthorDate: Sat Mar 7 16:20:11 2020 +0100 networkmanager: Upgrade 1.18.4 -> 1.22.8 - rebased patches - added two more small patches - Option --enable-polkit-agent is not available with current NM, removed - Option --with-libnm-glib is not available with current NM, removed - New package NM-cloud-setup for new experimental cloud setup feature - NM tries to re-license from GPL to LGPL, added LGPL to LICENSES - Removed empty packages libnmutil libnmglib libnmglib-vpn Signed-off-by: Adrian Freihofer Signed-off-by: Khem Raj --- ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 6 +-- ...te-settings-settings-property-documentati.patch | 23 ++++---- ...0001-Fix-build-with-musl-systemd-specific.patch | 26 +++++---- .../musl/0002-Fix-build-with-musl.patch | 30 +++++------ .../0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 ++++++++++++++++++++++ ...0004-Fix-build-with-musl-systemd-specific.patch | 26 +++++++++ ...kmanager_1.18.4.bb => networkmanager_1.22.8.bb} | 44 +++++++++++----- 7 files changed, 159 insertions(+), 57 deletions(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch index 302c029..19c8c74 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch @@ -1,4 +1,4 @@ -From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001 +From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Tue, 13 Mar 2018 17:36:20 +0100 Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations @@ -8,10 +8,10 @@ Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 967eac0..b914219 100644 +index 65ceffb..ad4b0fc 100644 --- a/configure.ac +++ b/configure.ac -@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then +@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch index 5581dd3..446637b 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch @@ -1,4 +1,4 @@ -From 4f000a4a19975d6aba71427e693cd1ed080abda9 Mon Sep 17 00:00:00 2001 +From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 22 Mar 2018 11:08:30 +0100 Subject: [PATCH] Do not create settings settings/property documentation @@ -6,23 +6,29 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + It was tried to get this work but gi / GirRepository could not be found by python. Anyway it is not necessary for us to have the settings/property docs. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas M?ller + --- Makefile.am | 11 ----------- configure.ac | 5 ----- 2 files changed, 16 deletions(-) diff --git a/Makefile.am b/Makefile.am -index b180466..1ab4658 100644 +index d5cbcf5..2a1819a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1298,9 +1298,7 @@ EXTRA_DIST += \ - if HAVE_INTROSPECTION +@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir + INTROSPECTION_GIRS += libnm/NM-1.0.gir libnm_noinst_data = \ - libnm/nm-property-docs.xml \ @@ -31,7 +37,7 @@ index b180466..1ab4658 100644 libnm/nm-settings-keyfile-docs.xml \ libnm/nm-settings-ifcfg-rh-docs.xml -@@ -3930,18 +3928,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) +@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp clients_common_settings_doc_h = clients/common/settings-docs.h @@ -51,10 +57,10 @@ index b180466..1ab4658 100644 $(clients_common_settings_doc_h) \ $(clients_common_settings_doc_h).in diff --git a/configure.ac b/configure.ac -index b914219..872c292 100644 +index ad4b0fc..0092092 100644 --- a/configure.ac +++ b/configure.ac -@@ -1215,11 +1215,6 @@ GTK_DOC_CHECK(1.0) +@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0) # check if we can build setting property documentation build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then @@ -66,6 +72,3 @@ index b914219..872c292 100644 AC_PATH_PROG(PERL, perl) if test -z "$PERL"; then AC_MSG_ERROR([--enable-introspection requires perl]) --- -2.20.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch index af6f938..c23fc30 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch @@ -1,4 +1,4 @@ -From a89c2e6d40606f563467a83fb98933e990e71377 Mon Sep 17 00:00:00 2001 +From e7ed91c48e1a07527a860637a7865eb67ce34cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 2 Apr 2019 01:34:35 +0200 Subject: [PATCH] Fix build with musl - systemd specific @@ -12,6 +12,7 @@ for musl. Upstream-Status: Pending Signed-off-by: Andreas M?ller + --- shared/systemd/src/basic/in-addr-util.c | 1 + shared/systemd/src/basic/process-util.c | 9 +++++++++ @@ -22,10 +23,10 @@ Signed-off-by: Andreas M?ller 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c -index 5899f62..0adb248 100644 +index 91d687c..8388304 100644 --- a/shared/systemd/src/basic/in-addr-util.c +++ b/shared/systemd/src/basic/in-addr-util.c -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #include "in-addr-util.h" #include "macro.h" #include "parse-util.h" @@ -34,10 +35,10 @@ index 5899f62..0adb248 100644 #include "strxcpyx.h" #include "util.h" diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c -index 7431be3..189060a 100644 +index 1456167..42f51a0 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c -@@ -21,6 +21,9 @@ +@@ -17,6 +17,9 @@ #include #include #include @@ -47,7 +48,7 @@ index 7431be3..189060a 100644 #if 0 /* NM_IGNORED */ #if HAVE_VALGRIND_VALGRIND_H #include -@@ -1183,11 +1186,13 @@ void reset_cached_pid(void) { +@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } @@ -61,7 +62,7 @@ index 7431be3..189060a 100644 pid_t getpid_cached(void) { static bool installed = false; -@@ -1216,7 +1221,11 @@ pid_t getpid_cached(void) { +@@ -1156,7 +1161,11 @@ pid_t getpid_cached(void) { * only half-documented (glibc doesn't document it but LSB does ? though only superficially) * we'll check for errors only in the most generic fashion possible. */ @@ -74,10 +75,10 @@ index 7431be3..189060a 100644 cached_pid = CACHED_PID_UNSET; return new_pid; diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h -index 15443f1..4807198 100644 +index a0886e0..da47d14 100644 --- a/shared/systemd/src/basic/socket-util.h +++ b/shared/systemd/src/basic/socket-util.h -@@ -13,6 +13,12 @@ +@@ -14,6 +14,12 @@ #include #include @@ -147,10 +148,10 @@ index c3b9448..e80a938 100644 #include #include diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h -index b23f4c8..8f2f6e0 100644 +index 04cc82b..2cf589a 100644 --- a/shared/systemd/src/basic/string-util.h +++ b/shared/systemd/src/basic/string-util.h -@@ -27,6 +27,11 @@ +@@ -26,6 +26,11 @@ #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) @@ -162,6 +163,3 @@ index b23f4c8..8f2f6e0 100644 int strcmp_ptr(const char *a, const char *b) _pure_; static inline bool streq_ptr(const char *a, const char *b) { --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch index e0973af..196a335 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch @@ -1,7 +1,7 @@ -From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001 +From 877fbb4e848629ff57371b5bdb0d56369abe9d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 8 Apr 2019 23:10:43 +0200 -Subject: [PATCH 2/2] Fix build with musl +Subject: [PATCH] Fix build with musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -32,6 +32,7 @@ linux-libc headers 'notoriously broken for userspace' [2] (search for Upstream-Status: Pending Signed-off-by: Andreas M?ller + --- clients/tui/nmt-device-entry.c | 1 - libnm-core/nm-utils.h | 4 ++++ @@ -41,10 +42,10 @@ Signed-off-by: Andreas M?ller 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c -index 43fbbc1..3eae286 100644 +index 4ab5932..915248c 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c -@@ -39,7 +39,6 @@ +@@ -26,7 +26,6 @@ #include "nmt-device-entry.h" #include @@ -53,10 +54,10 @@ index 43fbbc1..3eae286 100644 #include "nmtui.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 2b5baba..f7abab6 100644 +index 5418a1e..f492da6 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h -@@ -25,6 +25,10 @@ +@@ -10,6 +10,10 @@ #error "Only can be included directly." #endif @@ -68,10 +69,10 @@ index 2b5baba..f7abab6 100644 #include diff --git a/shared/nm-default.h b/shared/nm-default.h -index 54e9916..26e9f4e 100644 +index ace6ede..25357da 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h -@@ -211,6 +211,9 @@ +@@ -182,6 +182,9 @@ #endif #include @@ -82,10 +83,10 @@ index 54e9916..26e9f4e 100644 /*****************************************************************************/ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index bd4fbcc..f70b309 100644 +index 3bbc975..4e8a3f6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -24,6 +24,7 @@ +@@ -9,6 +9,7 @@ #include "nm-device.h" #include @@ -93,7 +94,7 @@ index bd4fbcc..f70b309 100644 #include #include #include -@@ -32,7 +33,6 @@ +@@ -17,7 +18,6 @@ #include #include #include @@ -102,10 +103,10 @@ index bd4fbcc..f70b309 100644 #include diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index d4b0115..22a3a90 100644 +index 7abe4df..9f53147 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c -@@ -28,7 +28,6 @@ +@@ -14,7 +14,6 @@ #include #include #include @@ -113,6 +114,3 @@ index d4b0115..22a3a90 100644 #include #include #include --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch new file mode 100644 index 0000000..6225282 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch @@ -0,0 +1,61 @@ +From aff5cded8847f3eee59f5cec22afb8630d401a85 Mon Sep 17 00:00:00 2001 +From: Adrian Freihofer +Date: Sat, 7 Mar 2020 14:22:36 +0100 +Subject: [PATCH 3/4] Fix build with musl for n-dhcp4 + +--- + shared/n-dhcp4/src/n-dhcp4-c-probe.c | 8 ++++++++ + shared/n-dhcp4/src/n-dhcp4-private.h | 4 ++++ + 2 files changed, 12 insertions(+) + +diff --git a/shared/n-dhcp4/src/n-dhcp4-c-probe.c b/shared/n-dhcp4/src/n-dhcp4-c-probe.c +index e4477a7..75713c8 100644 +--- a/shared/n-dhcp4/src/n-dhcp4-c-probe.c ++++ b/shared/n-dhcp4/src/n-dhcp4-c-probe.c +@@ -360,8 +360,12 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe + seed16v[1] = (u64 >> 16) ^ (u64 >> 0); + seed16v[2] = (u64 >> 32) ^ (u64 >> 16); + ++#ifdef __GLIBC__ + r = seed48_r(seed16v, &config->entropy); + c_assert(!r); ++#else ++ memcpy(config->entropy, seed16v, sizeof seed16v); ++#endif + } + + /** +@@ -375,10 +379,14 @@ static void n_dhcp4_client_probe_config_initialize_random_seed(NDhcp4ClientProbe + */ + uint32_t n_dhcp4_client_probe_config_get_random(NDhcp4ClientProbeConfig *config) { + long int result; ++#ifdef __GLIBC__ + int r; + + r = mrand48_r(&config->entropy, &result); + c_assert(!r); ++#else ++ result = jrand48(config->entropy); ++#endif + + return result; + }; +diff --git a/shared/n-dhcp4/src/n-dhcp4-private.h b/shared/n-dhcp4/src/n-dhcp4-private.h +index 436ee80..ffcb4b2 100644 +--- a/shared/n-dhcp4/src/n-dhcp4-private.h ++++ b/shared/n-dhcp4/src/n-dhcp4-private.h +@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig { + bool inform_only; + bool init_reboot; + struct in_addr requested_ip; ++#ifdef __GLIBC__ + struct drand48_data entropy; /* entropy pool */ ++#else ++ unsigned short entropy[3]; /* entropy pool */ ++#endif + uint64_t ms_start_delay; /* max ms to wait before starting probe */ + NDhcp4ClientProbeOption *options[UINT8_MAX + 1]; + int8_t request_parameters[UINT8_MAX + 1]; +-- +2.24.1 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch new file mode 100644 index 0000000..55aa4d2 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch @@ -0,0 +1,26 @@ +From 80c7d3391510993cba1a7499bf33a5b2b115280d Mon Sep 17 00:00:00 2001 +From: Adrian Freihofer +Date: Sat, 7 Mar 2020 14:24:01 +0100 +Subject: [PATCH 4/4] Fix build with musl - systemd specific + +--- + src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +index e1150f9..2c63bac 100644 +--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c +@@ -7,7 +7,9 @@ + + #include + #include ++#ifdef __GLIBC__ /* musl supplies full set of userspace headers */ + #include ++#endif + #include + + #include "sd-dhcp6-client.h" +-- +2.24.1 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb similarity index 76% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb index 27508c4..297f056 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb @@ -2,9 +2,9 @@ SUMMARY = "NetworkManager" HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" SECTION = "net/misc" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " DEPENDS = " \ @@ -30,9 +30,11 @@ SRC_URI = " \ SRC_URI_append_libc-musl = " \ file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ file://musl/0002-Fix-build-with-musl.patch \ + file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \ + file://musl/0004-Fix-build-with-musl-systemd-specific.patch \ " -SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d" -SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e" +SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284" +SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f" S = "${WORKDIR}/NetworkManager-${PV}" @@ -65,7 +67,7 @@ PACKAGECONFIG[systemd] = " \ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ --without-systemdsystemunitdir, \ " -PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" @@ -75,33 +77,47 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[glib] = "--with-libnm-glib,,dbus-glib-native dbus-glib" PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,wpa-supplicant" PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" +PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ +PACKAGES =+ " \ ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl \ + ${PN}-adsl ${PN}-cloud-setup \ " -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" +FILES_${PN}-cloud-setup = " \ + ${libexecdir}/nm-cloud-setup \ + ${systemd_system_unitdir}/nm-cloud-setup.service \ + ${systemd_system_unitdir}/nm-cloud-setup.timer \ + ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ + ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ +" +ALLOW_EMPTY_${PN}-cloud-setup = "1" +SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" + FILES_${PN} += " \ ${libexecdir} \ ${libdir}/NetworkManager/${PV}/*.so \ - ${nonarch_libdir}/NetworkManager/VPN \ + ${libdir}/NetworkManager \ ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/system-connections \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ ${nonarch_base_libdir}/udev/* \ - ${systemd_unitdir}/system \ + ${systemd_system_unitdir} \ ${libdir}/pppd \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 15:15:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 15:15:37 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: corosync: Update to 3.0.3 In-Reply-To: <158368053435.26091.8535599728251923139@git.openembedded.org> References: <158368053435.26091.8535599728251923139@git.openembedded.org> Message-ID: <20200308151535.00EB02329D1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5c051f8402e790386c69b163d7276d913591075e Author: Khem Raj AuthorDate: Fri Mar 6 18:07:17 2020 -0800 corosync: Update to 3.0.3 - Add dependency on kronosnet - Remove obsolete options and packageconfigs - Drop upstreamed patch Signed-off-by: Khem Raj --- ...-configure.ac-fix-pkgconfig-issue-of-rdma.patch | 32 ---------------------- .../{corosync_2.4.5.bb => corosync_3.0.3.bb} | 23 ++++++---------- 2 files changed, 8 insertions(+), 47 deletions(-) diff --git a/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch b/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch deleted file mode 100644 index bdc7645..0000000 --- a/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch +++ /dev/null @@ -1,32 +0,0 @@ -Subject: [PATCH] configure.ac: fix pkgconfig issue of rdma - -pkgconfig files from rdma-core(https://github.com/linux-rdma/rdma-core) -are named start with lib, such as librdmacm.pc and libibverbs.pc. When -rdma support is enabled, it fails to find rdma related libraries. Update -configure.ac to the issue. - -Upstream-Status: Submitted [https://github.com/corosync/corosync/pull/515] - -Signed-off-by: Kai Kang ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ac513e93..240cfed4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -459,8 +459,8 @@ if test "x${enable_testagents}" = xyes; then - fi - - if test "x${enable_rdma}" = xyes; then -- PKG_CHECK_MODULES([rdmacm],[rdmacm]) -- PKG_CHECK_MODULES([ibverbs],[ibverbs]) -+ PKG_CHECK_MODULES([rdmacm],[librdmacm]) -+ PKG_CHECK_MODULES([ibverbs],[libibverbs]) - AC_DEFINE_UNQUOTED([HAVE_RDMA], 1, [have rdmacm]) - PACKAGE_FEATURES="$PACKAGE_FEATURES rdma" - WITH_LIST="$WITH_LIST --with rdma" --- -2.20.1 - diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb b/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb similarity index 82% rename from meta-networking/recipes-extended/corosync/corosync_2.4.5.bb rename to meta-networking/recipes-extended/corosync/corosync_3.0.3.bb index eefbcca..c0531d3 100644 --- a/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb +++ b/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb @@ -7,20 +7,16 @@ SECTION = "base" inherit autotools pkgconfig systemd useradd -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://corosync.conf \ - file://0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch \ " - -SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd" -SRC_URI[sha256sum] = "ab6eafdb8f43a23794fc15d4c5198bbd6759060cb13c8d2d1e78a6c8360aba5f" - +SRC_URI[sha256sum] = "20eb903eb984f6a728282c199825e442e8bba869acefd22390076ef3a33a4ded" UPSTREAM_CHECK_REGEX = "(?P\d+\.(?!99)\d+(\.\d+)+)" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" -DEPENDS = "groff-native nss libqb" +DEPENDS = "groff-native nss libqb kronosnet" SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ @@ -31,23 +27,20 @@ SYSTEMD_AUTO_ENABLE = "disable" INITSCRIPT_NAME = "corosync-daemon" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - dbus qdevice qnetd snmp \ + dbus snmp \ " PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" -PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices" -PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd" -PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,rdma-core" PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no" EXTRA_OEMAKE = "tmpfilesdir_DATA=" -do_configure_prepend() { - ( cd ${S} - ${S}/autogen.sh ) -} +#do_configure_prepend() { +# ( cd ${S} +# ${S}/autogen.sh ) +#} do_install_append() { install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 15:15:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 15:15:39 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: nss,nspr: Add recipes In-Reply-To: <158368053435.26091.8535599728251923139@git.openembedded.org> References: <158368053435.26091.8535599728251923139@git.openembedded.org> Message-ID: <20200308151535.1969E2329D9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d62b2250233bd8add5409d86bdd07153bd0f28ec Author: Khem Raj AuthorDate: Sat Mar 7 08:34:02 2020 -0800 nss,nspr: Add recipes oe-core has punted them, but they are still needed by many packages e.g. mozjs Signed-off-by: Khem Raj --- .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 +++ .../nspr/nspr/0002-Add-nios2-support.patch | 102 ++++++++ ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ++++++++ .../nspr/nspr/fix-build-on-x86_64.patch | 52 ++++ meta-oe/recipes-support/nspr/nspr/nspr.pc.in | 11 + .../nspr/nspr/remove-rpath-from-tests.patch | 26 ++ .../nspr/remove-srcdir-from-configure-in.patch | 19 ++ meta-oe/recipes-support/nspr/nspr_4.25.bb | 197 +++++++++++++++ ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ++++ .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ++++ meta-oe/recipes-support/nss/nss/blank-cert9.db | Bin 0 -> 28672 bytes meta-oe/recipes-support/nss/nss/blank-key4.db | Bin 0 -> 36864 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 +++ .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 +++++++++ .../nss/nss/nss-fix-nsinstall-build.patch | 36 +++ .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 ++ meta-oe/recipes-support/nss/nss/nss.pc.in | 11 + .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 ++ meta-oe/recipes-support/nss/nss/signlibs.sh | 20 ++ meta-oe/recipes-support/nss/nss/system-pkcs11.txt | 5 + meta-oe/recipes-support/nss/nss_3.50.bb | 273 +++++++++++++++++++++ 21 files changed, 1178 insertions(+) diff --git a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch new file mode 100644 index 0000000..f3cd670 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch @@ -0,0 +1,31 @@ +From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 18 Sep 2017 17:22:43 -0700 +Subject: [PATCH] md: Fix build with musl + +The MIPS specific header is not provided by musl +linux kernel headers provide which has same definitions + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + pr/include/md/_linux.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +index 640b19c..31296a8 100644 +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -499,7 +499,7 @@ + #elif defined(__mips__) + + /* For _ABI64 */ +-#include ++#include + + #ifdef __MIPSEB__ + #define IS_BIG_ENDIAN 1 +-- +2.14.1 + diff --git a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch new file mode 100644 index 0000000..3a04d42 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch @@ -0,0 +1,102 @@ +From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 +From: Marek Vasut +Date: Sat, 30 Jan 2016 07:18:02 +0100 +Subject: [PATCH] Add nios2 support + +Add support for the nios2 CPU. + +Signed-off-by: Marek Vasut +Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] +--- + nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ + nspr/pr/include/md/_linux.h | 14 ++++++++++++++ + 2 files changed, 59 insertions(+) + +Index: nspr/pr/include/md/_linux.cfg +=================================================================== +--- nspr.orig/pr/include/md/_linux.cfg ++++ nspr/pr/include/md/_linux.cfg +@@ -975,6 +975,51 @@ + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__nios2__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #elif defined(__or1k__) + + #undef IS_LITTLE_ENDIAN +Index: nspr/pr/include/md/_linux.h +=================================================================== +--- nspr.orig/pr/include/md/_linux.h ++++ nspr/pr/include/md/_linux.h +@@ -55,6 +55,8 @@ + #define _PR_SI_ARCHITECTURE "avr32" + #elif defined(__m32r__) + #define _PR_SI_ARCHITECTURE "m32r" ++#elif defined(__nios2__) ++#define _PR_SI_ARCHITECTURE "nios2" + #elif defined(__or1k__) + #define _PR_SI_ARCHITECTURE "or1k" + #elif defined(__riscv) && (__riscv_xlen == 32) +@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn + #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet + #endif + ++#if defined(__nios2__) ++#if defined(__GNUC__) ++/* Use GCC built-in functions */ ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) ++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) ++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) ++#endif ++#endif ++ + #if defined(__or1k__) + #if defined(__GNUC__) + /* Use GCC built-in functions */ diff --git a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch new file mode 100644 index 0000000..90fe45f --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch @@ -0,0 +1,103 @@ +From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Fri, 16 Nov 2018 13:52:49 +0800 +Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME + +Remove _BUILD_STRING and _BUILD_TIME to avoid +adding timestamp to _pl_bld.h which can result +in adding timestamp in library file such as +libnspr4.so. + $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so + [snip] + 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 + [snip] + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + lib/ds/Makefile.in | 8 +------- + lib/libc/src/Makefile.in | 8 +------- + lib/prstreams/Makefile.in | 8 +------- + pr/src/Makefile.in | 8 +------- + 4 files changed, 4 insertions(+), 28 deletions(-) + +diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in +index e737791..b578476 100644 +--- a/lib/ds/Makefile.in ++++ b/lib/ds/Makefile.in +@@ -114,13 +114,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in +index e8a6d9f..978ed28 100644 +--- a/lib/libc/src/Makefile.in ++++ b/lib/libc/src/Makefile.in +@@ -116,13 +116,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in +index aeb2944..f318097 100644 +--- a/lib/prstreams/Makefile.in ++++ b/lib/prstreams/Makefile.in +@@ -116,13 +116,7 @@ endif + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) +diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in +index 19c5a69..b4ac31c 100644 +--- a/pr/src/Makefile.in ++++ b/pr/src/Makefile.in +@@ -326,13 +326,7 @@ GARBAGE += $(TINC) + + $(TINC): + @$(MAKE_OBJDIR) +- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) +- @if test ! -z "$(SH_NOW)"; then \ +- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ +- else \ +- true; \ +- fi +- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) ++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) + + + $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) +-- +2.7.4 + diff --git a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch new file mode 100644 index 0000000..f12acc8 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -0,0 +1,52 @@ +Fix build failure on x86_64 + +When the target_cpu is x86_64, we should assume that the pkg uses 64bit, +only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a +opposite logic before. + +Signed-off-by: Robert Yang + +Upstream-Status: Pending +--- + configure.in | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve + PR_MD_ASFILES=os_Linux_ia64.s + ;; + x86_64) +- if test -n "$USE_64"; then +- PR_MD_ASFILES=os_Linux_x86_64.s +- elif test -n "$USE_X32"; then ++ if test -n "$USE_X32"; then ++ AC_DEFINE(i386) + PR_MD_ASFILES=os_Linux_x86_64.s + CC="$CC -mx32" + CXX="$CXX -mx32" + else +- AC_DEFINE(i386) +- PR_MD_ASFILES=os_Linux_x86.s +- CC="$CC -m32" +- CXX="$CXX -m32" ++ PR_MD_ASFILES=os_Linux_x86_64.s + fi + ;; + ppc|powerpc) + PR_MD_ASFILES=os_Linux_ppc.s + ;; + powerpc64) +- if test -n "$USE_64"; then ++ if test -n "$USE_N32"; then ++ PR_MD_ASFILES=os_Linux_ppc.s ++ else + CC="$CC -m64" + CXX="$CXX -m64" +- else +- PR_MD_ASFILES=os_Linux_ppc.s + fi + ;; + esac diff --git a/meta-oe/recipes-support/nspr/nspr/nspr.pc.in b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in new file mode 100644 index 0000000..1f15d19 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/nspr.pc.in @@ -0,0 +1,11 @@ +os_libs=-lpthread -ldl +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSPR +Description: The Netscape Portable Runtime +Version: NSPRVERSION +Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl +Cflags: -I${includedir}/nspr diff --git a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch new file mode 100644 index 0000000..7ba59ed --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -0,0 +1,26 @@ +Author: Andrei Gherzan +Date: Thu Feb 9 00:03:38 2012 +0200 + +Avoid QA warnings by removing hardcoded rpath from binaries. + +[...] +WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib +in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait +[...] + +Signed-off-by: Andrei Gherzan +Upstream-Status: Pending + +Index: nspr/pr/tests/Makefile.in +=================================================================== +--- nspr.orig/pr/tests/Makefile.in ++++ nspr/pr/tests/Makefile.in +@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) + endif # SunOS + + ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) +- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) ++ LDOPTS += -Xlinker + ifeq ($(USE_PTHREADS),1) + EXTRA_LIBS = -lpthread + endif diff --git a/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch new file mode 100644 index 0000000..bde715c --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch @@ -0,0 +1,19 @@ +the $srcdir is not defined at the time of gnu-configurize. + +Upstream-Status: Inappropriate [OE-Core specific] + +Signed-off-by: Saul Wold + +Index: nspr/configure.in +=================================================================== +--- nspr.orig/configure.in ++++ nspr/configure.in +@@ -8,7 +8,7 @@ AC_PREREQ(2.61) + AC_INIT + AC_CONFIG_SRCDIR([pr/include/nspr.h]) + +-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) ++AC_CONFIG_AUX_DIR(build/autoconf) + AC_CANONICAL_TARGET + + dnl ======================================================== diff --git a/meta-oe/recipes-support/nspr/nspr_4.25.bb b/meta-oe/recipes-support/nspr/nspr_4.25.bb new file mode 100644 index 0000000..1de26e1 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr_4.25.bb @@ -0,0 +1,197 @@ +SUMMARY = "Netscape Portable Runtime Library" +HOMEPAGE = "http://www.mozilla.org/projects/nspr/" +LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" +LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ + file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" +SECTION = "libs/network" + +SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ + file://remove-rpath-from-tests.patch \ + file://fix-build-on-x86_64.patch \ + file://remove-srcdir-from-configure-in.patch \ + file://0002-Add-nios2-support.patch \ + file://0001-md-Fix-build-with-musl.patch \ + file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://nspr.pc.in \ +" + +CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ + -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ + -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ + -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" + +UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" +UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" + +SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" +SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" + +CVE_PRODUCT = "netscape_portable_runtime" + +S = "${WORKDIR}/nspr-${PV}/nspr" + +RDEPENDS_${PN}-dev += "perl" +TARGET_CC_ARCH += "${LDFLAGS}" + +TESTS = " \ + accept \ + acceptread \ + acceptreademu \ + affinity \ + alarm \ + anonfm \ + atomic \ + attach \ + bigfile \ + cleanup \ + cltsrv \ + concur \ + cvar \ + cvar2 \ + dlltest \ + dtoa \ + errcodes \ + exit \ + fdcach \ + fileio \ + foreign \ + formattm \ + fsync \ + gethost \ + getproto \ + i2l \ + initclk \ + inrval \ + instrumt \ + intrio \ + intrupt \ + io_timeout \ + ioconthr \ + join \ + joinkk \ + joinku \ + joinuk \ + joinuu \ + layer \ + lazyinit \ + libfilename \ + lltest \ + lock \ + lockfile \ + logfile \ + logger \ + many_cv \ + multiwait \ + nameshm1 \ + nblayer \ + nonblock \ + ntioto \ + ntoh \ + op_2long \ + op_excl \ + op_filnf \ + op_filok \ + op_nofil \ + parent \ + parsetm \ + peek \ + perf \ + pipeping \ + pipeping2 \ + pipeself \ + poll_nm \ + poll_to \ + pollable \ + prftest \ + primblok \ + provider \ + prpollml \ + ranfile \ + randseed \ + reinit \ + rwlocktest \ + sel_spd \ + selct_er \ + selct_nm \ + selct_to \ + selintr \ + sema \ + semaerr \ + semaping \ + sendzlf \ + server_test \ + servr_kk \ + servr_uk \ + servr_ku \ + servr_uu \ + short_thread \ + sigpipe \ + socket \ + sockopt \ + sockping \ + sprintf \ + stack \ + stdio \ + str2addr \ + strod \ + switch \ + system \ + testbit \ + testfile \ + threads \ + timemac \ + timetest \ + tpd \ + udpsrv \ + vercheck \ + version \ + writev \ + xnotify \ + zerolen" + +inherit autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# Do not install nspr in usr/include, but in usr/include/nspr, the +# preferred path upstream. +EXTRA_OECONF += "--includedir=${includedir}/nspr" + +do_compile_prepend() { + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export +} + +do_compile_append() { + oe_runmake -C pr/tests +} + +do_install_append() { + install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc + sed -i \ + -e 's:NSPRVERSION:${PV}:g' \ + -e 's:OEPREFIX:${prefix}:g' \ + -e 's:OELIBDIR:${libdir}:g' \ + -e 's:OEINCDIR:${includedir}:g' \ + -e 's:OEEXECPREFIX:${exec_prefix}:g' \ + ${D}${libdir}/pkgconfig/nspr.pc + + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests + cd ${B}/pr/tests + install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests + + # delete compile-et.pl and perr.properties from ${bindir} because these are + # only used to generate prerr.c and prerr.h files from prerr.et at compile + # time + rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties +} + +FILES_${PN} = "${libdir}/lib*.so" +FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ + ${includedir}/* ${datadir}/aclocal/* " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch new file mode 100644 index 0000000..c380c14 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -0,0 +1,52 @@ +From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 18 Dec 2019 12:29:50 +0100 +Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto + +Not all current hardware supports it, particularly anything +prior to armv8 does not. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + nss/lib/freebl/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -125,6 +125,9 @@ else + DEFINES += -DNSS_X86 + endif + endif ++ ++ifdef NSS_USE_ARM_HW_CRYPTO ++ DEFINES += -DNSS_USE_ARM_HW_CRYPTO + ifeq ($(CPU_ARCH),aarch64) + DEFINES += -DUSE_HW_AES + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c +@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) + endif + endif + endif ++endif + + ifeq ($(OS_TARGET),OSF1) + DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +--- a/nss/lib/freebl/gcm.c ++++ b/nss/lib/freebl/gcm.c +@@ -17,6 +17,7 @@ + + #include + ++#ifdef NSS_USE_ARM_HW_CRYPTO + /* old gcc doesn't support some poly64x2_t intrinsic */ + #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ + (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) +@@ -25,6 +26,7 @@ + /* We don't test on big endian platform, so disable this on big endian. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch new file mode 100644 index 0000000..d540339 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -0,0 +1,48 @@ +From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 22 Feb 2017 11:36:11 +0200 +Subject: [PATCH] nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Hongxu Jia +Signed-off-by: Alexander Kanavin +--- + nss/coreconf/arch.mk | 2 +- + nss/lib/freebl/Makefile | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 06c276f..9c1eb51 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + # +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 0ce1425..ebeb411 100644 +--- a/nss/lib/freebl/Makefile ++++ b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif +-- +2.11.0 + diff --git a/meta-oe/recipes-support/nss/nss/blank-cert9.db b/meta-oe/recipes-support/nss/nss/blank-cert9.db new file mode 100644 index 0000000..7d4bcf2 Binary files /dev/null and b/meta-oe/recipes-support/nss/nss/blank-cert9.db differ diff --git a/meta-oe/recipes-support/nss/nss/blank-key4.db b/meta-oe/recipes-support/nss/nss/blank-key4.db new file mode 100644 index 0000000..d47f08d Binary files /dev/null and b/meta-oe/recipes-support/nss/nss/blank-key4.db differ diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch new file mode 100644 index 0000000..de812d2 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -0,0 +1,33 @@ +clang 3.9 add this warning to rightly flag undefined +behavior, we relegate this to be just a warning instead +of error and keep the behavior as it was. Right fix would +be to not pass enum to the function with variadic arguments +as last named argument + +Fixes errors like +ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] + va_start(ap, responseType0); + ^ +ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here + SECOidTag responseType0, ...) + +see +https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start +for more details + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Index: nss-3.37.1/nss/coreconf/Werror.mk +=================================================================== +--- nss-3.37.1.orig/nss/coreconf/Werror.mk ++++ nss-3.37.1/nss/coreconf/Werror.mk +@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS + ifdef CC_IS_CLANG + # -Qunused-arguments : clang objects to arguments that it doesn't understand + # and fixing this would require rearchitecture +- WARNING_CFLAGS += -Qunused-arguments ++ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs + # -Wno-parentheses-equality : because clang warns about macro expansions + WARNING_CFLAGS += $(call disable_warning,parentheses-equality) + ifdef BUILD_OPT diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch new file mode 100644 index 0000000..547594d --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -0,0 +1,110 @@ +nss: fix incorrect shebang of perl + +Replace incorrect shebang of perl with `#!/usr/bin/env perl'. + +Signed-off-by: Hongxu Jia +Upstream-Status: Pending +--- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/cpdist.pl | 2 +- + nss/coreconf/import.pl | 2 +- + nss/coreconf/jniregen.pl | 2 +- + nss/coreconf/outofdate.pl | 2 +- + nss/coreconf/release.pl | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/path_uniq | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +--- a/nss/cmd/smimetools/smime ++++ b/nss/cmd/smimetools/smime +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl +index 800edfb..652187f 100755 +--- a/nss/coreconf/cpdist.pl ++++ b/nss/coreconf/cpdist.pl +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl +index dd2d177..428eaa5 100755 +--- a/nss/coreconf/import.pl ++++ b/nss/coreconf/import.pl +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl +index 2039180..5f4f69c 100755 +--- a/nss/coreconf/jniregen.pl ++++ b/nss/coreconf/jniregen.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl +index 33d80bb..01fc097 100755 +--- a/nss/coreconf/outofdate.pl ++++ b/nss/coreconf/outofdate.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl +index 7cde19d..b5df2f6 100755 +--- a/nss/coreconf/release.pl ++++ b/nss/coreconf/release.pl +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl +index d2a4942..79359fe 100644 +--- a/nss/coreconf/version.pl ++++ b/nss/coreconf/version.pl +@@ -1,4 +1,4 @@ +-#!/usr/sbin/perl ++#!/usr/bin/env perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx +index 4de9555..a7def9f 100755 +--- a/nss/tests/clean_tbx ++++ b/nss/tests/clean_tbx +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ####################################################################### + # +diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq +index f29f60a..08fbffa 100755 +--- a/nss/tests/path_uniq ++++ b/nss/tests/path_uniq +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/env perl + + ######################################################################## + # +-- +1.8.1.2 + diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch new file mode 100644 index 0000000..43c09d1 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -0,0 +1,36 @@ +Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan +=================================================== +Index: nss-3.24/nss/coreconf/nsinstall/Makefile +=================================================================== +--- nss-3.24.orig/nss/coreconf/nsinstall/Makefile ++++ nss-3.24/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++# CFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + else diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 0000000..7661dc9 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,26 @@ +nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia +Upstream-Status: Inappropriate [configuration] +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/nss/cmd/platlibs.mk ++++ b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + +-- +1.8.1.2 + diff --git a/meta-oe/recipes-support/nss/nss/nss.pc.in b/meta-oe/recipes-support/nss/nss/nss.pc.in new file mode 100644 index 0000000..402b4ec --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch new file mode 100644 index 0000000..3a817fa --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -0,0 +1,23 @@ +nss does not build on mips with clang because wrong types are used? + +pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] + if (addend < MP_DIGIT_MAX) { + ~~~~~~ ^ ~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +Upstream-Status: Pending +Index: nss-3.37.1/nss/lib/freebl/pqg.c +=================================================================== +--- nss-3.37.1.orig/nss/lib/freebl/pqg.c ++++ nss-3.37.1/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in + + static SECStatus + addToSeed(const SECItem *seed, +- unsigned long addend, +- int seedlen, /* g in 186-1 */ ++ unsigned long long addend, ++ int seedlen, /* g in 186-1 */ + SECItem *seedout) + { + mp_int s, sum, modulus, tmp; diff --git a/meta-oe/recipes-support/nss/nss/signlibs.sh b/meta-oe/recipes-support/nss/nss/signlibs.sh new file mode 100644 index 0000000..a74e499 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/signlibs.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# signlibs.sh +# +# (c)2010 Wind River Systems, Inc. +# +# regenerates the .chk files for the NSS libraries that require it +# since the ones that are built have incorrect checksums that were +# calculated on the host where they really need to be done on the +# target + +CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` +SIGN_BINARY=`which shlibsign` +for I in $CHK_FILES +do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + $SIGN_BINARY -i $FN +done diff --git a/meta-oe/recipes-support/nss/nss/system-pkcs11.txt b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt new file mode 100644 index 0000000..1a264e9 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss/system-pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' +NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) + diff --git a/meta-oe/recipes-support/nss/nss_3.50.bb b/meta-oe/recipes-support/nss/nss_3.50.bb new file mode 100644 index 0000000..e9855d7 --- /dev/null +++ b/meta-oe/recipes-support/nss/nss_3.50.bb @@ -0,0 +1,273 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server applications. \ +Applications built with NSS can support SSL v2 and v3, \ +TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ +v3 certificates, and other security standards." +HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" +SECTION = "libs" + +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" + +LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" + +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://signlibs.sh \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ + file://nss-fix-nsinstall-build.patch \ + file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + " + +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" + +inherit siteinfo + +TD = "${S}/tentative-dist" +TDS = "${S}/tentative-dist-staging" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure_prepend_libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + +do_compile_prepend_class-native() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr + export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} + export NSS_ENABLE_WERROR=0 +} + +do_compile_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_compile_prepend_class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + +do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + # Additional defines needed on Centos 7 + export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + export FREEBL_LOWHASH=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" +} + +do_compile[vardepsexclude] += "SITEINFO_BITS" + +do_install_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_install() { + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + make -C ./nss \ + CCC="${CXX}" \ + OS_TEST=${OS_TEST} \ + SOURCE_LIB_DIR="${TD}/${libdir}" \ + SOURCE_BIN_DIR="${TD}/${bindir}" \ + install + + install -d ${D}/${libdir}/ + for file in ${S}/dist/*.OBJ/lib/*.so; do + echo "Installing `basename $file`..." + cp $file ${D}/${libdir}/ + done + + for shared_lib in ${TD}/${libdir}/*.so.*; do + if [ -f $shared_lib ]; then + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) + fi + done + for shared_lib in ${TD}/${libdir}/*.so; do + if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then + cp $shared_lib ${D}/${libdir} + fi + done + + install -d ${D}/${includedir}/nss3 + install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* + + install -d ${D}/${bindir} + for binary in ${TD}/${bindir}/*; do + install -m 755 -t ${D}/${bindir} $binary + done +} + +do_install[vardepsexclude] += "SITEINFO_BITS" + +do_install_append() { + # Create empty .chk files for the NSS libraries at build time. They could + # be regenerated at target's boot time. + for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do + touch ${D}/${libdir}/$file + chmod 755 ${D}/${libdir}/$file + done + install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh + + install -d ${D}${libdir}/pkgconfig/ + sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc +} + +do_install_append_class-target() { + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt +} + +PACKAGE_WRITE_DEPS += "nss-native" +pkg_postinst_${PN} () { + if [ -n "$D" ]; then + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + exit 1 + fi + done + else + signlibs.sh + fi +} + +PACKAGES =+ "${PN}-smime" +FILES_${PN}-smime = "\ + ${bindir}/smime \ +" + +FILES_${PN} = "\ + ${sysconfdir} \ + ${bindir} \ + ${libdir}/lib*.chk \ + ${libdir}/lib*.so \ + " + +FILES_${PN}-dev = "\ + ${libdir}/nss \ + ${libdir}/pkgconfig/* \ + ${includedir}/* \ + " + +RDEPENDS_${PN}-smime = "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 Sun Mar 8 18:01:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 18:01:02 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (2ad7a29 -> 1584ef9) Message-ID: <158369046237.12503.11225463875932960480@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 2ad7a29 coreutils hack new 1584ef9 coreutils hack 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 (2ad7a29) \ N -- N -- N refs/heads/master-next (1584ef9) 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 Mar 8 18:01:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 18:01:03 +0000 Subject: [oe-commits] [openembedded-core] 01/01: coreutils hack In-Reply-To: <158369046237.12503.11225463875932960480@git.openembedded.org> References: <158369046237.12503.11225463875932960480@git.openembedded.org> Message-ID: <20200308180102.871BD232A08@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1584ef92be483e5599340f30213c64d145919e94 Author: Richard Purdie AuthorDate: Sun Mar 8 14:35:58 2020 +0000 coreutils hack Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 04a0522..c661d7c 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -147,7 +147,7 @@ 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" +RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-module-file-stat python3-core sed shadow" do_install_ptest () { install -d ${D}${PTEST_PATH}/tests -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 18:12:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 18:12:58 +0000 Subject: [oe-commits] [openembedded-core] 01/02: coreutils hack In-Reply-To: <158369117782.17002.15951976683680276867@git.openembedded.org> References: <158369117782.17002.15951976683680276867@git.openembedded.org> Message-ID: <20200308181257.EF1C4232A09@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0cc84f0cddb385d5ef574d675a461038d34d2227 Author: Richard Purdie AuthorDate: Sun Mar 8 14:35:58 2020 +0000 coreutils hack Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 04a0522..057792e 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -149,6 +149,10 @@ inherit ptest RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" +# -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy +RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" +RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev glibc-dev liberror-perl-dev sed-dev shadow-dev" + do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 18:12:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 18:12:57 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (1584ef9 -> 9bcfe8f) Message-ID: <158369117782.17002.15951976683680276867@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 1584ef9 coreutils hack new 0cc84f0 coreutils hack new 9bcfe8f buildtools: Add locale en 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 (1584ef9) \ N -- N -- N refs/heads/master-next (9bcfe8f) 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/coreutils/coreutils_8.31.bb | 6 +++++- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 2 files changed, 6 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 Mar 8 18:12:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 18:12:59 +0000 Subject: [oe-commits] [openembedded-core] 02/02: buildtools: Add locale en In-Reply-To: <158369117782.17002.15951976683680276867@git.openembedded.org> References: <158369117782.17002.15951976683680276867@git.openembedded.org> Message-ID: <20200308181258.04833232A0A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 9bcfe8f1a88df4492b9c1cfe4cf933dacf24564e Author: Richard Purdie AuthorDate: Sun Mar 8 18:10:00 2020 +0000 buildtools: Add locale en Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index 4a79b09..1a1302f 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -26,6 +26,7 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libtool \ nativesdk-pkgconfig \ nativesdk-libxcrypt-dev \ + nativesdk-locale-base-en-us.utf-8 \ " TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:38:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:38:29 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: mraa: Fix build on x86 32bit In-Reply-To: <158371070799.14906.3913731855286832105@git.openembedded.org> References: <158371070799.14906.3913731855286832105@git.openembedded.org> Message-ID: <20200308233828.714C7232A25@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7e6305da8e4e390be6c8065ff98b01b4128d8416 Author: Khem Raj AuthorDate: Sun Mar 8 16:35:32 2020 -0700 mraa: Fix build on x86 32bit Signed-off-by: Khem Raj --- ...-regular-expression-to-match-x86-architec.patch | 35 ++++++++++++++++++++++ meta-oe/recipes-extended/mraa/mraa_git.bb | 3 ++ 2 files changed, 38 insertions(+) diff --git a/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch b/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch new file mode 100644 index 0000000..0cae02f --- /dev/null +++ b/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch @@ -0,0 +1,35 @@ +From 5de183dc436bb647361ab641d891c113e6a7dadd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 8 Mar 2020 16:30:48 -0700 +Subject: [PATCH] cmake: Use a regular expression to match x86 architectures + +in OE we use i686 for qemux86 and this results in + +-- INFO - Target arch is i686 +CMake Error at CMakeLists.txt:191 (message): + Only x86, arm, mips, PERIPHERALMAN and mock platforms currently supported + +So using a wildcard helps in using any x86 arch + +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 250d9106..fb642722 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -176,8 +176,7 @@ else () + message (STATUS "INFO - Override arch is ${DETECTED_ARCH}") + endif() + +-if (DETECTED_ARCH STREQUAL "i586" OR DETECTED_ARCH STREQUAL "x86_64" +- OR DETECTED_ARCH STREQUAL "i386") ++if (DETECTED_ARCH MATCHES "i?86" OR DETECTED_ARCH STREQUAL "x86_64") + set (X86PLAT ON) + elseif (DETECTED_ARCH MATCHES "arm.*" OR DETECTED_ARCH MATCHES "aarch64") + set (ARMPLAT ON) +-- +2.25.1 + diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index a663039..e702ce0 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -9,6 +9,7 @@ SRCREV = "e15ce6fbc76148ba8835adc92196b0d0a3f245e7" PV = "2.1.0+git${SRCPV}" SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ + file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ " S = "${WORKDIR}/git" @@ -60,3 +61,5 @@ RDEPENDS_node-${PN} += "nodejs" ### Include desired language bindings ### PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" + +TOOLCHAIN = "gcc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:38:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:38:28 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (d62b225 -> 24875f4) Message-ID: <158371070799.14906.3913731855286832105@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 d62b225 nss,nspr: Add recipes new 7e6305d mraa: Fix build on x86 32bit new 9f6d453 mosquitto: refresh patches and sync with Debian packaging new d148bc4 mosquitto: do not enable srv by default new 87a44d8 python3-obd: Consolidate into a single file new 24875f4 mutter: add patch from upstream to fix build with mesa >= 20.0.x 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: .../mutter/0001-EGL-Include-EGL-eglmesaext.h.patch | 72 ++++++++++++++++++++++ meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 1 + .../mosquitto/files/1571.patch | 4 +- .../mosquitto/files/install-protocol.patch | 14 +++++ .../mosquitto/mosquitto_1.6.9.bb | 3 +- ...-regular-expression-to-match-x86-architec.patch | 35 +++++++++++ meta-oe/recipes-extended/mraa/mraa_git.bb | 3 + meta-python/recipes-devtools/python/python-obd.inc | 11 ---- .../recipes-devtools/python/python3-obd_0.7.1.bb | 12 +++- 9 files changed, 138 insertions(+), 17 deletions(-) create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch create mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch delete mode 100644 meta-python/recipes-devtools/python/python-obd.inc -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:38:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:38:31 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: mosquitto: do not enable srv by default In-Reply-To: <158371070799.14906.3913731855286832105@git.openembedded.org> References: <158371070799.14906.3913731855286832105@git.openembedded.org> Message-ID: <20200308233828.8710F232A27@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d148bc49409ea8cb293ff9141c3b05ce44241b4f Author: Gianfranco Costamagna AuthorDate: Sun Mar 8 09:00:07 2020 +0100 mosquitto: do not enable srv by default Rationale can be found in the Debian packaging (debian/changelog): Revert change enabling SRV functionality, it is disabled by default upstream and of little benefit to any end user, but adds reasonable complexity to the code. Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb index a0321a3..de43aae 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "412979b2db0a0020bd02fa64f0a0de9e7000b84462586e32b67f29bb1f inherit systemd update-rc.d useradd cmake -PACKAGECONFIG ??= "ssl dlt websockets dns-srv\ +PACKAGECONFIG ??= "ssl dlt websockets \ ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:38:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:38:32 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: python3-obd: Consolidate into a single file In-Reply-To: <158371070799.14906.3913731855286832105@git.openembedded.org> References: <158371070799.14906.3913731855286832105@git.openembedded.org> Message-ID: <20200308233828.92539232A2A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 87a44d82f2107a0d3ca181a990eab25cc91eeada Author: Alistair Francis AuthorDate: Sun Mar 8 00:07:26 2020 -0800 python3-obd: Consolidate into a single file Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-obd.inc | 11 ----------- meta-python/recipes-devtools/python/python3-obd_0.7.1.bb | 12 ++++++++++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-obd.inc b/meta-python/recipes-devtools/python/python-obd.inc deleted file mode 100644 index 51e663b..0000000 --- a/meta-python/recipes-devtools/python/python-obd.inc +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "A python module for handling realtime sensor data from OBD-II vehicle ports" -HOMEPAGE = "https://github.com/brendan-w/python-OBD" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=58ba896fa086c96ad23317cebfeab277" - -SRC_URI[md5sum] = "305efcb6c650db7b9583532355ebeb7c" -SRC_URI[sha256sum] = "8b81ea5896157b6e861af12e173c10b001cb6cca6ebb04db2c01d326812ad77b" - -inherit pypi - -RDEPENDS_${PN} = "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint" diff --git a/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb b/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb index 578e38d..55131b3 100644 --- a/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb @@ -1,2 +1,10 @@ -inherit setuptools3 -require python-obd.inc +DESCRIPTION = "A python module for handling realtime sensor data from OBD-II vehicle ports"HOMEPAGE = "https://github.com/brendan-w/python-OBD" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://README.md;md5=58ba896fa086c96ad23317cebfeab277" + +SRC_URI[md5sum] = "305efcb6c650db7b9583532355ebeb7c" +SRC_URI[sha256sum] = "8b81ea5896157b6e861af12e173c10b001cb6cca6ebb04db2c01d326812ad77b" + +inherit setuptools3 pypi + +RDEPENDS_${PN} = "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:38:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:38:30 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: mosquitto: refresh patches and sync with Debian packaging In-Reply-To: <158371070799.14906.3913731855286832105@git.openembedded.org> References: <158371070799.14906.3913731855286832105@git.openembedded.org> Message-ID: <20200308233828.7C760232A26@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9f6d45379eb4b32fa8c4e9b86d1f14ace2e7756e Author: Gianfranco Costamagna AuthorDate: Sun Mar 8 09:00:06 2020 +0100 mosquitto: refresh patches and sync with Debian packaging Also add patch from debian to mqtt_protocol.h header file Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../recipes-connectivity/mosquitto/files/1571.patch | 4 +--- .../mosquitto/files/install-protocol.patch | 14 ++++++++++++++ .../recipes-connectivity/mosquitto/mosquitto_1.6.9.bb | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch index 2cfa484..93ff6bc 100644 --- a/meta-networking/recipes-connectivity/mosquitto/files/1571.patch +++ b/meta-networking/recipes-connectivity/mosquitto/files/1571.patch @@ -9,11 +9,9 @@ Signed-off-by: Gianfranco Costamagna lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index e1521f12a..14ba12739 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -88,6 +88,8 @@ set_target_properties(libmosquitto PROPERTIES +@@ -89,6 +89,8 @@ OUTPUT_NAME mosquitto VERSION ${VERSION} SOVERSION 1 diff --git a/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch new file mode 100644 index 0000000..1397fc6 --- /dev/null +++ b/meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch @@ -0,0 +1,14 @@ +Description: Also install mqtt_protocol.h, as is done in Makefile +Author: Gianfranco Costamagna +Bug-Debian: https://bugs.debian.org/951116 +Forwarded: https://github.com/eclipse/mosquitto/pull/1599 +Last-Update: 2020-02-15 + +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -114,4 +114,4 @@ + install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + endif (WITH_STATIC_LIBRARIES) + +-install(FILES mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++install(FILES mqtt_protocol.h mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb index 0d840e9..a0321a3 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.9.bb @@ -17,6 +17,7 @@ DEPENDS = "uthash" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ file://1571.patch \ + file://install-protocol.patch \ " SRC_URI[md5sum] = "52f5078ec18aaf623b14dfb121fd534b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:38:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:38:33 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: mutter: add patch from upstream to fix build with mesa >= 20.0.x In-Reply-To: <158371070799.14906.3913731855286832105@git.openembedded.org> References: <158371070799.14906.3913731855286832105@git.openembedded.org> Message-ID: <20200308233828.9C620232A2B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 24875f48ea202c3a7394e4c533c5584dfddb0bbf Author: Andreas M?ller AuthorDate: Sun Mar 8 22:06:30 2020 +0100 mutter: add patch from upstream to fix build with mesa >= 20.0.x Fixes: | FAILED: cogl/cogl/d9c41d2@@mutter-cogl-5 at sha/winsys_cogl-winsys-egl.c.o | arm-mortsgna-linux-gnueabi-gcc -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 --sysroot=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot -Icogl/cogl/d9c41d2@@mutter-cogl-5 at sha -Icogl/cogl -I../mutter-3.34.4/cogl/cogl -Icogl -I../mutter-3.34.4/cogl -I/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/mutter/3.34.4-r0/recipe-sysroot/usr/include/glib-2.0 -I/home/superandy/ [...] | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c: In function '_cogl_winsys_display_setup': | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:467:23: error: 'CoglRendererEGL' {aka 'struct _CoglRendererEGL'} has no member named 'pf_eglBindWaylandDisplay' | 467 | if (egl_renderer->pf_eglBindWaylandDisplay) | | ^~ | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:468:14: error: 'CoglRendererEGL' {aka 'struct _CoglRendererEGL'} has no member named 'pf_eglBindWaylandDisplay' | 468 | egl_renderer->pf_eglBindWaylandDisplay (egl_renderer->edpy, | | ^~ | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c: In function '_cogl_egl_create_image': | ../mutter-3.34.4/cogl/cogl/winsys/cogl-winsys-egl.c:902:17: error: 'EGL_WAYLAND_BUFFER_WL' undeclared (first use in this function) | 902 | if (target == EGL_WAYLAND_BUFFER_WL) | | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../mutter/0001-EGL-Include-EGL-eglmesaext.h.patch | 72 ++++++++++++++++++++++ meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 1 + 2 files changed, 73 insertions(+) diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch new file mode 100644 index 0000000..b4fd039 --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch @@ -0,0 +1,72 @@ +From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 20 Oct 2019 12:04:31 +0200 +Subject: [PATCH] EGL: Include EGL/eglmesaext.h + +The eglext.h shipped by libglvnd does not include the Mesa extensions, +unlike the header shipped in Mesa. + +Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 + +Upstream-Status: Applied [1] + +[1] https://gitlab.gnome.org/GNOME/mutter/-/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 +--- + cogl/cogl/meson.build | 2 +- + src/backends/meta-egl-ext.h | 1 + + src/backends/meta-egl.c | 1 + + src/backends/meta-egl.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build +index 261955796..b0e66bff3 100644 +--- a/cogl/cogl/meson.build ++++ b/cogl/cogl/meson.build +@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( + built_headers += [cogl_gl_header_h] + + if have_egl +- cogl_egl_includes_string = '#include \n#include ' ++ cogl_egl_includes_string = '#include \n#include \n#include ' + else + cogl_egl_includes_string = '' + endif +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h +index 8705e7d5b..db0b74f76 100644 +--- a/src/backends/meta-egl-ext.h ++++ b/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + /* + * This is a little different to the tests shipped with EGL implementations, +diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c +index 6554be935..fdeff4f77 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h +index f2a816445..4591e7d85 100644 +--- a/src/backends/meta-egl.h ++++ b/src/backends/meta-egl.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + + #define META_EGL_ERROR meta_egl_error_quark () +-- +2.21.1 + diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb index b4ddc5d..7979802 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb @@ -24,6 +24,7 @@ inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-ev SRC_URI[archive.md5sum] = "de19a6de98a2250dd7efdfca14359e39" SRC_URI[archive.sha256sum] = "0134513515f605dd0858154d0b54d2e23c5779d52590533e266d407251e20ba2" +SRC_URI += "file://0001-EGL-Include-EGL-eglmesaext.h.patch" # 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 Sun Mar 8 23:45:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:45:49 +0000 Subject: [oe-commits] [openembedded-core] 01/04: files/toolchain-shar-extract.sh: Rework PATH cleaning In-Reply-To: <158371114817.16506.2220406203327405728@git.openembedded.org> References: <158371114817.16506.2220406203327405728@git.openembedded.org> Message-ID: <20200308234548.50803232A25@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 480e17e15ef7daad8a464e30ce3c3e7784fb1c06 Author: Richard Purdie AuthorDate: Sat Mar 7 13:43:44 2020 +0000 files/toolchain-shar-extract.sh: Rework PATH cleaning Trying to create a clean PATH breaks cases where we install a buildtools tarball on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up directories in PATH which don't exist isntead. Do it with python as the shell version was too fraught with corner cases. (From OE-Core rev: 02106d0551450b38a599a2b9a2fd10bc5a30be0f) Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4c4b4de..2e0fe94 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,13 +1,8 @@ #!/bin/sh -[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ - LC_ALL=en_US.UTF-8 \ - TERM=$TERM \ - ICECC_PATH="$ICECC_PATH" \ - http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ - no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" -[ -f /etc/environment ] && . /etc/environment -export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +export LC_ALL=en_US.UTF-8 +# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted +PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:45:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:45:48 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (9bcfe8f -> 1495fbb) Message-ID: <158371114817.16506.2220406203327405728@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 9bcfe8f buildtools: Add locale en discard 0cc84f0 coreutils hack discard 03c1b74 files/toolchain-shar-extract.sh: Rework PATH cleaning new 480e17e files/toolchain-shar-extract.sh: Rework PATH cleaning new bf09b58 coreutils hack new b5a3518 buildtools: Add locale en new 1495fbb Revert "buildtools: Add locale en" 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 (9bcfe8f) \ N -- N -- N refs/heads/master-next (1495fbb) 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/files/toolchain-shar-extract.sh | 2 +- meta/recipes-core/coreutils/coreutils_8.31.bb | 2 +- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 - 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 Sun Mar 8 23:45:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:45:50 +0000 Subject: [oe-commits] [openembedded-core] 02/04: coreutils hack In-Reply-To: <158371114817.16506.2220406203327405728@git.openembedded.org> References: <158371114817.16506.2220406203327405728@git.openembedded.org> Message-ID: <20200308234548.5C250232A26@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bf09b58bcabc3dffa89ec8533c99c25fa427c01c Author: Richard Purdie AuthorDate: Sun Mar 8 14:35:58 2020 +0000 coreutils hack Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 04a0522..020bcaf 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -149,6 +149,10 @@ inherit ptest RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" +# -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy +RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" +RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev liberror-perl-dev sed-dev shadow-dev" + do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:45:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:45:51 +0000 Subject: [oe-commits] [openembedded-core] 03/04: buildtools: Add locale en In-Reply-To: <158371114817.16506.2220406203327405728@git.openembedded.org> References: <158371114817.16506.2220406203327405728@git.openembedded.org> Message-ID: <20200308234548.6651B232A27@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5a3518667c0144960e16906d75fd094d2585793 Author: Richard Purdie AuthorDate: Sun Mar 8 18:10:00 2020 +0000 buildtools: Add locale en Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index 4a79b09..1a1302f 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -26,6 +26,7 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libtool \ nativesdk-pkgconfig \ nativesdk-libxcrypt-dev \ + nativesdk-locale-base-en-us.utf-8 \ " TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 8 23:45:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 08 Mar 2020 23:45:52 +0000 Subject: [oe-commits] [openembedded-core] 04/04: Revert "buildtools: Add locale en" In-Reply-To: <158371114817.16506.2220406203327405728@git.openembedded.org> References: <158371114817.16506.2220406203327405728@git.openembedded.org> Message-ID: <20200308234548.7434D232A2A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1495fbb00235bad32f1ad564e7790a28b49dd68e Author: Richard Purdie AuthorDate: Sun Mar 8 23:25:58 2020 +0000 Revert "buildtools: Add locale en" This reverts commit ab55e11c5fdb8438bdbfdd53f48df369a4293b3c. --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index 1a1302f..4a79b09 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -26,7 +26,6 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libtool \ nativesdk-pkgconfig \ nativesdk-libxcrypt-dev \ - nativesdk-locale-base-en-us.utf-8 \ " TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 05:23:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 05:23:11 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: dnf-plugin-tui: upgrade 1.0 -> 1.1 Message-ID: <158373139123.26529.11098718363989972084@git.openembedded.org> 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 3173648 dnf-plugin-tui: upgrade 1.0 -> 1.1 3173648 is described below commit 3173648279acb92d3e280c5148069ff7c7648e41 Author: Zheng Ruoqin AuthorDate: Mon Mar 9 13:15:05 2020 +0800 dnf-plugin-tui: upgrade 1.0 -> 1.1 Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5ecf649..406494e 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 @@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master " -SRCREV = "31d6866d5eda02be9a6bfb1fca9e9095b12eecd1" -PV = "1.0" +SRCREV = "c5416adeb210154dc4ccc4c3e1c5297d83ebd41e" +PV = "1.1" SRC_URI_append_class-target = "file://oe-remote.repo.sample" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 09:49:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 09:49:09 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (1495fbb -> 0ec677e) Message-ID: <158374734964.25402.13030167315831840041@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 1495fbb Revert "buildtools: Add locale en" discard b5a3518 buildtools: Add locale en discard bf09b58 coreutils hack new 0ec677e coreutils hack 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 (1495fbb) \ N -- N -- N refs/heads/master-next (0ec677e) 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-core/coreutils/coreutils_8.31.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 Mar 9 09:49:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 09:49:10 +0000 Subject: [oe-commits] [openembedded-core] 01/01: coreutils hack In-Reply-To: <158374734964.25402.13030167315831840041@git.openembedded.org> References: <158374734964.25402.13030167315831840041@git.openembedded.org> Message-ID: <20200309094909.C9514232A25@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0ec677ed4e0355825f33c8b81eb3ce82016c8672 Author: Richard Purdie AuthorDate: Sun Mar 8 14:35:58 2020 +0000 coreutils hack Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 04a0522..cc4008e 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -149,6 +149,10 @@ inherit ptest RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" +# -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy +RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" +RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" + do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 15:24:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 15:24:42 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (9068314 -> 3173648) Message-ID: <158376748258.1928.15573129216628464364@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 9068314 x265: Disable assembly on x86 add 0fa20f8 python3-gmqtt: upgrade 0.4.4 -> 0.6.2 add 2886e87 python3-evdev: upgrade 1.2.0 -> 1.3.0 add cab232a python3-pycurl: upgrade 7.43.0.3 -> 7.43.0.5 add 1559cf5 python3-socketio: upgrade 4.3.1 -> 4.4.0 add d16876d gd: fix CVE-2017-6363 add e5c5df9 libtinyxml2: upgrade 7.1.0 -> 8.0.0 add 0a3b6af tcsh: Update SRC_URI add 780bcdc uriparser: fix upstream version check add 4a13dc6 zeromq: fix upstream version check add 06d2b6a czmq: fix upstream version check add 5eeaa3e irssi: fix upstream version check add 18b4345 dbus-broker: fix upstream version check add c4fa664 jq: fix upstream version check add 07196b6 pugixml: fix upstream version check add b7eaa85 uim: fix upstream version check add f0aaedb libstatgrab: fix upstream version check add 171f3df icewm: fix upstream version check add 4211ff4 cloc: fix upstream version check add c39747b xfsdump: fix do patch error add 76073b9 monit: new package add d9fd04b mraa_git.bb: update to v2.1.0 add 1d4356c quagga: fix reproducibily issue. add d67a35b quagga: make version.h a multilib header add a0e6cd3 libdnet: make dnet-config a multilib_script add 8bfb1ff proftpd: remove macro-prefix-map from prxs add fd2e895 proftpd: make prxs a mulitlib script add 311f98f python3-pygobject: remove this recipe add ee15c67 exfat-utils: fix upstream version check add 1725078 babeld: add UPSTREAM_CHECK_GITTAGREGEX add 19f08ef abseil-cpp: set PV in the recipe add 4d85c3a pkcs11-helper: add UPSTREAM_CHECK_GITTAGREGEX add 01e4b86 python3-django: fix UPSTREAM_CHECK_REGEX add 088ca60 daemontools: remove native BBCLASSEXTEND add 49e6052 net-snmp: multilib fixes add cd6b342 net-snmp: fix reproducibilty issues in net-snmp-config add 3be47e7 networkmanager: Upgrade 1.18.4 -> 1.22.8 add a367e54 kronosnet: Add recipe add 5c051f8 corosync: Update to 3.0.3 add e15b04f libqb: Build native version as well add d62b225 nss,nspr: Add recipes add 7e6305d mraa: Fix build on x86 32bit add 9f6d453 mosquitto: refresh patches and sync with Debian packaging add d148bc4 mosquitto: do not enable srv by default add 87a44d8 python3-obd: Consolidate into a single file add 24875f4 mutter: add patch from upstream to fix build with mesa >= 20.0.x add 3173648 dnf-plugin-tui: upgrade 1.0 -> 1.1 No new revisions were added by this update. Summary of changes: .../recipes-utils/exfat-utils/exfat-utils_1.3.0.bb | 2 + .../files/0001-xfsdump-support-usrmerge.patch | 26 +- .../mutter/0001-EGL-Include-EGL-eglmesaext.h.patch | 72 ++++++ meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 1 + .../recipes-connectivity/libdnet/libdnet_1.12.bb | 4 +- .../mosquitto/files/1571.patch | 4 +- .../mosquitto/files/install-protocol.patch | 14 ++ .../mosquitto/mosquitto_1.6.9.bb | 3 +- ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 6 +- ...te-settings-settings-property-documentati.patch | 23 +- ...0001-Fix-build-with-musl-systemd-specific.patch | 26 +- .../musl/0002-Fix-build-with-musl.patch | 30 ++- .../0003-Fix-build-with-musl-for-n-dhcp4.patch | 61 +++++ ...0004-Fix-build-with-musl-systemd-specific.patch | 26 ++ ...kmanager_1.18.4.bb => networkmanager_1.22.8.bb} | 44 ++-- .../recipes-daemons/proftpd/proftpd_1.3.6.bb | 5 +- ...-configure.ac-fix-pkgconfig-issue-of-rdma.patch | 32 --- .../{corosync_2.4.5.bb => corosync_3.0.3.bb} | 23 +- .../recipes-extended/kronosnet/kronosnet_1.15.bb | 17 ++ .../recipes-protocols/babeld/babeld_1.9.1.bb | 2 + .../recipes-protocols/net-snmp/net-snmp_5.8.bb | 9 +- .../recipes-protocols/quagga/quagga.inc | 5 +- meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb | 2 + meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb | 2 + .../recipes-connectivity/zeromq/zeromq_4.3.2.bb | 2 + meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 + .../pkcs11-helper/pkcs11-helper_1.26.bb | 2 + .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 1 + meta-oe/recipes-devtools/cloc/cloc_1.84.bb | 2 + .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 4 +- meta-oe/recipes-devtools/jq/jq_1.6.bb | 6 +- meta-oe/recipes-devtools/pugixml/pugixml_1.10.bb | 2 + .../0001-python-pyobject-fix-install-dir.patch | 121 --------- .../python/python3-pygobject_3.34.0.bb | 33 --- meta-oe/recipes-extended/icewm/icewm_1.5.5.bb | 2 + meta-oe/recipes-extended/libqb/libqb_1.0.5.bb | 2 + .../libstatgrab/libstatgrab_0.92.bb | 2 + ...-regular-expression-to-match-x86-architec.patch | 35 +++ meta-oe/recipes-extended/mraa/mraa_git.bb | 11 +- meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb | 2 +- .../0001-daemontools-native-Fix-a-warning.patch | 26 -- .../daemontools/daemontools/cross-compile.patch | 4 +- .../daemontools/daemontools_0.76.bb | 24 +- meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch | 35 +++ meta-oe/recipes-support/gd/gd_2.2.5.bb | 1 + .../{libtinyxml2_7.1.0.bb => libtinyxml2_8.0.0.bb} | 2 +- meta-oe/recipes-support/monit/monit/monit | 42 ++++ meta-oe/recipes-support/monit/monit/monitrc | 44 ++++ meta-oe/recipes-support/monit/monit_5.26.0.bb | 53 ++++ .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 +++ .../nspr/nspr/0002-Add-nios2-support.patch | 102 ++++++++ ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ++++++++ .../nspr/nspr/fix-build-on-x86_64.patch | 52 ++++ meta-oe/recipes-support/nspr/nspr/nspr.pc.in | 11 + .../nspr/nspr/remove-rpath-from-tests.patch | 26 ++ .../nspr/remove-srcdir-from-configure-in.patch | 19 ++ meta-oe/recipes-support/nspr/nspr_4.25.bb | 197 +++++++++++++++ ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ++++ .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ++++ meta-oe/recipes-support/nss/nss/blank-cert9.db | Bin 0 -> 28672 bytes meta-oe/recipes-support/nss/nss/blank-key4.db | Bin 0 -> 36864 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 +++ .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 +++++++++ .../nss/nss/nss-fix-nsinstall-build.patch | 36 +++ .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 ++ meta-oe/recipes-support/nss/nss/nss.pc.in | 11 + .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 ++ meta-oe/recipes-support/nss/nss/signlibs.sh | 20 ++ meta-oe/recipes-support/nss/nss/system-pkcs11.txt | 5 + meta-oe/recipes-support/nss/nss_3.50.bb | 273 +++++++++++++++++++++ meta-oe/recipes-support/uim/uim_1.8.8.bb | 2 + .../recipes-support/uriparser/uriparser_0.9.3.bb | 2 + .../recipes-devtools/python/python-django.inc | 2 +- .../recipes-devtools/python/python-evdev.inc | 6 +- ...x-build-on-32bit-arches-with-64bit-time_t.patch | 83 ------- meta-python/recipes-devtools/python/python-obd.inc | 11 - .../recipes-devtools/python/python-pycurl.inc | 11 +- .../recipes-devtools/python/python-socketio.inc | 4 +- ...thon3-evdev_1.2.0.bb => python3-evdev_1.3.0.bb} | 1 + ...thon3-gmqtt_0.4.4.bb => python3-gmqtt_0.6.2.bb} | 4 +- .../recipes-devtools/python/python3-obd_0.7.1.bb | 12 +- ...curl_7.43.0.3.bb => python3-pycurl_7.43.0.5.bb} | 1 + ...socketio_4.3.1.bb => python3-socketio_4.4.0.bb} | 1 + 83 files changed, 1774 insertions(+), 443 deletions(-) create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/install-protocol.patch create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-Fix-build-with-musl-for-n-dhcp4.patch create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-Fix-build-with-musl-systemd-specific.patch rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.4.bb => networkmanager_1.22.8.bb} (76%) delete mode 100644 meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch rename meta-networking/recipes-extended/corosync/{corosync_2.4.5.bb => corosync_3.0.3.bb} (82%) create mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb delete mode 100644 meta-oe/recipes-devtools/python/python3-pygobject/0001-python-pyobject-fix-install-dir.patch delete mode 100644 meta-oe/recipes-devtools/python/python3-pygobject_3.34.0.bb create mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch delete mode 100644 meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2017-6363.patch rename meta-oe/recipes-support/libtinyxml2/{libtinyxml2_7.1.0.bb => libtinyxml2_8.0.0.bb} (88%) create mode 100644 meta-oe/recipes-support/monit/monit/monit create mode 100644 meta-oe/recipes-support/monit/monit/monitrc create mode 100644 meta-oe/recipes-support/monit/monit_5.26.0.bb create mode 100644 meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/nspr.pc.in create mode 100644 meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch create mode 100644 meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch create mode 100644 meta-oe/recipes-support/nspr/nspr_4.25.bb create mode 100644 meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch create mode 100644 meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch create mode 100644 meta-oe/recipes-support/nss/nss/blank-cert9.db create mode 100644 meta-oe/recipes-support/nss/nss/blank-key4.db create mode 100644 meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch create mode 100644 meta-oe/recipes-support/nss/nss/nss.pc.in create mode 100644 meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch create mode 100644 meta-oe/recipes-support/nss/nss/signlibs.sh create mode 100644 meta-oe/recipes-support/nss/nss/system-pkcs11.txt create mode 100644 meta-oe/recipes-support/nss/nss_3.50.bb delete mode 100644 meta-python/recipes-devtools/python/python-evdev/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch delete mode 100644 meta-python/recipes-devtools/python/python-obd.inc rename meta-python/recipes-devtools/python/{python3-evdev_1.2.0.bb => python3-evdev_1.3.0.bb} (98%) rename meta-python/recipes-devtools/python/{python3-gmqtt_0.4.4.bb => python3-gmqtt_0.6.2.bb} (74%) rename meta-python/recipes-devtools/python/{python3-pycurl_7.43.0.3.bb => python3-pycurl_7.43.0.5.bb} (97%) rename meta-python/recipes-devtools/python/{python3-socketio_4.3.1.bb => python3-socketio_4.4.0.bb} (98%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 15:31:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 15:31:07 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: guider: Upgrade to 3.9.7 In-Reply-To: <158376786647.13485.6217323506197001487@git.openembedded.org> References: <158376786647.13485.6217323506197001487@git.openembedded.org> Message-ID: <20200309153106.EAF62232A27@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ee2cbba03041983bd028aaa16c87b19fbba25c62 Author: Peace Lee AuthorDate: Mon Mar 9 21:39:11 2020 +0900 guider: Upgrade to 3.9.7 Signed-off-by: Peace Lee Signed-off-by: Khem Raj --- .../guider/{guider_3.9.6.bb => guider_3.9.7.bb} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.6.bb b/meta-oe/recipes-devtools/guider/guider_3.9.7.bb similarity index 74% rename from meta-oe/recipes-devtools/guider/guider_3.9.6.bb rename to meta-oe/recipes-devtools/guider/guider_3.9.7.bb index f059002..fd0241b 100644 --- a/meta-oe/recipes-devtools/guider/guider_3.9.6.bb +++ b/meta-oe/recipes-devtools/guider/guider_3.9.7.bb @@ -6,17 +6,18 @@ AUTHOR = "Peace Lee " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" -PV = "3.9.6+git${SRCPV}" +PV = "3.9.7+git${SRCPV}" PR = "r0" SRC_URI = "git://github.com/iipeace/${BPN}" #SRCREV = "${AUTOREV}" -SRCREV = "fef25c41efb9bde0614ea477d0b90bd9565ae0b4" +SRCREV = "52aeb6f4c536865305afa51f37166bfe46fa460d" S = "${WORKDIR}/git" R = "${RECIPE_SYSROOT}" -inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)} +#inherit distutils +inherit distutils3 GUIDER_OBJ = "guider.pyc" GUIDER_SCRIPT = "guider" @@ -33,7 +34,3 @@ do_install() { RDEPENDS_${PN} = "python-ctypes python-shell \ python-json python-subprocess" -python() { - if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') -} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 15:31:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 15:31:06 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (3173648 -> ba914ed) Message-ID: <158376786647.13485.6217323506197001487@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 3173648 dnf-plugin-tui: upgrade 1.0 -> 1.1 new ee2cbba guider: Upgrade to 3.9.7 new ba914ed python3-sqlparse: change shebang to python3 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: .../guider/{guider_3.9.6.bb => guider_3.9.7.bb} | 11 ++--- .../recipes-devtools/python/python-sqlparse.inc | 2 + .../0001-sqlparse-change-shebang-to-python3.patch | 51 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 7 deletions(-) rename meta-oe/recipes-devtools/guider/{guider_3.9.6.bb => guider_3.9.7.bb} (74%) create mode 100644 meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 15:31:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 15:31:08 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: python3-sqlparse: change shebang to python3 In-Reply-To: <158376786647.13485.6217323506197001487@git.openembedded.org> References: <158376786647.13485.6217323506197001487@git.openembedded.org> Message-ID: <20200309153107.04155232A2A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ba914edc2edb973eabe608f9406ab76326223446 Author: Changqing Li AuthorDate: Mon Mar 9 14:04:28 2020 +0800 python3-sqlparse: change shebang to python3 we have offcially dropped python2, so it is possible that our code run on python3 only host, so change shebang to python3 to avoid error like: python: command not found Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-sqlparse.inc | 2 + .../0001-sqlparse-change-shebang-to-python3.patch | 51 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-sqlparse.inc b/meta-python/recipes-devtools/python/python-sqlparse.inc index f71f815..14e683d 100644 --- a/meta-python/recipes-devtools/python/python-sqlparse.inc +++ b/meta-python/recipes-devtools/python/python-sqlparse.inc @@ -4,6 +4,8 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" +SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch" + SRC_URI[md5sum] = "2ce34181d6b7b234c9f3c0ecd1ffb93e" SRC_URI[sha256sum] = "7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" diff --git a/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch new file mode 100644 index 0000000..ad6c50f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch @@ -0,0 +1,51 @@ +From 10c9d3341d64d697f678a64ae707f6bda21565bb Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 9 Mar 2020 13:10:37 +0800 +Subject: [PATCH] sqlparse: change shebang to python3 + +Upstream-Status: Pending + +Don't send upstream since upstream still support python2, +we can only make this change after python2 is offcially +dropped. + +Signed-off-by: Changqing Li +--- + setup.py | 2 +- + sqlparse/__main__.py | 2 +- + sqlparse/cli.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 345d0ce..ce3abc3 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py +index 867d75d..dd0c074 100644 +--- a/sqlparse/__main__.py ++++ b/sqlparse/__main__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +diff --git a/sqlparse/cli.py b/sqlparse/cli.py +index 25555a5..8bf050a 100755 +--- a/sqlparse/cli.py ++++ b/sqlparse/cli.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +-- +2.7.4 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 18:26:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 18:26:36 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (ba914ed -> a2a3640) Message-ID: <158377839652.16048.6378580297650698910@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 ba914ed python3-sqlparse: change shebang to python3 discard ee2cbba guider: Upgrade to 3.9.7 new 41eb6e1 python3-sqlparse: change shebang to python3 new a2a3640 wireshark: Inherit mime and mime-xdg 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 (ba914ed) \ N -- N -- N refs/heads/master-next (a2a3640) 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-multimedia/recipes-multimedia/minidlna/minidlna.inc | 1 + meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +- .../guider/{guider_3.9.7.bb => guider_3.9.6.bb} | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) rename meta-oe/recipes-devtools/guider/{guider_3.9.7.bb => guider_3.9.6.bb} (74%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 18:26:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 18:26:38 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: wireshark: Inherit mime and mime-xdg In-Reply-To: <158377839652.16048.6378580297650698910@git.openembedded.org> References: <158377839652.16048.6378580297650698910@git.openembedded.org> Message-ID: <20200309182636.DD3AC232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a2a364040b1a635283e8a02bf0fb16c3105c2a1d Author: Khem Raj AuthorDate: Mon Mar 9 11:16:36 2020 -0700 wireshark: Inherit mime and mime-xdg Fixes ERROR: QA Issue: package contains mime types but does not inherit mime: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/mime/packages/wireshark.xml' [mime] ERROR: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/applications/wireshark.desktop' [mime-xdg] Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/minidlna/minidlna.inc | 1 + meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index 187ff53..04648a5 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -12,6 +12,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna-daemon.init.d \ file://minidlna.service \ file://0001-Update-Gettext-version.patch \ + file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ " S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb index b2bcf5f..91a7e1a 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208fe PE = "1" -inherit cmake pkgconfig python3native perlnative upstream-version-is-even +inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 18:26:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 18:26:37 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: python3-sqlparse: change shebang to python3 In-Reply-To: <158377839652.16048.6378580297650698910@git.openembedded.org> References: <158377839652.16048.6378580297650698910@git.openembedded.org> Message-ID: <20200309182636.D2A81232A31@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 41eb6e1a61ee416714149918489af975eba3dba6 Author: Changqing Li AuthorDate: Mon Mar 9 14:04:28 2020 +0800 python3-sqlparse: change shebang to python3 we have offcially dropped python2, so it is possible that our code run on python3 only host, so change shebang to python3 to avoid error like: python: command not found Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-sqlparse.inc | 2 + .../0001-sqlparse-change-shebang-to-python3.patch | 51 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-sqlparse.inc b/meta-python/recipes-devtools/python/python-sqlparse.inc index f71f815..14e683d 100644 --- a/meta-python/recipes-devtools/python/python-sqlparse.inc +++ b/meta-python/recipes-devtools/python/python-sqlparse.inc @@ -4,6 +4,8 @@ SECTION = "devel/python" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" +SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch" + SRC_URI[md5sum] = "2ce34181d6b7b234c9f3c0ecd1ffb93e" SRC_URI[sha256sum] = "7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" diff --git a/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch new file mode 100644 index 0000000..ad6c50f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch @@ -0,0 +1,51 @@ +From 10c9d3341d64d697f678a64ae707f6bda21565bb Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 9 Mar 2020 13:10:37 +0800 +Subject: [PATCH] sqlparse: change shebang to python3 + +Upstream-Status: Pending + +Don't send upstream since upstream still support python2, +we can only make this change after python2 is offcially +dropped. + +Signed-off-by: Changqing Li +--- + setup.py | 2 +- + sqlparse/__main__.py | 2 +- + sqlparse/cli.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 345d0ce..ce3abc3 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py +index 867d75d..dd0c074 100644 +--- a/sqlparse/__main__.py ++++ b/sqlparse/__main__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +diff --git a/sqlparse/cli.py b/sqlparse/cli.py +index 25555a5..8bf050a 100755 +--- a/sqlparse/cli.py ++++ b/sqlparse/cli.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + # + # Copyright (C) 2009-2018 the sqlparse authors and contributors +-- +2.7.4 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 19:37:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 19:37:29 +0000 Subject: [oe-commits] [meta-openembedded] 02/05: kronoset: Disable sign-compare with clang In-Reply-To: <158378264764.13047.13773407171943908210@git.openembedded.org> References: <158378264764.13047.13773407171943908210@git.openembedded.org> Message-ID: <20200309193728.35F92232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cfb432a714457d2fd66a02fe7f1340094742ba69 Author: Khem Raj AuthorDate: Mon Mar 9 12:18:21 2020 -0700 kronoset: Disable sign-compare with clang clang isn't suppressing warnings from system headers like it should Fixes ../../git/libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { ^~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Khem Raj --- meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb index 24aa27a..6bf268d 100644 --- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb +++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb @@ -15,3 +15,9 @@ SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" inherit autotools S = "${WORKDIR}/git" + +# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] +# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { +# ^~~~~~~~~~~~~~~~~~~~~~~ +CFLAGS_append_toolchain-clang = " -Wno-sign-compare" + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 19:37:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 19:37:27 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (a2a3640 -> 3f6419c) Message-ID: <158378264764.13047.13773407171943908210@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 a2a3640 wireshark: Inherit mime and mime-xdg new cae26bb wireshark: Inherit mime and mime-xdg new cfb432a kronoset: Disable sign-compare with clang new 70f4648 abseil-cpp: Depend on libexecinfo on musl new 33440e8 minidlna: Use clock_gettime API insteaad of syscall new 3f6419c libde265: Update to 1.0.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 (a2a3640) \ N -- N -- N refs/heads/master-next (3f6419c) 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: .../{libde265_1.0.2.bb => libde265_1.0.5.bb} | 7 ++--- ...heck-for-clock_gettime-seprately-from-__N.patch | 36 ++++++++++++++++++++++ .../recipes-extended/kronosnet/kronosnet_1.15.bb | 6 ++++ .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 2 ++ 4 files changed, 47 insertions(+), 4 deletions(-) rename meta-multimedia/recipes-multimedia/libde265/{libde265_1.0.2.bb => libde265_1.0.5.bb} (69%) create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 19:37:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 19:37:30 +0000 Subject: [oe-commits] [meta-openembedded] 03/05: abseil-cpp: Depend on libexecinfo on musl In-Reply-To: <158378264764.13047.13773407171943908210@git.openembedded.org> References: <158378264764.13047.13773407171943908210@git.openembedded.org> Message-ID: <20200309193728.43635232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 70f464892b3fac590a770fedfb0784fca07858ef Author: Khem Raj AuthorDate: Mon Mar 9 12:19:49 2020 -0700 abseil-cpp: Depend on libexecinfo on musl Needed for execinfo to work Fixes absl/debugging/internal/stacktrace_generic-inl.inc:14:10: fatal error: 'execinfo.h' file not found ^~~~~~~~~~~~ 1 error generated. Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 2 ++ 1 file changed, 2 insertions(+) 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 115ffc6..b6ea5fd 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -19,6 +19,8 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ S = "${WORKDIR}/git" +DEPENDS_append_libc-musl = " libexecinfo " + ASNEEDED_class-native = "" ASNEEDED_class-nativesdk = "" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 19:37:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 19:37:28 +0000 Subject: [oe-commits] [meta-openembedded] 01/05: wireshark: Inherit mime and mime-xdg In-Reply-To: <158378264764.13047.13773407171943908210@git.openembedded.org> References: <158378264764.13047.13773407171943908210@git.openembedded.org> Message-ID: <20200309193728.294D9232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit cae26bb8423087819e921b5205dcced59033eb74 Author: Khem Raj AuthorDate: Mon Mar 9 11:16:36 2020 -0700 wireshark: Inherit mime and mime-xdg Fixes ERROR: QA Issue: package contains mime types but does not inherit mime: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/mime/packages/wireshark.xml' [mime] ERROR: QA Issue: package contains desktop file with key 'MimeType' but does not inhert mime-xdg: wireshark path '/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/wireshark/1_3.2.2-r0/packages-split/wireshark/usr/share/applications/wireshark.desktop' [mime-xdg] Signed-off-by: Khem Raj --- meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb index b2bcf5f..91a7e1a 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "5f5923ef4c3fee370ed0ca1bb324f37c246015eba4a7e74ab95d9208fe PE = "1" -inherit cmake pkgconfig python3native perlnative upstream-version-is-even +inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 19:37:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 19:37:31 +0000 Subject: [oe-commits] [meta-openembedded] 04/05: minidlna: Use clock_gettime API insteaad of syscall In-Reply-To: <158378264764.13047.13773407171943908210@git.openembedded.org> References: <158378264764.13047.13773407171943908210@git.openembedded.org> Message-ID: <20200309193728.4EE49232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 33440e89febd33f5019a87b055ed28d04625b8e9 Author: Khem Raj AuthorDate: Mon Mar 9 12:21:01 2020 -0700 minidlna: Use clock_gettime API insteaad of syscall Makes it 64bit time_t safe Signed-off-by: Khem Raj --- .../recipes-multimedia/minidlna/minidlna.inc | 1 + ...heck-for-clock_gettime-seprately-from-__N.patch | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index 187ff53..04648a5 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -12,6 +12,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna-daemon.init.d \ file://minidlna.service \ file://0001-Update-Gettext-version.patch \ + file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ " S = "${WORKDIR}/git" diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch new file mode 100644 index 0000000..24a307d --- /dev/null +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch @@ -0,0 +1,36 @@ +From 1118b1912916924bbfa3fd4dced9dfed01fbf0e0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 9 Mar 2020 09:44:33 -0700 +Subject: [PATCH] configure: Check for clock_gettime seprately from + __NR_clock_gettime + +This helps prioritize using clock_gettime API from libc over syscall +since direct use of __NR_clock_gettime is not time64-safe + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -125,6 +125,10 @@ case $host in + esac + + AC_CHECK_HEADERS(syscall.h sys/syscall.h mach/mach_time.h) ++ ++AC_MSG_CHECKING([for clock_gettime]) ++AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],) ++ + AC_MSG_CHECKING([for __NR_clock_gettime syscall]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( +@@ -143,7 +147,6 @@ AC_COMPILE_IFELSE( + ], + [ + AC_MSG_RESULT([no]) +- AC_SEARCH_LIBS([clock_gettime], [rt], [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [use clock_gettime])],) + ]) + + AC_CHECK_HEADER(linux/netlink.h, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 19:37:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 19:37:32 +0000 Subject: [oe-commits] [meta-openembedded] 05/05: libde265: Update to 1.0.5 In-Reply-To: <158378264764.13047.13773407171943908210@git.openembedded.org> References: <158378264764.13047.13773407171943908210@git.openembedded.org> Message-ID: <20200309193728.5AFA4232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3f6419c89505d9b6360d36e5d6478dc02410866e Author: Khem Raj AuthorDate: Mon Mar 9 12:32:05 2020 -0700 libde265: Update to 1.0.5 License-Update: Examples are now MIT see [1] [1] https://github.com/strukturag/libde265/commit/4488ae0c3b287ef6f24a958004481b2b337abc76 Signed-off-by: Khem Raj --- .../libde265/{libde265_1.0.2.bb => libde265_1.0.5.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb similarity index 69% rename from meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb rename to meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb index cd075ff..613dcc7 100644 --- a/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb +++ b/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb @@ -4,13 +4,12 @@ simple integration into other software." HOMEPAGE = "http://www.libde265.org/" SECTION = "libs/multimedia" -LICENSE = "LGPLv3" +LICENSE = "LGPLv3 & MIT" LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=852f345c1c52c9160f9a7c36bb997546" +LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f" SRC_URI = "https://github.com/strukturag/libde265/releases/download/v${PV}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "93520b378df25f3a94e962f2b54872cc" -SRC_URI[sha256sum] = "eaa0348839c2935dd90647d72c6dd4a043e36361cb3c33d2b04df10fbcebd3cb" +SRC_URI[sha256sum] = "e3f277d8903408615a5cc34718b391b83c97c646faea4f41da93bac5ee08a87f" EXTRA_OECONF = "--disable-sherlock265 --disable-dec265" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 21:13:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 21:13:26 +0000 Subject: [oe-commits] [openembedded-core] 02/02: buildtools-extended-tarball: Add locale command In-Reply-To: <158378840476.16558.10787636460757620466@git.openembedded.org> References: <158378840476.16558.10787636460757620466@git.openembedded.org> Message-ID: <20200309211325.00373232A33@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 88f1967a676e28fb53cd2a3a5c7f1175185c1e14 Author: Richard Purdie AuthorDate: Mon Mar 9 21:09:43 2020 +0000 buildtools-extended-tarball: Add locale command The eSDK installation code checks installed locales with the locale command which is from glibc-utils. Add this so that we find the correct locales from the buildtools. Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index 4a79b09..dd780c5 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libstdc++-dev \ nativesdk-libtool \ nativesdk-pkgconfig \ + nativesdk-glibc-utils \ nativesdk-libxcrypt-dev \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 21:13:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 21:13:24 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (0ec677e -> 88f1967) Message-ID: <158378840476.16558.10787636460757620466@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 0ec677e coreutils hack new d326e52 glibc: Update nativesdk locale relocation patch new 88f1967 buildtools-extended-tarball: Add locale command 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: ...libc-Make-relocatable-install-for-locales.patch | 62 ++++++++++++++++------ .../meta/buildtools-extended-tarball.bb | 1 + 2 files changed, 48 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 21:13:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 21:13:25 +0000 Subject: [oe-commits] [openembedded-core] 01/02: glibc: Update nativesdk locale relocation patch In-Reply-To: <158378840476.16558.10787636460757620466@git.openembedded.org> References: <158378840476.16558.10787636460757620466@git.openembedded.org> Message-ID: <20200309211324.E8014232A32@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d326e521fe23750c4a0bd31b57c76d0f59c1ff0d Author: Richard Purdie AuthorDate: Mon Mar 9 20:59:11 2020 +0000 glibc: Update nativesdk locale relocation patch Signed-off-by: Richard Purdie --- ...libc-Make-relocatable-install-for-locales.patch | 62 ++++++++++++++++------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch index d9985c2..27cd17c 100644 --- a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +++ b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch @@ -17,11 +17,11 @@ Signed-off-by: Khem Raj locale/localeinfo.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/locale/findlocale.c b/locale/findlocale.c -index 9cd3b71a6d..84272310e0 100644 ---- a/locale/findlocale.c -+++ b/locale/findlocale.c -@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = +Index: git/locale/findlocale.c +=================================================================== +--- git.orig/locale/findlocale.c ++++ git/locale/findlocale.c +@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attr which are somehow addressed. */ struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; @@ -30,7 +30,7 @@ index 9cd3b71a6d..84272310e0 100644 /* Checks if the name is actually present, that is, not NULL and not empty. */ -@@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, +@@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path /* Nothing in the archive. Set the default path to search below. */ locale_path = _nl_default_locale_path; @@ -39,10 +39,10 @@ index 9cd3b71a6d..84272310e0 100644 } else /* We really have to load some data. First see whether the name is -diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index ba0fe45648..9737fd4cda 100644 ---- a/locale/loadarchive.c -+++ b/locale/loadarchive.c +Index: git/locale/loadarchive.c +=================================================================== +--- git.orig/locale/loadarchive.c ++++ git/locale/loadarchive.c @@ -42,7 +42,7 @@ @@ -52,11 +52,11 @@ index ba0fe45648..9737fd4cda 100644 /* Size of initial mapping window, optimal if large enough to cover the header plus the initial locale. */ -diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 1bfe22aa7f..fdc283c69a 100644 ---- a/locale/localeinfo.h -+++ b/locale/localeinfo.h -@@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int category, int item) +Index: git/locale/localeinfo.h +=================================================================== +--- git.orig/locale/localeinfo.h ++++ git/locale/localeinfo.h +@@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int categor } /* Default search path if no LOCPATH environment variable. */ @@ -65,3 +65,35 @@ index 1bfe22aa7f..fdc283c69a 100644 /* Load the locale data for CATEGORY from the file specified by *NAME. If *NAME is "", use environment variables as specified by POSIX, and +Index: git/locale/programs/locale.c +=================================================================== +--- git.orig/locale/programs/locale.c ++++ git/locale/programs/locale.c +@@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b + ((const struct nameent *) b)->name); + } + ++static char _write_archive_locales_path[4096] attribute_hidden __attribute__ ((section (".gccrelocprefix"))) = ARCHIVE_NAME; + + static int + write_archive_locales (void **all_datap, char *linebuf) +@@ -645,7 +646,7 @@ write_archive_locales (void **all_datap, + int fd, ret = 0; + uint32_t cnt; + +- fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ fd = open64 (_write_archive_locales_path, O_RDONLY); + if (fd < 0) + return 0; + +@@ -700,8 +701,8 @@ write_archive_locales (void **all_datap, + if (cnt) + putchar_unlocked ('\n'); + +- printf ("locale: %-15.15s archive: " ARCHIVE_NAME "\n%s\n", +- names[cnt].name, linebuf); ++ printf ("locale: %-15.15s archive: %s\n%s\n", ++ names[cnt].name, _write_archive_locales_path, linebuf); + + locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:25 +0000 Subject: [oe-commits] [openembedded-core] 02/06: archiver.bbclass: Make do_deploy_archives a recursive dependency In-Reply-To: <158379434352.3422.2464672961297421134@git.openembedded.org> References: <158379434352.3422.2464672961297421134@git.openembedded.org> Message-ID: <20200309225223.C53A1232A37@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fe54c05325d1617d4988c68b9735d211bc71b494 Author: Paul Barker AuthorDate: Mon Mar 9 14:21:36 2020 +0000 archiver.bbclass: Make do_deploy_archives a recursive dependency To ensure that archives are captured for all dependencies of a typical bitbake build we add do_deploy_archives to the list of recursive dependencies of do_build. Without this, archives may be missed for recipes such as gcc-source which do not create packages or populate a sysroot. do_deploy_archives is also added to the recursive dependencies of do_populate_sdk so that all sources required for an SDK can be captured. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/classes/archiver.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index fef7ad4..c11d36d 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -604,7 +604,9 @@ addtask do_ar_configured after do_unpack_and_patch addtask do_ar_mirror after do_fetch addtask do_dumpdata addtask do_ar_recipe -addtask do_deploy_archives before do_build +addtask do_deploy_archives +do_build[recrdeptask] += "do_deploy_archives" +do_populate_sdk[recrdeptask] += "do_deploy_archives" python () { # Add tasks in the correct order, specifically for linux-yocto to avoid race condition. -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:23 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (88f1967 -> e221d94) Message-ID: <158379434352.3422.2464672961297421134@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 88f1967 buildtools-extended-tarball: Add locale command new c23d3a5 archiver.bbclass: Handle gitsm URLs in the mirror archiver new fe54c05 archiver.bbclass: Make do_deploy_archives a recursive dependency new 3677eaf kernelsrc.bbclass: Fix externalsrc support new e7bff4e perf: Fix externalsrc support new 3e72ed8 kernel-yocto.bbclass: Support config fragments with externalsrc new e221d94 p11-kit: Add nativesdk variant 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/archiver.bbclass | 35 ++++++++++++++++++++----- meta/classes/kernel-yocto.bbclass | 3 ++- meta/classes/kernelsrc.bbclass | 2 +- meta/recipes-kernel/perf/perf.bb | 2 +- meta/recipes-support/p11-kit/p11-kit_0.23.20.bb | 2 ++ 5 files changed, 35 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:26 +0000 Subject: [oe-commits] [openembedded-core] 03/06: kernelsrc.bbclass: Fix externalsrc support In-Reply-To: <158379434352.3422.2464672961297421134@git.openembedded.org> References: <158379434352.3422.2464672961297421134@git.openembedded.org> Message-ID: <20200309225223.D236E232A38@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3677eaff8e00f2a740463c053c90f52cc4977973 Author: Paul Barker AuthorDate: Mon Mar 9 14:21:37 2020 +0000 kernelsrc.bbclass: Fix externalsrc support When the externalsrc class is used the tasks listed in SRCTREECOVEREDTASKS are deleted to prevent them being executed. If externalsrc is used for the kernel then this will include virtual/kernel:do_patch. We can depend on do_shared_workdir instead as this will survive when externalsrc is used. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/classes/kernelsrc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernelsrc.bbclass b/meta/classes/kernelsrc.bbclass index 675d40e..a951ba3 100644 --- a/meta/classes/kernelsrc.bbclass +++ b/meta/classes/kernelsrc.bbclass @@ -1,7 +1,7 @@ S = "${STAGING_KERNEL_DIR}" deltask do_fetch deltask do_unpack -do_patch[depends] += "virtual/kernel:do_patch" +do_patch[depends] += "virtual/kernel:do_shared_workdir" do_patch[noexec] = "1" do_package[depends] += "virtual/kernel:do_populate_sysroot" KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:24 +0000 Subject: [oe-commits] [openembedded-core] 01/06: archiver.bbclass: Handle gitsm URLs in the mirror archiver In-Reply-To: <158379434352.3422.2464672961297421134@git.openembedded.org> References: <158379434352.3422.2464672961297421134@git.openembedded.org> Message-ID: <20200309225223.B8B07232A34@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c23d3a5cd51bf6d33c2a7cb269b37e22bb711300 Author: Paul Barker AuthorDate: Mon Mar 9 14:21:35 2020 +0000 archiver.bbclass: Handle gitsm URLs in the mirror archiver To fully archive a `gitsm://` entry in SRC_URI we need to also capture the submodules recursively. If shallow mirror tarballs are found, they must be temporarily extracted so that the submodules can be determined. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/classes/archiver.bbclass | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 013195d..fef7ad4 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -306,7 +306,7 @@ python do_ar_configured() { } python do_ar_mirror() { - import subprocess + import shutil, subprocess, tempfile src_uri = (d.getVar('SRC_URI') or '').split() if len(src_uri) == 0: @@ -337,12 +337,10 @@ python do_ar_mirror() { bb.utils.mkdirhier(destdir) - fetcher = bb.fetch2.Fetch(src_uri, d) - - for url in fetcher.urls: + def archive_url(fetcher, url): if is_excluded(url): bb.note('Skipping excluded url: %s' % (url)) - continue + return bb.note('Archiving url: %s' % (url)) ud = fetcher.ud[url] @@ -376,6 +374,29 @@ python do_ar_mirror() { bb.note('Copying source mirror') cmd = 'cp -fpPRH %s %s' % (localpath, destdir) subprocess.check_call(cmd, shell=True) + + if url.startswith('gitsm://'): + def archive_submodule(ud, url, module, modpath, workdir, d): + url += ";bareclone=1;nobranch=1" + newfetch = bb.fetch2.Fetch([url], d, cache=False) + + for url in newfetch.urls: + archive_url(newfetch, url) + + # If we're using a shallow mirror tarball it needs to be unpacked + # temporarily so that we can examine the .gitmodules file + if ud.shallow and os.path.exists(ud.fullshallow) and ud.method.need_update(ud, d): + tmpdir = tempfile.mkdtemp(dir=d.getVar("DL_DIR")) + subprocess.check_call("tar -xzf %s" % ud.fullshallow, cwd=tmpdir, shell=True) + ud.method.process_submodules(ud, tmpdir, archive_submodule, d) + shutil.rmtree(tmpdir) + else: + ud.method.process_submodules(ud, ud.clonedir, archive_submodule, d) + + fetcher = bb.fetch2.Fetch(src_uri, d, cache=False) + + for url in fetcher.urls: + archive_url(fetcher, url) } def exclude_useless_paths(tarinfo): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:27 +0000 Subject: [oe-commits] [openembedded-core] 04/06: perf: Fix externalsrc support In-Reply-To: <158379434352.3422.2464672961297421134@git.openembedded.org> References: <158379434352.3422.2464672961297421134@git.openembedded.org> Message-ID: <20200309225223.E1E33232A4F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e7bff4e24f386d7462dfc358a1a7a43d755a5813 Author: Paul Barker AuthorDate: Mon Mar 9 14:21:38 2020 +0000 perf: Fix externalsrc support When the externalsrc class is used the tasks listed in SRCTREECOVEREDTASKS are deleted to prevent them being executed. If externalsrc is used for the kernel then this will include virtual/kernel:do_patch. We can depend on do_shared_workdir instead as this will survive when externalsrc is used. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 10a5b88..e005eb0 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -52,7 +52,7 @@ export PYTHON_SITEPACKAGES_DIR #kernel 3.1+ supports WERROR to disable warnings as errors export WERROR = "0" -do_populate_lic[depends] += "virtual/kernel:do_patch" +do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" # needed for building the tools/perf Perl binding include ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'perf-perl.inc', '', d)} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:28 +0000 Subject: [oe-commits] [openembedded-core] 05/06: kernel-yocto.bbclass: Support config fragments with externalsrc In-Reply-To: <158379434352.3422.2464672961297421134@git.openembedded.org> References: <158379434352.3422.2464672961297421134@git.openembedded.org> Message-ID: <20200309225223.EFEC3232A50@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3e72ed833d0a0a9167ba6271a050a347980ca65f Author: Paul Barker AuthorDate: Mon Mar 9 14:21:39 2020 +0000 kernel-yocto.bbclass: Support config fragments with externalsrc The merging of config fragments is performend in the do_kernel_configme task and so config fragments will not be supported when this task is removed from the dependency tree. kernel-yocto adds additional tasks which may modify the source directory to SRCTREECOVEREDTASKS so that they are removed when using externalsrc. However, do_kernel_configme should be safe to use, the only modification to the source tree is the potential creation of the '.kernel-meta' directory and the '.metadir' file. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d71ce21..6792c9a 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -1,5 +1,5 @@ # remove tasks that modify the source tree in case externalsrc is inherited -SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" +SRCTREECOVEREDTASKS += "do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" @@ -325,6 +325,7 @@ do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot" 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[depends] += "kern-tools-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { # translate the kconfig_mode into something that merge_config.sh -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:29 +0000 Subject: [oe-commits] [openembedded-core] 06/06: p11-kit: Add nativesdk variant In-Reply-To: <158379434352.3422.2464672961297421134@git.openembedded.org> References: <158379434352.3422.2464672961297421134@git.openembedded.org> Message-ID: <20200309225224.0FD3E232A51@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e221d94d0a860b87387ee4747220e2ff3696ff8c Author: Codrin Ciubotariu AuthorDate: Mon Mar 9 19:55:35 2020 +0200 p11-kit: Add nativesdk variant The nativesdk variant is needed by the buildtools-tarball, when p11-kit feature is enabled for gnutls. The error message is: Missing or unbuildable dependency chain was: ['buildtools-tarball', 'nativesdk-wget', 'nativesdk-gnutls', 'nativesdk-p11-kit'] Signed-off-by: Codrin Ciubotariu Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/p11-kit/p11-kit_0.23.20.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 54b8cc6..4ba93f9 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -25,3 +25,5 @@ FILES_${PN} += " \ # PN contains p11-kit-proxy.so, a symlink to a loadable module INSANE_SKIP_${PN} = "dev-so" + +BBCLASSEXTEND = "nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:44 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (2885034 -> 32c858a) Message-ID: <158379436418.3946.17057285534959064878@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 2885034 build.py: augment TaskBase to capture PN and PV new 966bd64 bitbake: lib/bb/msg.py: Convert default domains to a dictionary new 2e9af05 bitbake: knotty: Handle logging messages with specific logger new 8c042e6 bitbake: lib/bb/msg.py: Use log level instead of debug count new 302bc9f bitbake: lib/bb/msg.py: Add repr for BBLogFormatter new e3503f9 bitbake: knotty: Add commented logging_tree code new 41d6c17 bitbake: lib/bb/msg.py: Add filter utilities new ac0fd90 bitbake: lib/bb/msg.py: Remove unused filters new 2bbd26c bitbake: lib/bb/msg.py: Add helper to set logging config new a7fa136 bitbake: knotty: Remove dependency on format variable new f459d48 bitbake: knotty: Setup logs with config helper new 5e05a1a bitbake: worker: Remove unnecessary addDefaultLogFilter new efd3b57 bitbake: Log hash equivalence with a different logger new 6974dbe bitbake: Add autobuilder logging configuration new bdaf502 bitbake: Lower hash equivalence logging new 7e69bc4 bitbake-user-manual: Add documentation for BB_LOGCONFIG new 5f5f3fc fetch2/gitsm: Unpack shallow mirror tarballs new 32c858a tests: Add test for gitsm fetcher with shallow mirror tarballs 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: bin/bitbake-worker | 3 +- bitbake/contrib/autobuilderlog.json | 27 ++++ .../bitbake-user-manual-execution.xml | 97 ++++++++++++ .../bitbake-user-manual-ref-variables.xml | 11 ++ lib/bb/__init__.py | 7 +- lib/bb/fetch2/gitsm.py | 21 ++- lib/bb/msg.py | 172 ++++++++++++++++---- lib/bb/runqueue.py | 13 +- lib/bb/siggen.py | 17 +- lib/bb/tests/fetch.py | 41 +++++ lib/bb/tinfoil.py | 4 +- lib/bb/ui/knotty.py | 173 +++++++++++++++------ 12 files changed, 476 insertions(+), 110 deletions(-) create mode 100644 bitbake/contrib/autobuilderlog.json -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:46 +0000 Subject: [oe-commits] [bitbake] 02/17: bitbake: knotty: Handle logging messages with specific logger In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.7192F232BFA@git.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 2e9af05572fd54e7a779ee461d7891fbccd1ab67 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:40 2020 -0500 bitbake: knotty: Handle logging messages with specific logger Handles the log messages from the bitbake server with the specific logger that the event originated from. This allows hierarchical logging configurations to work as expected. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index cbb289b..a6a92b9 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -522,7 +522,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): event.msg = taskinfo['title'] + ': ' + event.msg if hasattr(event, 'fn'): event.msg = event.fn + ': ' + event.msg - logger.handle(event) + logging.getLogger(event.name).handle(event) continue if isinstance(event, bb.build.TaskFailedSilent): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:45 +0000 Subject: [oe-commits] [bitbake] 01/17: bitbake: lib/bb/msg.py: Convert default domains to a dictionary In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.61F68232BF9@git.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 966bd64b41aaddbd8b148e7c544fdcf97895086c Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:39 2020 -0500 bitbake: lib/bb/msg.py: Convert default domains to a dictionary Converts the default domain variable to a dictionary where the keys are the logging domains and the values are the logging level (instead of the debug count). This makes it easier to deal with the logging domains and the awkward conversion from a list to a dictionary only needs to be done once when logging is initialized. Finally, other code has been written that already assumes this variable is a dictionary, see: f04cd93109 ("bitbake: lib/bb: Optimise out debug messages from cooker") Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/__init__.py | 5 +++-- lib/bb/msg.py | 17 +++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index 88641e2..acd4af1 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -43,12 +43,13 @@ class BBLogger(Logger): Logger.__init__(self, name) def bbdebug(self, level, msg, *args, **kwargs): + loglevel = logging.DEBUG - level + 1 if not bb.event.worker_pid: - if self.name in bb.msg.loggerDefaultDomains and level > (bb.msg.loggerDefaultDomains[self.name]): + if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): return if level > (bb.msg.loggerDefaultDebugLevel): return - return self.log(logging.DEBUG - level + 1, msg, *args, **kwargs) + return self.log(loglevel, msg, *args, **kwargs) def plain(self, msg, *args, **kwargs): return self.log(logging.INFO + 1, msg, *args, **kwargs) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 33c0e2f..d1b0e92 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -138,7 +138,7 @@ class BBLogFilterStdOut(BBLogFilter): loggerDefaultDebugLevel = 0 loggerDefaultVerbose = False loggerVerboseLogs = False -loggerDefaultDomains = [] +loggerDefaultDomains = {} def init_msgconfig(verbose, debug, debug_domains=None): """ @@ -148,15 +148,16 @@ def init_msgconfig(verbose, debug, debug_domains=None): bb.msg.loggerDefaultVerbose = verbose if verbose: bb.msg.loggerVerboseLogs = True + + bb.msg.loggerDefaultDomains = {} if debug_domains: - bb.msg.loggerDefaultDomains = debug_domains - else: - bb.msg.loggerDefaultDomains = [] + for (domainarg, iterator) in groupby(debug_domains): + dlevel = len(tuple(iterator)) + bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 def constructLogOptions(): debug = loggerDefaultDebugLevel verbose = loggerDefaultVerbose - domains = loggerDefaultDomains if debug: level = BBLogFormatter.DEBUG - debug + 1 @@ -165,11 +166,7 @@ def constructLogOptions(): else: level = BBLogFormatter.NOTE - debug_domains = {} - for (domainarg, iterator) in groupby(domains): - dlevel = len(tuple(iterator)) - debug_domains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 - return level, debug_domains + return level, loggerDefaultDomains def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): level, debug_domains = constructLogOptions() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:48 +0000 Subject: [oe-commits] [bitbake] 04/17: bitbake: lib/bb/msg.py: Add repr for BBLogFormatter In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.917E2232C14@git.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 302bc9f5e64c5f159039cecbf1dc6b01ee631f1a Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:42 2020 -0500 bitbake: lib/bb/msg.py: Add repr for BBLogFormatter Adds a __repr__ function for BBLogFormatter. This allows it to get a human readable string when printed using the logging_tree module Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index ea6a954..c70fd80 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -98,6 +98,9 @@ class BBLogFormatter(logging.Formatter): def enable_color(self): self.color_enabled = True + def __repr__(self): + return "%s fmt='%s' color=%s" % (self.__class__.__name__, self._fmt, "True" if self.color_enabled else "False") + class BBLogFilter(object): def __init__(self, handler, level, debug_domains): self.stdlevel = level -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:47 +0000 Subject: [oe-commits] [bitbake] 03/17: bitbake: lib/bb/msg.py: Use log level instead of debug count In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.857B1232BFB@git.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 8c042e6ace4c798b889252aff6c669774f8c1245 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:41 2020 -0500 bitbake: lib/bb/msg.py: Use log level instead of debug count Passes around the actual logging level as the default log level variable instead of the debug count. This makes it easier to deal with logging levels since the conversion from debug count and verbose flag only has to occur once when logging is initialized and after that actual log levels can be used Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bin/bitbake-worker | 2 +- lib/bb/__init__.py | 2 +- lib/bb/msg.py | 22 +++++++++------------- lib/bb/runqueue.py | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 1e641e8..fc28a34 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -414,7 +414,7 @@ class BitbakeWorker(object): def handle_workerdata(self, data): self.workerdata = pickle.loads(data) - bb.msg.loggerDefaultDebugLevel = self.workerdata["logdefaultdebug"] + bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index acd4af1..dc5e91e 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -47,7 +47,7 @@ class BBLogger(Logger): if not bb.event.worker_pid: if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): return - if level > (bb.msg.loggerDefaultDebugLevel): + if loglevel > bb.msg.loggerDefaultLogLevel: return return self.log(loglevel, msg, *args, **kwargs) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index d1b0e92..ea6a954 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -135,7 +135,7 @@ class BBLogFilterStdOut(BBLogFilter): # Message control functions # -loggerDefaultDebugLevel = 0 +loggerDefaultLogLevel = BBLogFormatter.NOTE loggerDefaultVerbose = False loggerVerboseLogs = False loggerDefaultDomains = {} @@ -144,11 +144,17 @@ def init_msgconfig(verbose, debug, debug_domains=None): """ Set default verbosity and debug levels config the logger """ - bb.msg.loggerDefaultDebugLevel = debug bb.msg.loggerDefaultVerbose = verbose if verbose: bb.msg.loggerVerboseLogs = True + if debug: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.DEBUG - debug + 1 + elif verbose: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.VERBOSE + else: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.NOTE + bb.msg.loggerDefaultDomains = {} if debug_domains: for (domainarg, iterator) in groupby(debug_domains): @@ -156,17 +162,7 @@ def init_msgconfig(verbose, debug, debug_domains=None): bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 def constructLogOptions(): - debug = loggerDefaultDebugLevel - verbose = loggerDefaultVerbose - - if debug: - level = BBLogFormatter.DEBUG - debug + 1 - elif verbose: - level = BBLogFormatter.VERBOSE - else: - level = BBLogFormatter.NOTE - - return level, loggerDefaultDomains + return loggerDefaultLogLevel, loggerDefaultDomains def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): level, debug_domains = constructLogOptions() diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 32966b4..4106fa4 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1254,7 +1254,7 @@ class RunQueue: "fakerootdirs" : self.rqdata.dataCaches[mc].fakerootdirs, "fakerootnoenv" : self.rqdata.dataCaches[mc].fakerootnoenv, "sigdata" : bb.parse.siggen.get_taskdata(), - "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, + "logdefaultlevel" : bb.msg.loggerDefaultLogLevel, "logdefaultverbose" : bb.msg.loggerDefaultVerbose, "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, "logdefaultdomain" : bb.msg.loggerDefaultDomains, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:50 +0000 Subject: [oe-commits] [bitbake] 06/17: bitbake: lib/bb/msg.py: Add filter utilities In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.A52F9232C9F@git.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 41d6c17c899def2c923119b96e09dd455fff44f1 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:44 2020 -0500 bitbake: lib/bb/msg.py: Add filter utilities Adds generic filter utilities that can be used to filter when the log level is greater than or equal to a defined value, or below a defined value, as well as a generic function to translate a string to a logging level (or bitbake logging level) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index c70fd80..8561826 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -135,6 +135,28 @@ class BBLogFilterStdOut(BBLogFilter): return True return False +class LogFilterGEQLevel(logging.Filter): + def __init__(self, level): + self.strlevel = str(level) + self.level = stringToLevel(level) + + def __repr__(self): + return "%s level >= %s (%d)" % (self.__class__.__name__, self.strlevel, self.level) + + def filter(self, record): + return (record.levelno >= self.level) + +class LogFilterLTLevel(logging.Filter): + def __init__(self, level): + self.strlevel = str(level) + self.level = stringToLevel(level) + + def __repr__(self): + return "%s level < %s (%d)" % (self.__class__.__name__, self.strlevel, self.level) + + def filter(self, record): + return (record.levelno < self.level) + # Message control functions # @@ -175,6 +197,19 @@ def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): cls(handler, level, debug_domains) +def stringToLevel(level): + try: + return int(level) + except ValueError: + pass + + try: + return getattr(logging, level) + except AttributeError: + pass + + return getattr(BBLogFormatter, level) + # # Message handling functions # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:49 +0000 Subject: [oe-commits] [bitbake] 05/17: bitbake: knotty: Add commented logging_tree code In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.9B582232C93@git.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 e3503f9ef3aaa1aa74b393309c678fe1c129f5bc Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:43 2020 -0500 bitbake: knotty: Add commented logging_tree code Adds a comment section that can be easily uncommented to enable dumping the logging tree. This module is extremely useful for debugging issued with logging configuration Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index a6a92b9..aac12cd 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -430,6 +430,11 @@ def main(server, eventHandler, params, tf = TerminalFilter): llevel, debug_domains = bb.msg.constructLogOptions() server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) + # The logging_tree module is *extremely* helpful in debugging logging + # domains. Uncomment here to dump the logging tree when bitbake starts + #import logging_tree + #logging_tree.printout() + universe = False if not params.observe_only: params.updateFromServer(server) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:51 +0000 Subject: [oe-commits] [bitbake] 07/17: bitbake: lib/bb/msg.py: Remove unused filters In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.B01DF232CA2@git.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 ac0fd90dc8ef41b70af9184627cd993d0c35ddbc Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:45 2020 -0500 bitbake: lib/bb/msg.py: Remove unused filters Now that the filter are described using the python logging structure, these classes are no longer needed. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 8561826..cab079e 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -119,22 +119,6 @@ class BBLogFilter(object): return True return False -class BBLogFilterStdErr(BBLogFilter): - def filter(self, record): - if not BBLogFilter.filter(self, record): - return False - if record.levelno >= logging.ERROR: - return True - return False - -class BBLogFilterStdOut(BBLogFilter): - def filter(self, record): - if not BBLogFilter.filter(self, record): - return False - if record.levelno < logging.ERROR: - return True - return False - class LogFilterGEQLevel(logging.Filter): def __init__(self, level): self.strlevel = str(level) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:52 +0000 Subject: [oe-commits] [bitbake] 08/17: bitbake: lib/bb/msg.py: Add helper to set logging config In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.BD6E9232CA9@git.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 2bbd26c73dc17e59ce76a8a0e3e5ed6096ceaf1f Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:46 2020 -0500 bitbake: lib/bb/msg.py: Add helper to set logging config Adds a helper function to setup the structure logging information in bitbake. The helper function takes a default configuration and an optional path to a user config file that can be merged into the default. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index cab079e..6259af0 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -13,6 +13,7 @@ Message handling infrastructure for bitbake import sys import copy import logging +import logging.config from itertools import groupby import bb import bb.event @@ -227,3 +228,95 @@ def has_console_handler(logger): if handler.stream in [sys.stderr, sys.stdout]: return True return False + +def setLoggingConfig(defaultconfig, userconfigfile=None): + logconfig = copy.deepcopy(defaultconfig) + + if userconfigfile: + with open(userconfigfile, 'r') as f: + if userconfigfile.endswith('.yml') or userconfigfile.endswith('.yaml'): + import yaml + userconfig = yaml.load(f) + elif userconfigfile.endswith('.json') or userconfigfile.endswith('.cfg'): + import json + userconfig = json.load(f) + else: + raise BaseException("Unrecognized file format: %s" % userconfigfile) + + if userconfig.get('bitbake_merge', True): + # Merge config with the default config + if userconfig.get('version') != logconfig['version']: + raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) + + # Set some defaults to make merging easier + userconfig.setdefault("loggers", {}) + + # If a handler, formatter, or filter is defined in the user + # config, it will replace an existing one in the default config + for k in ("handlers", "formatters", "filters"): + logconfig.setdefault(k, {}).update(userconfig.get(k, {})) + + seen_loggers = set() + for name, l in logconfig["loggers"].items(): + # If the merge option is set, merge the handlers and + # filters. Otherwise, if it is False, this logger won't get + # add to the set of seen loggers and will replace the + # existing one + if l.get('bitbake_merge', True): + ulogger = userconfig["loggers"].setdefault(name, {}) + ulogger.setdefault("handlers", []) + ulogger.setdefault("filters", []) + + # Merge lists + l.setdefault("handlers", []).extend(ulogger["handlers"]) + l.setdefault("filters", []).extend(ulogger["filters"]) + + # Replace other properties if present + if "level" in ulogger: + l["level"] = ulogger["level"] + + if "propagate" in ulogger: + l["propagate"] = ulogger["propagate"] + + seen_loggers.add(name) + + # Add all loggers present in the user config, but not any that + # have already been processed + for name in set(userconfig["loggers"].keys()) - seen_loggers: + logconfig["loggers"][name] = userconfig["loggers"][name] + + else: + # Replace the entire default config + logconfig = userconfig + + # Convert all level parameters to integers in case users want to use the + # bitbake defined level names + for h in logconfig["handlers"].values(): + if "level" in h: + h["level"] = bb.msg.stringToLevel(h["level"]) + + for l in logconfig["loggers"].values(): + if "level" in l: + l["level"] = bb.msg.stringToLevel(l["level"]) + + logging.config.dictConfig(logconfig) + + # The user may have specified logging domains they want at a higher debug + # level than the standard. + for name, l in logconfig["loggers"].items(): + if not name.startswith("BitBake."): + continue + + if not "level" in l: + continue + + curlevel = bb.msg.loggerDefaultDomains.get(name) + # Note: level parameter should already be a int because of conversion + # above + newlevel = int(l["level"]) + if curlevel is None or newlevel < curlevel: + bb.msg.loggerDefaultDomains[name] = newlevel + + # TODO: I don't think that setting the global log level should be necessary + #if newlevel < bb.msg.loggerDefaultLogLevel: + # bb.msg.loggerDefaultLogLevel = newlevel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:53 +0000 Subject: [oe-commits] [bitbake] 09/17: bitbake: knotty: Remove dependency on format variable In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.CB330232BF8@git.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 a7fa1363933f1419578a7dbe22275b7bbea3c6b8 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:47 2020 -0500 bitbake: knotty: Remove dependency on format variable Passing around the log formatter variable was unnecessary since the log levels of interest can be accesses as class members of bb.msg.BBLogFormatter. Switching to do this will make using the structured python logging much easier, since it can be difficult to extract out the formatter for a specific handler. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 4 +--- lib/bb/ui/knotty.py | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 9560eb5..5c5be45 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -735,11 +735,9 @@ class Tinfoil: console = handler elif handler.stream == sys.stderr: errconsole = handler - format_str = "%(levelname)s: %(message)s" - format = bb.msg.BBLogFormatter(format_str) helper.shutdown = 0 parseprogress = None - termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, format, quiet=self.quiet) + termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet) try: while True: try: diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index aac12cd..d5dce71 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -109,12 +109,11 @@ def pluralise(singular, plural, qty): class InteractConsoleLogFilter(logging.Filter): - def __init__(self, tf, format): + def __init__(self, tf): self.tf = tf - self.format = format def filter(self, record): - if record.levelno == self.format.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): + if record.levelno == bb.msg.BBLogFormatter.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): return False self.tf.clearFooter() return True @@ -150,7 +149,7 @@ class TerminalFilter(object): cr = (25, 80) return cr - def __init__(self, main, helper, console, errconsole, format, quiet): + def __init__(self, main, helper, console, errconsole, quiet): self.main = main self.helper = helper self.cuu = None @@ -180,7 +179,16 @@ class TerminalFilter(object): termios.tcsetattr(fd, termios.TCSADRAIN, new) curses.setupterm() if curses.tigetnum("colors") > 2: - format.enable_color() + if console: + try: + console.formatter.enable_color() + except AttributeError: + pass + if errconsole: + try: + errconsole.formatter.enable_color() + except AttributeError: + pass self.ed = curses.tigetstr("ed") if self.ed: self.cuu = curses.tigetstr("cuu") @@ -197,9 +205,9 @@ class TerminalFilter(object): bb.note("Unable to use interactive mode for this terminal, using fallback") return if console: - console.addFilter(InteractConsoleLogFilter(self, format)) + console.addFilter(InteractConsoleLogFilter(self)) if errconsole: - errconsole.addFilter(InteractConsoleLogFilter(self, format)) + errconsole.addFilter(InteractConsoleLogFilter(self)) self.main_progress = None @@ -469,7 +477,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): printinterval = 5000 lastprint = time.time() - termfilter = tf(main, helper, console, errconsole, format, params.options.quiet) + termfilter = tf(main, helper, console, errconsole, params.options.quiet) atexit.register(termfilter.finish) while True: @@ -508,21 +516,21 @@ def main(server, eventHandler, params, tf = TerminalFilter): if isinstance(event, logging.LogRecord): lastprint = time.time() printinterval = 5000 - if event.levelno >= format.ERROR: + if event.levelno >= bb.msg.BBLogFormatter.ERROR: errors = errors + 1 return_value = 1 - elif event.levelno == format.WARNING: + elif event.levelno == bb.msg.BBLogFormatter.WARNING: warnings = warnings + 1 if event.taskpid != 0: # For "normal" logging conditions, don't show note logs from tasks # but do show them if the user has changed the default log level to # include verbose/debug messages - if event.levelno <= format.NOTE and (event.levelno < llevel or (event.levelno == format.NOTE and llevel != format.VERBOSE)): + if event.levelno <= bb.msg.BBLogFormatter.NOTE and (event.levelno < llevel or (event.levelno == bb.msg.BBLogFormatter.NOTE and llevel != bb.msg.BBLogFormatter.VERBOSE)): continue # Prefix task messages with recipe/task - if event.taskpid in helper.pidmap and event.levelno != format.PLAIN: + if event.taskpid in helper.pidmap and event.levelno != bb.msg.BBLogFormatter.PLAIN: taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]] event.msg = taskinfo['title'] + ': ' + event.msg if hasattr(event, 'fn'): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:55 +0000 Subject: [oe-commits] [bitbake] 11/17: bitbake: worker: Remove unnecessary addDefaultLogFilter In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.E4E96232BFA@git.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 5e05a1ab670e97c2af65887933efed2d5fddddb7 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:49 2020 -0500 bitbake: worker: Remove unnecessary addDefaultLogFilter Adding the default log filter here is unnecessary because there are no defined logging domains when it is called, which means it does no actual filtering. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bin/bitbake-worker | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/bitbake-worker b/bin/bitbake-worker index fc28a34..97cc0fd 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -65,7 +65,6 @@ if 0: format_str = "%(levelname)s: %(message)s" conlogformat = bb.msg.BBLogFormatter(format_str) consolelog = logging.FileHandler(logfilename) - bb.msg.addDefaultlogFilter(consolelog) consolelog.setFormatter(conlogformat) logger.addHandler(consolelog) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:54 +0000 Subject: [oe-commits] [bitbake] 10/17: bitbake: knotty: Setup logs with config helper In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.D82B7232CAA@git.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 f459d485f330fbc34ac90bcb91cb067d82368778 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:48 2020 -0500 bitbake: knotty: Setup logs with config helper Sets up logging in knotty to use python's structured logging config and the bb.msg.setLoggingConfig() helper to setup logging. This allows the user to specify additional logging mechanism in a config file with BB_LOGCONFIG Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 134 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 38 deletions(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index d5dce71..386f278 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -370,7 +370,11 @@ def _log_settings_from_server(server, observe_only): if error: logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error) raise BaseException(error) - return includelogs, loglines, consolelogfile + logconfigfile, error = server.runCommand([cmd, "BB_LOGCONFIG"]) + if error: + logger.error("Unable to get the value of BB_LOGCONFIG variable: %s" % error) + raise BaseException(error) + return includelogs, loglines, consolelogfile, logconfigfile _evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.LogRecord", "bb.build.TaskFailed", "bb.build.TaskBase", "bb.event.ParseStarted", @@ -387,7 +391,87 @@ def main(server, eventHandler, params, tf = TerminalFilter): if not params.observe_only: params.updateToServer(server, os.environ.copy()) - includelogs, loglines, consolelogfile = _log_settings_from_server(server, params.observe_only) + includelogs, loglines, consolelogfile, logconfigfile = _log_settings_from_server(server, params.observe_only) + + loglevel, _ = bb.msg.constructLogOptions() + + if params.options.quiet == 0: + console_loglevel = loglevel + elif params.options.quiet > 2: + console_loglevel = bb.msg.BBLogFormatter.ERROR + else: + console_loglevel = bb.msg.BBLogFormatter.WARNING + + logconfig = { + "version": 1, + "handlers": { + "BitBake.console": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": console_loglevel, + "stream": "ext://sys.stdout", + "filters": ["BitBake.stdoutFilter"], + }, + "BitBake.errconsole": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": loglevel, + "stream": "ext://sys.stderr", + "filters": ["BitBake.stderrFilter"], + }, + }, + "formatters": { + # This format instance will get color output enabled by the + # terminal + "BitBake.consoleFormatter" : { + "()": "bb.msg.BBLogFormatter", + "format": "%(levelname)s: %(message)s" + }, + # The file log requires a separate instance so that it doesn't get + # color enabled + "BitBake.logfileFormatter": { + "()": "bb.msg.BBLogFormatter", + "format": "%(levelname)s: %(message)s" + } + }, + "filters": { + "BitBake.stdoutFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": "ERROR" + }, + "BitBake.stderrFilter": { + "()": "bb.msg.LogFilterGEQLevel", + "level": "ERROR" + } + }, + "loggers": { + "BitBake": { + "level": loglevel, + "handlers": ["BitBake.console", "BitBake.errconsole"], + } + }, + "disable_existing_loggers": False + } + + # Enable the console log file if enabled + if consolelogfile and not params.options.show_environment and not params.options.show_versions: + logconfig["handlers"]["BitBake.consolelog"] ={ + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": "INFO", + "filename": consolelogfile, + } + logconfig["loggers"]["BitBake"]["handlers"].append("BitBake.consolelog") + + bb.utils.mkdirhier(os.path.dirname(consolelogfile)) + loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') + bb.utils.remove(loglink) + try: + os.symlink(os.path.basename(consolelogfile), loglink) + except OSError: + pass + + bb.msg.setLoggingConfig(logconfig, logconfigfile) if sys.stdin.isatty() and sys.stdout.isatty(): log_exec_tty = True @@ -396,23 +480,16 @@ def main(server, eventHandler, params, tf = TerminalFilter): helper = uihelper.BBUIHelper() - console = logging.StreamHandler(sys.stdout) - errconsole = logging.StreamHandler(sys.stderr) - format_str = "%(levelname)s: %(message)s" - format = bb.msg.BBLogFormatter(format_str) - if params.options.quiet == 0: - forcelevel = None - elif params.options.quiet > 2: - forcelevel = bb.msg.BBLogFormatter.ERROR - else: - forcelevel = bb.msg.BBLogFormatter.WARNING - bb.msg.addDefaultlogFilter(console, bb.msg.BBLogFilterStdOut, forcelevel) - bb.msg.addDefaultlogFilter(errconsole, bb.msg.BBLogFilterStdErr) - console.setFormatter(format) - errconsole.setFormatter(format) - if not bb.msg.has_console_handler(logger): - logger.addHandler(console) - logger.addHandler(errconsole) + # Look for the specially designated handlers which need to be passed to the + # terminal handler + console = None + errconsole = None + for h in logger.handlers: + name = getattr(h, '_name', None) + if name == 'BitBake.console': + console = h + elif name == 'BitBake.errconsole': + errconsole = h bb.utils.set_process_name("KnottyUI") @@ -420,21 +497,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): server.terminateServer() return - consolelog = None - if consolelogfile and not params.options.show_environment and not params.options.show_versions: - bb.utils.mkdirhier(os.path.dirname(consolelogfile)) - conlogformat = bb.msg.BBLogFormatter(format_str) - consolelog = logging.FileHandler(consolelogfile) - bb.msg.addDefaultlogFilter(consolelog) - consolelog.setFormatter(conlogformat) - logger.addHandler(consolelog) - loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') - bb.utils.remove(loglink) - try: - os.symlink(os.path.basename(consolelogfile), loglink) - except OSError: - pass - llevel, debug_domains = bb.msg.constructLogOptions() server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) @@ -761,8 +823,4 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass - if consolelog: - logger.removeHandler(consolelog) - consolelog.close() - return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:57 +0000 Subject: [oe-commits] [bitbake] 13/17: bitbake: Add autobuilder logging configuration In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225245.0B0B5232CB1@git.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 6974dbe416ff64bcc71946e40e5a290da885f555 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:51 2020 -0500 bitbake: Add autobuilder logging configuration Adds a configuration file that the autobuilder can use to capture interesting logging domains above the ones that show up for normal users on stdout/stderr. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bitbake/contrib/autobuilderlog.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/bitbake/contrib/autobuilderlog.json b/bitbake/contrib/autobuilderlog.json new file mode 100644 index 0000000..103a114 --- /dev/null +++ b/bitbake/contrib/autobuilderlog.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "autobuilder.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:59 +0000 Subject: [oe-commits] [bitbake] 15/17: bitbake-user-manual: Add documentation for BB_LOGCONFIG In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225245.2B6E9232C14@git.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 7e69bc4dcf5e8ef23a8e44a3905fdb2c9ac14ecc Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:53 2020 -0500 bitbake-user-manual: Add documentation for BB_LOGCONFIG Adds documentation describing how to use the BB_LOGCONFIG variable to enable custom logging. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- .../bitbake-user-manual-execution.xml | 97 ++++++++++++++++++++++ .../bitbake-user-manual-ref-variables.xml | 11 +++ 2 files changed, 108 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml index 8f60667..3b31f74 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml @@ -929,4 +929,101 @@ section. + +
+ Logging + + In addition to the standard command line option to control how + verbose builds are when execute, bitbake also supports user defined + configuration of the + Python logging + facilities through the + BB_LOGCONFIG + variable. This variable defines a json or yaml + logging configuration + that will be intelligently merged into the default configuration. + The logging configuration is merged using the following rules: + + + The user defined configuration will completely replace the default + configuration if top level key + bitbake_merge is set to the value + False. In this case, all other rules + are ignored. + + + The user configuration must have a top level + version which must match the value of + the default configuration. + + + Any keys defined in the handlers, + formatters, or filters, + will be merged into the same section in the default + configuration, with the user specified keys taking + replacing a default one if there is a conflict. In + practice, this means that if both the default configuration + and user configuration specify a handler named + myhandler, the user defined one will + replace the default. To prevent the user from inadvertently + replacing a default handler, formatter, or filter, all of + the default ones are named with a prefix of + "BitBake." + + + If a logger is defined by the user with the key + bitbake_merge set to + False, that logger will be completely + replaced by user configuration. In this case, no other + rules will apply to that logger. + + + All user defined filter and + handlers properties for a given logger + will be merged with corresponding properties from the + default logger. For example, if the user configuration adds + a filter called myFilter to the + BitBake.SigGen, and the default + configuration adds a filter called + BitBake.defaultFilter, both filters + will be applied to the logger + + + + + + As an example, consider the following user logging configuration + file which logs all Hash Equivalence related messages of VERBOSE or + higher to a file called hashequiv.log + + { + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "hashequiv.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } + } + + +
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 bae01d9..c4bd1f2 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml @@ -539,6 +539,17 @@ + BB_LOGCONFIG + + + Specifies the name of a config file that contains the user + logging configuration. See + Logging for additional + information + + + + BB_LOGFMT -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:56 +0000 Subject: [oe-commits] [bitbake] 12/17: bitbake: Log hash equivalence with a different logger In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225244.F2B45232BF9@git.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 efd3b57003cc1da318ed20ff6ff45b5c5eed6303 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:50 2020 -0500 bitbake: Log hash equivalence with a different logger Switches the hash equivalence logging to use a different logger so that it can be easily filtered out with python's structured logging. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 11 ++++++----- lib/bb/siggen.py | 17 +++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 4106fa4..e84890b 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -27,6 +27,7 @@ import pprint bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") +hashequiv_logger = logging.getLogger("BitBake.RunQueue.HashEquiv") __find_sha256__ = re.compile( r'(?i)(?" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"") - logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) + hashequiv_logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) for tid in changed: if tid not in self.rqdata.runq_setscene_tids: @@ -2346,7 +2347,7 @@ class RunQueueExecute: # Check no tasks this covers are running for dep in self.sqdata.sq_covered_tasks[tid]: if dep in self.runq_running and dep not in self.runq_complete: - logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) + hashequiv_logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) valid = False break if not valid: @@ -2409,7 +2410,7 @@ class RunQueueExecute: for (tid, harddepfail, origvalid) in update_tasks: if tid in self.sqdata.valid and not origvalid: - logger.info("Setscene task %s became valid" % tid) + hashequiv_logger.info("Setscene task %s became valid" % tid) if harddepfail: self.sq_task_failoutright(tid) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index c2d0c73..0357b54 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -16,6 +16,7 @@ from bb import runqueue import hashserv logger = logging.getLogger('BitBake.SigGen') +hashequiv_logger = logging.getLogger('BitBake.SigGen.HashEquiv') def init(d): siggens = [obj for obj in globals().values() @@ -502,9 +503,9 @@ class SignatureGeneratorUniHashMixIn(object): # A unique hash equal to the taskhash is not very interesting, # so it is reported it at debug level 2. If they differ, that # is much more interesting, so it is reported at debug level 1 - bb.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) + hashequiv_logger.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) else: - bb.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) + hashequiv_logger.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) @@ -578,12 +579,12 @@ class SignatureGeneratorUniHashMixIn(object): new_unihash = data['unihash'] if new_unihash != unihash: - bb.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) + hashequiv_logger.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d) self.set_unihash(tid, new_unihash) d.setVar('BB_UNIHASH', new_unihash) else: - bb.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) + hashequiv_logger.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) finally: @@ -606,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object): method = method + self.extramethod[tid] data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) - bb.note('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) + hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) if data is None: bb.warn("Server unable to handle unihash report") @@ -615,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object): finalunihash = data['unihash'] if finalunihash == current_unihash: - bb.note('Task %s unihash %s unchanged by server' % (tid, finalunihash)) + hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) elif finalunihash == wanted_unihash: - bb.note('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) + hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) self.set_unihash(tid, finalunihash) return True else: # TODO: What to do here? - bb.note('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) + hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:53:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:53:00 +0000 Subject: [oe-commits] [bitbake] 16/17: fetch2/gitsm: Unpack shallow mirror tarballs In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225245.37E07232CB2@git.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 5f5f3fcef43a88fffe1e34bf44a3b2db65c77ef3 Author: Paul Barker AuthorDate: Mon Mar 9 13:42:46 2020 +0000 fetch2/gitsm: Unpack shallow mirror tarballs When a shallow mirror tarball is used to satisfy a gitsm URI it needs to be unpacked temporarily so that the .gitmodules file can be examined. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- lib/bb/fetch2/gitsm.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index aa121cb..e708300 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -20,6 +20,8 @@ NOTE: Switching a SRC_URI from "git://" to "gitsm://" requires a clean of your r import os import bb import copy +import shutil +import tempfile from bb.fetch2.git import Git from bb.fetch2 import runfetchcmd from bb.fetch2 import logger @@ -130,7 +132,7 @@ class GitSM(Git): ld.setVar('SRCPV', d.getVar('SRCPV')) ld.setVar('SRCREV_FORMAT', module) - function(ud, url, module, paths[module], ld) + function(ud, url, module, paths[module], workdir, ld) return submodules != [] @@ -152,7 +154,7 @@ class GitSM(Git): return False def download(self, ud, d): - def download_submodule(ud, url, module, modpath, d): + def download_submodule(ud, url, module, modpath, workdir, d): url += ";bareclone=1;nobranch=1" # Is the following still needed? @@ -163,16 +165,25 @@ class GitSM(Git): newfetch.download() # Drop a nugget to add each of the srcrevs we've fetched (used by need_update) runfetchcmd("%s config --add bitbake.srcrev %s" % \ - (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=ud.clonedir) + (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=workdir) except Exception as e: logger.error('gitsm: submodule download failed: %s %s' % (type(e).__name__, str(e))) raise Git.download(self, ud, d) - self.process_submodules(ud, ud.clonedir, download_submodule, d) + + # If we're using a shallow mirror tarball it needs to be unpacked + # temporarily so that we can examine the .gitmodules file + if ud.shallow and os.path.exists(ud.fullshallow) and self.need_update(ud, d): + tmpdir = tempfile.mkdtemp(dir=d.getVar("DL_DIR")) + runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=tmpdir) + self.process_submodules(ud, tmpdir, download_submodule, d) + shutil.rmtree(tmpdir) + else: + self.process_submodules(ud, ud.clonedir, download_submodule, d) def unpack(self, ud, destdir, d): - def unpack_submodules(ud, url, module, modpath, d): + def unpack_submodules(ud, url, module, modpath, workdir, d): url += ";bareclone=1;nobranch=1" # Figure out where we clone over the bare submodules... -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:52:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:52:58 +0000 Subject: [oe-commits] [bitbake] 14/17: bitbake: Lower hash equivalence logging In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225245.1B7BA232BFB@git.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 bdaf50298f401f8202674709f62ac324c9873285 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:52 2020 -0500 bitbake: Lower hash equivalence logging Lowers the level at which hash equivalence messages are logged so as to not annoy the majority of users. The autobuilder can use a custom logging configuration to log these to a file for debugging (see contrib/autobuilderlog.json) [YOCTO #13813] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 6 +++--- lib/bb/siggen.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index e84890b..cef9b0f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2264,7 +2264,7 @@ class RunQueueExecute: self.updated_taskhash_queue.remove((tid, unihash)) if unihash != self.rqdata.runtaskentries[tid].unihash: - hashequiv_logger.info("Task %s unihash changed to %s" % (tid, unihash)) + hashequiv_logger.verbose("Task %s unihash changed to %s" % (tid, unihash)) self.rqdata.runtaskentries[tid].unihash = unihash bb.parse.siggen.set_unihash(tid, unihash) toprocess.add(tid) @@ -2309,7 +2309,7 @@ class RunQueueExecute: elif tid in self.scenequeue_covered or tid in self.sq_live: # Already ran this setscene task or it running. Report the new taskhash bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) - hashequiv_logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) + hashequiv_logger.verbose("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) remapped = True if not remapped: @@ -2410,7 +2410,7 @@ class RunQueueExecute: for (tid, harddepfail, origvalid) in update_tasks: if tid in self.sqdata.valid and not origvalid: - hashequiv_logger.info("Setscene task %s became valid" % tid) + hashequiv_logger.verbose("Setscene task %s became valid" % tid) if harddepfail: self.sq_task_failoutright(tid) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 0357b54..8bfc452 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -607,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object): method = method + self.extramethod[tid] data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) - hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) + hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) if data is None: bb.warn("Server unable to handle unihash report") @@ -616,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object): finalunihash = data['unihash'] if finalunihash == current_unihash: - hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash %s unchanged by server' % (tid, finalunihash)) elif finalunihash == wanted_unihash: - hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) + hashequiv_logger.verbose('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) self.set_unihash(tid, finalunihash) return True else: # TODO: What to do here? - hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:53:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:53:01 +0000 Subject: [oe-commits] [bitbake] 17/17: tests: Add test for gitsm fetcher with shallow mirror tarballs In-Reply-To: <158379436418.3946.17057285534959064878@git.openembedded.org> References: <158379436418.3946.17057285534959064878@git.openembedded.org> Message-ID: <20200309225245.48540232C93@git.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 32c858a597483ba4c64b862f366d5b5fea6d4113 Author: Paul Barker AuthorDate: Mon Mar 9 13:52:13 2020 +0000 tests: Add test for gitsm fetcher with shallow mirror tarballs Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- lib/bb/tests/fetch.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 45dc9e5..d0c161a 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -1691,6 +1691,47 @@ class GitShallowTest(FetcherTest): # Verify the submodule is also shallow self.assertRevCount(1, cwd=os.path.join(self.gitdir, 'gitsubmodule')) + def test_shallow_submodule_mirrors(self): + self.add_empty_file('a') + self.add_empty_file('b') + + smdir = os.path.join(self.tempdir, 'gitsubmodule') + bb.utils.mkdirhier(smdir) + self.git('init', cwd=smdir) + # Make this look like it was cloned from a remote... + self.git('config --add remote.origin.url "%s"' % smdir, cwd=smdir) + self.git('config --add remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"', cwd=smdir) + self.add_empty_file('asub', cwd=smdir) + self.add_empty_file('bsub', cwd=smdir) + + self.git('submodule init', cwd=self.srcdir) + self.git('submodule add file://%s' % smdir, cwd=self.srcdir) + self.git('submodule update', cwd=self.srcdir) + self.git('commit -m submodule -a', cwd=self.srcdir) + + uri = 'gitsm://%s;protocol=file;subdir=${S}' % self.srcdir + + # Fetch once to generate the shallow tarball + fetcher, ud = self.fetch(uri) + + # Set up the mirror + mirrordir = os.path.join(self.tempdir, 'mirror') + os.rename(self.dldir, mirrordir) + self.d.setVar('PREMIRRORS', 'gitsm://.*/.* file://%s/\n' % mirrordir) + + # Fetch from the mirror + bb.utils.remove(self.dldir, recurse=True) + bb.utils.remove(self.gitdir, recurse=True) + self.fetch_and_unpack(uri) + + # Verify the main repository is shallow + self.assertRevCount(1) + + # Verify the gitsubmodule directory is present + assert os.listdir(os.path.join(self.gitdir, 'gitsubmodule')) + + # Verify the submodule is also shallow + self.assertRevCount(1, cwd=os.path.join(self.gitdir, 'gitsubmodule')) if any(os.path.exists(os.path.join(p, 'git-annex')) for p in os.environ.get('PATH').split(':')): def test_shallow_annex(self): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:54:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:54:40 +0000 Subject: [oe-commits] [openembedded-core] 01/06: cve-check: fix ValueError In-Reply-To: <158379447919.4944.15970038701688797924@git.openembedded.org> References: <158379447919.4944.15970038701688797924@git.openembedded.org> Message-ID: <20200309225439.86E5E232C14@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e89266706196948ee659d3c95823d2d0b9cfc82c Author: Chee Yang Lee AuthorDate: Mon Mar 9 12:57:03 2020 +0800 cve-check: fix ValueError fix below error for whitelisted recipe and recipe skip cve check. Error: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: 0001: *** 0002:do_cve_check(d) 0003: File: '/poky-master/meta/classes/cve-check.bbclass', lineno: 59, function: do_cve_check 0055: try: 0056: patched_cves = get_patches_cves(d) 0057: except FileNotFoundError: 0058: bb.fatal("Failure in searching patches") *** 0059: whitelisted, patched, unpatched = check_cves(d, patched_cves) 0060: if patched or unpatched: 0061: cve_data = get_cve_info(d, patched + unpatched) 0062: cve_write_data(d, patched, unpatched, whitelisted, cve_data) 0063: else: Exception: ValueError: not enough values to unpack (expected 3, got 2) Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- meta/classes/cve-check.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 7f98da6..5d84b93 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -179,13 +179,13 @@ def check_cves(d, patched_cves): products = d.getVar("CVE_PRODUCT").split() # If this has been unset then we're not scanning for CVEs here (for example, image recipes) if not products: - return ([], []) + return ([], [], []) pv = d.getVar("CVE_VERSION").split("+git")[0] # If the recipe has been whitlisted we return empty lists if d.getVar("PN") in d.getVar("CVE_CHECK_PN_WHITELIST").split(): bb.note("Recipe has been whitelisted, skipping check") - return ([], []) + return ([], [], []) old_cve_whitelist = d.getVar("CVE_CHECK_CVE_WHITELIST") if old_cve_whitelist: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:54:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:54:39 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (e221d94 -> 528c750) Message-ID: <158379447919.4944.15970038701688797924@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 e221d94 p11-kit: Add nativesdk variant new e892667 cve-check: fix ValueError new fc3088b kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds new ca03832 sqlite3: fix CVE-2020-9327 new 0e61e95 e2fsprogs: fix CVE-2019-5188 new 16e806b e2fsprogs: backport upstream patch new 528c750 glibc: CVE-2020-10029 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/cve-check.bbclass | 4 +- meta/classes/kernel.bbclass | 12 +- meta/recipes-core/glibc/glibc/CVE-2020-10029.patch | 128 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.31.bb | 1 + ...k-don-t-try-to-rehash-a-deleted-directory.patch | 49 +++++++ .../e2fsprogs/e2fsprogs/CVE-2019-5188.patch | 57 +++++++++ ...fsck-fix-use-after-free-in-calculate_tree.patch | 76 +++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 3 + .../sqlite/files/CVE-2020-9327.patch | 141 +++++++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 1 + 10 files changed, 462 insertions(+), 10 deletions(-) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-10029.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch create mode 100644 meta/recipes-support/sqlite/files/CVE-2020-9327.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:54:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:54:41 +0000 Subject: [oe-commits] [openembedded-core] 02/06: kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds In-Reply-To: <158379447919.4944.15970038701688797924@git.openembedded.org> References: <158379447919.4944.15970038701688797924@git.openembedded.org> Message-ID: <20200309225439.90E50232C93@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fc3088b0a13103a6a3549300fe5f94add81a4338 Author: Christopher Clark AuthorDate: Sun Mar 8 21:48:13 2020 -0700 kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds The source directory is not always a git repository, so when querying git for data to set SOURCE_DATE_EPOCH, specify ${S}/.git as the git directory to prevent retrieving incorrect data from any parent directory. Fixes the following errors with the prior logic when building a kernel that is not obtained from a git repository: 1. With TMPDIR set to a directory outside any git repository on a mounted filesystem, reproducible builds fail in do_compile with this git error: fatal: not a git repository (or any parent up to mount point ) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). aborting before the error handling logic. 2. With TMPDIR located within a subdirectory of a git repository, the SOURCE_DATE_EPOCH timestamp would be that of said repository rather than that of the kernel. Signed-off-by: Christopher Clark Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 0eadd3e..a724645 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -294,14 +294,10 @@ kernel_do_compile() { # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not # be set.... if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then - olddir=`pwd` - cd ${S} - SOURCE_DATE_EPOCH=`git log -1 --pretty=%ct` - # git repo not guaranteed, so fall back to REPRODUCIBLE_TIMESTAMP_ROOTFS - if [ $? -ne 0 ]; then - SOURCE_DATE_EPOCH=${REPRODUCIBLE_TIMESTAMP_ROOTFS} - fi - cd $olddir + # The source directory is not necessarily a git repository, so we + # specify the git-dir to ensure that git does not query a + # repository in any parent directory. + SOURCE_DATE_EPOCH=`git --git-dir="${S}/.git" log -1 --pretty=%ct 2>/dev/null || echo "${REPRODUCIBLE_TIMESTAMP_ROOTFS}"` fi ts=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH` -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:54:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:54:42 +0000 Subject: [oe-commits] [openembedded-core] 03/06: sqlite3: fix CVE-2020-9327 In-Reply-To: <158379447919.4944.15970038701688797924@git.openembedded.org> References: <158379447919.4944.15970038701688797924@git.openembedded.org> Message-ID: <20200309225439.9BCD9232C9F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ca0383218b03b4045a617b55be8b949b5b654ba3 Author: Anuj Mittal AuthorDate: Mon Mar 9 08:45:00 2020 +0800 sqlite3: fix CVE-2020-9327 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../sqlite/files/CVE-2020-9327.patch | 141 +++++++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 1 + 2 files changed, 142 insertions(+) diff --git a/meta/recipes-support/sqlite/files/CVE-2020-9327.patch b/meta/recipes-support/sqlite/files/CVE-2020-9327.patch new file mode 100644 index 0000000..fecbbab --- /dev/null +++ b/meta/recipes-support/sqlite/files/CVE-2020-9327.patch @@ -0,0 +1,141 @@ +From 45d491851e1bca378de158a5e279fd584ce548e4 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Mon, 17 Feb 2020 00:12:04 +0000 +Subject: [PATCH] [PATCH 1/2] Take care when checking the table of a TK_COLUMN + expression node to see if the table is a virtual table to first ensure that + the Expr.y.pTab pointer is not null due to generated column optimizations. + Ticket [4374860b29383380]. + +FossilOrigin-Name: 9d0d4ab95dc0c56e053c2924ed322a9ea7b25439e6f74599f706905a1994e454 + +[PATCH 2/2] A better (smaller and faster) solution to ticket + [4374860b29383380]. + +FossilOrigin-Name: abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d + +The two patches were converted to amalgamation format + +Signed-off-by: Anuj Mittal +Upstream-Status: Backport +CVE: CVE-2020-9327 +--- + sqlite3.c | 35 ++++++++++++++++++++++++----------- + sqlite3.h | 2 +- + 2 files changed, 25 insertions(+), 12 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 55dc686..64fae04 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -1167,7 +1167,7 @@ extern "C" { + */ + #define SQLITE_VERSION "3.31.1" + #define SQLITE_VERSION_NUMBER 3031001 +-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6" ++#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt1" + + /* + ** CAPI3REF: Run-Time Library Version Numbers +@@ -17428,8 +17428,11 @@ struct Table { + */ + #ifndef SQLITE_OMIT_VIRTUALTABLE + # define IsVirtual(X) ((X)->nModuleArg) ++# define ExprIsVtab(X) \ ++ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg) + #else + # define IsVirtual(X) 0 ++# define ExprIsVtab(X) 0 + #endif + + /* +@@ -104133,19 +104136,25 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){ + case TK_LT: + case TK_LE: + case TK_GT: +- case TK_GE: ++ case TK_GE: { ++ Expr *pLeft = pExpr->pLeft; ++ Expr *pRight = pExpr->pRight; + testcase( pExpr->op==TK_EQ ); + testcase( pExpr->op==TK_NE ); + testcase( pExpr->op==TK_LT ); + testcase( pExpr->op==TK_LE ); + testcase( pExpr->op==TK_GT ); + testcase( pExpr->op==TK_GE ); +- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab)) +- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab)) ++ /* The y.pTab=0 assignment in wherecode.c always happens after the ++ ** impliesNotNullRow() test */ ++ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0) ++ && IsVirtual(pLeft->y.pTab)) ++ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0) ++ && IsVirtual(pRight->y.pTab)) + ){ +- return WRC_Prune; ++ return WRC_Prune; + } +- ++ } + default: + return WRC_Continue; + } +@@ -142591,7 +142600,8 @@ static int isAuxiliaryVtabOperator( + ** MATCH(expression,vtab_column) + */ + pCol = pList->a[1].pExpr; +- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){ ++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 ); ++ if( ExprIsVtab(pCol) ){ + for(i=0; iu.zToken, aOp[i].zOp)==0 ){ + *peOp2 = aOp[i].eOp2; +@@ -142613,7 +142623,8 @@ static int isAuxiliaryVtabOperator( + ** with function names in an arbitrary case. + */ + pCol = pList->a[0].pExpr; +- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){ ++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 ); ++ if( ExprIsVtab(pCol) ){ + sqlite3_vtab *pVtab; + sqlite3_module *pMod; + void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**); +@@ -142636,10 +142647,12 @@ static int isAuxiliaryVtabOperator( + int res = 0; + Expr *pLeft = pExpr->pLeft; + Expr *pRight = pExpr->pRight; +- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){ ++ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 ); ++ if( ExprIsVtab(pLeft) ){ + res++; + } +- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){ ++ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 ); ++ if( pRight && ExprIsVtab(pRight) ){ + res++; + SWAP(Expr*, pLeft, pRight); + } +@@ -228440,7 +228453,7 @@ SQLITE_API int sqlite3_stmt_init( + #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ + + /************** End of stmt.c ************************************************/ +-#if __LINE__!=228443 ++#if __LINE__!=228456 + #undef SQLITE_SOURCE_ID + #define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt2" + #endif +diff --git a/sqlite3.h b/sqlite3.h +index cef6eea..5b9796c 100644 +--- a/sqlite3.h ++++ b/sqlite3.h +@@ -125,7 +125,7 @@ extern "C" { + */ + #define SQLITE_VERSION "3.31.1" + #define SQLITE_VERSION_NUMBER 3031001 +-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6" ++#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt1" + + /* + ** CAPI3REF: Run-Time Library Version Numbers +-- +2.25.1 + diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb index 903d66a..de564e2 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb @@ -4,6 +4,7 @@ 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 \ + file://CVE-2020-9327.patch \ " SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:54:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:54:43 +0000 Subject: [oe-commits] [openembedded-core] 04/06: e2fsprogs: fix CVE-2019-5188 In-Reply-To: <158379447919.4944.15970038701688797924@git.openembedded.org> References: <158379447919.4944.15970038701688797924@git.openembedded.org> Message-ID: <20200309225439.A6DAD232CA2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0e61e956f11a460587f4197e284d3194a2369189 Author: Anuj Mittal AuthorDate: Mon Mar 9 08:45:01 2020 +0800 e2fsprogs: fix CVE-2019-5188 Also see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948508 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...k-don-t-try-to-rehash-a-deleted-directory.patch | 49 +++++++++++++++++++ .../e2fsprogs/e2fsprogs/CVE-2019-5188.patch | 57 ++++++++++++++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 2 + 3 files changed, 108 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch new file mode 100644 index 0000000..ba4e3a3 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch @@ -0,0 +1,49 @@ +From 71ba13755337e19c9a826dfc874562a36e1b24d3 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Thu, 19 Dec 2019 19:45:06 -0500 +Subject: [PATCH] e2fsck: don't try to rehash a deleted directory + +If directory has been deleted in pass1[bcd] processing, then we +shouldn't try to rehash the directory in pass 3a when we try to +rehash/reoptimize directories. + +Signed-off-by: Theodore Ts'o + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=71ba13755337e19c9a826dfc874562a36e1b24d3] +Signed-off-by: Anuj Mittal +--- + e2fsck/pass1b.c | 4 ++++ + e2fsck/rehash.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c +index 5693b9cf..bca701ca 100644 +--- a/e2fsck/pass1b.c ++++ b/e2fsck/pass1b.c +@@ -705,6 +705,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx); + if (ctx->inode_bad_map) + ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); ++ if (ctx->inode_reg_map) ++ ext2fs_unmark_inode_bitmap2(ctx->inode_reg_map, ino); ++ ext2fs_unmark_inode_bitmap2(ctx->inode_dir_map, ino); ++ ext2fs_unmark_inode_bitmap2(ctx->inode_used_map, ino); + ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(dp->inode.i_mode)); + quota_data_sub(ctx->qctx, &dp->inode, ino, + pb.dup_blocks * fs->blocksize); +diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c +index 3dd1e941..2c908be0 100644 +--- a/e2fsck/rehash.c ++++ b/e2fsck/rehash.c +@@ -1028,6 +1028,8 @@ void e2fsck_rehash_directories(e2fsck_t ctx) + if (!ext2fs_u32_list_iterate(iter, &ino)) + break; + } ++ if (!ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino)) ++ continue; + + pctx.dir = ino; + if (first) { +-- +2.24.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch new file mode 100644 index 0000000..de4bce0 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch @@ -0,0 +1,57 @@ +From 8dd73c149f418238f19791f9d666089ef9734dff Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Thu, 19 Dec 2019 19:37:34 -0500 +Subject: [PATCH] e2fsck: abort if there is a corrupted directory block when + rehashing + +In e2fsck pass 3a, when we are rehashing directories, at least in +theory, all of the directories should have had corruptions with +respect to directory entry structure fixed. However, it's possible +(for example, if the user declined a fix) that we can reach this stage +of processing with a corrupted directory entries. + +So check for that case and don't try to process a corrupted directory +block so we don't run into trouble in mutate_name() if there is a +zero-length file name. + +Addresses: TALOS-2019-0973 +Addresses: CVE-2019-5188 +Signed-off-by: Theodore Ts'o + +CVE: CVE-2019-5188 +Signed-off-by: Anuj Mittal +Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=8dd73c149f418238f19791f9d666089ef9734dff] +--- + e2fsck/rehash.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c +index a5fc1be1..3dd1e941 100644 +--- a/e2fsck/rehash.c ++++ b/e2fsck/rehash.c +@@ -160,6 +160,10 @@ static int fill_dir_block(ext2_filsys fs, + dir_offset += rec_len; + if (dirent->inode == 0) + continue; ++ if ((name_len) == 0) { ++ fd->err = EXT2_ET_DIR_CORRUPTED; ++ return BLOCK_ABORT; ++ } + if (!fd->compress && (name_len == 1) && + (dirent->name[0] == '.')) + continue; +@@ -401,6 +405,11 @@ static int duplicate_search_and_fix(e2fsck_t ctx, ext2_filsys fs, + continue; + } + new_len = ext2fs_dirent_name_len(ent->dir); ++ if (new_len == 0) { ++ /* should never happen */ ++ ext2fs_unmark_valid(fs); ++ continue; ++ } + memcpy(new_name, ent->dir->name, new_len); + mutate_name(new_name, &new_len); + for (j=0; j < fd->num_array; j++) { +-- +2.24.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb index 6e69eea..fc92b77 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb @@ -7,6 +7,8 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ + file://CVE-2019-5188.patch \ + file://0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:54:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:54:44 +0000 Subject: [oe-commits] [openembedded-core] 05/06: e2fsprogs: backport upstream patch In-Reply-To: <158379447919.4944.15970038701688797924@git.openembedded.org> References: <158379447919.4944.15970038701688797924@git.openembedded.org> Message-ID: <20200309225439.B45EC232CA9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 16e806b7b15dc2cd78ada7ec76b5d49334f84c7b Author: Anuj Mittal AuthorDate: Mon Mar 9 08:45:02 2020 +0800 e2fsprogs: backport upstream patch Fixes a bug wherein a use after free could potentially be used to run malicious code if a user can be tricked into running e2fsck on a maliciously crafted file system. Also see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948517 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...fsck-fix-use-after-free-in-calculate_tree.patch | 76 ++++++++++++++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 1 + 2 files changed, 77 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch new file mode 100644 index 0000000..342a2b8 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch @@ -0,0 +1,76 @@ +From: Wang Shilong +Date: Mon, 30 Dec 2019 19:52:39 -0500 +Subject: e2fsck: fix use after free in calculate_tree() + +The problem is alloc_blocks() will call get_next_block() which might +reallocate outdir->buf, and memory address could be changed after +this. To fix this, pointers that point into outdir->buf, such as +int_limit and root need to be recaulated based on the new starting +address of outdir->buf. + +[ Changed to correctly recalculate int_limit, and to optimize how we + reallocate outdir->buf. -TYT ] + +Addresses-Debian-Bug: 948517 +Signed-off-by: Wang Shilong +Signed-off-by: Theodore Ts'o +(cherry picked from commit 101e73e99ccafa0403fcb27dd7413033b587ca01) + +Signed-off-by: Anuj Mittal +Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=101e73e99ccafa0403fcb27dd7413033b587ca01] +--- + e2fsck/rehash.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c +index 0a5888a9..2574e151 100644 +--- a/e2fsck/rehash.c ++++ b/e2fsck/rehash.c +@@ -295,7 +295,11 @@ static errcode_t get_next_block(ext2_filsys fs, struct out_dir *outdir, + errcode_t retval; + + if (outdir->num >= outdir->max) { +- retval = alloc_size_dir(fs, outdir, outdir->max + 50); ++ int increment = outdir->max / 10; ++ ++ if (increment < 50) ++ increment = 50; ++ retval = alloc_size_dir(fs, outdir, outdir->max + increment); + if (retval) + return retval; + } +@@ -637,6 +641,9 @@ static int alloc_blocks(ext2_filsys fs, + if (retval) + return retval; + ++ /* outdir->buf might be reallocated */ ++ *prev_ent = (struct ext2_dx_entry *) (outdir->buf + *prev_offset); ++ + *next_ent = set_int_node(fs, block_start); + *limit = (struct ext2_dx_countlimit *)(*next_ent); + if (next_offset) +@@ -726,6 +733,9 @@ static errcode_t calculate_tree(ext2_filsys fs, + return retval; + } + if (c3 == 0) { ++ int delta1 = (char *)int_limit - outdir->buf; ++ int delta2 = (char *)root - outdir->buf; ++ + retval = alloc_blocks(fs, &limit, &int_ent, + &dx_ent, &int_offset, + NULL, outdir, i, &c2, +@@ -733,6 +743,11 @@ static errcode_t calculate_tree(ext2_filsys fs, + if (retval) + return retval; + ++ /* outdir->buf might be reallocated */ ++ int_limit = (struct ext2_dx_countlimit *) ++ (outdir->buf + delta1); ++ root = (struct ext2_dx_entry *) ++ (outdir->buf + delta2); + } + dx_ent->block = ext2fs_cpu_to_le32(i); + if (c3 != limit->limit) +-- +2.24.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb index fc92b77..4f7cafe 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb @@ -9,6 +9,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ file://CVE-2019-5188.patch \ file://0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch \ + file://e2fsck-fix-use-after-free-in-calculate_tree.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 9 22:54:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 09 Mar 2020 22:54:45 +0000 Subject: [oe-commits] [openembedded-core] 06/06: glibc: CVE-2020-10029 In-Reply-To: <158379447919.4944.15970038701688797924@git.openembedded.org> References: <158379447919.4944.15970038701688797924@git.openembedded.org> Message-ID: <20200309225439.BE79B232CAA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 528c750d62feb44a4fb630405184d68d95df6a81 Author: Zhixiong Chi AuthorDate: Mon Mar 9 00:43:41 2020 -0700 glibc: CVE-2020-10029 Backport the CVE patch from upstream: [https://sourceware.org/git/gitweb.cgi?p=glibc.git; a=patch;h=9333498794cde1d5cca518badf79533a24114b6f] Signed-off-by: Zhixiong Chi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc/CVE-2020-10029.patch | 128 +++++++++++++++++++++ meta/recipes-core/glibc/glibc_2.31.bb | 1 + 2 files changed, 129 insertions(+) diff --git a/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch b/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch new file mode 100644 index 0000000..22a15f5 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch @@ -0,0 +1,128 @@ +From ce265ec5bc25ec35fba53807abac1b0c8469895e Mon Sep 17 00:00:00 2001 +From: Joseph Myers +Date: Wed, 12 Feb 2020 23:31:56 +0000 +Subject: [PATCH] Avoid ldbl-96 stack corruption from range reduction of + + pseudo-zero (bug 25487). + +Bug 25487 reports stack corruption in ldbl-96 sinl on a pseudo-zero +argument (an representation where all the significand bits, including +the explicit high bit, are zero, but the exponent is not zero, which +is not a valid representation for the long double type). + +Although this is not a valid long double representation, existing +practice in this area (see bug 4586, originally marked invalid but +subsequently fixed) is that we still seek to avoid invalid memory +accesses as a result, in case of programs that treat arbitrary binary +data as long double representations, although the invalid +representations of the ldbl-96 format do not need to be consistently +handled the same as any particular valid representation. + +This patch makes the range reduction detect pseudo-zero and unnormal +representations that would otherwise go to __kernel_rem_pio2, and +returns a NaN for them instead of continuing with the range reduction +process. (Pseudo-zero and unnormal representations whose unbiased +exponent is less than -1 have already been safely returned from the +function before this point without going through the rest of range +reduction.) Pseudo-zero representations would previously result in +the value passed to __kernel_rem_pio2 being all-zero, which is +definitely unsafe; unnormal representations would previously result in +a value passed whose high bit is zero, which might well be unsafe +since that is not a form of input expected by __kernel_rem_pio2. + +Tested for x86_64. + +CVE: CVE-2020-10029 +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git; +a=patch;h=9333498794cde1d5cca518badf79533a24114b6f] +Signed-off-by: Zhixiong Chi + +--- + sysdeps/ieee754/ldbl-96/Makefile | 3 ++- + sysdeps/ieee754/ldbl-96/e_rem_pio2l.c | 12 +++++++++ + sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c | 41 ++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 1 deletion(-) + create mode 100644 sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c + +diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile +index b103254..052c1c7 100644 +--- a/sysdeps/ieee754/ldbl-96/Makefile ++++ b/sysdeps/ieee754/ldbl-96/Makefile +@@ -17,5 +17,6 @@ + # . + + ifeq ($(subdir),math) +-tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 ++tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 test-sinl-pseudo ++CFLAGS-test-sinl-pseudo.c += -fstack-protector-all + endif +diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +index 805de22..1aeccb4 100644 +--- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c ++++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +@@ -210,6 +210,18 @@ __ieee754_rem_pio2l (long double x, long double *y) + return 0; + } + ++ if ((i0 & 0x80000000) == 0) ++ { ++ /* Pseudo-zero and unnormal representations are not valid ++ representations of long double. We need to avoid stack ++ corruption in __kernel_rem_pio2, which expects input in a ++ particular normal form, but those representations do not need ++ to be consistently handled like any particular floating-point ++ value. */ ++ y[1] = y[0] = __builtin_nanl (""); ++ return 0; ++ } ++ + /* Split the 64 bits of the mantissa into three 24-bit integers + stored in a double array. */ + exp = j0 - 23; +diff --git a/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +new file mode 100644 +index 0000000..f59b977 +--- /dev/null ++++ b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +@@ -0,0 +1,41 @@ ++/* Test sinl for pseudo-zeros and unnormals for ldbl-96 (bug 25487). ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ for (int i = 0; i < 64; i++) ++ { ++ uint64_t sig = i == 63 ? 0 : 1ULL << i; ++ long double ld; ++ SET_LDOUBLE_WORDS (ld, 0x4141, ++ sig >> 32, sig & 0xffffffffULL); ++ /* The requirement is that no stack overflow occurs when the ++ pseudo-zero or unnormal goes through range reduction. */ ++ volatile long double ldr; ++ ldr = sinl (ld); ++ (void) ldr; ++ } ++ return 0; ++} ++ ++#include diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb index 2032311..6dd9415 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://CVE-2020-10029.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 Tue Mar 10 04:20:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 04:20:26 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: python3-pycryptodomex: add 3.9.4 recipe Message-ID: <158381402676.14785.5926856391987222798@git.openembedded.org> 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 0ebd2a5 python3-pycryptodomex: add 3.9.4 recipe 0ebd2a5 is described below commit 0ebd2a50423b5ab87f55c6a953a0a6c127977f63 Author: Rajesh Ravi AuthorDate: Mon Mar 9 19:49:36 2020 -0700 python3-pycryptodomex: add 3.9.4 recipe Add python3-pycryptodomex 3.9.4 recipe needed to build such components as optee 3.8.0. Signed-off-by: Rajesh Ravi Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../python/python3-pycryptodomex_3.9.4.bb | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb new file mode 100644 index 0000000..be6b10f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb @@ -0,0 +1,30 @@ +SUMMARY = "Cryptographic library for Python" +DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\ + cryptographic primitives." +HOMEPAGE = "http://www.pycryptodome.org" +LICENSE = "PD & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba" + +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b" +SRC_URI[sha256sum] = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167" + +inherit pypi +inherit setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-math \ +" + +RDEPENDS_${PN}-tests += " \ + ${PYTHON_PN}-unittest \ +" + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \ + ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \ +" + +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 Mar 10 05:35:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 05:35:17 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: kea: upgrade 1.7.4 -> 1.7.5 Message-ID: <158381851777.26690.9365721673583569332@git.openembedded.org> 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 721cdf5 kea: upgrade 1.7.4 -> 1.7.5 721cdf5 is described below commit 721cdf58037ad034a677c9b9d1c2ef12a398e8b6 Author: Wang Mingyu AuthorDate: Tue Mar 10 04:29:18 2020 -0700 kea: upgrade 1.7.4 -> 1.7.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-connectivity/kea/{kea_1.7.4.bb => kea_1.7.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb similarity index 93% rename from meta-networking/recipes-connectivity/kea/kea_1.7.4.bb rename to meta-networking/recipes-connectivity/kea/kea_1.7.5.bb index a2c9765..38a256a 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb @@ -14,8 +14,8 @@ SRC_URI = "\ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ " -SRC_URI[md5sum] = "d2d0e3ad8064a5e6f3ba1e970d39f9cc" -SRC_URI[sha256sum] = "2b7f8d8cafdb9ad2be8df9aceb2de58c8f37c1544e47c28f05e84555d0015ef5" +SRC_URI[md5sum] = "1f771e0209c9149bcf8fb91a25db03bf" +SRC_URI[sha256sum] = "9b89b75cd8fd71e0ad7cb32c1b996177ba617bea2d162851eed42eea739e9999" 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 Mar 10 14:17:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 14:17:10 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: python-pandas: upgrade 0.23.4 -> 1.0.1 Message-ID: <158384982999.9452.8269755404609484443@git.openembedded.org> 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 c4666e4 python-pandas: upgrade 0.23.4 -> 1.0.1 c4666e4 is described below commit c4666e414cf280ae0cf8f2673f71197af37f3316 Author: Henry Chang AuthorDate: Tue Mar 10 15:02:08 2020 +0800 python-pandas: upgrade 0.23.4 -> 1.0.1 Signed-off-by: Henry Chang Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pandas.inc | 4 ++-- .../python/{python3-pandas_0.23.4.bb => python3-pandas_1.0.1.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pandas.inc b/meta-python/recipes-devtools/python/python-pandas.inc index d6ca243..9342ced 100644 --- a/meta-python/recipes-devtools/python/python-pandas.inc +++ b/meta-python/recipes-devtools/python/python-pandas.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=ee0470f2de336c370a71c2f8d5e81c11" -SRC_URI[md5sum] = "7b597c7f989652e0c9af5f09a157e3ae" -SRC_URI[sha256sum] = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4" +SRC_URI[md5sum] = "628ffa1dd5768e0be70236596cee8d6b" +SRC_URI[sha256sum] = "3c07765308f091d81b6735d4f2242bb43c332cc3461cae60543df6b10967fe27" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-pandas_0.23.4.bb b/meta-python/recipes-devtools/python/python3-pandas_1.0.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pandas_0.23.4.bb rename to meta-python/recipes-devtools/python/python3-pandas_1.0.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 14:57:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 14:57:08 +0000 Subject: [oe-commits] [openembedded-core] 01/03: oeqa/selftest: Ensure buildtools in environment variables isn't replaced In-Reply-To: <158385222732.5226.12618820335132766112@git.openembedded.org> References: <158385222732.5226.12618820335132766112@git.openembedded.org> Message-ID: <20200310145707.91F33233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3eab8b8b89197380649486c535e9fd3dc8e6980c Author: Richard Purdie AuthorDate: Tue Mar 10 13:02:07 2020 +0000 oeqa/selftest: Ensure buildtools in environment variables isn't replaced This avoids the seeing broken replacements like: oe-selftest-centos/build/build-st-926tools/sysroots/x86_64-pokysdk-linux/etc/ssl/certs/ca-certificates.crt which understandably break builds. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 409698d..48ec5d4 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -46,7 +46,7 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(selftestdir, newselftestdir) for e in os.environ: - if builddir in os.environ[e]: + if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): 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) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 14:57:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 14:57:07 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (528c750 -> ac28824) Message-ID: <158385222732.5226.12618820335132766112@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 528c750 glibc: CVE-2020-10029 new 3eab8b8 oeqa/selftest: Ensure buildtools in environment variables isn't replaced new aa9150f gcc: don't ship build host information in the target gcc-plugins package new ac28824 gcc: strip line numbers from generated code 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/selftest/context.py | 2 +- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + .../gcc/gcc-9.2/gen-no-line-numbers.patch | 170 +++++++++++++++++++++ meta/recipes-devtools/gcc/gcc-target.inc | 4 + 4 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 14:57:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 14:57:09 +0000 Subject: [oe-commits] [openembedded-core] 02/03: gcc: don't ship build host information in the target gcc-plugins package In-Reply-To: <158385222732.5226.12618820335132766112@git.openembedded.org> References: <158385222732.5226.12618820335132766112@git.openembedded.org> Message-ID: <20200310145707.9DF95233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aa9150f26905648afbf2c5d81de542405431d577 Author: Ross Burton AuthorDate: Tue Mar 10 14:07:01 2020 +0000 gcc: don't ship build host information in the target gcc-plugins package WIP will this work can we delete more Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-target.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 18d078d..204f947 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -179,6 +179,10 @@ do_install () { # Cleanup manpages.. rm -rf ${D}${mandir}/man7 + # Don't package details about the build host + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h + cd ${D}${bindir} # We care about g++ not c++ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 14:57:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 14:57:10 +0000 Subject: [oe-commits] [openembedded-core] 03/03: gcc: strip line numbers from generated code In-Reply-To: <158385222732.5226.12618820335132766112@git.openembedded.org> References: <158385222732.5226.12618820335132766112@git.openembedded.org> Message-ID: <20200310145707.AA7EB2334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ac288245746eb198b14741ee9ac74804a6b24408 Author: Ross Burton AuthorDate: Tue Mar 10 13:48:26 2020 +0000 gcc: strip line numbers from generated code Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + .../gcc/gcc-9.2/gen-no-line-numbers.patch | 170 +++++++++++++++++++++ 2 files changed, 171 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index 2bae85a..2368f35 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -70,6 +70,7 @@ SRC_URI = "\ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ + file://gen-no-line-numbers.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch new file mode 100644 index 0000000..8e2c3f5 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch @@ -0,0 +1,170 @@ +Inserting line numbers into generated code means its not always reproducible wth +differing versions of host gcc. Void the issue by not adding these. + +Upstream-Status: Inappropriate [OE Reproducibility specific] +Signed-off-by: Richard Purdie + +diff --git a/gcc/gengtype.c b/gcc/gengtype.c +index 53317337c..bbb261516 100644 +--- a/gcc/gengtype.c ++++ b/gcc/gengtype.c +@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, + /* Create a fake field with the given type and name. NEXT is the next + field in the chain. */ + #define create_field(next,type,name) \ +- create_field_all (next,type,name, 0, this_file, __LINE__) ++ create_field_all (next,type,name, 0, this_file, 0) + + /* Like create_field, but the field is only valid when condition COND + is true. */ +@@ -1024,7 +1024,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, + } + + #define create_optional_field(next,type,name,cond) \ +- create_optional_field_(next,type,name,cond,__LINE__) ++ create_optional_field_(next,type,name,cond,0) + + /* Reverse a linked list of 'struct pair's in place. */ + pair_p +@@ -5186,7 +5186,7 @@ main (int argc, char **argv) + /* These types are set up with #define or else outside of where + we can see them. We should initialize them before calling + read_input_list. */ +-#define POS_HERE(Call) do { pos.file = this_file; pos.line = __LINE__; \ ++#define POS_HERE(Call) do { pos.file = this_file; pos.line = 0; \ + Call;} while (0) + POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); + POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); +diff --git a/gcc/genmodes.c b/gcc/genmodes.c +index f33eefa24..07bef9eeb 100644 +--- a/gcc/genmodes.c ++++ b/gcc/genmodes.c +@@ -429,7 +429,7 @@ complete_all_modes (void) + } + + /* For each mode in class CLASS, construct a corresponding complex mode. */ +-#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, __LINE__) ++#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, 0) + static void + make_complex_modes (enum mode_class cl, + const char *file, unsigned int line) +@@ -487,7 +487,7 @@ make_complex_modes (enum mode_class cl, + /* For all modes in class CL, construct vector modes of width + WIDTH, having as many components as necessary. */ + #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W) \ +- make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, __LINE__) ++ make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, 0) + #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W) + static void ATTRIBUTE_UNUSED + make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, +@@ -538,7 +538,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, + /* Create a vector of booleans called NAME with COUNT elements and + BYTESIZE bytes in total. */ + #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \ +- make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, __LINE__) ++ make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_vector_bool_mode (const char *name, unsigned int count, + unsigned int bytesize, const char *file, +@@ -560,7 +560,7 @@ make_vector_bool_mode (const char *name, unsigned int count, + /* Input. */ + + #define _SPECIAL_MODE(C, N) \ +- make_special_mode (MODE_##C, #N, __FILE__, __LINE__) ++ make_special_mode (MODE_##C, #N, __FILE__, 0) + #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) + #define CC_MODE(N) _SPECIAL_MODE (CC, N) + +@@ -573,7 +573,7 @@ make_special_mode (enum mode_class cl, const char *name, + + #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) + #define FRACTIONAL_INT_MODE(N, B, Y) \ +- make_int_mode (#N, B, Y, __FILE__, __LINE__) ++ make_int_mode (#N, B, Y, __FILE__, 0) + + static void + make_int_mode (const char *name, +@@ -586,16 +586,16 @@ make_int_mode (const char *name, + } + + #define FRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, 0) + + #define UFRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, 0) + + #define ACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, 0) + + #define UACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, 0) + + /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, + FILE, and LINE. */ +@@ -616,7 +616,7 @@ make_fixed_point_mode (enum mode_class cl, + + #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ +- make_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_float_mode (const char *name, +@@ -633,7 +633,7 @@ make_float_mode (const char *name, + #define DECIMAL_FLOAT_MODE(N, Y, F) \ + FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ +- make_decimal_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_decimal_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_decimal_float_mode (const char *name, +@@ -648,7 +648,7 @@ make_decimal_float_mode (const char *name, + } + + #define RESET_FLOAT_FORMAT(N, F) \ +- reset_float_format (#N, #F, __FILE__, __LINE__) ++ reset_float_format (#N, #F, __FILE__, 0) + static void ATTRIBUTE_UNUSED + reset_float_format (const char *name, const char *format, + const char *file, unsigned int line) +@@ -669,7 +669,7 @@ reset_float_format (const char *name, const char *format, + + /* __intN support. */ + #define INT_N(M,PREC) \ +- make_int_n (#M, PREC, __FILE__, __LINE__) ++ make_int_n (#M, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_int_n (const char *m, int bitsize, + const char *file, unsigned int line) +@@ -698,7 +698,7 @@ make_int_n (const char *m, int bitsize, + /* Partial integer modes are specified by relation to a full integer + mode. */ + #define PARTIAL_INT_MODE(M,PREC,NAME) \ +- make_partial_integer_mode (#M, #NAME, PREC, __FILE__, __LINE__) ++ make_partial_integer_mode (#M, #NAME, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_partial_integer_mode (const char *base, const char *name, + unsigned int precision, +@@ -725,7 +725,7 @@ make_partial_integer_mode (const char *base, const char *name, + /* A single vector mode can be specified by naming its component + mode and the number of components. */ + #define VECTOR_MODE(C, M, N) \ +- make_vector_mode (MODE_##C, #M, N, __FILE__, __LINE__); ++ make_vector_mode (MODE_##C, #M, N, __FILE__, 0); + static void ATTRIBUTE_UNUSED + make_vector_mode (enum mode_class bclass, + const char *base, +@@ -768,7 +768,7 @@ make_vector_mode (enum mode_class bclass, + + /* Adjustability. */ + #define _ADD_ADJUST(A, M, X, C1, C2) \ +- new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, __LINE__) ++ new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, 0) + + #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) + #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 17:09:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 17:09:10 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (c4666e4 -> 525cd63) Message-ID: <158386015016.21207.7267013957828945617@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 c4666e4 python-pandas: upgrade 0.23.4 -> 1.0.1 discard 721cdf5 kea: upgrade 1.7.4 -> 1.7.5 discard 0ebd2a5 python3-pycryptodomex: add 3.9.4 recipe new 4b8904c python3-pycryptodomex: add 3.9.4 recipe new 2ea7f70 kea: upgrade 1.7.4 -> 1.7.5 new 525cd63 python-pandas: upgrade 0.23.4 -> 1.0.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 (c4666e4) \ N -- N -- N refs/heads/master-next (525cd63) 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 Tue Mar 10 17:09:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 17:09:11 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: python3-pycryptodomex: add 3.9.4 recipe In-Reply-To: <158386015016.21207.7267013957828945617@git.openembedded.org> References: <158386015016.21207.7267013957828945617@git.openembedded.org> Message-ID: <20200310170910.8704C233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 4b8904c1fc646971f83bd229181eb27066ebb7b7 Author: Rajesh Ravi AuthorDate: Mon Mar 9 19:49:36 2020 -0700 python3-pycryptodomex: add 3.9.4 recipe Add python3-pycryptodomex 3.9.4 recipe needed to build such components as optee 3.8.0. Signed-off-by: Rajesh Ravi Signed-off-by: Scott Branden Signed-off-by: Khem Raj --- .../python/python3-pycryptodomex_3.9.4.bb | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb new file mode 100644 index 0000000..be6b10f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb @@ -0,0 +1,30 @@ +SUMMARY = "Cryptographic library for Python" +DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\ + cryptographic primitives." +HOMEPAGE = "http://www.pycryptodome.org" +LICENSE = "PD & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba" + +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b" +SRC_URI[sha256sum] = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167" + +inherit pypi +inherit setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-math \ +" + +RDEPENDS_${PN}-tests += " \ + ${PYTHON_PN}-unittest \ +" + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \ + ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \ +" + +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 Mar 10 17:09:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 17:09:12 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: kea: upgrade 1.7.4 -> 1.7.5 In-Reply-To: <158386015016.21207.7267013957828945617@git.openembedded.org> References: <158386015016.21207.7267013957828945617@git.openembedded.org> Message-ID: <20200310170910.AB1F32334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2ea7f70b0a6e1b822c6ca94d23c28b601291abfc Author: Wang Mingyu AuthorDate: Tue Mar 10 04:29:18 2020 -0700 kea: upgrade 1.7.4 -> 1.7.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-connectivity/kea/{kea_1.7.4.bb => kea_1.7.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb similarity index 93% rename from meta-networking/recipes-connectivity/kea/kea_1.7.4.bb rename to meta-networking/recipes-connectivity/kea/kea_1.7.5.bb index a2c9765..38a256a 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb @@ -14,8 +14,8 @@ SRC_URI = "\ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ " -SRC_URI[md5sum] = "d2d0e3ad8064a5e6f3ba1e970d39f9cc" -SRC_URI[sha256sum] = "2b7f8d8cafdb9ad2be8df9aceb2de58c8f37c1544e47c28f05e84555d0015ef5" +SRC_URI[md5sum] = "1f771e0209c9149bcf8fb91a25db03bf" +SRC_URI[sha256sum] = "9b89b75cd8fd71e0ad7cb32c1b996177ba617bea2d162851eed42eea739e9999" 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 Mar 10 17:09:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 17:09:13 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: python-pandas: upgrade 0.23.4 -> 1.0.1 In-Reply-To: <158386015016.21207.7267013957828945617@git.openembedded.org> References: <158386015016.21207.7267013957828945617@git.openembedded.org> Message-ID: <20200310170910.CDAF2233518@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 525cd637eb0959a33e8253d9e40ab0056bf8b19e Author: Henry Chang AuthorDate: Tue Mar 10 15:02:08 2020 +0800 python-pandas: upgrade 0.23.4 -> 1.0.1 Signed-off-by: Henry Chang Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pandas.inc | 4 ++-- .../python/{python3-pandas_0.23.4.bb => python3-pandas_1.0.1.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pandas.inc b/meta-python/recipes-devtools/python/python-pandas.inc index d6ca243..9342ced 100644 --- a/meta-python/recipes-devtools/python/python-pandas.inc +++ b/meta-python/recipes-devtools/python/python-pandas.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=ee0470f2de336c370a71c2f8d5e81c11" -SRC_URI[md5sum] = "7b597c7f989652e0c9af5f09a157e3ae" -SRC_URI[sha256sum] = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4" +SRC_URI[md5sum] = "628ffa1dd5768e0be70236596cee8d6b" +SRC_URI[sha256sum] = "3c07765308f091d81b6735d4f2242bb43c332cc3461cae60543df6b10967fe27" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-pandas_0.23.4.bb b/meta-python/recipes-devtools/python/python3-pandas_1.0.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pandas_0.23.4.bb rename to meta-python/recipes-devtools/python/python3-pandas_1.0.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 17:19:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 17:19:14 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: renderdoc: Upgrade to 1.7 Message-ID: <158386075438.28996.17295394440751750871@git.openembedded.org> 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 852870b renderdoc: Upgrade to 1.7 852870b is described below commit 852870bff4077be46ba0164243fe39731660c013 Author: Khem Raj AuthorDate: Tue Mar 10 10:17:51 2020 -0700 renderdoc: Upgrade to 1.7 Signed-off-by: Khem Raj --- .../recipes-graphics/renderdoc/{renderdoc_1.6.bb => renderdoc_1.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb similarity index 95% rename from meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb rename to meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb index 7cb79d0..6ea632d 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772" -SRCREV = "0e7f772596035137416be01766c2d61205efc63e" +SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2" SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ file://0001-Remove-glslang-pool_allocator-setAllocator.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 20:49:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 20:49:33 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (852870b -> 72d4033) Message-ID: <158387337312.16422.15929370908704058208@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 852870b renderdoc: Upgrade to 1.7 discard 525cd63 python-pandas: upgrade 0.23.4 -> 1.0.1 discard 2ea7f70 kea: upgrade 1.7.4 -> 1.7.5 discard 4b8904c python3-pycryptodomex: add 3.9.4 recipe new 2773a9f kea: upgrade 1.7.4 -> 1.7.5 new 27d458c python-pandas: upgrade 0.23.4 -> 1.0.1 new a4b0a7c renderdoc: Upgrade to 1.7 new 72d4033 glmark2: Update to latest version 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 (852870b) \ N -- N -- N refs/heads/master-next (72d4033) 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-benchmark/glmark2/glmark2_git.bb | 4 +-- .../python/python3-pycryptodomex_3.9.4.bb | 30 ---------------------- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 20:49:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 20:49:34 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: kea: upgrade 1.7.4 -> 1.7.5 In-Reply-To: <158387337312.16422.15929370908704058208@git.openembedded.org> References: <158387337312.16422.15929370908704058208@git.openembedded.org> Message-ID: <20200310204933.42CAB2328EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2773a9f02e372f6c6123a05e99d4c1184565f77b Author: Wang Mingyu AuthorDate: Tue Mar 10 04:29:18 2020 -0700 kea: upgrade 1.7.4 -> 1.7.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-connectivity/kea/{kea_1.7.4.bb => kea_1.7.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb similarity index 93% rename from meta-networking/recipes-connectivity/kea/kea_1.7.4.bb rename to meta-networking/recipes-connectivity/kea/kea_1.7.5.bb index a2c9765..38a256a 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.7.4.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.7.5.bb @@ -14,8 +14,8 @@ SRC_URI = "\ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ " -SRC_URI[md5sum] = "d2d0e3ad8064a5e6f3ba1e970d39f9cc" -SRC_URI[sha256sum] = "2b7f8d8cafdb9ad2be8df9aceb2de58c8f37c1544e47c28f05e84555d0015ef5" +SRC_URI[md5sum] = "1f771e0209c9149bcf8fb91a25db03bf" +SRC_URI[sha256sum] = "9b89b75cd8fd71e0ad7cb32c1b996177ba617bea2d162851eed42eea739e9999" 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 Mar 10 20:49:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 20:49:36 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: renderdoc: Upgrade to 1.7 In-Reply-To: <158387337312.16422.15929370908704058208@git.openembedded.org> References: <158387337312.16422.15929370908704058208@git.openembedded.org> Message-ID: <20200310204933.56412232984@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a4b0a7ca9adac6dba83c3f638884322caaebe79e Author: Khem Raj AuthorDate: Tue Mar 10 10:17:51 2020 -0700 renderdoc: Upgrade to 1.7 Signed-off-by: Khem Raj --- .../recipes-graphics/renderdoc/{renderdoc_1.6.bb => renderdoc_1.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb similarity index 95% rename from meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb rename to meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb index 7cb79d0..6ea632d 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.6.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.7.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=df7ea9e196efc7014c124747a0ef9772" -SRCREV = "0e7f772596035137416be01766c2d61205efc63e" +SRCREV = "a56af589d94dc851809fd5344d0ae441da70c1f2" SRC_URI = "git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x \ file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ file://0001-Remove-glslang-pool_allocator-setAllocator.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 20:49:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 20:49:35 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: python-pandas: upgrade 0.23.4 -> 1.0.1 In-Reply-To: <158387337312.16422.15929370908704058208@git.openembedded.org> References: <158387337312.16422.15929370908704058208@git.openembedded.org> Message-ID: <20200310204933.4BFB523293F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 27d458c72dd9200afb07f490edd719ca7fbf8a15 Author: Henry Chang AuthorDate: Tue Mar 10 15:02:08 2020 +0800 python-pandas: upgrade 0.23.4 -> 1.0.1 Signed-off-by: Henry Chang Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pandas.inc | 4 ++-- .../python/{python3-pandas_0.23.4.bb => python3-pandas_1.0.1.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pandas.inc b/meta-python/recipes-devtools/python/python-pandas.inc index d6ca243..9342ced 100644 --- a/meta-python/recipes-devtools/python/python-pandas.inc +++ b/meta-python/recipes-devtools/python/python-pandas.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=ee0470f2de336c370a71c2f8d5e81c11" -SRC_URI[md5sum] = "7b597c7f989652e0c9af5f09a157e3ae" -SRC_URI[sha256sum] = "5b24ca47acf69222e82530e89111dd9d14f9b970ab2cd3a1c2c78f0c4fbba4f4" +SRC_URI[md5sum] = "628ffa1dd5768e0be70236596cee8d6b" +SRC_URI[sha256sum] = "3c07765308f091d81b6735d4f2242bb43c332cc3461cae60543df6b10967fe27" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-pandas_0.23.4.bb b/meta-python/recipes-devtools/python/python3-pandas_1.0.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pandas_0.23.4.bb rename to meta-python/recipes-devtools/python/python3-pandas_1.0.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Tue Mar 10 20:49:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Tue, 10 Mar 2020 20:49:37 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: glmark2: Update to latest version In-Reply-To: <158387337312.16422.15929370908704058208@git.openembedded.org> References: <158387337312.16422.15929370908704058208@git.openembedded.org> Message-ID: <20200310204933.5FB0E2329BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 72d403364c3a23415cd137d30f0c0d3357bdf5af Author: Joshua Watt AuthorDate: Tue Mar 10 14:50:25 2020 -0500 glmark2: Update to latest version Updates to the most recent version of glmark2. In particular, this fixes problems where the benchmark would fail to start due to improper handling of EGL_NO_DISPLAY with EGL 1.5 Signed-off-by: Joshua Watt Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 50b553c..6d20bbd 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" -PV = "20190904+${SRCPV}" +PV = "20191226+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ file://python3.patch" -SRCREV = "24a1139dcbfd86bd02065316eaa90559e39374e1" +SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" 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 Mar 11 01:13:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:13:54 +0000 Subject: [oe-commits] [openembedded-core] 01/11: kernelsrc.bbclass: Fix externalsrc support In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.7D7912329BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 2c17d35cc7b9c5e01fd5829858d2f0234e7ac8d6 Author: Paul Barker AuthorDate: Mon Mar 9 14:21:37 2020 +0000 kernelsrc.bbclass: Fix externalsrc support When the externalsrc class is used the tasks listed in SRCTREECOVEREDTASKS are deleted to prevent them being executed. If externalsrc is used for the kernel then this will include virtual/kernel:do_patch. We can depend on do_shared_workdir instead as this will survive when externalsrc is used. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/classes/kernelsrc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernelsrc.bbclass b/meta/classes/kernelsrc.bbclass index 675d40e..a951ba3 100644 --- a/meta/classes/kernelsrc.bbclass +++ b/meta/classes/kernelsrc.bbclass @@ -1,7 +1,7 @@ S = "${STAGING_KERNEL_DIR}" deltask do_fetch deltask do_unpack -do_patch[depends] += "virtual/kernel:do_patch" +do_patch[depends] += "virtual/kernel:do_shared_workdir" do_patch[noexec] = "1" do_package[depends] += "virtual/kernel:do_populate_sysroot" KERNEL_VERSION = "${@get_kernelversion_file("${STAGING_KERNEL_BUILDDIR}")}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:13:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:13:53 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (5d579fc -> 04ee0e8) Message-ID: <158388923314.10346.2635716817837501391@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 5d579fc reproducibile_build: Fix SDE file generation when unpack reruns new 2c17d35 kernelsrc.bbclass: Fix externalsrc support new eab605b perf: Fix externalsrc support new 44f04c0 kernel-yocto.bbclass: Support config fragments with externalsrc new 744f247 p11-kit: Add nativesdk variant new 64a362b cve-check: fix ValueError new 270ae94 kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds new 6acb974 sqlite3: fix CVE-2020-9327 new 09bdcef e2fsprogs: fix CVE-2019-5188 new 23c1b15 e2fsprogs: backport upstream patch new bc0b66c glibc: CVE-2020-10029 new 04ee0e8 oeqa/selftest: Ensure buildtools in environment variables isn't replaced 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/cve-check.bbclass | 4 +- meta/classes/kernel-yocto.bbclass | 3 +- meta/classes/kernel.bbclass | 12 +- meta/classes/kernelsrc.bbclass | 2 +- meta/lib/oeqa/selftest/context.py | 2 +- meta/recipes-core/glibc/glibc/CVE-2020-10029.patch | 128 +++++++++++++++++++ meta/recipes-core/glibc/glibc_2.31.bb | 1 + ...k-don-t-try-to-rehash-a-deleted-directory.patch | 49 +++++++ .../e2fsprogs/e2fsprogs/CVE-2019-5188.patch | 57 +++++++++ ...fsck-fix-use-after-free-in-calculate_tree.patch | 76 +++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 3 + meta/recipes-kernel/perf/perf.bb | 2 +- meta/recipes-support/p11-kit/p11-kit_0.23.20.bb | 2 + .../sqlite/files/CVE-2020-9327.patch | 141 +++++++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 1 + 15 files changed, 469 insertions(+), 14 deletions(-) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-10029.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch create mode 100644 meta/recipes-support/sqlite/files/CVE-2020-9327.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:13:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:13:56 +0000 Subject: [oe-commits] [openembedded-core] 03/11: kernel-yocto.bbclass: Support config fragments with externalsrc In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.9C2982329C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 44f04c039a4d61dd18666e42b9b9865cbc3ada9e Author: Paul Barker AuthorDate: Mon Mar 9 14:21:39 2020 +0000 kernel-yocto.bbclass: Support config fragments with externalsrc The merging of config fragments is performend in the do_kernel_configme task and so config fragments will not be supported when this task is removed from the dependency tree. kernel-yocto adds additional tasks which may modify the source directory to SRCTREECOVEREDTASKS so that they are removed when using externalsrc. However, do_kernel_configme should be safe to use, the only modification to the source tree is the potential creation of the '.kernel-meta' directory and the '.metadir' file. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d71ce21..6792c9a 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -1,5 +1,5 @@ # remove tasks that modify the source tree in case externalsrc is inherited -SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" +SRCTREECOVEREDTASKS += "do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" PATCH_GIT_USER_EMAIL ?= "kernel-yocto at oe" PATCH_GIT_USER_NAME ?= "OpenEmbedded" @@ -325,6 +325,7 @@ do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot" 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[depends] += "kern-tools-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { # translate the kconfig_mode into something that merge_config.sh -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:13:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:13:55 +0000 Subject: [oe-commits] [openembedded-core] 02/11: perf: Fix externalsrc support In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.8DB662329C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit eab605bab94552046ec4adae5debe026cc03bb4c Author: Paul Barker AuthorDate: Mon Mar 9 14:21:38 2020 +0000 perf: Fix externalsrc support When the externalsrc class is used the tasks listed in SRCTREECOVEREDTASKS are deleted to prevent them being executed. If externalsrc is used for the kernel then this will include virtual/kernel:do_patch. We can depend on do_shared_workdir instead as this will survive when externalsrc is used. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 10a5b88..e005eb0 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -52,7 +52,7 @@ export PYTHON_SITEPACKAGES_DIR #kernel 3.1+ supports WERROR to disable warnings as errors export WERROR = "0" -do_populate_lic[depends] += "virtual/kernel:do_patch" +do_populate_lic[depends] += "virtual/kernel:do_shared_workdir" # needed for building the tools/perf Perl binding include ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'perf-perl.inc', '', d)} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:13:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:13:57 +0000 Subject: [oe-commits] [openembedded-core] 04/11: p11-kit: Add nativesdk variant In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.A85272329C9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 744f2472df627cd85dd11aa9da445a2a1af196ed Author: Codrin Ciubotariu AuthorDate: Mon Mar 9 19:55:35 2020 +0200 p11-kit: Add nativesdk variant The nativesdk variant is needed by the buildtools-tarball, when p11-kit feature is enabled for gnutls. The error message is: Missing or unbuildable dependency chain was: ['buildtools-tarball', 'nativesdk-wget', 'nativesdk-gnutls', 'nativesdk-p11-kit'] Signed-off-by: Codrin Ciubotariu Cc: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/p11-kit/p11-kit_0.23.20.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb index 54b8cc6..4ba93f9 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.20.bb @@ -25,3 +25,5 @@ FILES_${PN} += " \ # PN contains p11-kit-proxy.so, a symlink to a loadable module INSANE_SKIP_${PN} = "dev-so" + +BBCLASSEXTEND = "nativesdk" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:13:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:13:58 +0000 Subject: [oe-commits] [openembedded-core] 05/11: cve-check: fix ValueError In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.B0CFE232A23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 64a362bd2dd0b4f3165d5162adbc600826af66f8 Author: Chee Yang Lee AuthorDate: Mon Mar 9 12:57:03 2020 +0800 cve-check: fix ValueError fix below error for whitelisted recipe and recipe skip cve check. Error: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: 0001: *** 0002:do_cve_check(d) 0003: File: '/poky-master/meta/classes/cve-check.bbclass', lineno: 59, function: do_cve_check 0055: try: 0056: patched_cves = get_patches_cves(d) 0057: except FileNotFoundError: 0058: bb.fatal("Failure in searching patches") *** 0059: whitelisted, patched, unpatched = check_cves(d, patched_cves) 0060: if patched or unpatched: 0061: cve_data = get_cve_info(d, patched + unpatched) 0062: cve_write_data(d, patched, unpatched, whitelisted, cve_data) 0063: else: Exception: ValueError: not enough values to unpack (expected 3, got 2) Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- meta/classes/cve-check.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 7f98da6..5d84b93 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -179,13 +179,13 @@ def check_cves(d, patched_cves): products = d.getVar("CVE_PRODUCT").split() # If this has been unset then we're not scanning for CVEs here (for example, image recipes) if not products: - return ([], []) + return ([], [], []) pv = d.getVar("CVE_VERSION").split("+git")[0] # If the recipe has been whitlisted we return empty lists if d.getVar("PN") in d.getVar("CVE_CHECK_PN_WHITELIST").split(): bb.note("Recipe has been whitelisted, skipping check") - return ([], []) + return ([], [], []) old_cve_whitelist = d.getVar("CVE_CHECK_CVE_WHITELIST") if old_cve_whitelist: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:13:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:13:59 +0000 Subject: [oe-commits] [openembedded-core] 06/11: kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.BB0D6232A42@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 270ae94fe345b9ce98d822034cbfad7e24c5f393 Author: Christopher Clark AuthorDate: Sun Mar 8 21:48:13 2020 -0700 kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds The source directory is not always a git repository, so when querying git for data to set SOURCE_DATE_EPOCH, specify ${S}/.git as the git directory to prevent retrieving incorrect data from any parent directory. Fixes the following errors with the prior logic when building a kernel that is not obtained from a git repository: 1. With TMPDIR set to a directory outside any git repository on a mounted filesystem, reproducible builds fail in do_compile with this git error: fatal: not a git repository (or any parent up to mount point ) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). aborting before the error handling logic. 2. With TMPDIR located within a subdirectory of a git repository, the SOURCE_DATE_EPOCH timestamp would be that of said repository rather than that of the kernel. Signed-off-by: Christopher Clark Signed-off-by: Richard Purdie --- meta/classes/kernel.bbclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 0eadd3e..a724645 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -294,14 +294,10 @@ kernel_do_compile() { # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not # be set.... if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then - olddir=`pwd` - cd ${S} - SOURCE_DATE_EPOCH=`git log -1 --pretty=%ct` - # git repo not guaranteed, so fall back to REPRODUCIBLE_TIMESTAMP_ROOTFS - if [ $? -ne 0 ]; then - SOURCE_DATE_EPOCH=${REPRODUCIBLE_TIMESTAMP_ROOTFS} - fi - cd $olddir + # The source directory is not necessarily a git repository, so we + # specify the git-dir to ensure that git does not query a + # repository in any parent directory. + SOURCE_DATE_EPOCH=`git --git-dir="${S}/.git" log -1 --pretty=%ct 2>/dev/null || echo "${REPRODUCIBLE_TIMESTAMP_ROOTFS}"` fi ts=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH` -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:00 +0000 Subject: [oe-commits] [openembedded-core] 07/11: sqlite3: fix CVE-2020-9327 In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.C3F83232A4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6acb9746744536019d5c04ce482a873916aac99f Author: Anuj Mittal AuthorDate: Mon Mar 9 08:45:00 2020 +0800 sqlite3: fix CVE-2020-9327 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../sqlite/files/CVE-2020-9327.patch | 141 +++++++++++++++++++++ meta/recipes-support/sqlite/sqlite3_3.31.1.bb | 1 + 2 files changed, 142 insertions(+) diff --git a/meta/recipes-support/sqlite/files/CVE-2020-9327.patch b/meta/recipes-support/sqlite/files/CVE-2020-9327.patch new file mode 100644 index 0000000..fecbbab --- /dev/null +++ b/meta/recipes-support/sqlite/files/CVE-2020-9327.patch @@ -0,0 +1,141 @@ +From 45d491851e1bca378de158a5e279fd584ce548e4 Mon Sep 17 00:00:00 2001 +From: "D. Richard Hipp" +Date: Mon, 17 Feb 2020 00:12:04 +0000 +Subject: [PATCH] [PATCH 1/2] Take care when checking the table of a TK_COLUMN + expression node to see if the table is a virtual table to first ensure that + the Expr.y.pTab pointer is not null due to generated column optimizations. + Ticket [4374860b29383380]. + +FossilOrigin-Name: 9d0d4ab95dc0c56e053c2924ed322a9ea7b25439e6f74599f706905a1994e454 + +[PATCH 2/2] A better (smaller and faster) solution to ticket + [4374860b29383380]. + +FossilOrigin-Name: abc473fb8fb999005dc79a360e34f97b3b25429decf1820dd2afa5c19577753d + +The two patches were converted to amalgamation format + +Signed-off-by: Anuj Mittal +Upstream-Status: Backport +CVE: CVE-2020-9327 +--- + sqlite3.c | 35 ++++++++++++++++++++++++----------- + sqlite3.h | 2 +- + 2 files changed, 25 insertions(+), 12 deletions(-) + +diff --git a/sqlite3.c b/sqlite3.c +index 55dc686..64fae04 100644 +--- a/sqlite3.c ++++ b/sqlite3.c +@@ -1167,7 +1167,7 @@ extern "C" { + */ + #define SQLITE_VERSION "3.31.1" + #define SQLITE_VERSION_NUMBER 3031001 +-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6" ++#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt1" + + /* + ** CAPI3REF: Run-Time Library Version Numbers +@@ -17428,8 +17428,11 @@ struct Table { + */ + #ifndef SQLITE_OMIT_VIRTUALTABLE + # define IsVirtual(X) ((X)->nModuleArg) ++# define ExprIsVtab(X) \ ++ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg) + #else + # define IsVirtual(X) 0 ++# define ExprIsVtab(X) 0 + #endif + + /* +@@ -104133,19 +104136,25 @@ static int impliesNotNullRow(Walker *pWalker, Expr *pExpr){ + case TK_LT: + case TK_LE: + case TK_GT: +- case TK_GE: ++ case TK_GE: { ++ Expr *pLeft = pExpr->pLeft; ++ Expr *pRight = pExpr->pRight; + testcase( pExpr->op==TK_EQ ); + testcase( pExpr->op==TK_NE ); + testcase( pExpr->op==TK_LT ); + testcase( pExpr->op==TK_LE ); + testcase( pExpr->op==TK_GT ); + testcase( pExpr->op==TK_GE ); +- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab)) +- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab)) ++ /* The y.pTab=0 assignment in wherecode.c always happens after the ++ ** impliesNotNullRow() test */ ++ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0) ++ && IsVirtual(pLeft->y.pTab)) ++ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0) ++ && IsVirtual(pRight->y.pTab)) + ){ +- return WRC_Prune; ++ return WRC_Prune; + } +- ++ } + default: + return WRC_Continue; + } +@@ -142591,7 +142600,8 @@ static int isAuxiliaryVtabOperator( + ** MATCH(expression,vtab_column) + */ + pCol = pList->a[1].pExpr; +- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){ ++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 ); ++ if( ExprIsVtab(pCol) ){ + for(i=0; iu.zToken, aOp[i].zOp)==0 ){ + *peOp2 = aOp[i].eOp2; +@@ -142613,7 +142623,8 @@ static int isAuxiliaryVtabOperator( + ** with function names in an arbitrary case. + */ + pCol = pList->a[0].pExpr; +- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){ ++ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 ); ++ if( ExprIsVtab(pCol) ){ + sqlite3_vtab *pVtab; + sqlite3_module *pMod; + void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**); +@@ -142636,10 +142647,12 @@ static int isAuxiliaryVtabOperator( + int res = 0; + Expr *pLeft = pExpr->pLeft; + Expr *pRight = pExpr->pRight; +- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){ ++ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 ); ++ if( ExprIsVtab(pLeft) ){ + res++; + } +- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){ ++ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 ); ++ if( pRight && ExprIsVtab(pRight) ){ + res++; + SWAP(Expr*, pLeft, pRight); + } +@@ -228440,7 +228453,7 @@ SQLITE_API int sqlite3_stmt_init( + #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ + + /************** End of stmt.c ************************************************/ +-#if __LINE__!=228443 ++#if __LINE__!=228456 + #undef SQLITE_SOURCE_ID + #define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt2" + #endif +diff --git a/sqlite3.h b/sqlite3.h +index cef6eea..5b9796c 100644 +--- a/sqlite3.h ++++ b/sqlite3.h +@@ -125,7 +125,7 @@ extern "C" { + */ + #define SQLITE_VERSION "3.31.1" + #define SQLITE_VERSION_NUMBER 3031001 +-#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837bb4d6" ++#define SQLITE_SOURCE_ID "2020-01-27 19:55:54 3bfa9cc97da10598521b342961df8f5f68c7388fa117345eeb516eaa837balt1" + + /* + ** CAPI3REF: Run-Time Library Version Numbers +-- +2.25.1 + diff --git a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb index 903d66a..de564e2 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.31.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.31.1.bb @@ -4,6 +4,7 @@ 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 \ + file://CVE-2020-9327.patch \ " SRC_URI[md5sum] = "2d0a553534c521504e3ac3ad3b90f125" SRC_URI[sha256sum] = "62284efebc05a76f909c580ffa5c008a7d22a1287285d68b7825a2b6b51949ae" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:04 +0000 Subject: [oe-commits] [openembedded-core] 11/11: oeqa/selftest: Ensure buildtools in environment variables isn't replaced In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.E6256232B56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 04ee0e8b95cd8ed890374e0007f976684206b630 Author: Richard Purdie AuthorDate: Tue Mar 10 13:02:07 2020 +0000 oeqa/selftest: Ensure buildtools in environment variables isn't replaced This avoids the seeing broken replacements like: oe-selftest-centos/build/build-st-926tools/sysroots/x86_64-pokysdk-linux/etc/ssl/certs/ca-certificates.crt which understandably break builds. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 409698d..48ec5d4 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -46,7 +46,7 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(selftestdir, newselftestdir) for e in os.environ: - if builddir in os.environ[e]: + if builddir + "/" in os.environ[e] or os.environ[e].endswith(builddir): 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) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:01 +0000 Subject: [oe-commits] [openembedded-core] 08/11: e2fsprogs: fix CVE-2019-5188 In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.CC262232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 09bdcef183d885025da6aa87a7c2bf7e8268774e Author: Anuj Mittal AuthorDate: Mon Mar 9 08:45:01 2020 +0800 e2fsprogs: fix CVE-2019-5188 Also see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948508 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...k-don-t-try-to-rehash-a-deleted-directory.patch | 49 +++++++++++++++++++ .../e2fsprogs/e2fsprogs/CVE-2019-5188.patch | 57 ++++++++++++++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 2 + 3 files changed, 108 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch new file mode 100644 index 0000000..ba4e3a3 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch @@ -0,0 +1,49 @@ +From 71ba13755337e19c9a826dfc874562a36e1b24d3 Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Thu, 19 Dec 2019 19:45:06 -0500 +Subject: [PATCH] e2fsck: don't try to rehash a deleted directory + +If directory has been deleted in pass1[bcd] processing, then we +shouldn't try to rehash the directory in pass 3a when we try to +rehash/reoptimize directories. + +Signed-off-by: Theodore Ts'o + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=71ba13755337e19c9a826dfc874562a36e1b24d3] +Signed-off-by: Anuj Mittal +--- + e2fsck/pass1b.c | 4 ++++ + e2fsck/rehash.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c +index 5693b9cf..bca701ca 100644 +--- a/e2fsck/pass1b.c ++++ b/e2fsck/pass1b.c +@@ -705,6 +705,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx); + if (ctx->inode_bad_map) + ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); ++ if (ctx->inode_reg_map) ++ ext2fs_unmark_inode_bitmap2(ctx->inode_reg_map, ino); ++ ext2fs_unmark_inode_bitmap2(ctx->inode_dir_map, ino); ++ ext2fs_unmark_inode_bitmap2(ctx->inode_used_map, ino); + ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(dp->inode.i_mode)); + quota_data_sub(ctx->qctx, &dp->inode, ino, + pb.dup_blocks * fs->blocksize); +diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c +index 3dd1e941..2c908be0 100644 +--- a/e2fsck/rehash.c ++++ b/e2fsck/rehash.c +@@ -1028,6 +1028,8 @@ void e2fsck_rehash_directories(e2fsck_t ctx) + if (!ext2fs_u32_list_iterate(iter, &ino)) + break; + } ++ if (!ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino)) ++ continue; + + pctx.dir = ino; + if (first) { +-- +2.24.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch new file mode 100644 index 0000000..de4bce0 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2019-5188.patch @@ -0,0 +1,57 @@ +From 8dd73c149f418238f19791f9d666089ef9734dff Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o +Date: Thu, 19 Dec 2019 19:37:34 -0500 +Subject: [PATCH] e2fsck: abort if there is a corrupted directory block when + rehashing + +In e2fsck pass 3a, when we are rehashing directories, at least in +theory, all of the directories should have had corruptions with +respect to directory entry structure fixed. However, it's possible +(for example, if the user declined a fix) that we can reach this stage +of processing with a corrupted directory entries. + +So check for that case and don't try to process a corrupted directory +block so we don't run into trouble in mutate_name() if there is a +zero-length file name. + +Addresses: TALOS-2019-0973 +Addresses: CVE-2019-5188 +Signed-off-by: Theodore Ts'o + +CVE: CVE-2019-5188 +Signed-off-by: Anuj Mittal +Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=8dd73c149f418238f19791f9d666089ef9734dff] +--- + e2fsck/rehash.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c +index a5fc1be1..3dd1e941 100644 +--- a/e2fsck/rehash.c ++++ b/e2fsck/rehash.c +@@ -160,6 +160,10 @@ static int fill_dir_block(ext2_filsys fs, + dir_offset += rec_len; + if (dirent->inode == 0) + continue; ++ if ((name_len) == 0) { ++ fd->err = EXT2_ET_DIR_CORRUPTED; ++ return BLOCK_ABORT; ++ } + if (!fd->compress && (name_len == 1) && + (dirent->name[0] == '.')) + continue; +@@ -401,6 +405,11 @@ static int duplicate_search_and_fix(e2fsck_t ctx, ext2_filsys fs, + continue; + } + new_len = ext2fs_dirent_name_len(ent->dir); ++ if (new_len == 0) { ++ /* should never happen */ ++ ext2fs_unmark_valid(fs); ++ continue; ++ } + memcpy(new_name, ent->dir->name, new_len); + mutate_name(new_name, &new_len); + for (j=0; j < fd->num_array; j++) { +-- +2.24.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb index 6e69eea..fc92b77 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb @@ -7,6 +7,8 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ + file://CVE-2019-5188.patch \ + file://0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:02 +0000 Subject: [oe-commits] [openembedded-core] 09/11: e2fsprogs: backport upstream patch In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.D452E232A8B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 23c1b157362609bd8d85c7d35e6c7f0f60c32c88 Author: Anuj Mittal AuthorDate: Mon Mar 9 08:45:02 2020 +0800 e2fsprogs: backport upstream patch Fixes a bug wherein a use after free could potentially be used to run malicious code if a user can be tricked into running e2fsck on a maliciously crafted file system. Also see: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=948517 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...fsck-fix-use-after-free-in-calculate_tree.patch | 76 ++++++++++++++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 1 + 2 files changed, 77 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch new file mode 100644 index 0000000..342a2b8 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsck-fix-use-after-free-in-calculate_tree.patch @@ -0,0 +1,76 @@ +From: Wang Shilong +Date: Mon, 30 Dec 2019 19:52:39 -0500 +Subject: e2fsck: fix use after free in calculate_tree() + +The problem is alloc_blocks() will call get_next_block() which might +reallocate outdir->buf, and memory address could be changed after +this. To fix this, pointers that point into outdir->buf, such as +int_limit and root need to be recaulated based on the new starting +address of outdir->buf. + +[ Changed to correctly recalculate int_limit, and to optimize how we + reallocate outdir->buf. -TYT ] + +Addresses-Debian-Bug: 948517 +Signed-off-by: Wang Shilong +Signed-off-by: Theodore Ts'o +(cherry picked from commit 101e73e99ccafa0403fcb27dd7413033b587ca01) + +Signed-off-by: Anuj Mittal +Upstream-Status: Backport [https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=101e73e99ccafa0403fcb27dd7413033b587ca01] +--- + e2fsck/rehash.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c +index 0a5888a9..2574e151 100644 +--- a/e2fsck/rehash.c ++++ b/e2fsck/rehash.c +@@ -295,7 +295,11 @@ static errcode_t get_next_block(ext2_filsys fs, struct out_dir *outdir, + errcode_t retval; + + if (outdir->num >= outdir->max) { +- retval = alloc_size_dir(fs, outdir, outdir->max + 50); ++ int increment = outdir->max / 10; ++ ++ if (increment < 50) ++ increment = 50; ++ retval = alloc_size_dir(fs, outdir, outdir->max + increment); + if (retval) + return retval; + } +@@ -637,6 +641,9 @@ static int alloc_blocks(ext2_filsys fs, + if (retval) + return retval; + ++ /* outdir->buf might be reallocated */ ++ *prev_ent = (struct ext2_dx_entry *) (outdir->buf + *prev_offset); ++ + *next_ent = set_int_node(fs, block_start); + *limit = (struct ext2_dx_countlimit *)(*next_ent); + if (next_offset) +@@ -726,6 +733,9 @@ static errcode_t calculate_tree(ext2_filsys fs, + return retval; + } + if (c3 == 0) { ++ int delta1 = (char *)int_limit - outdir->buf; ++ int delta2 = (char *)root - outdir->buf; ++ + retval = alloc_blocks(fs, &limit, &int_ent, + &dx_ent, &int_offset, + NULL, outdir, i, &c2, +@@ -733,6 +743,11 @@ static errcode_t calculate_tree(ext2_filsys fs, + if (retval) + return retval; + ++ /* outdir->buf might be reallocated */ ++ int_limit = (struct ext2_dx_countlimit *) ++ (outdir->buf + delta1); ++ root = (struct ext2_dx_entry *) ++ (outdir->buf + delta2); + } + dx_ent->block = ext2fs_cpu_to_le32(i); + if (c3 != limit->limit) +-- +2.24.1 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb index fc92b77..4f7cafe 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb @@ -9,6 +9,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ file://CVE-2019-5188.patch \ file://0001-e2fsck-don-t-try-to-rehash-a-deleted-directory.patch \ + file://e2fsck-fix-use-after-free-in-calculate_tree.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:03 +0000 Subject: [oe-commits] [openembedded-core] 10/11: glibc: CVE-2020-10029 In-Reply-To: <158388923314.10346.2635716817837501391@git.openembedded.org> References: <158388923314.10346.2635716817837501391@git.openembedded.org> Message-ID: <20200311011353.DDB12232B21@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bc0b66c584116635940364fdc2740b8b6ce3d384 Author: Zhixiong Chi AuthorDate: Mon Mar 9 00:43:41 2020 -0700 glibc: CVE-2020-10029 Backport the CVE patch from upstream: [https://sourceware.org/git/gitweb.cgi?p=glibc.git; a=patch;h=9333498794cde1d5cca518badf79533a24114b6f] Signed-off-by: Zhixiong Chi Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc/CVE-2020-10029.patch | 128 +++++++++++++++++++++ meta/recipes-core/glibc/glibc_2.31.bb | 1 + 2 files changed, 129 insertions(+) diff --git a/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch b/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch new file mode 100644 index 0000000..22a15f5 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch @@ -0,0 +1,128 @@ +From ce265ec5bc25ec35fba53807abac1b0c8469895e Mon Sep 17 00:00:00 2001 +From: Joseph Myers +Date: Wed, 12 Feb 2020 23:31:56 +0000 +Subject: [PATCH] Avoid ldbl-96 stack corruption from range reduction of + + pseudo-zero (bug 25487). + +Bug 25487 reports stack corruption in ldbl-96 sinl on a pseudo-zero +argument (an representation where all the significand bits, including +the explicit high bit, are zero, but the exponent is not zero, which +is not a valid representation for the long double type). + +Although this is not a valid long double representation, existing +practice in this area (see bug 4586, originally marked invalid but +subsequently fixed) is that we still seek to avoid invalid memory +accesses as a result, in case of programs that treat arbitrary binary +data as long double representations, although the invalid +representations of the ldbl-96 format do not need to be consistently +handled the same as any particular valid representation. + +This patch makes the range reduction detect pseudo-zero and unnormal +representations that would otherwise go to __kernel_rem_pio2, and +returns a NaN for them instead of continuing with the range reduction +process. (Pseudo-zero and unnormal representations whose unbiased +exponent is less than -1 have already been safely returned from the +function before this point without going through the rest of range +reduction.) Pseudo-zero representations would previously result in +the value passed to __kernel_rem_pio2 being all-zero, which is +definitely unsafe; unnormal representations would previously result in +a value passed whose high bit is zero, which might well be unsafe +since that is not a form of input expected by __kernel_rem_pio2. + +Tested for x86_64. + +CVE: CVE-2020-10029 +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git; +a=patch;h=9333498794cde1d5cca518badf79533a24114b6f] +Signed-off-by: Zhixiong Chi + +--- + sysdeps/ieee754/ldbl-96/Makefile | 3 ++- + sysdeps/ieee754/ldbl-96/e_rem_pio2l.c | 12 +++++++++ + sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c | 41 ++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 1 deletion(-) + create mode 100644 sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c + +diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile +index b103254..052c1c7 100644 +--- a/sysdeps/ieee754/ldbl-96/Makefile ++++ b/sysdeps/ieee754/ldbl-96/Makefile +@@ -17,5 +17,6 @@ + # . + + ifeq ($(subdir),math) +-tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 ++tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 test-sinl-pseudo ++CFLAGS-test-sinl-pseudo.c += -fstack-protector-all + endif +diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +index 805de22..1aeccb4 100644 +--- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c ++++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +@@ -210,6 +210,18 @@ __ieee754_rem_pio2l (long double x, long double *y) + return 0; + } + ++ if ((i0 & 0x80000000) == 0) ++ { ++ /* Pseudo-zero and unnormal representations are not valid ++ representations of long double. We need to avoid stack ++ corruption in __kernel_rem_pio2, which expects input in a ++ particular normal form, but those representations do not need ++ to be consistently handled like any particular floating-point ++ value. */ ++ y[1] = y[0] = __builtin_nanl (""); ++ return 0; ++ } ++ + /* Split the 64 bits of the mantissa into three 24-bit integers + stored in a double array. */ + exp = j0 - 23; +diff --git a/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +new file mode 100644 +index 0000000..f59b977 +--- /dev/null ++++ b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +@@ -0,0 +1,41 @@ ++/* Test sinl for pseudo-zeros and unnormals for ldbl-96 (bug 25487). ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ for (int i = 0; i < 64; i++) ++ { ++ uint64_t sig = i == 63 ? 0 : 1ULL << i; ++ long double ld; ++ SET_LDOUBLE_WORDS (ld, 0x4141, ++ sig >> 32, sig & 0xffffffffULL); ++ /* The requirement is that no stack overflow occurs when the ++ pseudo-zero or unnormal goes through range reduction. */ ++ volatile long double ldr; ++ ldr = sinl (ld); ++ (void) ldr; ++ } ++ return 0; ++} ++ ++#include diff --git a/meta/recipes-core/glibc/glibc_2.31.bb b/meta/recipes-core/glibc/glibc_2.31.bb index 2032311..6dd9415 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://CVE-2020-10029.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 Wed Mar 11 01:14:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:14 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ac28824 -> 2e18fcb) Message-ID: <158388925488.10989.11107238542418316524@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 ac28824 gcc: strip line numbers from generated code discard aa9150f gcc: don't ship build host information in the target gcc-plugins package discard 3eab8b8 oeqa/selftest: Ensure buildtools in environment variables isn't replaced discard 528c750 glibc: CVE-2020-10029 discard 16e806b e2fsprogs: backport upstream patch discard 0e61e95 e2fsprogs: fix CVE-2019-5188 discard ca03832 sqlite3: fix CVE-2020-9327 discard fc3088b kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds discard e892667 cve-check: fix ValueError discard e221d94 p11-kit: Add nativesdk variant discard 3e72ed8 kernel-yocto.bbclass: Support config fragments with externalsrc discard e7bff4e perf: Fix externalsrc support discard 3677eaf kernelsrc.bbclass: Fix externalsrc support discard fe54c05 archiver.bbclass: Make do_deploy_archives a recursive dependency discard c23d3a5 archiver.bbclass: Handle gitsm URLs in the mirror archiver discard 88f1967 buildtools-extended-tarball: Add locale command discard d326e52 glibc: Update nativesdk locale relocation patch discard 0ec677e coreutils hack discard 480e17e files/toolchain-shar-extract.sh: Rework PATH cleaning discard 8ad285b oeqa/testsdk: Use original PATH discard d31fadb ptest-packagelists.inc: add coreutils to SLOW list discard caec70b coreutils: add ptest discard f288e92 nspr: Move to meta-oe discard c2727fa nss: Move to meta-oe discard 9ca7fab rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 06b4977 HACK: signing: Add extra test debug discard 835accd glew/curl: specify exclusive package configs discard b35ea40 base.bbclass: extend PACKAGECONFIG for conflict package configs add 2c17d35 kernelsrc.bbclass: Fix externalsrc support add eab605b perf: Fix externalsrc support add 44f04c0 kernel-yocto.bbclass: Support config fragments with externalsrc add 744f247 p11-kit: Add nativesdk variant add 64a362b cve-check: fix ValueError add 270ae94 kernel.bbclass: fix SOURCE_DATE_EPOCH for non-git kernel builds add 6acb974 sqlite3: fix CVE-2020-9327 add 09bdcef e2fsprogs: fix CVE-2019-5188 add 23c1b15 e2fsprogs: backport upstream patch add bc0b66c glibc: CVE-2020-10029 add 04ee0e8 oeqa/selftest: Ensure buildtools in environment variables isn't replaced new 7a762e7 base.bbclass: extend PACKAGECONFIG for conflict package configs new bfce159 glew/curl: specify exclusive package configs new 5263de8 HACK: signing: Add extra test debug new 3174def rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new a128180 nss: Move to meta-oe new 223d204 nspr: Move to meta-oe new 2c9b7af gcc: don't ship build host information in the target gcc-plugins package new 2ff2cdf gcc: strip line numbers from generated code in gcc-plugins on target new 40a7170 oeqa/testsdk: Use original PATH new 49c9ab0 files/toolchain-shar-extract.sh: Rework PATH cleaning new 280649c glibc: Update nativesdk locale relocation patch new ddefb69 buildtools-extended-tarball: Add locale command new b5dcbbb ruby: Use arm32 for coroutines on 32bit-arm new 0906d45 valgrind: Fix timerfd syscall test to be 64bit time_t safe new 5082266 libdnf: fix upstream version check new 222c794 image-prelink: remove assumption of sysconfdir presence new 04cc7fc grub-efi-cfg: enable per-label APPEND override new 5327c7c coreutils: add ptest new d098443 ptest-packagelists.inc: add coreutils to SLOW list new 62b79d3 coreutils hack new 2e18fcb coreutils: 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 (ac28824) \ N -- N -- N refs/heads/master-next (2e18fcb) 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: meta/classes/archiver.bbclass | 35 ++------ meta/classes/grub-efi-cfg.bbclass | 6 ++ meta/classes/image-prelink.bbclass | 17 ++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 3 + meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + meta/recipes-devtools/ruby/ruby_2.7.0.bb | 3 + ...1-memcheck-tests-Fix-timerfd-syscall-test.patch | 98 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 8 files changed, 135 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:15 +0000 Subject: [oe-commits] [openembedded-core] 01/21: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.3C7F62329BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7a762e709b80935e8597ec2b09226d70983e6c2d 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 Mar 11 01:14:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:16 +0000 Subject: [oe-commits] [openembedded-core] 02/21: glew/curl: specify exclusive package configs In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.5168F2329C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bfce1590002ca1245ada1a284ad3a11d8fa3ff8c 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.69.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.69.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb index cf4f4bc..2e9b512 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.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 Mar 11 01:14:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:17 +0000 Subject: [oe-commits] [openembedded-core] 03/21: HACK: signing: Add extra test debug In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.666292329C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5263de8cfda754a64d5cb75345ba73ecf0ec4230 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/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..9db1a20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -221,4 +222,17 @@ 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 = runCmd('cat bitbake-cookerdaemon.log').output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) + 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 Mar 11 01:14:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:18 +0000 Subject: [oe-commits] [openembedded-core] 04/21: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.7AB512329C9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3174deff303de94b25c7d85430350b1b80278ee9 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 Wed Mar 11 01:14:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:21 +0000 Subject: [oe-commits] [openembedded-core] 07/21: gcc: don't ship build host information in the target gcc-plugins package In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.B6CE0232A4E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2c9b7afeac1ed0a81e49fa29d5f26c6502963c88 Author: Ross Burton AuthorDate: Tue Mar 10 14:07:01 2020 +0000 gcc: don't ship build host information in the target gcc-plugins package The build host configuration isn't reproducible as it varies depending on the gcc version of the build host. This information isn't useful on the target anyway so remove it. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-target.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 18d078d..204f947 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -179,6 +179,10 @@ do_install () { # Cleanup manpages.. rm -rf ${D}${mandir}/man7 + # Don't package details about the build host + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h + cd ${D}${bindir} # We care about g++ not c++ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:19 +0000 Subject: [oe-commits] [openembedded-core] 05/21: nss: Move to meta-oe In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.940A3232A23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a1281809e1c486739253851c522ccdfc082a8055 Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:07 2020 +0200 nss: Move to meta-oe rpm was the last user in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 14 files changed, 638 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..f6a2936 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -527,7 +527,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " 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 deleted file mode 100644 index c380c14..0000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d540339..0000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2..0000000 Binary files a/meta/recipes-support/nss/nss/blank-cert9.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db deleted file mode 100644 index d47f08d..0000000 Binary files a/meta/recipes-support/nss/nss/blank-key4.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d2..0000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d1..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc9..0000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ec..0000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817fa..0000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499..0000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9..0000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7..0000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -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" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "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 Wed Mar 11 01:14:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:22 +0000 Subject: [oe-commits] [openembedded-core] 08/21: gcc: strip line numbers from generated code in gcc-plugins on target In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.C8A24232A54@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2ff2cdfa0e535040ec9fb8d3ee9d4e80eb01beca Author: Ross Burton AuthorDate: Tue Mar 10 13:48:26 2020 +0000 gcc: strip line numbers from generated code in gcc-plugins on target The line numbers are influenced by the gcc version on the host used to generate the code. Remove these to ensure the shipped source code is the same. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + .../gcc/gcc-9.2/gen-no-line-numbers.patch | 170 +++++++++++++++++++++ 2 files changed, 171 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index 2bae85a..2368f35 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -70,6 +70,7 @@ SRC_URI = "\ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ + file://gen-no-line-numbers.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch new file mode 100644 index 0000000..8e2c3f5 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch @@ -0,0 +1,170 @@ +Inserting line numbers into generated code means its not always reproducible wth +differing versions of host gcc. Void the issue by not adding these. + +Upstream-Status: Inappropriate [OE Reproducibility specific] +Signed-off-by: Richard Purdie + +diff --git a/gcc/gengtype.c b/gcc/gengtype.c +index 53317337c..bbb261516 100644 +--- a/gcc/gengtype.c ++++ b/gcc/gengtype.c +@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, + /* Create a fake field with the given type and name. NEXT is the next + field in the chain. */ + #define create_field(next,type,name) \ +- create_field_all (next,type,name, 0, this_file, __LINE__) ++ create_field_all (next,type,name, 0, this_file, 0) + + /* Like create_field, but the field is only valid when condition COND + is true. */ +@@ -1024,7 +1024,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, + } + + #define create_optional_field(next,type,name,cond) \ +- create_optional_field_(next,type,name,cond,__LINE__) ++ create_optional_field_(next,type,name,cond,0) + + /* Reverse a linked list of 'struct pair's in place. */ + pair_p +@@ -5186,7 +5186,7 @@ main (int argc, char **argv) + /* These types are set up with #define or else outside of where + we can see them. We should initialize them before calling + read_input_list. */ +-#define POS_HERE(Call) do { pos.file = this_file; pos.line = __LINE__; \ ++#define POS_HERE(Call) do { pos.file = this_file; pos.line = 0; \ + Call;} while (0) + POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); + POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); +diff --git a/gcc/genmodes.c b/gcc/genmodes.c +index f33eefa24..07bef9eeb 100644 +--- a/gcc/genmodes.c ++++ b/gcc/genmodes.c +@@ -429,7 +429,7 @@ complete_all_modes (void) + } + + /* For each mode in class CLASS, construct a corresponding complex mode. */ +-#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, __LINE__) ++#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, 0) + static void + make_complex_modes (enum mode_class cl, + const char *file, unsigned int line) +@@ -487,7 +487,7 @@ make_complex_modes (enum mode_class cl, + /* For all modes in class CL, construct vector modes of width + WIDTH, having as many components as necessary. */ + #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W) \ +- make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, __LINE__) ++ make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, 0) + #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W) + static void ATTRIBUTE_UNUSED + make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, +@@ -538,7 +538,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, + /* Create a vector of booleans called NAME with COUNT elements and + BYTESIZE bytes in total. */ + #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \ +- make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, __LINE__) ++ make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_vector_bool_mode (const char *name, unsigned int count, + unsigned int bytesize, const char *file, +@@ -560,7 +560,7 @@ make_vector_bool_mode (const char *name, unsigned int count, + /* Input. */ + + #define _SPECIAL_MODE(C, N) \ +- make_special_mode (MODE_##C, #N, __FILE__, __LINE__) ++ make_special_mode (MODE_##C, #N, __FILE__, 0) + #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) + #define CC_MODE(N) _SPECIAL_MODE (CC, N) + +@@ -573,7 +573,7 @@ make_special_mode (enum mode_class cl, const char *name, + + #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) + #define FRACTIONAL_INT_MODE(N, B, Y) \ +- make_int_mode (#N, B, Y, __FILE__, __LINE__) ++ make_int_mode (#N, B, Y, __FILE__, 0) + + static void + make_int_mode (const char *name, +@@ -586,16 +586,16 @@ make_int_mode (const char *name, + } + + #define FRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, 0) + + #define UFRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, 0) + + #define ACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, 0) + + #define UACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, 0) + + /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, + FILE, and LINE. */ +@@ -616,7 +616,7 @@ make_fixed_point_mode (enum mode_class cl, + + #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ +- make_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_float_mode (const char *name, +@@ -633,7 +633,7 @@ make_float_mode (const char *name, + #define DECIMAL_FLOAT_MODE(N, Y, F) \ + FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ +- make_decimal_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_decimal_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_decimal_float_mode (const char *name, +@@ -648,7 +648,7 @@ make_decimal_float_mode (const char *name, + } + + #define RESET_FLOAT_FORMAT(N, F) \ +- reset_float_format (#N, #F, __FILE__, __LINE__) ++ reset_float_format (#N, #F, __FILE__, 0) + static void ATTRIBUTE_UNUSED + reset_float_format (const char *name, const char *format, + const char *file, unsigned int line) +@@ -669,7 +669,7 @@ reset_float_format (const char *name, const char *format, + + /* __intN support. */ + #define INT_N(M,PREC) \ +- make_int_n (#M, PREC, __FILE__, __LINE__) ++ make_int_n (#M, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_int_n (const char *m, int bitsize, + const char *file, unsigned int line) +@@ -698,7 +698,7 @@ make_int_n (const char *m, int bitsize, + /* Partial integer modes are specified by relation to a full integer + mode. */ + #define PARTIAL_INT_MODE(M,PREC,NAME) \ +- make_partial_integer_mode (#M, #NAME, PREC, __FILE__, __LINE__) ++ make_partial_integer_mode (#M, #NAME, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_partial_integer_mode (const char *base, const char *name, + unsigned int precision, +@@ -725,7 +725,7 @@ make_partial_integer_mode (const char *base, const char *name, + /* A single vector mode can be specified by naming its component + mode and the number of components. */ + #define VECTOR_MODE(C, M, N) \ +- make_vector_mode (MODE_##C, #M, N, __FILE__, __LINE__); ++ make_vector_mode (MODE_##C, #M, N, __FILE__, 0); + static void ATTRIBUTE_UNUSED + make_vector_mode (enum mode_class bclass, + const char *base, +@@ -768,7 +768,7 @@ make_vector_mode (enum mode_class bclass, + + /* Adjustability. */ + #define _ADD_ADJUST(A, M, X, C1, C2) \ +- new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, __LINE__) ++ new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, 0) + + #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) + #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:23 +0000 Subject: [oe-commits] [openembedded-core] 09/21: oeqa/testsdk: Use original PATH In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.D9A65232984@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 40a717045a985bac0c17c4a4f7d0ed78d504a165 Author: Richard Purdie AuthorDate: Sun Mar 8 10:20:12 2020 +0000 oeqa/testsdk: Use original PATH We want to test the SDK with PATH from the original host, not with our own tools injected via HOSTTOOLS. It even uses some tools which aren't in HOSTTOOLS. This is necessary after changing the SDK to not reset PATH to the system default which is bad for other reasons and brings the testing into sync with that change. Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdkext/testsdk.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index 785b5dd..c5c46df 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py @@ -25,11 +25,8 @@ class TestSDKExt(TestSDKBase): subprocesstweak.errors_have_output() - # extensible sdk can be contaminated if native programs are - # in PATH, i.e. use perl-native instead of eSDK one. - paths_to_avoid = [d.getVar('STAGING_DIR'), - d.getVar('BASE_WORKDIR')] - os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) + # We need the original PATH for testing the eSDK, not with our manipulations + os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH") tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") if not os.path.exists(tcname): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:20 +0000 Subject: [oe-commits] [openembedded-core] 06/21: nspr: Move to meta-oe In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.A9AAC232A42@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 223d204c48fe1f7e516614ffc84b7b0a1ccf28f8 Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:08 2020 +0200 nspr: Move to meta-oe It was used only by nss. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 ---- .../nspr/nspr/0002-Add-nios2-support.patch | 102 ----------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ----------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ------ meta/recipes-support/nspr/nspr/nspr.pc.in | 11 -- .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- 9 files changed, 542 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f6a2936..33f8044 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670..0000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d42..0000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f..0000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8..0000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19..0000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed..0000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1..0000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -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 Mar 11 01:14:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:24 +0000 Subject: [oe-commits] [openembedded-core] 10/21: files/toolchain-shar-extract.sh: Rework PATH cleaning In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011415.E6CFA2329BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 49c9ab03e41e1dc175e2e8db057eb5c5b9c12b4e Author: Richard Purdie AuthorDate: Sat Mar 7 13:43:44 2020 +0000 files/toolchain-shar-extract.sh: Rework PATH cleaning Trying to create a clean PATH breaks cases where we install a buildtools tarball on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up directories in PATH which don't exist isntead. Do it with python as the shell version was too fraught with corner cases. Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4c4b4de..2e0fe94 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,13 +1,8 @@ #!/bin/sh -[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ - LC_ALL=en_US.UTF-8 \ - TERM=$TERM \ - ICECC_PATH="$ICECC_PATH" \ - http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ - no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" -[ -f /etc/environment ] && . /etc/environment -export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +export LC_ALL=en_US.UTF-8 +# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted +PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:26 +0000 Subject: [oe-commits] [openembedded-core] 12/21: buildtools-extended-tarball: Add locale command In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.10254232A8B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ddefb69d1a90466e7fc8815adedac5e1618854c6 Author: Richard Purdie AuthorDate: Mon Mar 9 21:09:43 2020 +0000 buildtools-extended-tarball: Add locale command The eSDK installation code checks installed locales with the locale command which is from glibc-utils. Add this so that we find the correct locales from the buildtools. Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index 4a79b09..dd780c5 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libstdc++-dev \ nativesdk-libtool \ nativesdk-pkgconfig \ + nativesdk-glibc-utils \ nativesdk-libxcrypt-dev \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:27 +0000 Subject: [oe-commits] [openembedded-core] 13/21: ruby: Use arm32 for coroutines on 32bit-arm In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.1F9A22329C3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b5dcbbb3c5711759f1eca639c2dcebe4e007c95a Author: Khem Raj AuthorDate: Mon Mar 9 18:19:38 2020 -0700 ruby: Use arm32 for coroutines on 32bit-arm in 2.7 [2] ruby enabled ucontext for coroutines on arm32 but it does not work for musl since it uses glibc specific functions e.g. getcontext/swapcontext/swapcontext also see [1] This patch reverts back to using arm32 implementation for coroutines on arm [1] https://bugs.ruby-lang.org/issues/16455#change-83442 [2] https://github.com/ruby/ruby/commit/6c6bf9ffcbfeb8be9d9c342e7604b74ec819e88a#diff-7fccec8474e2184cd2518046bf39d54cL10 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby_2.7.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index 268b4be..44c7616 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -25,6 +25,9 @@ EXTRA_OECONF = "\ --with-pkg-config=pkg-config \ " +EXTRA_OECONF_append_libc-musl_arm = " --with-coroutine=arm32" +EXTRA_OECONF_append_libc-musl_armeb = " --with-coroutine=arm32" + do_install() { oe_runmake 'DESTDIR=${D}' install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:25 +0000 Subject: [oe-commits] [openembedded-core] 11/21: glibc: Update nativesdk locale relocation patch In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.015742329C2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 280649cca0a6d6e7190c4565d19da7b5e5f38995 Author: Richard Purdie AuthorDate: Mon Mar 9 20:59:11 2020 +0000 glibc: Update nativesdk locale relocation patch The locale binary reported incorrect locale lists in relocated toolchains as some path references were not relocated by this patch. Fix this missing relocations so the locale binary correctly reports the locales. Signed-off-by: Richard Purdie --- ...libc-Make-relocatable-install-for-locales.patch | 62 ++++++++++++++++------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch index d9985c2..27cd17c 100644 --- a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +++ b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch @@ -17,11 +17,11 @@ Signed-off-by: Khem Raj locale/localeinfo.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/locale/findlocale.c b/locale/findlocale.c -index 9cd3b71a6d..84272310e0 100644 ---- a/locale/findlocale.c -+++ b/locale/findlocale.c -@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = +Index: git/locale/findlocale.c +=================================================================== +--- git.orig/locale/findlocale.c ++++ git/locale/findlocale.c +@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attr which are somehow addressed. */ struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; @@ -30,7 +30,7 @@ index 9cd3b71a6d..84272310e0 100644 /* Checks if the name is actually present, that is, not NULL and not empty. */ -@@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, +@@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path /* Nothing in the archive. Set the default path to search below. */ locale_path = _nl_default_locale_path; @@ -39,10 +39,10 @@ index 9cd3b71a6d..84272310e0 100644 } else /* We really have to load some data. First see whether the name is -diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index ba0fe45648..9737fd4cda 100644 ---- a/locale/loadarchive.c -+++ b/locale/loadarchive.c +Index: git/locale/loadarchive.c +=================================================================== +--- git.orig/locale/loadarchive.c ++++ git/locale/loadarchive.c @@ -42,7 +42,7 @@ @@ -52,11 +52,11 @@ index ba0fe45648..9737fd4cda 100644 /* Size of initial mapping window, optimal if large enough to cover the header plus the initial locale. */ -diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 1bfe22aa7f..fdc283c69a 100644 ---- a/locale/localeinfo.h -+++ b/locale/localeinfo.h -@@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int category, int item) +Index: git/locale/localeinfo.h +=================================================================== +--- git.orig/locale/localeinfo.h ++++ git/locale/localeinfo.h +@@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int categor } /* Default search path if no LOCPATH environment variable. */ @@ -65,3 +65,35 @@ index 1bfe22aa7f..fdc283c69a 100644 /* Load the locale data for CATEGORY from the file specified by *NAME. If *NAME is "", use environment variables as specified by POSIX, and +Index: git/locale/programs/locale.c +=================================================================== +--- git.orig/locale/programs/locale.c ++++ git/locale/programs/locale.c +@@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b + ((const struct nameent *) b)->name); + } + ++static char _write_archive_locales_path[4096] attribute_hidden __attribute__ ((section (".gccrelocprefix"))) = ARCHIVE_NAME; + + static int + write_archive_locales (void **all_datap, char *linebuf) +@@ -645,7 +646,7 @@ write_archive_locales (void **all_datap, + int fd, ret = 0; + uint32_t cnt; + +- fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ fd = open64 (_write_archive_locales_path, O_RDONLY); + if (fd < 0) + return 0; + +@@ -700,8 +701,8 @@ write_archive_locales (void **all_datap, + if (cnt) + putchar_unlocked ('\n'); + +- printf ("locale: %-15.15s archive: " ARCHIVE_NAME "\n%s\n", +- names[cnt].name, linebuf); ++ printf ("locale: %-15.15s archive: %s\n%s\n", ++ names[cnt].name, _write_archive_locales_path, linebuf); + + locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:31 +0000 Subject: [oe-commits] [openembedded-core] 17/21: grub-efi-cfg: enable per-label APPEND override In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.5A215232B66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 04cc7fcfc05595e87d650e452d664243aeba8a4a Author: Rich Persaud AuthorDate: Mon Mar 9 18:44:57 2020 -0400 grub-efi-cfg: enable per-label APPEND override For legacy bios boot configurations, syslinux supports multiple labels with per-label APPEND definitions. grub-efi-cfg supports multiple labels, but only a single APPEND definition. Enable optional per-label APPEND definitions for grub EFI, with variable names prefixed by "grub_" to isolate grub definitions from syslinux defintions. Example use from an ISO image recipe that inherits grub-efi-cfg: LABELS_LIVE="foo bar" APPEND_grub_foo = "linuxcmdline" No change in behavior for those using APPEND without overrides. Signed-off-by: Rich Persaud Signed-off-by: Richard Purdie --- meta/classes/grub-efi-cfg.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass index 8b5ff20..3a2cdd6 100644 --- a/meta/classes/grub-efi-cfg.bbclass +++ b/meta/classes/grub-efi-cfg.bbclass @@ -88,6 +88,12 @@ python build_efi_cfg() { for label in labels.split(): localdata = d.createCopy() + overrides = localdata.getVar('OVERRIDES') + if not overrides: + bb.fatal('OVERRIDES not defined') + + localdata.setVar('OVERRIDES', 'grub_' + label + ':' + overrides) + for btype in btypes: cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0])) lb = label -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:29 +0000 Subject: [oe-commits] [openembedded-core] 15/21: libdnf: fix upstream version check In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.414A8232B21@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 50822667727b9f0c92fbf54212bdbfbe839013e2 Author: Alexander Kanavin AuthorDate: Tue Mar 10 20:43:28 2020 +0100 libdnf: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 163a2ee..cc2ceb8 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -12,6 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ " SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77" +UPSTREAM_CHECK_GITTAGREGEX = "(?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 Wed Mar 11 01:14:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:33 +0000 Subject: [oe-commits] [openembedded-core] 19/21: ptest-packagelists.inc: add coreutils to SLOW list In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.76203232984@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d098443fed8017f90db655b61678b6370cefb110 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 d6f3aaf..c13ff72 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -66,6 +66,7 @@ PTESTS_SLOW = "\ babeltrace-ptest \ babeltrace2-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 Wed Mar 11 01:14:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:28 +0000 Subject: [oe-commits] [openembedded-core] 14/21: valgrind: Fix timerfd syscall test to be 64bit time_t safe In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.2FC4F2329C9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0906d45c984b1633ca894694541bee88f93f2a34 Author: Khem Raj AuthorDate: Mon Mar 9 18:15:43 2020 -0700 valgrind: Fix timerfd syscall test to be 64bit time_t safe This helps compile the testcase with musl on 32bit arches Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...1-memcheck-tests-Fix-timerfd-syscall-test.patch | 98 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 99 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch new file mode 100644 index 0000000..15fbbe9 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch @@ -0,0 +1,98 @@ +From 5d411fd147d652e9d7bb259f4048693c6e4742aa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 9 Mar 2020 16:30:19 -0700 +Subject: [PATCH] memcheck/tests: Fix timerfd syscall test + +modern libc provides these functions, moreover this also ensures that we +are 64bit time_t safe. Fallback to existing definitions if libc does not +have the implementation or syscall is not defined + +Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36943897/] +Signed-off-by: Khem Raj +--- + config.h.in | 9 +++++++++ + configure.ac | 3 +++ + memcheck/tests/linux/timerfd-syscall.c | 10 ++++++++-- + 5 files changed, 32 insertions(+), 2 deletions(-) + +--- a/config.h.in ++++ b/config.h.in +@@ -301,6 +301,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_SYSNVL_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TIMERFD_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TIME_H + +--- a/configure.ac ++++ b/configure.ac +@@ -4098,6 +4098,7 @@ AC_CHECK_HEADERS([ \ + sys/syscall.h \ + sys/sysnvl.h \ + sys/time.h \ ++ sys/timerfd.h \ + sys/types.h \ + ]) + +--- a/memcheck/tests/linux/timerfd-syscall.c ++++ b/memcheck/tests/linux/timerfd-syscall.c +@@ -45,6 +45,9 @@ + #if defined(HAVE_SYS_TIME_H) + #include + #endif ++#if defined(HAVE_SYS_TIMERFD_H) ++#include ++#endif + #if defined(HAVE_SYS_TYPES_H) + #include + #endif +@@ -54,7 +57,8 @@ + * timerfd_* system call numbers introduced in 2.6.23. These constants are + * not yet in the glibc 2.7 headers, that is why they are defined here. + */ +-#ifndef __NR_timerfd_create ++#if !defined(HAVE_SYS_TIMERFD_H) ++#if !defined(__NR_timerfd_create) + #if defined(__x86_64__) + #define __NR_timerfd_create 283 + #elif defined(__i386__) +@@ -67,8 +71,10 @@ + #error Cannot detect your architecture! + #endif + #endif ++#endif + +-#ifndef __NR_timerfd_settime ++#if !defined(HAVE_SYS_TIMERFD_H) ++#if !defined(__NR_timerfd_settime) + #if defined(__x86_64__) + #define __NR_timerfd_settime 286 + #define __NR_timerfd_gettime 287 +@@ -85,7 +91,7 @@ + #error Cannot detect your architecture! + #endif + #endif +- ++#endif + + + /* Definitions from include/linux/timerfd.h */ +@@ -127,6 +133,7 @@ void set_timespec(struct timespec *tmr, + tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); + } + ++#if !defined(HAVE_SYS_TIMERFD_H) + int timerfd_create(int clockid, int flags) + { + return syscall(__NR_timerfd_create, clockid, flags); +@@ -142,6 +149,7 @@ int timerfd_gettime(int ufc, struct itim + { + return syscall(__NR_timerfd_gettime, ufc, otmr); + } ++#endif + + long waittmr(int tfd, int timeo) + { diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 1475ff8..7954437 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -41,6 +41,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ 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 \ + file://0001-memcheck-tests-Fix-timerfd-syscall-test.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 Wed Mar 11 01:14:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:32 +0000 Subject: [oe-commits] [openembedded-core] 18/21: coreutils: add ptest In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.68A23232A23@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 5327c7c6f6a60fc642b5bebd60caf7c66ad48825 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 Wed Mar 11 01:14:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:34 +0000 Subject: [oe-commits] [openembedded-core] 20/21: coreutils hack In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.8310D2329BB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 62b79d3c177443e4e7fd57e2453088fde5adaa53 Author: Richard Purdie AuthorDate: Sun Mar 8 14:35:58 2020 +0000 coreutils hack Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 04a0522..cc4008e 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -149,6 +149,10 @@ inherit ptest RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" +# -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy +RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" +RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" + do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:30 +0000 Subject: [oe-commits] [openembedded-core] 16/21: image-prelink: remove assumption of sysconfdir presence In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.4EB37232B56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 222c794bcd0a0246a6f029f3227b8545614598b0 Author: Christopher Clark AuthorDate: Tue Mar 10 14:55:13 2020 -0700 image-prelink: remove assumption of sysconfdir presence If sysconfdir is not present in the image filesystem then the temporary creation of a prelink.conf will fail. Fix this by creating sysconfdir temporarily if needed beforehand and then remove any directories that were created afterwards. fixes: OpenXT OXT-1751 Signed-off-by: Christopher Clark Signed-off-by: Richard Purdie --- meta/classes/image-prelink.bbclass | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index 04dd57c..ebf6e6d 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -17,6 +17,16 @@ prelink_image () { pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` echo "Size before prelinking $pre_prelink_size." + # The filesystem may not contain sysconfdir so establish what is present + # to enable cleanup after temporary creation of sysconfdir if needed + presentdir="${IMAGE_ROOTFS}${sysconfdir}" + while [ "${IMAGE_ROOTFS}" != "${presentdir}" ] ; do + [ ! -d "${presentdir}" ] || break + presentdir=`dirname "${presentdir}"` + done + + mkdir -p "${IMAGE_ROOTFS}${sysconfdir}" + # We need a prelink conf on the filesystem, add one if it's missing if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then cp ${STAGING_ETCDIR_NATIVE}/prelink.conf \ @@ -59,6 +69,13 @@ prelink_image () { rm $ldsoconf fi + # Remove any directories temporarily created for sysconfdir + cleanupdir="${IMAGE_ROOTFS}${sysconfdir}" + while [ "${presentdir}" != "${cleanupdir}" ] ; do + rmdir "${cleanupdir}" + cleanupdir=`dirname ${cleanupdir}` + done + pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` echo "Size after prelinking $pre_prelink_size." } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:14:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:14:35 +0000 Subject: [oe-commits] [openembedded-core] 21/21: coreutils: fixup In-Reply-To: <158388925488.10989.11107238542418316524@git.openembedded.org> References: <158388925488.10989.11107238542418316524@git.openembedded.org> Message-ID: <20200311011416.910C1232A42@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2e18fcbc05a4cb4c1f9d7cf22db0b6ba1ea894bf Author: Richard Purdie AuthorDate: Wed Mar 11 01:12:56 2020 +0000 coreutils: fixup Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index cc4008e..eac0163 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -175,6 +175,9 @@ do_install_ptest () { # Disable subcase stty-pairs.sh, it will cause test framework hang sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile + # Disable subcase tail-2/assert.sh as it has issues on 32-bit systems + sed -i '/assert.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} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:24 +0000 Subject: [oe-commits] [meta-openembedded] 02/13: python3-lxml: upgrade 4.4.2 -> 4.5.0 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.741F2232B56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 73eb1578cf2a70b652141b1182a83d6cda72898b Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 20:59:23 2020 +0000 python3-lxml: upgrade 4.4.2 -> 4.5.0 See full changelog https://pypi.org/project/lxml/4.5.0/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-lxml.inc | 4 ++-- .../python/{python3-lxml_4.4.2.bb => python3-lxml_4.5.0.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-lxml.inc b/meta-python/recipes-devtools/python/python-lxml.inc index df9573b..05b5eae 100644 --- a/meta-python/recipes-devtools/python/python-lxml.inc +++ b/meta-python/recipes-devtools/python/python-lxml.inc @@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ DEPENDS += "libxml2 libxslt" -SRC_URI[md5sum] = "235c1a22d97a174144e76b66ce62ae46" -SRC_URI[sha256sum] = "eff69ddbf3ad86375c344339371168640951c302450c5d3e9936e98d6459db06" +SRC_URI[md5sum] = "f088e452ed45b030b6f84269f1e84d11" +SRC_URI[sha256sum] = "8620ce80f50d023d414183bf90cc2576c2837b88e00bea3f33ad2630133bbb60" DISTUTILS_BUILD_ARGS += " \ --with-xslt-config='pkg-config libxslt' \ diff --git a/meta-python/recipes-devtools/python/python3-lxml_4.4.2.bb b/meta-python/recipes-devtools/python/python3-lxml_4.5.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-lxml_4.4.2.bb rename to meta-python/recipes-devtools/python/python3-lxml_4.5.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:23 +0000 Subject: [oe-commits] [meta-openembedded] 01/13: dbus-broker: upgrade 21 -> 22 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.6842C232B21@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ad371d63cab20c98d522607001340b6ea276eac3 Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 17:59:25 2020 +0000 dbus-broker: upgrade 21 -> 22 See full changelog https://github.com/bus1/dbus-broker/releases/tag/v22 Also remove patches applied upstream Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- ...launch-improve-error-handling-for-opendir.patch | 48 ------------ ...nge-the-constant-used-for-invalid-timesta.patch | 86 ---------------------- ...3-dbus-socket-treat-MSG_CTRUNC-gracefully.patch | 83 --------------------- .../0004-launcher-fix-build-with-musl-libc.patch | 38 ---------- ...h-policy-fix-crash-when-importing-selinux.patch | 50 ------------- ...h-policy-fix-crash-when-exporting-selinux.patch | 59 --------------- .../dbus/{dbus-broker_21.bb => dbus-broker_22.bb} | 10 +-- 7 files changed, 2 insertions(+), 372 deletions(-) diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch b/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch deleted file mode 100644 index ccc175b..0000000 --- a/meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f42d5e38859c65a186acd0da94bbeeca12faf7a2 Mon Sep 17 00:00:00 2001 -From: David Rheinsberg -Date: Thu, 2 May 2019 17:33:34 +0200 -Subject: [PATCH] launch: improve error handling for opendir() - -This improves the error-handling of opendir() by always printing -diagnostics. Furthermore, it aligns the behavior with dbus-deamon and -ignores EACCES. - -Signed-off-by: David Rheinsberg -Upstream-Status: dbus-broker at f42d5e38859c65a186acd0da94bbeeca12faf7a2 ---- - src/launch/launcher.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/launch/launcher.c b/src/launch/launcher.c -index 31a5364..2ec4bda 100644 ---- a/src/launch/launcher.c -+++ b/src/launch/launcher.c -@@ -749,10 +749,23 @@ static int launcher_load_service_dir(Launcher *launcher, const char *dirpath, NS - - dir = opendir(dirpath); - if (!dir) { -- if (errno == ENOENT || errno == ENOTDIR) -+ if (errno == ENOENT || errno == ENOTDIR) { - return 0; -- else -+ } else if (errno == EACCES) { -+ log_append_here(&launcher->log, LOG_ERR, 0, NULL); -+ r = log_commitf(&launcher->log, "Access denied to service directory '%s'\n", dirpath); -+ if (r) -+ return error_fold(r); -+ -+ return 0; -+ } else { -+ log_append_here(&launcher->log, LOG_ERR, errno, NULL); -+ r = log_commitf(&launcher->log, "Unable to open service directory '%s': %m\n", dirpath); -+ if (r) -+ return error_fold(r); -+ - return error_origin(-errno); -+ } - } - - r = dirwatch_add(launcher->dirwatch, dirpath); --- -2.20.1 - diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch b/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch deleted file mode 100644 index 67a2dc4..0000000 --- a/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 3570b3e9ba367f10718b56336ce32d5254f66575 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen -Date: Thu, 9 May 2019 13:00:37 +0200 -Subject: [PATCH] metrics: change the constant used for invalid timestamps - -Use (uint64_t)-1 rather than 0 to indicate an invalid timestamp. It -should not be possible for the kernel to return 0 from -clock_gettime(), but we have received some reports of our asserts -triggering, so avoid the issue entirely by using -1 instead (which -really can never be returned). - -See https://retrace.fedoraproject.org/faf/reports/2539484/ - -Signed-off-by: Tom Gundersen -Upstream-Status: dbus-broker at 3570b3e9ba367f10718b56336ce32d5254f66575 ---- - src/util/metrics.c | 8 ++++---- - src/util/metrics.h | 9 ++++++--- - 2 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/util/metrics.c b/src/util/metrics.c -index b5a7182..eef94eb 100644 ---- a/src/util/metrics.c -+++ b/src/util/metrics.c -@@ -26,7 +26,7 @@ void metrics_init(Metrics *metrics, clockid_t id) { - } - - void metrics_deinit(Metrics *metrics) { -- c_assert(!metrics->timestamp); -+ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); - metrics_init(metrics, metrics->id); - } - -@@ -82,7 +82,7 @@ void metrics_sample_add(Metrics *metrics, uint64_t timestamp) { - * a sample is not currently running. - */ - void metrics_sample_start(Metrics *metrics) { -- c_assert(!metrics->timestamp); -+ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); - metrics->timestamp = metrics_get_time(metrics); - } - -@@ -93,11 +93,11 @@ void metrics_sample_start(Metrics *metrics) { - * End a currently running sample, and update the internal state. - */ - void metrics_sample_end(Metrics *metrics) { -- c_assert(metrics->timestamp); -+ c_assert(metrics->timestamp != METRICS_TIMESTAMP_INVALID); - - metrics_sample_add(metrics, metrics->timestamp); - -- metrics->timestamp = 0; -+ metrics->timestamp = METRICS_TIMESTAMP_INVALID; - } - - /** -diff --git a/src/util/metrics.h b/src/util/metrics.h -index a8ee915..b00dee6 100644 ---- a/src/util/metrics.h -+++ b/src/util/metrics.h -@@ -8,6 +8,8 @@ - #include - #include - -+#define METRICS_TIMESTAMP_INVALID ((uint64_t) -1) -+ - typedef struct Metrics Metrics; - - struct Metrics { -@@ -23,9 +25,10 @@ struct Metrics { - uint64_t sum_of_squares; - }; - --#define METRICS_INIT(_id) { \ -- .minimum = (uint64_t) -1, \ -- .id = (_id), \ -+#define METRICS_INIT(_id) { \ -+ .minimum = (uint64_t) -1, \ -+ .id = (_id), \ -+ .timestamp = METRICS_TIMESTAMP_INVALID, \ - } - - void metrics_init(Metrics *metrics, clockid_t id); --- -2.21.0 - diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch b/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch deleted file mode 100644 index 53f9e71..0000000 --- a/meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 520c47c53deeb893e03194fefaf3c5b9223ede27 Mon Sep 17 00:00:00 2001 -From: David Rheinsberg -Date: Fri, 10 May 2019 10:58:06 +0200 -Subject: [PATCH] dbus/socket: treat MSG_CTRUNC gracefully - -As it turns out, LSMs allow clients to trigger a MSG_CTRUNC on the -remote side of a unix socket. Whenever LSMs reject the transmission of -an FD, they will simply drop the FD and set MSG_CTRUNC, without any -other error notification. - -Therefore, we must assume any occurance of MSG_CTRUNC is trigger by a -client. This makes it impossible to consider MSG_CTRUNC for any other -error handling, and as such we are left to disconnecting the client and -ignoring the flag. - -Luckily, MSG_CTRUNC is expected for any other event, so we only used it -for diagnostics so far. - -Signed-off-by: David Rheinsberg -Upstream-Status: dbus-broker at 520c47c53deeb893e03194fefaf3c5b9223ede27 ---- - src/dbus/socket.c | 44 +++++++++++++++++++++++++++++++++----------- - 1 file changed, 33 insertions(+), 11 deletions(-) - -diff --git a/src/dbus/socket.c b/src/dbus/socket.c -index cacdff2..6e6ba10 100644 ---- a/src/dbus/socket.c -+++ b/src/dbus/socket.c -@@ -593,18 +593,40 @@ static int socket_recvmsg(Socket *socket, - - if (msg.msg_flags & MSG_CTRUNC) { - /* -- * This flag means the control-buffer was too small to retrieve -- * all data. If this can be triggered remotely, it means a peer -- * can cause us to miss FDs. Hence, we really must protect -- * against this. -- * We do provide suitably sized buffers to be prepared for any -- * possible scenario. So if this happens, something is fishy -- * and we better report it. -- * Note that this is also reported by the kernel if we exceeded -- * our NOFILE limit. Since this implies resource -- * misconfiguration as well, we treat it the same way. -+ * Our control-buffer-size is carefully calculated to be big -+ * enough for any possible ancillary data we expect. Therefore, -+ * the kernel should never be required to truncate it, and thus -+ * MSG_CTRUNC will never be set. This is also foward compatible -+ * to future extensions to the ancillary data, since these must -+ * be enabled explicitly before the kernel considers forwarding -+ * them. -+ * -+ * Unfortunately, the SCM_RIGHTS implementation might set this -+ * flag as well. In particular, if not all FDs can be returned -+ * to user-space, MSG_CTRUNC will be set (signalling that the -+ * FD-set is non-complete). No other error is returned or -+ * signalled, though. There are several reasons why the FD -+ * transmission can fail. Most importantly, if we exhaust our -+ * FD limit, further FDs will simply be discarded. We are -+ * protected against this by our accounting-quotas, but we -+ * would still like to catch this condition and warn loudly. -+ * However, FDs are also dropped if the security layer refused -+ * the transmission of the FD in question. This means, if an -+ * LSM refuses the D-Bus client to send us an FD, the FD is -+ * just dropped and MSG_CTRUNC will be set. This can be -+ * triggered by clients. -+ * -+ * To summarize: In an ideal world, we would expect this flag -+ * to never be set, and we would just use -+ * `error_origin(-ENOTRECOVERABLE)` to provide diagnostics. -+ * Unfortunately, the gross misuse of this flag for LSM -+ * security enforcements means we have to assume any occurence -+ * of MSG_CTRUNC means the client was refused to send a -+ * specific message. Our only possible way to deal with this is -+ * to disconnect the client. - */ -- r = error_origin(-ENOTRECOVERABLE); -+ socket_close(socket); -+ r = SOCKET_E_LOST_INTEREST; - goto error; - } - --- -2.21.0 - diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch b/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch deleted file mode 100644 index 0348d97..0000000 --- a/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fc1d26dd08c48c04fc9883b36a94c219aba2091c Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Mon, 28 Oct 2019 14:31:38 +0000 -Subject: [PATCH] launcher: fix build with musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -../src/launch/launcher.c: In function ?launcher_fork?: -../src/launch/launcher.c:378:60: error: ?WEXITED? undeclared (first use in this function); did you mean ?WIFEXITED?? - r = sd_event_add_child(launcher->event, NULL, pid, WEXITED, launcher_on_child_exit, launcher); - ^~~~~~~ - WIFEXITED - -Include sys/wait.h which defines it. - -Signed-off-by: Luca Boccassi -Suggested-by: Khem Raj -Upstream-Status: pending https://github.com/bus1/dbus-broker/pull/214 ---- - src/launch/launcher.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/launch/launcher.c b/src/launch/launcher.c -index 2ec4bda..1f38fcf 100644 ---- a/src/launch/launcher.c -+++ b/src/launch/launcher.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.20.1 - 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 deleted file mode 100644 index c5f3092..0000000 --- a/meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 51f4536..0000000 --- a/meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch +++ /dev/null @@ -1,59 +0,0 @@ -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_22.bb similarity index 63% rename from meta-oe/recipes-core/dbus/dbus-broker_21.bb rename to meta-oe/recipes-core/dbus/dbus-broker_22.bb index 67b515d..c0b6f7f 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_21.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_22.bb @@ -7,14 +7,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -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" +SRC_URI[md5sum] = "03c4730f2110b5492e1212c81af325dc" +SRC_URI[sha256sum] = "32f30700cefc997c479d75fcc42f3177940f1ebbee9c5a60c1e3ee39b90a9783" UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:25 +0000 Subject: [oe-commits] [meta-openembedded] 03/13: python3-pyperf: upgrade 1.7.0 -> 1.7.1 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.7F7E0232B66@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bf7de63a4f894c4b81868e1189ce93364d7c42b2 Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 21:03:46 2020 +0000 python3-pyperf: upgrade 1.7.0 -> 1.7.1 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pyperf.inc | 4 ++-- .../python/{python3-pyperf_1.7.0.bb => python3-pyperf_1.7.1.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pyperf.inc b/meta-python/recipes-devtools/python/python-pyperf.inc index 2e6304b..d9291b5 100644 --- a/meta-python/recipes-devtools/python/python-pyperf.inc +++ b/meta-python/recipes-devtools/python/python-pyperf.inc @@ -13,8 +13,8 @@ Features: \ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" -SRC_URI[md5sum] = "e30b67b62a4e30e4504352d0778c622c" -SRC_URI[sha256sum] = "0d214aa65e085d3e4108a36152cb12f7cd0f4e7fda93b5134b43a9687c975786" +SRC_URI[md5sum] = "d9e894dc843bb7f0abff109931a29895" +SRC_URI[sha256sum] = "c37690e810116a83a244dfeec47885e2f0475b4c450313904be3bc2cdaf6d50a" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-pyperf_1.7.0.bb b/meta-python/recipes-devtools/python/python3-pyperf_1.7.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pyperf_1.7.0.bb rename to meta-python/recipes-devtools/python/python3-pyperf_1.7.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:22 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (72d4033 -> f5d2bf5) Message-ID: <158388968288.14825.222504785319736455@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 72d4033 glmark2: Update to latest version new ad371d6 dbus-broker: upgrade 21 -> 22 new 73eb157 python3-lxml: upgrade 4.4.2 -> 4.5.0 new bf7de63 python3-pyperf: upgrade 1.7.0 -> 1.7.1 new 9b615bc python3-sqlparse: upgrade 0.3.0 -> 0.3.1 new 3a9f818 python3-jsonpatch: upgrade 1.24 -> 1.25 new 47a6b2b python3-wrapt: upgrade 1.11.2 -> 1.21.1 new 8b6cda1 python3-pyroute2: upgrade 0.5.7 -> 0.5.9 new 558d321 python3-protobuf: upgrade 3.9.2 -> 3.11.3 new e47b59f python3-tqdm: upgrade 4.41.1 -> 4.43.0 new bce68a4 python3-pymisp: upgrade 2.4.119.1 -> 2.4.122 new 6549c2d python3-pulsectl: upgrade 20.1.2 -> 20.2.4 new b650d80 python-parse: upgrade 1.14.0 -> 1.15.0 new f5d2bf5 python3-packaging: upgrade 20.0 -> 20.3 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: ...launch-improve-error-handling-for-opendir.patch | 48 ------------ ...nge-the-constant-used-for-invalid-timesta.patch | 86 ---------------------- ...3-dbus-socket-treat-MSG_CTRUNC-gracefully.patch | 83 --------------------- .../0004-launcher-fix-build-with-musl-libc.patch | 38 ---------- ...h-policy-fix-crash-when-importing-selinux.patch | 50 ------------- ...h-policy-fix-crash-when-exporting-selinux.patch | 59 --------------- .../dbus/{dbus-broker_21.bb => dbus-broker_22.bb} | 10 +-- .../recipes-devtools/python/python-jsonpatch.inc | 4 +- .../recipes-devtools/python/python-lxml.inc | 4 +- .../recipes-devtools/python/python-packaging.inc | 4 +- .../recipes-devtools/python/python-parse.inc | 6 +- .../recipes-devtools/python/python-protobuf.inc | 4 +- .../recipes-devtools/python/python-pymisp.inc | 8 +- .../recipes-devtools/python/python-pyperf.inc | 4 +- .../recipes-devtools/python/python-pyroute2.inc | 4 +- .../recipes-devtools/python/python-sqlparse.inc | 4 +- .../recipes-devtools/python/python-tqdm.inc | 6 +- .../recipes-devtools/python/python-wrapt.inc | 4 +- ...jsonpatch_1.24.bb => python3-jsonpatch_1.25.bb} | 0 ...python3-lxml_4.4.2.bb => python3-lxml_4.5.0.bb} | 0 ...packaging_20.0.bb => python3-packaging_20.3.bb} | 0 ...on3-parse_1.14.0.bb => python3-parse_1.15.0.bb} | 0 ...rotobuf_3.9.2.bb => python3-protobuf_3.11.3.bb} | 0 ...lsectl_20.1.2.bb => python3-pulsectl_20.2.4.bb} | 4 +- ...misp_2.4.119.1.bb => python3-pymisp_2.4.122.bb} | 0 ...on3-pyperf_1.7.0.bb => python3-pyperf_1.7.1.bb} | 0 ...pyroute2_0.5.7.bb => python3-pyroute2_0.5.9.bb} | 0 ...sqlparse_0.3.0.bb => python3-sqlparse_0.3.1.bb} | 0 ...thon3-tqdm_4.41.1.bb => python3-tqdm_4.43.0.bb} | 0 ...on3-wrapt_1.11.2.bb => python3-wrapt_1.12.1.bb} | 0 30 files changed, 32 insertions(+), 398 deletions(-) delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch rename meta-oe/recipes-core/dbus/{dbus-broker_21.bb => dbus-broker_22.bb} (63%) rename meta-python/recipes-devtools/python/{python3-jsonpatch_1.24.bb => python3-jsonpatch_1.25.bb} (100%) rename meta-python/recipes-devtools/python/{python3-lxml_4.4.2.bb => python3-lxml_4.5.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-packaging_20.0.bb => python3-packaging_20.3.bb} (100%) rename meta-python/recipes-devtools/python/{python3-parse_1.14.0.bb => python3-parse_1.15.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-protobuf_3.9.2.bb => python3-protobuf_3.11.3.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pulsectl_20.1.2.bb => python3-pulsectl_20.2.4.bb} (76%) rename meta-python/recipes-devtools/python/{python3-pymisp_2.4.119.1.bb => python3-pymisp_2.4.122.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pyperf_1.7.0.bb => python3-pyperf_1.7.1.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pyroute2_0.5.7.bb => python3-pyroute2_0.5.9.bb} (100%) rename meta-python/recipes-devtools/python/{python3-sqlparse_0.3.0.bb => python3-sqlparse_0.3.1.bb} (100%) rename meta-python/recipes-devtools/python/{python3-tqdm_4.41.1.bb => python3-tqdm_4.43.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-wrapt_1.11.2.bb => python3-wrapt_1.12.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 Mar 11 01:21:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:26 +0000 Subject: [oe-commits] [meta-openembedded] 04/13: python3-sqlparse: upgrade 0.3.0 -> 0.3.1 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.8D2EC232B81@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9b615bcfabf36efc346e1cef71767d6324901ce9 Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 21:06:28 2020 +0000 python3-sqlparse: upgrade 0.3.0 -> 0.3.1 See full changelog https://sqlparse.readthedocs.io/en/latest/changes/ Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-sqlparse.inc | 4 ++-- .../python/{python3-sqlparse_0.3.0.bb => python3-sqlparse_0.3.1.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-sqlparse.inc b/meta-python/recipes-devtools/python/python-sqlparse.inc index 14e683d..473232d 100644 --- a/meta-python/recipes-devtools/python/python-sqlparse.inc +++ b/meta-python/recipes-devtools/python/python-sqlparse.inc @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch" -SRC_URI[md5sum] = "2ce34181d6b7b234c9f3c0ecd1ffb93e" -SRC_URI[sha256sum] = "7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" +SRC_URI[md5sum] = "423047887a3590b04dd18f8caf843a2f" +SRC_URI[sha256sum] = "e162203737712307dfe78860cc56c8da8a852ab2ee33750e33aeadf38d12c548" export BUILD_SYS export HOST_SYS diff --git a/meta-python/recipes-devtools/python/python3-sqlparse_0.3.0.bb b/meta-python/recipes-devtools/python/python3-sqlparse_0.3.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-sqlparse_0.3.0.bb rename to meta-python/recipes-devtools/python/python3-sqlparse_0.3.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:27 +0000 Subject: [oe-commits] [meta-openembedded] 05/13: python3-jsonpatch: upgrade 1.24 -> 1.25 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.98B5A232C03@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3a9f81839b63c827e08035b0ce7e70ef35bc781b Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 21:09:23 2020 +0000 python3-jsonpatch: upgrade 1.24 -> 1.25 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-jsonpatch.inc | 4 ++-- .../python/{python3-jsonpatch_1.24.bb => python3-jsonpatch_1.25.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-jsonpatch.inc b/meta-python/recipes-devtools/python/python-jsonpatch.inc index b23142d..e23f96b 100644 --- a/meta-python/recipes-devtools/python/python-jsonpatch.inc +++ b/meta-python/recipes-devtools/python/python-jsonpatch.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3" inherit pypi -SRC_URI[md5sum] = "e86503f05fa192fa870d7004b8ce929a" -SRC_URI[sha256sum] = "cbb72f8bf35260628aea6b508a107245f757d1ec839a19c34349985e2c05645a" +SRC_URI[md5sum] = "fcc546892414bef2f7f89f0e2a618a9e" +SRC_URI[sha256sum] = "ddc0f7628b8bfdd62e3cbfbc24ca6671b0b6265b50d186c2cf3659dc0f78fd6a" RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold" diff --git a/meta-python/recipes-devtools/python/python3-jsonpatch_1.24.bb b/meta-python/recipes-devtools/python/python3-jsonpatch_1.25.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-jsonpatch_1.24.bb rename to meta-python/recipes-devtools/python/python3-jsonpatch_1.25.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:28 +0000 Subject: [oe-commits] [meta-openembedded] 06/13: python3-wrapt: upgrade 1.11.2 -> 1.21.1 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.A5410232C56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 47a6b2b73190d5dbe7d6100bea097e414bff47b2 Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 21:13:00 2020 +0000 python3-wrapt: upgrade 1.11.2 -> 1.21.1 See full changelog https://wrapt.readthedocs.io/en/latest/changes.html Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-wrapt.inc | 4 ++-- .../python/{python3-wrapt_1.11.2.bb => python3-wrapt_1.12.1.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-wrapt.inc b/meta-python/recipes-devtools/python/python-wrapt.inc index 496c73f..f4a8f19 100644 --- a/meta-python/recipes-devtools/python/python-wrapt.inc +++ b/meta-python/recipes-devtools/python/python-wrapt.inc @@ -4,8 +4,8 @@ LICENSE = "BSD-2-Clause" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=fdfc019b57affbe1d7a32e3d34e83db4" -SRC_URI[md5sum] = "cc15c001b129f81eb2f79b15eb99ffe5" -SRC_URI[sha256sum] = "565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" +SRC_URI[md5sum] = "6d56ed0de4336462a73350341462f45e" +SRC_URI[sha256sum] = "b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-wrapt_1.11.2.bb b/meta-python/recipes-devtools/python/python3-wrapt_1.12.1.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-wrapt_1.11.2.bb rename to meta-python/recipes-devtools/python/python3-wrapt_1.12.1.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:33 +0000 Subject: [oe-commits] [meta-openembedded] 11/13: python3-pulsectl: upgrade 20.1.2 -> 20.2.4 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.E9C80233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6549c2d7eac4ae2aec3a074b339894f9ea6e0761 Author: Pierre-Jean Texier AuthorDate: Tue Mar 10 14:16:39 2020 +0000 python3-pulsectl: upgrade 20.1.2 -> 20.2.4 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../python/{python3-pulsectl_20.1.2.bb => python3-pulsectl_20.2.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-pulsectl_20.1.2.bb b/meta-python/recipes-devtools/python/python3-pulsectl_20.2.4.bb similarity index 76% rename from meta-python/recipes-devtools/python/python3-pulsectl_20.1.2.bb rename to meta-python/recipes-devtools/python/python3-pulsectl_20.2.4.bb index 7ac3aaf..f0db968 100644 --- a/meta-python/recipes-devtools/python/python3-pulsectl_20.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-pulsectl_20.2.4.bb @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" -SRC_URI[md5sum] = "90d02204d65f684af2fd77a77d50ec01" -SRC_URI[sha256sum] = "4a97a4f7fcd8dbe56380980e8c9519ff4e26552604776cbc7555e6a14ff0202f" +SRC_URI[md5sum] = "07d7a5fddc49f5da22634464aa008003" +SRC_URI[sha256sum] = "fca9ed501bef2efd551b35773fd24bba36bbd21bc448f402cf8ee13c12423c19" RDEPENDS_${PN} += "pulseaudio" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:29 +0000 Subject: [oe-commits] [meta-openembedded] 07/13: python3-pyroute2: upgrade 0.5.7 -> 0.5.9 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.B2F8A232C6C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8b6cda142bc6687177708dc939d750fa76d43160 Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 21:48:09 2020 +0000 python3-pyroute2: upgrade 0.5.7 -> 0.5.9 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pyroute2.inc | 4 ++-- .../python/{python3-pyroute2_0.5.7.bb => python3-pyroute2_0.5.9.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pyroute2.inc b/meta-python/recipes-devtools/python/python-pyroute2.inc index 7a14b9e..add7b7b 100644 --- a/meta-python/recipes-devtools/python/python-pyroute2.inc +++ b/meta-python/recipes-devtools/python/python-pyroute2.inc @@ -3,8 +3,8 @@ LICENSE = "GPLv2 & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" -SRC_URI[md5sum] = "371683b62314211b8bc9807ac8ef1144" -SRC_URI[sha256sum] = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98" +SRC_URI[md5sum] = "4ee568832c98c39253230293a2ca3d59" +SRC_URI[sha256sum] = "240ed116fabef02c284cc40d27986e629f02aa788311a8059905b8988752d5b7" FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyroute2:" diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.5.7.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.5.9.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pyroute2_0.5.7.bb rename to meta-python/recipes-devtools/python/python3-pyroute2_0.5.9.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:32 +0000 Subject: [oe-commits] [meta-openembedded] 10/13: python3-pymisp: upgrade 2.4.119.1 -> 2.4.122 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.DC41D233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit bce68a4739cfc5347fd16de1cbac842f783926f7 Author: Pierre-Jean Texier AuthorDate: Tue Mar 10 11:02:06 2020 +0000 python3-pymisp: upgrade 2.4.119.1 -> 2.4.122 See full changelog https://github.com/MISP/PyMISP/blob/master/CHANGELOG.txt Also add bash to RDEPENDS Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pymisp.inc | 8 ++++++-- .../{python3-pymisp_2.4.119.1.bb => python3-pymisp_2.4.122.bb} | 0 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-pymisp.inc b/meta-python/recipes-devtools/python/python-pymisp.inc index 6c47492..d2485ff 100644 --- a/meta-python/recipes-devtools/python/python-pymisp.inc +++ b/meta-python/recipes-devtools/python/python-pymisp.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[md5sum] = "57184785340e25469e4a80ff9ddce09e" -SRC_URI[sha256sum] = "594ea0a9e150052232425009eac6dd104a80f494d0e273cc48dd114d7ea8482b" +SRC_URI[md5sum] = "ef41185d4c2753dc2c1a9ab937e3614a" +SRC_URI[sha256sum] = "ecdc362b4bb5dd500a5f0b9e795b35ed75037de64f8dcf39c24d029e7657ad7f" RDEPENDS_${PN} += " \ ${PYTHON_PN}-dateutil \ @@ -13,3 +13,7 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-requests \ ${PYTHON_PN}-six \ " + +# Fixes: python3-pymisp requires /bin/bash, but no +# providers found in RDEPENDS_python3-pymisp? [file-rdep +RDEPENDS_${PN} += "bash" diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.119.1.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.4.122.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-pymisp_2.4.119.1.bb rename to meta-python/recipes-devtools/python/python3-pymisp_2.4.122.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:31 +0000 Subject: [oe-commits] [meta-openembedded] 09/13: python3-tqdm: upgrade 4.41.1 -> 4.43.0 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.CEA59233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e47b59f413665c526193203c5410542ca8a40210 Author: Pierre-Jean Texier AuthorDate: Tue Mar 10 09:16:54 2020 +0000 python3-tqdm: upgrade 4.41.1 -> 4.43.0 License-Update: copyright years updated See full changelog https://github.com/tqdm/tqdm/releases Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-tqdm.inc | 6 +++--- .../python/{python3-tqdm_4.41.1.bb => python3-tqdm_4.43.0.bb} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-tqdm.inc b/meta-python/recipes-devtools/python/python-tqdm.inc index 8a0534f..242bb3c 100644 --- a/meta-python/recipes-devtools/python/python-tqdm.inc +++ b/meta-python/recipes-devtools/python/python-tqdm.inc @@ -3,11 +3,11 @@ HOMEPAGE = "http://tqdm.github.io/" SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=054ef7105cba050017d1368262a1623c" +LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" inherit pypi -SRC_URI[md5sum] = "aa3d5fd173c9fea7408cad14c0e73d5d" -SRC_URI[sha256sum] = "4789ccbb6fc122b5a6a85d512e4e41fc5acad77216533a6f2b8ce51e0f265c23" +SRC_URI[md5sum] = "81454c26572e4e47911596ea065eb1b7" +SRC_URI[sha256sum] = "f35fb121bafa030bd94e74fcfd44f3c2830039a2ddef7fc87ef1c2d205237b24" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.41.1.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.43.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-tqdm_4.41.1.bb rename to meta-python/recipes-devtools/python/python3-tqdm_4.43.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:34 +0000 Subject: [oe-commits] [meta-openembedded] 12/13: python-parse: upgrade 1.14.0 -> 1.15.0 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012124.03221232B56@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b650d8055e7886c593da8415c08639ae1f9cf783 Author: Pierre-Jean Texier AuthorDate: Tue Mar 10 14:21:37 2020 +0000 python-parse: upgrade 1.14.0 -> 1.15.0 License-Update: copyright years updated Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-parse.inc | 6 +++--- .../python/{python3-parse_1.14.0.bb => python3-parse_1.15.0.bb} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-parse.inc b/meta-python/recipes-devtools/python/python-parse.inc index 5ce67f1..adae261 100644 --- a/meta-python/recipes-devtools/python/python-parse.inc +++ b/meta-python/recipes-devtools/python/python-parse.inc @@ -1,10 +1,10 @@ SUMMARY = "Parse strings using a specification based on the Python format() syntax" HOMEPAGE = "https://github.com/r1chardj0n3s/parse" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://parse.py;beginline=1325;endline=1345;md5=fa03bae3f51a2db25e239e869c647437" +LIC_FILES_CHKSUM = "file://parse.py;beginline=1325;endline=1345;md5=3d987b2e73881bbce768a80f9cdd23d9" -SRC_URI[md5sum] = "07cbb5ba1025cbfe92fc3376c372dda5" -SRC_URI[sha256sum] = "95a4f4469e37c57b5e924629ac99926f28bee7da59515dc5b8078c4c3e779249" +SRC_URI[md5sum] = "a5aa82b2b8b4d733d227e3c99d7d01b4" +SRC_URI[sha256sum] = "a6d4e2c2f1fbde6717d28084a191a052950f758c0cbd83805357e6575c2b95c0" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-parse_1.14.0.bb b/meta-python/recipes-devtools/python/python3-parse_1.15.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-parse_1.14.0.bb rename to meta-python/recipes-devtools/python/python3-parse_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 Mar 11 01:21:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:30 +0000 Subject: [oe-commits] [meta-openembedded] 08/13: python3-protobuf: upgrade 3.9.2 -> 3.11.3 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012123.C0DAB232C89@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 558d321c46b20c212168fd7971108fb9e7591bc9 Author: Pierre-Jean Texier AuthorDate: Mon Mar 9 21:57:29 2020 +0000 python3-protobuf: upgrade 3.9.2 -> 3.11.3 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-protobuf.inc | 4 ++-- .../python/{python3-protobuf_3.9.2.bb => python3-protobuf_3.11.3.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-python/recipes-devtools/python/python-protobuf.inc index 4061311..5716894 100644 --- a/meta-python/recipes-devtools/python/python-protobuf.inc +++ b/meta-python/recipes-devtools/python/python-protobuf.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de8 inherit pypi -SRC_URI[md5sum] = "d634666c898148e4565ac62f3ba4a2ca" -SRC_URI[sha256sum] = "843f498e98ad1469ad54ecb4a7ccf48605a1c5d2bd26ae799c7a2cddab4a37ec" +SRC_URI[md5sum] = "eeda7dea65fc94e560fc9a8180eb1872" +SRC_URI[sha256sum] = "c77c974d1dadf246d789f6dad1c24426137c9091e930dbf50e0a29c1fcf00b1f" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-python/recipes-devtools/python/python3-protobuf_3.9.2.bb b/meta-python/recipes-devtools/python/python3-protobuf_3.11.3.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-protobuf_3.9.2.bb rename to meta-python/recipes-devtools/python/python3-protobuf_3.11.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 01:21:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 01:21:35 +0000 Subject: [oe-commits] [meta-openembedded] 13/13: python3-packaging: upgrade 20.0 -> 20.3 In-Reply-To: <158388968288.14825.222504785319736455@git.openembedded.org> References: <158388968288.14825.222504785319736455@git.openembedded.org> Message-ID: <20200311012124.15C84232A8B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f5d2bf55a8169a9446c2f96f327b3e5d91a6e6cc Author: Pierre-Jean Texier AuthorDate: Tue Mar 10 14:25:33 2020 +0000 python3-packaging: upgrade 20.0 -> 20.3 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-packaging.inc | 4 ++-- .../python/{python3-packaging_20.0.bb => python3-packaging_20.3.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-packaging.inc b/meta-python/recipes-devtools/python/python-packaging.inc index 7cedadf..418483f 100644 --- a/meta-python/recipes-devtools/python/python-packaging.inc +++ b/meta-python/recipes-devtools/python/python-packaging.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/pypa/packaging" LICENSE = "Apache-2.0 & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" -SRC_URI[md5sum] = "93d6ccbdfcb5b7697b6ecea53ecc294b" -SRC_URI[sha256sum] = "fe1d8331dfa7cc0a883b49d75fc76380b2ab2734b220fbb87d774e4fd4b851f8" +SRC_URI[md5sum] = "19e0d1f82a9007b448650ccfeffd0a26" +SRC_URI[sha256sum] = "3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" diff --git a/meta-python/recipes-devtools/python/python3-packaging_20.0.bb b/meta-python/recipes-devtools/python/python3-packaging_20.3.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-packaging_20.0.bb rename to meta-python/recipes-devtools/python/python3-packaging_20.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:26 +0000 Subject: [oe-commits] [openembedded-core] 02/12: files/toolchain-shar-extract.sh: Rework PATH cleaning In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133924.F0A6A232C89@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7674b63819aa7ca95ca5ca5477a5cce32e9691eb Author: Richard Purdie AuthorDate: Sat Mar 7 13:43:44 2020 +0000 files/toolchain-shar-extract.sh: Rework PATH cleaning Trying to create a clean PATH breaks cases where we install a buildtools tarball on hosts to provide newer versions of gcc. Rework the fix for #8698 to clean up directories in PATH which don't exist isntead. Do it with python as the shell version was too fraught with corner cases. Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4c4b4de..2e0fe94 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,13 +1,8 @@ #!/bin/sh -[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ - LC_ALL=en_US.UTF-8 \ - TERM=$TERM \ - ICECC_PATH="$ICECC_PATH" \ - http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ - no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" -[ -f /etc/environment ] && . /etc/environment -export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +export LC_ALL=en_US.UTF-8 +# Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted +PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:24 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (04ee0e8 -> 5463971) Message-ID: <158393396461.12481.3540940656948225488@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 04ee0e8 oeqa/selftest: Ensure buildtools in environment variables isn't replaced new 87c9602 oeqa/testsdk: Use original PATH new 7674b63 files/toolchain-shar-extract.sh: Rework PATH cleaning new f7a6a72 glibc: Update nativesdk locale relocation patch new 7d35e4b buildtools-extended-tarball: Add locale command new ea93afa ruby: Use arm32 for coroutines on 32bit-arm new ac5a65c valgrind: Fix timerfd syscall test to be 64bit time_t safe new 206580e libdnf: fix upstream version check new 6bf3e3d image-prelink: remove assumption of sysconfdir presence new 20ad770 grub-efi-cfg: enable per-label APPEND override new 9a703f8 coreutils: add ptest new 0c2c798 ptest-packagelists.inc: add coreutils to SLOW new 5463971 coreutils: Fix -dev package dependencies The 12 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/grub-efi-cfg.bbclass | 6 ++ meta/classes/image-prelink.bbclass | 17 ++++ meta/conf/distro/include/ptest-packagelists.inc | 1 + meta/files/toolchain-shar-extract.sh | 11 +-- meta/lib/oeqa/sdkext/testsdk.py | 7 +- meta/recipes-core/coreutils/coreutils/run-ptest | 17 ++++ meta/recipes-core/coreutils/coreutils_8.31.bb | 44 ++++++++++ ...libc-Make-relocatable-install-for-locales.patch | 62 ++++++++++---- .../meta/buildtools-extended-tarball.bb | 1 + meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + meta/recipes-devtools/ruby/ruby_2.7.0.bb | 3 + ...1-memcheck-tests-Fix-timerfd-syscall-test.patch | 98 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 13 files changed, 241 insertions(+), 28 deletions(-) create mode 100755 meta/recipes-core/coreutils/coreutils/run-ptest create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:25 +0000 Subject: [oe-commits] [openembedded-core] 01/12: oeqa/testsdk: Use original PATH In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133924.E774B232C6C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 87c9602fd0dedc7bcf75b822aaf5f6ebfc17737c Author: Richard Purdie AuthorDate: Sun Mar 8 10:20:12 2020 +0000 oeqa/testsdk: Use original PATH We want to test the SDK with PATH from the original host, not with our own tools injected via HOSTTOOLS. It even uses some tools which aren't in HOSTTOOLS. This is necessary after changing the SDK to not reset PATH to the system default which is bad for other reasons and brings the testing into sync with that change. Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdkext/testsdk.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index 785b5dd..c5c46df 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py @@ -25,11 +25,8 @@ class TestSDKExt(TestSDKBase): subprocesstweak.errors_have_output() - # extensible sdk can be contaminated if native programs are - # in PATH, i.e. use perl-native instead of eSDK one. - paths_to_avoid = [d.getVar('STAGING_DIR'), - d.getVar('BASE_WORKDIR')] - os.environ['PATH'] = avoid_paths_in_environ(paths_to_avoid) + # We need the original PATH for testing the eSDK, not with our manipulations + os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH") tcname = d.expand("${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.sh") if not os.path.exists(tcname): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:28 +0000 Subject: [oe-commits] [openembedded-core] 04/12: buildtools-extended-tarball: Add locale command In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.1128F233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 7d35e4bc6ff94a2d03c48827d7d60a6855c9029d Author: Richard Purdie AuthorDate: Mon Mar 9 21:09:43 2020 +0000 buildtools-extended-tarball: Add locale command The eSDK installation code checks installed locales with the locale command which is from glibc-utils. Add this so that we find the correct locales from the buildtools. Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-extended-tarball.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb index 4a79b09..dd780c5 100644 --- a/meta/recipes-core/meta/buildtools-extended-tarball.bb +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb @@ -25,6 +25,7 @@ TOOLCHAIN_HOST_TASK += "\ nativesdk-libstdc++-dev \ nativesdk-libtool \ nativesdk-pkgconfig \ + nativesdk-glibc-utils \ nativesdk-libxcrypt-dev \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:27 +0000 Subject: [oe-commits] [openembedded-core] 03/12: glibc: Update nativesdk locale relocation patch In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.0772B233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f7a6a72880009380ae81bc7fc863921a26811c8c Author: Richard Purdie AuthorDate: Mon Mar 9 20:59:11 2020 +0000 glibc: Update nativesdk locale relocation patch The locale binary reported incorrect locale lists in relocated toolchains as some path references were not relocated by this patch. Fix this missing relocations so the locale binary correctly reports the locales. Signed-off-by: Richard Purdie --- ...libc-Make-relocatable-install-for-locales.patch | 62 ++++++++++++++++------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch index d9985c2..27cd17c 100644 --- a/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +++ b/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch @@ -17,11 +17,11 @@ Signed-off-by: Khem Raj locale/localeinfo.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/locale/findlocale.c b/locale/findlocale.c -index 9cd3b71a6d..84272310e0 100644 ---- a/locale/findlocale.c -+++ b/locale/findlocale.c -@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden = +Index: git/locale/findlocale.c +=================================================================== +--- git.orig/locale/findlocale.c ++++ git/locale/findlocale.c +@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attr which are somehow addressed. */ struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; @@ -30,7 +30,7 @@ index 9cd3b71a6d..84272310e0 100644 /* Checks if the name is actually present, that is, not NULL and not empty. */ -@@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, +@@ -166,7 +166,7 @@ _nl_find_locale (const char *locale_path /* Nothing in the archive. Set the default path to search below. */ locale_path = _nl_default_locale_path; @@ -39,10 +39,10 @@ index 9cd3b71a6d..84272310e0 100644 } else /* We really have to load some data. First see whether the name is -diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index ba0fe45648..9737fd4cda 100644 ---- a/locale/loadarchive.c -+++ b/locale/loadarchive.c +Index: git/locale/loadarchive.c +=================================================================== +--- git.orig/locale/loadarchive.c ++++ git/locale/loadarchive.c @@ -42,7 +42,7 @@ @@ -52,11 +52,11 @@ index ba0fe45648..9737fd4cda 100644 /* Size of initial mapping window, optimal if large enough to cover the header plus the initial locale. */ -diff --git a/locale/localeinfo.h b/locale/localeinfo.h -index 1bfe22aa7f..fdc283c69a 100644 ---- a/locale/localeinfo.h -+++ b/locale/localeinfo.h -@@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int category, int item) +Index: git/locale/localeinfo.h +=================================================================== +--- git.orig/locale/localeinfo.h ++++ git/locale/localeinfo.h +@@ -331,7 +331,7 @@ _nl_lookup_word (locale_t l, int categor } /* Default search path if no LOCPATH environment variable. */ @@ -65,3 +65,35 @@ index 1bfe22aa7f..fdc283c69a 100644 /* Load the locale data for CATEGORY from the file specified by *NAME. If *NAME is "", use environment variables as specified by POSIX, and +Index: git/locale/programs/locale.c +=================================================================== +--- git.orig/locale/programs/locale.c ++++ git/locale/programs/locale.c +@@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b + ((const struct nameent *) b)->name); + } + ++static char _write_archive_locales_path[4096] attribute_hidden __attribute__ ((section (".gccrelocprefix"))) = ARCHIVE_NAME; + + static int + write_archive_locales (void **all_datap, char *linebuf) +@@ -645,7 +646,7 @@ write_archive_locales (void **all_datap, + int fd, ret = 0; + uint32_t cnt; + +- fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ fd = open64 (_write_archive_locales_path, O_RDONLY); + if (fd < 0) + return 0; + +@@ -700,8 +701,8 @@ write_archive_locales (void **all_datap, + if (cnt) + putchar_unlocked ('\n'); + +- printf ("locale: %-15.15s archive: " ARCHIVE_NAME "\n%s\n", +- names[cnt].name, linebuf); ++ printf ("locale: %-15.15s archive: %s\n%s\n", ++ names[cnt].name, _write_archive_locales_path, linebuf); + + locrec = (struct locrecent *) (addr + names[cnt].locrec_offset); + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:32 +0000 Subject: [oe-commits] [openembedded-core] 08/12: image-prelink: remove assumption of sysconfdir presence In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.3C1C4233517@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 6bf3e3db355643c4b2e20346230c09e45e519035 Author: Christopher Clark AuthorDate: Tue Mar 10 14:55:13 2020 -0700 image-prelink: remove assumption of sysconfdir presence If sysconfdir is not present in the image filesystem then the temporary creation of a prelink.conf will fail. Fix this by creating sysconfdir temporarily if needed beforehand and then remove any directories that were created afterwards. fixes: OpenXT OXT-1751 Signed-off-by: Christopher Clark Signed-off-by: Richard Purdie --- meta/classes/image-prelink.bbclass | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index 04dd57c..ebf6e6d 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -17,6 +17,16 @@ prelink_image () { pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` echo "Size before prelinking $pre_prelink_size." + # The filesystem may not contain sysconfdir so establish what is present + # to enable cleanup after temporary creation of sysconfdir if needed + presentdir="${IMAGE_ROOTFS}${sysconfdir}" + while [ "${IMAGE_ROOTFS}" != "${presentdir}" ] ; do + [ ! -d "${presentdir}" ] || break + presentdir=`dirname "${presentdir}"` + done + + mkdir -p "${IMAGE_ROOTFS}${sysconfdir}" + # We need a prelink conf on the filesystem, add one if it's missing if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then cp ${STAGING_ETCDIR_NATIVE}/prelink.conf \ @@ -59,6 +69,13 @@ prelink_image () { rm $ldsoconf fi + # Remove any directories temporarily created for sysconfdir + cleanupdir="${IMAGE_ROOTFS}${sysconfdir}" + while [ "${presentdir}" != "${cleanupdir}" ] ; do + rmdir "${cleanupdir}" + cleanupdir=`dirname ${cleanupdir}` + done + pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` echo "Size after prelinking $pre_prelink_size." } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:29 +0000 Subject: [oe-commits] [openembedded-core] 05/12: ruby: Use arm32 for coroutines on 32bit-arm In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.1B609233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ea93afa4c1c40d74faf321baa78a29d0ad7d3223 Author: Khem Raj AuthorDate: Mon Mar 9 18:19:38 2020 -0700 ruby: Use arm32 for coroutines on 32bit-arm in 2.7 [2] ruby enabled ucontext for coroutines on arm32 but it does not work for musl since it uses glibc specific functions e.g. getcontext/swapcontext/swapcontext also see [1] This patch reverts back to using arm32 implementation for coroutines on arm [1] https://bugs.ruby-lang.org/issues/16455#change-83442 [2] https://github.com/ruby/ruby/commit/6c6bf9ffcbfeb8be9d9c342e7604b74ec819e88a#diff-7fccec8474e2184cd2518046bf39d54cL10 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ruby/ruby_2.7.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb b/meta/recipes-devtools/ruby/ruby_2.7.0.bb index 268b4be..44c7616 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.0.bb @@ -25,6 +25,9 @@ EXTRA_OECONF = "\ --with-pkg-config=pkg-config \ " +EXTRA_OECONF_append_libc-musl_arm = " --with-coroutine=arm32" +EXTRA_OECONF_append_libc-musl_armeb = " --with-coroutine=arm32" + do_install() { oe_runmake 'DESTDIR=${D}' install } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:31 +0000 Subject: [oe-commits] [openembedded-core] 07/12: libdnf: fix upstream version check In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.3078F2334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 206580e72336229f8044eb941ecb09d3f0d60d3e Author: Alexander Kanavin AuthorDate: Tue Mar 10 20:43:28 2020 +0100 libdnf: fix upstream version check Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/libdnf/libdnf_0.28.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb index 163a2ee..cc2ceb8 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb @@ -12,6 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ " SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77" +UPSTREAM_CHECK_GITTAGREGEX = "(?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 Wed Mar 11 13:39:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:33 +0000 Subject: [oe-commits] [openembedded-core] 09/12: grub-efi-cfg: enable per-label APPEND override In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.461CF233518@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 20ad7705d1060300d53304c259b1f07d04b86eba Author: Rich Persaud AuthorDate: Mon Mar 9 18:44:57 2020 -0400 grub-efi-cfg: enable per-label APPEND override For legacy bios boot configurations, syslinux supports multiple labels with per-label APPEND definitions. grub-efi-cfg supports multiple labels, but only a single APPEND definition. Enable optional per-label APPEND definitions for grub EFI, with variable names prefixed by "grub_" to isolate grub definitions from syslinux defintions. Example use from an ISO image recipe that inherits grub-efi-cfg: LABELS_LIVE="foo bar" APPEND_grub_foo = "linuxcmdline" No change in behavior for those using APPEND without overrides. Signed-off-by: Rich Persaud Signed-off-by: Richard Purdie --- meta/classes/grub-efi-cfg.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/classes/grub-efi-cfg.bbclass b/meta/classes/grub-efi-cfg.bbclass index 8b5ff20..3a2cdd6 100644 --- a/meta/classes/grub-efi-cfg.bbclass +++ b/meta/classes/grub-efi-cfg.bbclass @@ -88,6 +88,12 @@ python build_efi_cfg() { for label in labels.split(): localdata = d.createCopy() + overrides = localdata.getVar('OVERRIDES') + if not overrides: + bb.fatal('OVERRIDES not defined') + + localdata.setVar('OVERRIDES', 'grub_' + label + ':' + overrides) + for btype in btypes: cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0])) lb = label -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:35 +0000 Subject: [oe-commits] [openembedded-core] 11/12: ptest-packagelists.inc: add coreutils to SLOW In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.5979523351F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 0c2c798164da283b79d396b1e50aedee9b6e70d6 Author: Trevor Gamblin AuthorDate: Wed Mar 11 04:32:35 2020 -0700 ptest-packagelists.inc: add coreutils to SLOW 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 d6f3aaf..c13ff72 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -66,6 +66,7 @@ PTESTS_SLOW = "\ babeltrace-ptest \ babeltrace2-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 Wed Mar 11 13:39:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:36 +0000 Subject: [oe-commits] [openembedded-core] 12/12: coreutils: Fix -dev package dependencies In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.62A3D233520@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5463971d45b21512210cf20f3902baf95eacd4c6 Author: Richard Purdie AuthorDate: Sun Mar 8 14:35:58 2020 +0000 coreutils: Fix -dev package dependencies The new ptest dependencies present some challenges, in particular libmodule-build-perl which effectively depends on gcc. In multilib images, this results in both libXX-gcc-symlinks and libYY-gcc-symlinks being installed which conflict. This also makes little sense. The easiest way to fix this is to disable the automatic -dev package dependencies and manually specify the correct ones. Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index cba0bfe..eac0163 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -149,6 +149,10 @@ inherit ptest RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" +# -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy +RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" +RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" + do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:30 +0000 Subject: [oe-commits] [openembedded-core] 06/12: valgrind: Fix timerfd syscall test to be 64bit time_t safe In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.25004233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ac5a65cb5fdb315df2cb016d0cc5c3389c7971f0 Author: Khem Raj AuthorDate: Mon Mar 9 18:15:43 2020 -0700 valgrind: Fix timerfd syscall test to be 64bit time_t safe This helps compile the testcase with musl on 32bit arches Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...1-memcheck-tests-Fix-timerfd-syscall-test.patch | 98 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 99 insertions(+) diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch new file mode 100644 index 0000000..15fbbe9 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch @@ -0,0 +1,98 @@ +From 5d411fd147d652e9d7bb259f4048693c6e4742aa Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 9 Mar 2020 16:30:19 -0700 +Subject: [PATCH] memcheck/tests: Fix timerfd syscall test + +modern libc provides these functions, moreover this also ensures that we +are 64bit time_t safe. Fallback to existing definitions if libc does not +have the implementation or syscall is not defined + +Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36943897/] +Signed-off-by: Khem Raj +--- + config.h.in | 9 +++++++++ + configure.ac | 3 +++ + memcheck/tests/linux/timerfd-syscall.c | 10 ++++++++-- + 5 files changed, 32 insertions(+), 2 deletions(-) + +--- a/config.h.in ++++ b/config.h.in +@@ -301,6 +301,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_SYSNVL_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TIMERFD_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_SYS_TIME_H + +--- a/configure.ac ++++ b/configure.ac +@@ -4098,6 +4098,7 @@ AC_CHECK_HEADERS([ \ + sys/syscall.h \ + sys/sysnvl.h \ + sys/time.h \ ++ sys/timerfd.h \ + sys/types.h \ + ]) + +--- a/memcheck/tests/linux/timerfd-syscall.c ++++ b/memcheck/tests/linux/timerfd-syscall.c +@@ -45,6 +45,9 @@ + #if defined(HAVE_SYS_TIME_H) + #include + #endif ++#if defined(HAVE_SYS_TIMERFD_H) ++#include ++#endif + #if defined(HAVE_SYS_TYPES_H) + #include + #endif +@@ -54,7 +57,8 @@ + * timerfd_* system call numbers introduced in 2.6.23. These constants are + * not yet in the glibc 2.7 headers, that is why they are defined here. + */ +-#ifndef __NR_timerfd_create ++#if !defined(HAVE_SYS_TIMERFD_H) ++#if !defined(__NR_timerfd_create) + #if defined(__x86_64__) + #define __NR_timerfd_create 283 + #elif defined(__i386__) +@@ -67,8 +71,10 @@ + #error Cannot detect your architecture! + #endif + #endif ++#endif + +-#ifndef __NR_timerfd_settime ++#if !defined(HAVE_SYS_TIMERFD_H) ++#if !defined(__NR_timerfd_settime) + #if defined(__x86_64__) + #define __NR_timerfd_settime 286 + #define __NR_timerfd_gettime 287 +@@ -85,7 +91,7 @@ + #error Cannot detect your architecture! + #endif + #endif +- ++#endif + + + /* Definitions from include/linux/timerfd.h */ +@@ -127,6 +133,7 @@ void set_timespec(struct timespec *tmr, + tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); + } + ++#if !defined(HAVE_SYS_TIMERFD_H) + int timerfd_create(int clockid, int flags) + { + return syscall(__NR_timerfd_create, clockid, flags); +@@ -142,6 +149,7 @@ int timerfd_gettime(int ufc, struct itim + { + return syscall(__NR_timerfd_gettime, ufc, otmr); + } ++#endif + + long waittmr(int tfd, int timeo) + { diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 1475ff8..7954437 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -41,6 +41,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ 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 \ + file://0001-memcheck-tests-Fix-timerfd-syscall-test.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 Wed Mar 11 13:39:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:34 +0000 Subject: [oe-commits] [openembedded-core] 10/12: coreutils: add ptest In-Reply-To: <158393396461.12481.3540940656948225488@git.openembedded.org> References: <158393396461.12481.3540940656948225488@git.openembedded.org> Message-ID: <20200311133925.4E3CA23351D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9a703f8e05d9e7e609d0e04278be290d4051ec31 Author: Trevor Gamblin AuthorDate: Wed Mar 11 04:32:34 2020 -0700 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 | 40 +++++++++++++++++++++++++ 2 files changed, 57 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..cba0bfe 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,42 @@ 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 + + # Disable subcase tail-2/assert.sh as it has issues on 32-bit systems + sed -i '/assert.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 Wed Mar 11 13:39:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:47 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (2e18fcb -> 81b1841) Message-ID: <158393398738.13342.3975177925665368925@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 2e18fcb coreutils: fixup discard 62b79d3 coreutils hack discard d098443 ptest-packagelists.inc: add coreutils to SLOW list discard 5327c7c coreutils: add ptest discard 04cc7fc grub-efi-cfg: enable per-label APPEND override discard 222c794 image-prelink: remove assumption of sysconfdir presence discard 5082266 libdnf: fix upstream version check discard 0906d45 valgrind: Fix timerfd syscall test to be 64bit time_t safe discard b5dcbbb ruby: Use arm32 for coroutines on 32bit-arm discard ddefb69 buildtools-extended-tarball: Add locale command discard 280649c glibc: Update nativesdk locale relocation patch discard 49c9ab0 files/toolchain-shar-extract.sh: Rework PATH cleaning discard 40a7170 oeqa/testsdk: Use original PATH discard 2ff2cdf gcc: strip line numbers from generated code in gcc-plugins on target discard 2c9b7af gcc: don't ship build host information in the target gcc-plugins package discard 223d204 nspr: Move to meta-oe discard a128180 nss: Move to meta-oe discard 3174def rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 5263de8 HACK: signing: Add extra test debug discard bfce159 glew/curl: specify exclusive package configs discard 7a762e7 base.bbclass: extend PACKAGECONFIG for conflict package configs add 87c9602 oeqa/testsdk: Use original PATH add 7674b63 files/toolchain-shar-extract.sh: Rework PATH cleaning add f7a6a72 glibc: Update nativesdk locale relocation patch add 7d35e4b buildtools-extended-tarball: Add locale command add ea93afa ruby: Use arm32 for coroutines on 32bit-arm add ac5a65c valgrind: Fix timerfd syscall test to be 64bit time_t safe add 206580e libdnf: fix upstream version check add 6bf3e3d image-prelink: remove assumption of sysconfdir presence add 20ad770 grub-efi-cfg: enable per-label APPEND override add 9a703f8 coreutils: add ptest add 0c2c798 ptest-packagelists.inc: add coreutils to SLOW add 5463971 coreutils: Fix -dev package dependencies new c23d9b5 base.bbclass: extend PACKAGECONFIG for conflict package configs new 1f92ddd glew/curl: specify exclusive package configs new ad57427 HACK: signing: Add extra test debug new a729fb6 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 04b81a1 nss: Move to meta-oe new b413739 nspr: Move to meta-oe new 377874b gcc: don't ship build host information in the target gcc-plugins package new 81b1841 gcc: strip line numbers from generated code in gcc-plugins on target 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 (2e18fcb) \ N -- N -- N refs/heads/master-next (81b1841) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:48 +0000 Subject: [oe-commits] [openembedded-core] 01/08: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.844A2232C89@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c23d9b5f2c9a417a47d64e9defa6b49a9170ea7d 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 Mar 11 13:39:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:49 +0000 Subject: [oe-commits] [openembedded-core] 02/08: glew/curl: specify exclusive package configs In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.8DB1B233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1f92ddd37e40a46d0857d235ad916bafea9e92ac 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.69.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.69.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb index cf4f4bc..2e9b512 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.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 Mar 11 13:39:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:50 +0000 Subject: [oe-commits] [openembedded-core] 03/08: HACK: signing: Add extra test debug In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.96466233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ad57427957e19526a7050f83776b2a93123cc14b 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/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..9db1a20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -221,4 +222,17 @@ 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 = runCmd('cat bitbake-cookerdaemon.log').output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) + 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 Mar 11 13:39:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:51 +0000 Subject: [oe-commits] [openembedded-core] 04/08: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.A038E233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a729fb65808faeab2b70d7baac61492da9c87571 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 Wed Mar 11 13:39:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:54 +0000 Subject: [oe-commits] [openembedded-core] 07/08: gcc: don't ship build host information in the target gcc-plugins package In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.C0632233517@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 377874b580c14c824819a47dfd2f10baaad650b8 Author: Ross Burton AuthorDate: Tue Mar 10 14:07:01 2020 +0000 gcc: don't ship build host information in the target gcc-plugins package The build host configuration isn't reproducible as it varies depending on the gcc version of the build host. This information isn't useful on the target anyway so remove it. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-target.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 18d078d..204f947 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -179,6 +179,10 @@ do_install () { # Cleanup manpages.. rm -rf ${D}${mandir}/man7 + # Don't package details about the build host + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h + cd ${D}${bindir} # We care about g++ not c++ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:39:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:52 +0000 Subject: [oe-commits] [openembedded-core] 05/08: nss: Move to meta-oe In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.AC4AA233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 04b81a10a832a93584f041360d698fb0c695a35d Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:07 2020 +0200 nss: Move to meta-oe rpm was the last user in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 14 files changed, 638 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..f6a2936 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -527,7 +527,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " 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 deleted file mode 100644 index c380c14..0000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d540339..0000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2..0000000 Binary files a/meta/recipes-support/nss/nss/blank-cert9.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db deleted file mode 100644 index d47f08d..0000000 Binary files a/meta/recipes-support/nss/nss/blank-key4.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d2..0000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d1..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc9..0000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ec..0000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817fa..0000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499..0000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9..0000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7..0000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -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" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "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 Wed Mar 11 13:39:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:53 +0000 Subject: [oe-commits] [openembedded-core] 06/08: nspr: Move to meta-oe In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.B7A072334EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b41373960621b6adfc3b5221e7f4376a505262df Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:08 2020 +0200 nspr: Move to meta-oe It was used only by nss. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 ---- .../nspr/nspr/0002-Add-nios2-support.patch | 102 ----------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ----------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ------ meta/recipes-support/nspr/nspr/nspr.pc.in | 11 -- .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- 9 files changed, 542 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f6a2936..33f8044 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670..0000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d42..0000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f..0000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8..0000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19..0000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed..0000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1..0000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -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 Mar 11 13:39:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:39:55 +0000 Subject: [oe-commits] [openembedded-core] 08/08: gcc: strip line numbers from generated code in gcc-plugins on target In-Reply-To: <158393398738.13342.3975177925665368925@git.openembedded.org> References: <158393398738.13342.3975177925665368925@git.openembedded.org> Message-ID: <20200311133947.C824C233518@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 81b18419f35e2098c31c99b9fb729ed336a7f546 Author: Ross Burton AuthorDate: Tue Mar 10 13:48:26 2020 +0000 gcc: strip line numbers from generated code in gcc-plugins on target The line numbers are influenced by the gcc version on the host used to generate the code. Remove these to ensure the shipped source code is the same. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + .../gcc/gcc-9.2/gen-no-line-numbers.patch | 170 +++++++++++++++++++++ 2 files changed, 171 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index 2bae85a..2368f35 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -70,6 +70,7 @@ SRC_URI = "\ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ + file://gen-no-line-numbers.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch new file mode 100644 index 0000000..8e2c3f5 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch @@ -0,0 +1,170 @@ +Inserting line numbers into generated code means its not always reproducible wth +differing versions of host gcc. Void the issue by not adding these. + +Upstream-Status: Inappropriate [OE Reproducibility specific] +Signed-off-by: Richard Purdie + +diff --git a/gcc/gengtype.c b/gcc/gengtype.c +index 53317337c..bbb261516 100644 +--- a/gcc/gengtype.c ++++ b/gcc/gengtype.c +@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, + /* Create a fake field with the given type and name. NEXT is the next + field in the chain. */ + #define create_field(next,type,name) \ +- create_field_all (next,type,name, 0, this_file, __LINE__) ++ create_field_all (next,type,name, 0, this_file, 0) + + /* Like create_field, but the field is only valid when condition COND + is true. */ +@@ -1024,7 +1024,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, + } + + #define create_optional_field(next,type,name,cond) \ +- create_optional_field_(next,type,name,cond,__LINE__) ++ create_optional_field_(next,type,name,cond,0) + + /* Reverse a linked list of 'struct pair's in place. */ + pair_p +@@ -5186,7 +5186,7 @@ main (int argc, char **argv) + /* These types are set up with #define or else outside of where + we can see them. We should initialize them before calling + read_input_list. */ +-#define POS_HERE(Call) do { pos.file = this_file; pos.line = __LINE__; \ ++#define POS_HERE(Call) do { pos.file = this_file; pos.line = 0; \ + Call;} while (0) + POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); + POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); +diff --git a/gcc/genmodes.c b/gcc/genmodes.c +index f33eefa24..07bef9eeb 100644 +--- a/gcc/genmodes.c ++++ b/gcc/genmodes.c +@@ -429,7 +429,7 @@ complete_all_modes (void) + } + + /* For each mode in class CLASS, construct a corresponding complex mode. */ +-#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, __LINE__) ++#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, 0) + static void + make_complex_modes (enum mode_class cl, + const char *file, unsigned int line) +@@ -487,7 +487,7 @@ make_complex_modes (enum mode_class cl, + /* For all modes in class CL, construct vector modes of width + WIDTH, having as many components as necessary. */ + #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W) \ +- make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, __LINE__) ++ make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, 0) + #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W) + static void ATTRIBUTE_UNUSED + make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, +@@ -538,7 +538,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, + /* Create a vector of booleans called NAME with COUNT elements and + BYTESIZE bytes in total. */ + #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \ +- make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, __LINE__) ++ make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_vector_bool_mode (const char *name, unsigned int count, + unsigned int bytesize, const char *file, +@@ -560,7 +560,7 @@ make_vector_bool_mode (const char *name, unsigned int count, + /* Input. */ + + #define _SPECIAL_MODE(C, N) \ +- make_special_mode (MODE_##C, #N, __FILE__, __LINE__) ++ make_special_mode (MODE_##C, #N, __FILE__, 0) + #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) + #define CC_MODE(N) _SPECIAL_MODE (CC, N) + +@@ -573,7 +573,7 @@ make_special_mode (enum mode_class cl, const char *name, + + #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) + #define FRACTIONAL_INT_MODE(N, B, Y) \ +- make_int_mode (#N, B, Y, __FILE__, __LINE__) ++ make_int_mode (#N, B, Y, __FILE__, 0) + + static void + make_int_mode (const char *name, +@@ -586,16 +586,16 @@ make_int_mode (const char *name, + } + + #define FRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, 0) + + #define UFRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, 0) + + #define ACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, 0) + + #define UACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, 0) + + /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, + FILE, and LINE. */ +@@ -616,7 +616,7 @@ make_fixed_point_mode (enum mode_class cl, + + #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ +- make_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_float_mode (const char *name, +@@ -633,7 +633,7 @@ make_float_mode (const char *name, + #define DECIMAL_FLOAT_MODE(N, Y, F) \ + FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ +- make_decimal_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_decimal_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_decimal_float_mode (const char *name, +@@ -648,7 +648,7 @@ make_decimal_float_mode (const char *name, + } + + #define RESET_FLOAT_FORMAT(N, F) \ +- reset_float_format (#N, #F, __FILE__, __LINE__) ++ reset_float_format (#N, #F, __FILE__, 0) + static void ATTRIBUTE_UNUSED + reset_float_format (const char *name, const char *format, + const char *file, unsigned int line) +@@ -669,7 +669,7 @@ reset_float_format (const char *name, const char *format, + + /* __intN support. */ + #define INT_N(M,PREC) \ +- make_int_n (#M, PREC, __FILE__, __LINE__) ++ make_int_n (#M, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_int_n (const char *m, int bitsize, + const char *file, unsigned int line) +@@ -698,7 +698,7 @@ make_int_n (const char *m, int bitsize, + /* Partial integer modes are specified by relation to a full integer + mode. */ + #define PARTIAL_INT_MODE(M,PREC,NAME) \ +- make_partial_integer_mode (#M, #NAME, PREC, __FILE__, __LINE__) ++ make_partial_integer_mode (#M, #NAME, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_partial_integer_mode (const char *base, const char *name, + unsigned int precision, +@@ -725,7 +725,7 @@ make_partial_integer_mode (const char *base, const char *name, + /* A single vector mode can be specified by naming its component + mode and the number of components. */ + #define VECTOR_MODE(C, M, N) \ +- make_vector_mode (MODE_##C, #M, N, __FILE__, __LINE__); ++ make_vector_mode (MODE_##C, #M, N, __FILE__, 0); + static void ATTRIBUTE_UNUSED + make_vector_mode (enum mode_class bclass, + const char *base, +@@ -768,7 +768,7 @@ make_vector_mode (enum mode_class bclass, + + /* Adjustability. */ + #define _ADD_ADJUST(A, M, X, C1, C2) \ +- new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, __LINE__) ++ new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, 0) + + #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) + #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:44:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:30 +0000 Subject: [oe-commits] [openembedded-core] 01/04: gcc: don't ship build host information in the target gcc-plugins package In-Reply-To: <158393426955.16023.8225441473743590950@git.openembedded.org> References: <158393426955.16023.8225441473743590950@git.openembedded.org> Message-ID: <20200311134429.C327B233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit f9154b2c3eff8434914710ab453e13cf338597ec Author: Ross Burton AuthorDate: Tue Mar 10 14:07:01 2020 +0000 gcc: don't ship build host information in the target gcc-plugins package The build host configuration isn't reproducible as it varies depending on the gcc version of the build host. This information isn't useful on the target anyway so remove it. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-target.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 18d078d..204f947 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -179,6 +179,10 @@ do_install () { # Cleanup manpages.. rm -rf ${D}${mandir}/man7 + # Don't package details about the build host + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h + rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h + cd ${D}${bindir} # We care about g++ not c++ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:44:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:31 +0000 Subject: [oe-commits] [openembedded-core] 02/04: gcc: strip line numbers from generated code in gcc-plugins on target In-Reply-To: <158393426955.16023.8225441473743590950@git.openembedded.org> References: <158393426955.16023.8225441473743590950@git.openembedded.org> Message-ID: <20200311134429.CE03B233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5c3d3440809e9d76377af653ac8c5307bc1a01b4 Author: Ross Burton AuthorDate: Tue Mar 10 13:48:26 2020 +0000 gcc: strip line numbers from generated code in gcc-plugins on target The line numbers are influenced by the gcc version on the host used to generate the code. Remove these to ensure the shipped source code is the same. Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + .../gcc/gcc-9.2/gen-no-line-numbers.patch | 170 +++++++++++++++++++++ 2 files changed, 171 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.2.inc index 2bae85a..2368f35 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.2.inc @@ -70,6 +70,7 @@ SRC_URI = "\ file://CVE-2019-15847_2.patch \ file://CVE-2019-15847_3.patch \ file://re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch \ + file://gen-no-line-numbers.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch new file mode 100644 index 0000000..8e2c3f5 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch @@ -0,0 +1,170 @@ +Inserting line numbers into generated code means its not always reproducible wth +differing versions of host gcc. Void the issue by not adding these. + +Upstream-Status: Inappropriate [OE Reproducibility specific] +Signed-off-by: Richard Purdie + +diff --git a/gcc/gengtype.c b/gcc/gengtype.c +index 53317337c..bbb261516 100644 +--- a/gcc/gengtype.c ++++ b/gcc/gengtype.c +@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, + /* Create a fake field with the given type and name. NEXT is the next + field in the chain. */ + #define create_field(next,type,name) \ +- create_field_all (next,type,name, 0, this_file, __LINE__) ++ create_field_all (next,type,name, 0, this_file, 0) + + /* Like create_field, but the field is only valid when condition COND + is true. */ +@@ -1024,7 +1024,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name, + } + + #define create_optional_field(next,type,name,cond) \ +- create_optional_field_(next,type,name,cond,__LINE__) ++ create_optional_field_(next,type,name,cond,0) + + /* Reverse a linked list of 'struct pair's in place. */ + pair_p +@@ -5186,7 +5186,7 @@ main (int argc, char **argv) + /* These types are set up with #define or else outside of where + we can see them. We should initialize them before calling + read_input_list. */ +-#define POS_HERE(Call) do { pos.file = this_file; pos.line = __LINE__; \ ++#define POS_HERE(Call) do { pos.file = this_file; pos.line = 0; \ + Call;} while (0) + POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); + POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); +diff --git a/gcc/genmodes.c b/gcc/genmodes.c +index f33eefa24..07bef9eeb 100644 +--- a/gcc/genmodes.c ++++ b/gcc/genmodes.c +@@ -429,7 +429,7 @@ complete_all_modes (void) + } + + /* For each mode in class CLASS, construct a corresponding complex mode. */ +-#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, __LINE__) ++#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, 0) + static void + make_complex_modes (enum mode_class cl, + const char *file, unsigned int line) +@@ -487,7 +487,7 @@ make_complex_modes (enum mode_class cl, + /* For all modes in class CL, construct vector modes of width + WIDTH, having as many components as necessary. */ + #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W) \ +- make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, __LINE__) ++ make_vector_modes (MODE_##C, #PREFIX, W, __FILE__, 0) + #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W) + static void ATTRIBUTE_UNUSED + make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, +@@ -538,7 +538,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width, + /* Create a vector of booleans called NAME with COUNT elements and + BYTESIZE bytes in total. */ + #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \ +- make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, __LINE__) ++ make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_vector_bool_mode (const char *name, unsigned int count, + unsigned int bytesize, const char *file, +@@ -560,7 +560,7 @@ make_vector_bool_mode (const char *name, unsigned int count, + /* Input. */ + + #define _SPECIAL_MODE(C, N) \ +- make_special_mode (MODE_##C, #N, __FILE__, __LINE__) ++ make_special_mode (MODE_##C, #N, __FILE__, 0) + #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N) + #define CC_MODE(N) _SPECIAL_MODE (CC, N) + +@@ -573,7 +573,7 @@ make_special_mode (enum mode_class cl, const char *name, + + #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y) + #define FRACTIONAL_INT_MODE(N, B, Y) \ +- make_int_mode (#N, B, Y, __FILE__, __LINE__) ++ make_int_mode (#N, B, Y, __FILE__, 0) + + static void + make_int_mode (const char *name, +@@ -586,16 +586,16 @@ make_int_mode (const char *name, + } + + #define FRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, 0) + + #define UFRACT_MODE(N, Y, F) \ +- make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, 0) + + #define ACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, 0) + + #define UACCUM_MODE(N, Y, I, F) \ +- make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, __LINE__) ++ make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, 0) + + /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT, + FILE, and LINE. */ +@@ -616,7 +616,7 @@ make_fixed_point_mode (enum mode_class cl, + + #define FLOAT_MODE(N, Y, F) FRACTIONAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \ +- make_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_float_mode (const char *name, +@@ -633,7 +633,7 @@ make_float_mode (const char *name, + #define DECIMAL_FLOAT_MODE(N, Y, F) \ + FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F) + #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F) \ +- make_decimal_float_mode (#N, B, Y, #F, __FILE__, __LINE__) ++ make_decimal_float_mode (#N, B, Y, #F, __FILE__, 0) + + static void + make_decimal_float_mode (const char *name, +@@ -648,7 +648,7 @@ make_decimal_float_mode (const char *name, + } + + #define RESET_FLOAT_FORMAT(N, F) \ +- reset_float_format (#N, #F, __FILE__, __LINE__) ++ reset_float_format (#N, #F, __FILE__, 0) + static void ATTRIBUTE_UNUSED + reset_float_format (const char *name, const char *format, + const char *file, unsigned int line) +@@ -669,7 +669,7 @@ reset_float_format (const char *name, const char *format, + + /* __intN support. */ + #define INT_N(M,PREC) \ +- make_int_n (#M, PREC, __FILE__, __LINE__) ++ make_int_n (#M, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_int_n (const char *m, int bitsize, + const char *file, unsigned int line) +@@ -698,7 +698,7 @@ make_int_n (const char *m, int bitsize, + /* Partial integer modes are specified by relation to a full integer + mode. */ + #define PARTIAL_INT_MODE(M,PREC,NAME) \ +- make_partial_integer_mode (#M, #NAME, PREC, __FILE__, __LINE__) ++ make_partial_integer_mode (#M, #NAME, PREC, __FILE__, 0) + static void ATTRIBUTE_UNUSED + make_partial_integer_mode (const char *base, const char *name, + unsigned int precision, +@@ -725,7 +725,7 @@ make_partial_integer_mode (const char *base, const char *name, + /* A single vector mode can be specified by naming its component + mode and the number of components. */ + #define VECTOR_MODE(C, M, N) \ +- make_vector_mode (MODE_##C, #M, N, __FILE__, __LINE__); ++ make_vector_mode (MODE_##C, #M, N, __FILE__, 0); + static void ATTRIBUTE_UNUSED + make_vector_mode (enum mode_class bclass, + const char *base, +@@ -768,7 +768,7 @@ make_vector_mode (enum mode_class bclass, + + /* Adjustability. */ + #define _ADD_ADJUST(A, M, X, C1, C2) \ +- new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, __LINE__) ++ new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, 0) + + #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) + #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:44:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:29 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (5463971 -> baecda5) Message-ID: <158393426955.16023.8225441473743590950@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 5463971 coreutils: Fix -dev package dependencies new f9154b2 gcc: don't ship build host information in the target gcc-plugins package new 5c3d344 gcc: strip line numbers from generated code in gcc-plugins on target new 15aa3bd nss: Move to meta-oe new baecda5 nspr: Move to meta-oe 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 | 2 - meta/recipes-devtools/gcc/gcc-9.2.inc | 1 + .../gcc/gcc-9.2/gen-no-line-numbers.patch | 170 +++++++++++++ meta/recipes-devtools/gcc/gcc-target.inc | 4 + .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 --- .../nspr/nspr/0002-Add-nios2-support.patch | 102 -------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 -------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ---- meta/recipes-support/nspr/nspr/nspr.pc.in | 11 - .../nspr/nspr/remove-rpath-from-tests.patch | 26 -- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------- ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 25 files changed, 175 insertions(+), 1180 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch delete mode 100644 meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch delete mode 100644 meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch delete mode 100644 meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch delete mode 100644 meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch delete mode 100644 meta/recipes-support/nspr/nspr/nspr.pc.in delete mode 100644 meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch delete mode 100644 meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch delete mode 100644 meta/recipes-support/nspr/nspr_4.25.bb delete mode 100644 meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch delete mode 100644 meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch delete mode 100644 meta/recipes-support/nss/nss/blank-cert9.db delete mode 100644 meta/recipes-support/nss/nss/blank-key4.db delete mode 100644 meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch delete mode 100644 meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch delete mode 100644 meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch delete mode 100644 meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch delete mode 100644 meta/recipes-support/nss/nss/nss.pc.in delete mode 100644 meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch delete mode 100644 meta/recipes-support/nss/nss/signlibs.sh delete mode 100644 meta/recipes-support/nss/nss/system-pkcs11.txt delete mode 100644 meta/recipes-support/nss/nss_3.50.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 13:44:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:32 +0000 Subject: [oe-commits] [openembedded-core] 03/04: nss: Move to meta-oe In-Reply-To: <158393426955.16023.8225441473743590950@git.openembedded.org> References: <158393426955.16023.8225441473743590950@git.openembedded.org> Message-ID: <20200311134429.E27FB233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 15aa3bdf798b0e45a20f877e203f3750b623754f Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:07 2020 +0200 nss: Move to meta-oe rpm was the last user in OE-core. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - ...a-configure-option-to-disable-ARM-HW-cryp.patch | 52 ---- .../nss/0001-nss-fix-support-cross-compiling.patch | 48 ---- meta/recipes-support/nss/nss/blank-cert9.db | Bin 28672 -> 0 bytes meta/recipes-support/nss/nss/blank-key4.db | Bin 36864 -> 0 bytes .../nss/nss/disable-Wvarargs-with-clang.patch | 33 --- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 110 --------- .../nss/nss/nss-fix-nsinstall-build.patch | 36 --- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 26 -- meta/recipes-support/nss/nss/nss.pc.in | 11 - .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 23 -- meta/recipes-support/nss/nss/signlibs.sh | 20 -- meta/recipes-support/nss/nss/system-pkcs11.txt | 5 - meta/recipes-support/nss/nss_3.50.bb | 273 --------------------- 14 files changed, 638 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index adb1822..f6a2936 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -527,7 +527,6 @@ RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " -RECIPE_MAINTAINER_pn-nss = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " 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 deleted file mode 100644 index c380c14..0000000 --- a/meta/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 18 Dec 2019 12:29:50 +0100 -Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto - -Not all current hardware supports it, particularly anything -prior to armv8 does not. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,9 @@ else - DEFINES += -DNSS_X86 - endif - endif -+ -+ifdef NSS_USE_ARM_HW_CRYPTO -+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO - ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) - endif - endif - endif -+endif - - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD ---- a/nss/lib/freebl/gcm.c -+++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ - - #include - -+#ifdef NSS_USE_ARM_HW_CRYPTO - /* old gcc doesn't support some poly64x2_t intrinsic */ - #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ - (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ - /* We don't test on big endian platform, so disable this on big endian. */ - #define USE_ARM_GCM - #endif -+#endif - - /* Forward declarations */ - SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch deleted file mode 100644 index d540339..0000000 --- a/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 22 Feb 2017 11:36:11 +0200 -Subject: [PATCH] nss: fix support cross compiling - -Let some make variables be assigned from outside makefile. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Hongxu Jia -Signed-off-by: Alexander Kanavin ---- - nss/coreconf/arch.mk | 2 +- - nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 ---- a/nss/coreconf/arch.mk -+++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) - ifeq ($(OS_TEST),i86pc) - OS_RELEASE := $(shell uname -r)_$(OS_TEST) - else -- OS_RELEASE := $(shell uname -r) -+ OS_RELEASE ?= $(shell uname -r) - endif - - # -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 ---- a/nss/lib/freebl/Makefile -+++ b/nss/lib/freebl/Makefile -@@ -36,6 +36,12 @@ ifdef USE_64 - DEFINES += -DNSS_USE_64 - endif - -+ifeq ($(OS_TEST),mips) -+ifndef USE_64 -+ DEFINES += -DNS_PTR_LE_32 -+endif -+endif -+ - ifdef USE_ABI32_FPU - DEFINES += -DNSS_USE_ABI32_FPU - endif --- -2.11.0 - diff --git a/meta/recipes-support/nss/nss/blank-cert9.db b/meta/recipes-support/nss/nss/blank-cert9.db deleted file mode 100644 index 7d4bcf2..0000000 Binary files a/meta/recipes-support/nss/nss/blank-cert9.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/blank-key4.db b/meta/recipes-support/nss/nss/blank-key4.db deleted file mode 100644 index d47f08d..0000000 Binary files a/meta/recipes-support/nss/nss/blank-key4.db and /dev/null differ diff --git a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch deleted file mode 100644 index de812d2..0000000 --- a/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ /dev/null @@ -1,33 +0,0 @@ -clang 3.9 add this warning to rightly flag undefined -behavior, we relegate this to be just a warning instead -of error and keep the behavior as it was. Right fix would -be to not pass enum to the function with variadic arguments -as last named argument - -Fixes errors like -ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs] - va_start(ap, responseType0); - ^ -ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here - SECOidTag responseType0, ...) - -see -https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start -for more details - -Signed-off-by: Khem Raj -Upstream-Status: Pending - -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk -@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS - ifdef CC_IS_CLANG - # -Qunused-arguments : clang objects to arguments that it doesn't understand - # and fixing this would require rearchitecture -- WARNING_CFLAGS += -Qunused-arguments -+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs - # -Wno-parentheses-equality : because clang warns about macro expansions - WARNING_CFLAGS += $(call disable_warning,parentheses-equality) - ifdef BUILD_OPT diff --git a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch deleted file mode 100644 index 547594d..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ /dev/null @@ -1,110 +0,0 @@ -nss: fix incorrect shebang of perl - -Replace incorrect shebang of perl with `#!/usr/bin/env perl'. - -Signed-off-by: Hongxu Jia -Upstream-Status: Pending ---- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 ---- a/nss/coreconf/version.pl -+++ b/nss/coreconf/version.pl -@@ -1,4 +1,4 @@ --#!/usr/sbin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 ---- a/nss/tests/clean_tbx -+++ b/nss/tests/clean_tbx -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ####################################################################### - # -diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 ---- a/nss/tests/path_uniq -+++ b/nss/tests/path_uniq -@@ -1,4 +1,4 @@ --#! /bin/perl -+#!/usr/bin/env perl - - ######################################################################## - # --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch deleted file mode 100644 index 43c09d1..0000000 --- a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix nss multilib build on openSUSE 11.x 32bit - -While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will -fail with error: - -* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled - -It caused by the '-m64' option which passed to host gcc. - -The nsinstall was built first while nss starting to build, it only runs -on host to install built files, it doesn't need any cross-compling or -multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this -error. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan -=================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile -@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 - - include $(DEPTH)/coreconf/config.mk - -+# nsinstall is unfit for cross-compiling/multilib-build since it was -+# always run on local host to install built files. This change intends -+# to clean the '-m64' from ARCHFLAG and LDFLAGS. -+ARCHFLAG = -+LDFLAGS = -+# CFLAGS = -+ - ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) - PROGRAM = - else diff --git a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch deleted file mode 100644 index 7661dc9..0000000 --- a/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ /dev/null @@ -1,26 +0,0 @@ -nss:no rpath for cross compiling - -Signed-off-by: Hongxu Jia -Upstream-Status: Inappropriate [configuration] ---- - nss/cmd/platlibs.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk ---- a/nss/cmd/platlibs.mk -+++ b/nss/cmd/platlibs.mk -@@ -18,9 +18,9 @@ endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' - endif - endif - --- -1.8.1.2 - diff --git a/meta/recipes-support/nss/nss/nss.pc.in b/meta/recipes-support/nss/nss/nss.pc.in deleted file mode 100644 index 402b4ec..0000000 --- a/meta/recipes-support/nss/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 -Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch deleted file mode 100644 index 3a817fa..0000000 --- a/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ /dev/null @@ -1,23 +0,0 @@ -nss does not build on mips with clang because wrong types are used? - -pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] - if (addend < MP_DIGIT_MAX) { - ~~~~~~ ^ ~~~~~~~~~~~~ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in - - static SECStatus - addToSeed(const SECItem *seed, -- unsigned long addend, -- int seedlen, /* g in 186-1 */ -+ unsigned long long addend, -+ int seedlen, /* g in 186-1 */ - SECItem *seedout) - { - mp_int s, sum, modulus, tmp; diff --git a/meta/recipes-support/nss/nss/signlibs.sh b/meta/recipes-support/nss/nss/signlibs.sh deleted file mode 100644 index a74e499..0000000 --- a/meta/recipes-support/nss/nss/signlibs.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# signlibs.sh -# -# (c)2010 Wind River Systems, Inc. -# -# regenerates the .chk files for the NSS libraries that require it -# since the ones that are built have incorrect checksums that were -# calculated on the host where they really need to be done on the -# target - -CHK_FILES=`ls /lib*/*.chk /usr/lib*/*.chk 2>/dev/null` -SIGN_BINARY=`which shlibsign` -for I in $CHK_FILES -do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - $SIGN_BINARY -i $FN -done diff --git a/meta/recipes-support/nss/nss/system-pkcs11.txt b/meta/recipes-support/nss/nss/system-pkcs11.txt deleted file mode 100644 index 1a264e9..0000000 --- a/meta/recipes-support/nss/nss/system-pkcs11.txt +++ /dev/null @@ -1,5 +0,0 @@ -library= -name=NSS Internal PKCS #11 Module -parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' -NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) - diff --git a/meta/recipes-support/nss/nss_3.50.bb b/meta/recipes-support/nss/nss_3.50.bb deleted file mode 100644 index e9855d7..0000000 --- a/meta/recipes-support/nss/nss_3.50.bb +++ /dev/null @@ -1,273 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - " - -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" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "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 Wed Mar 11 13:44:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:33 +0000 Subject: [oe-commits] [openembedded-core] 04/04: nspr: Move to meta-oe In-Reply-To: <158393426955.16023.8225441473743590950@git.openembedded.org> References: <158393426955.16023.8225441473743590950@git.openembedded.org> Message-ID: <20200311134429.F0BA6233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit baecda5b32b66d09dadccbcbe706c5ec0a270568 Author: Adrian Bunk AuthorDate: Sun Feb 23 21:34:08 2020 +0200 nspr: Move to meta-oe It was used only by nss. Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 1 - .../nspr/nspr/0001-md-Fix-build-with-musl.patch | 31 ---- .../nspr/nspr/0002-Add-nios2-support.patch | 102 ----------- ...e.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ----------- .../nspr/nspr/fix-build-on-x86_64.patch | 52 ------ meta/recipes-support/nspr/nspr/nspr.pc.in | 11 -- .../nspr/nspr/remove-rpath-from-tests.patch | 26 --- .../nspr/remove-srcdir-from-configure-in.patch | 19 -- meta/recipes-support/nspr/nspr_4.25.bb | 197 --------------------- 9 files changed, 542 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f6a2936..33f8044 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -526,7 +526,6 @@ RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang " RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang " RECIPE_MAINTAINER_pn-ninja = "Khem Raj " RECIPE_MAINTAINER_pn-npth = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-nspr = "Armin Kuster " RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal " RECIPE_MAINTAINER_pn-ofono = "Ross Burton " RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis " diff --git a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch deleted file mode 100644 index f3cd670..0000000 --- a/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 18 Sep 2017 17:22:43 -0700 -Subject: [PATCH] md: Fix build with musl - -The MIPS specific header is not provided by musl -linux kernel headers provide which has same definitions - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - pr/include/md/_linux.cfg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg -index 640b19c..31296a8 100644 ---- a/pr/include/md/_linux.cfg -+++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 --- -2.14.1 - diff --git a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch deleted file mode 100644 index 3a04d42..0000000 --- a/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Sat, 30 Jan 2016 07:18:02 +0100 -Subject: [PATCH] Add nios2 support - -Add support for the nios2 CPU. - -Signed-off-by: Marek Vasut -Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) - -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg -@@ -975,6 +975,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__nios2__) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #elif defined(__or1k__) - - #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h -@@ -55,6 +55,8 @@ - #define _PR_SI_ARCHITECTURE "avr32" - #elif defined(__m32r__) - #define _PR_SI_ARCHITECTURE "m32r" -+#elif defined(__nios2__) -+#define _PR_SI_ARCHITECTURE "nios2" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" - #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn - #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet - #endif - -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) - #if defined(__GNUC__) - /* Use GCC built-in functions */ diff --git a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch deleted file mode 100644 index 90fe45f..0000000 --- a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 16 Nov 2018 13:52:49 +0800 -Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME - -Remove _BUILD_STRING and _BUILD_TIME to avoid -adding timestamp to _pl_bld.h which can result -in adding timestamp in library file such as -libnspr4.so. - $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so - [snip] - 0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49 - [snip] - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - lib/ds/Makefile.in | 8 +------- - lib/libc/src/Makefile.in | 8 +------- - lib/prstreams/Makefile.in | 8 +------- - pr/src/Makefile.in | 8 +------- - 4 files changed, 4 insertions(+), 28 deletions(-) - -diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in -index e737791..b578476 100644 ---- a/lib/ds/Makefile.in -+++ b/lib/ds/Makefile.in -@@ -114,13 +114,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in -index e8a6d9f..978ed28 100644 ---- a/lib/libc/src/Makefile.in -+++ b/lib/libc/src/Makefile.in -@@ -116,13 +116,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in -index aeb2944..f318097 100644 ---- a/lib/prstreams/Makefile.in -+++ b/lib/prstreams/Makefile.in -@@ -116,13 +116,7 @@ endif - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in -index 19c5a69..b4ac31c 100644 ---- a/pr/src/Makefile.in -+++ b/pr/src/Makefile.in -@@ -326,13 +326,7 @@ GARBAGE += $(TINC) - - $(TINC): - @$(MAKE_OBJDIR) -- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC) -- @if test ! -z "$(SH_NOW)"; then \ -- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \ -- else \ -- true; \ -- fi -- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC) -+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC) - - - $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) --- -2.7.4 - diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch deleted file mode 100644 index f12acc8..0000000 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure on x86_64 - -When the target_cpu is x86_64, we should assume that the pkg uses 64bit, -only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a -opposite logic before. - -Signed-off-by: Robert Yang - -Upstream-Status: Pending ---- - configure.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve - PR_MD_ASFILES=os_Linux_ia64.s - ;; - x86_64) -- if test -n "$USE_64"; then -- PR_MD_ASFILES=os_Linux_x86_64.s -- elif test -n "$USE_X32"; then -+ if test -n "$USE_X32"; then -+ AC_DEFINE(i386) - PR_MD_ASFILES=os_Linux_x86_64.s - CC="$CC -mx32" - CXX="$CXX -mx32" - else -- AC_DEFINE(i386) -- PR_MD_ASFILES=os_Linux_x86.s -- CC="$CC -m32" -- CXX="$CXX -m32" -+ PR_MD_ASFILES=os_Linux_x86_64.s - fi - ;; - ppc|powerpc) - PR_MD_ASFILES=os_Linux_ppc.s - ;; - powerpc64) -- if test -n "$USE_64"; then -+ if test -n "$USE_N32"; then -+ PR_MD_ASFILES=os_Linux_ppc.s -+ else - CC="$CC -m64" - CXX="$CXX -m64" -- else -- PR_MD_ASFILES=os_Linux_ppc.s - fi - ;; - esac diff --git a/meta/recipes-support/nspr/nspr/nspr.pc.in b/meta/recipes-support/nspr/nspr/nspr.pc.in deleted file mode 100644 index 1f15d19..0000000 --- a/meta/recipes-support/nspr/nspr/nspr.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -os_libs=-lpthread -ldl -prefix=OEPREFIX -exec_prefix=OEEXECPREFIX -libdir=OELIBDIR -includedir=OEINCDIR - -Name: NSPR -Description: The Netscape Portable Runtime -Version: NSPRVERSION -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Cflags: -I${includedir}/nspr diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch deleted file mode 100644 index 7ba59ed..0000000 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Andrei Gherzan -Date: Thu Feb 9 00:03:38 2012 +0200 - -Avoid QA warnings by removing hardcoded rpath from binaries. - -[...] -WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib -in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait -[...] - -Signed-off-by: Andrei Gherzan -Upstream-Status: Pending - -Index: nspr/pr/tests/Makefile.in -=================================================================== ---- nspr.orig/pr/tests/Makefile.in -+++ nspr/pr/tests/Makefile.in -@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) - endif # SunOS - - ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) -- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -+ LDOPTS += -Xlinker - ifeq ($(USE_PTHREADS),1) - EXTRA_LIBS = -lpthread - endif diff --git a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta/recipes-support/nspr/nspr_4.25.bb b/meta/recipes-support/nspr/nspr_4.25.bb deleted file mode 100644 index 1de26e1..0000000 --- a/meta/recipes-support/nspr/nspr_4.25.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "4ca4d75a424f30fcdc766296bb103d17" -SRC_URI[sha256sum] = "0bc309be21f91da4474c56df90415101c7f0c7c7cab2943cd943cd7896985256" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -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 Mar 11 13:44:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:39 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (81b1841 -> 6f01a53) Message-ID: <158393427979.16510.12166460542981637608@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 81b1841 gcc: strip line numbers from generated code in gcc-plugins on target discard 377874b gcc: don't ship build host information in the target gcc-plugins package discard b413739 nspr: Move to meta-oe discard 04b81a1 nss: Move to meta-oe discard a729fb6 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard ad57427 HACK: signing: Add extra test debug discard 1f92ddd glew/curl: specify exclusive package configs discard c23d9b5 base.bbclass: extend PACKAGECONFIG for conflict package configs add f9154b2 gcc: don't ship build host information in the target gcc-plugins package add 5c3d344 gcc: strip line numbers from generated code in gcc-plugins on target add 15aa3bd nss: Move to meta-oe add baecda5 nspr: Move to meta-oe new 734475b base.bbclass: extend PACKAGECONFIG for conflict package configs new 8579673 glew/curl: specify exclusive package configs new 38ce012 HACK: signing: Add extra test debug new 6f01a53 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 (81b1841) \ N -- N -- N refs/heads/master-next (6f01a53) 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 Wed Mar 11 13:44:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:40 +0000 Subject: [oe-commits] [openembedded-core] 01/04: base.bbclass: extend PACKAGECONFIG for conflict package configs In-Reply-To: <158393427979.16510.12166460542981637608@git.openembedded.org> References: <158393427979.16510.12166460542981637608@git.openembedded.org> Message-ID: <20200311134439.EDAFD233442@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 734475b3f86d88a548bc9eb91d836bd1b9335e9f 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 Mar 11 13:44:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:41 +0000 Subject: [oe-commits] [openembedded-core] 02/04: glew/curl: specify exclusive package configs In-Reply-To: <158393427979.16510.12166460542981637608@git.openembedded.org> References: <158393427979.16510.12166460542981637608@git.openembedded.org> Message-ID: <20200311134440.04AC4233480@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8579673bdb314dbc554f40fc4c4c1db3d0bb0d63 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.69.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.69.0.bb b/meta/recipes-support/curl/curl_7.69.0.bb index cf4f4bc..2e9b512 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.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 Mar 11 13:44:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:42 +0000 Subject: [oe-commits] [openembedded-core] 03/04: HACK: signing: Add extra test debug In-Reply-To: <158393427979.16510.12166460542981637608@git.openembedded.org> References: <158393427979.16510.12166460542981637608@git.openembedded.org> Message-ID: <20200311134440.0F7A5233492@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 38ce012b511e2ea08778a1205f1c8fce89124920 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/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..9db1a20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -221,4 +222,17 @@ 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 = runCmd('cat bitbake-cookerdaemon.log').output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) + 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 Mar 11 13:44:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 13:44:43 +0000 Subject: [oe-commits] [openembedded-core] 04/04: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158393427979.16510.12166460542981637608@git.openembedded.org> References: <158393427979.16510.12166460542981637608@git.openembedded.org> Message-ID: <20200311134440.1B915233494@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6f01a53a9afec36a0a121498c2e979847d4ca257 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 Wed Mar 11 14:43:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:43:56 +0000 Subject: [oe-commits] [bitbake] branch master updated (2885034 -> 2e26e97) Message-ID: <158393783685.7907.9714587112196760980@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 2885034 build.py: augment TaskBase to capture PN and PV new 3987db9 fetch2/gitsm: Unpack shallow mirror tarballs new 2e26e97 tests: Add test for gitsm fetcher with shallow mirror tarballs 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: lib/bb/fetch2/gitsm.py | 21 ++++++++++++++++----- lib/bb/tests/fetch.py | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 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 Mar 11 14:43:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:43:58 +0000 Subject: [oe-commits] [bitbake] 02/02: tests: Add test for gitsm fetcher with shallow mirror tarballs In-Reply-To: <158393783685.7907.9714587112196760980@git.openembedded.org> References: <158393783685.7907.9714587112196760980@git.openembedded.org> Message-ID: <20200311144357.0DBB3233480@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 2e26e97129d4c54bf86cdea8f9791696a06a36b4 Author: Paul Barker AuthorDate: Mon Mar 9 13:52:13 2020 +0000 tests: Add test for gitsm fetcher with shallow mirror tarballs Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- lib/bb/tests/fetch.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 45dc9e5..d0c161a 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -1691,6 +1691,47 @@ class GitShallowTest(FetcherTest): # Verify the submodule is also shallow self.assertRevCount(1, cwd=os.path.join(self.gitdir, 'gitsubmodule')) + def test_shallow_submodule_mirrors(self): + self.add_empty_file('a') + self.add_empty_file('b') + + smdir = os.path.join(self.tempdir, 'gitsubmodule') + bb.utils.mkdirhier(smdir) + self.git('init', cwd=smdir) + # Make this look like it was cloned from a remote... + self.git('config --add remote.origin.url "%s"' % smdir, cwd=smdir) + self.git('config --add remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"', cwd=smdir) + self.add_empty_file('asub', cwd=smdir) + self.add_empty_file('bsub', cwd=smdir) + + self.git('submodule init', cwd=self.srcdir) + self.git('submodule add file://%s' % smdir, cwd=self.srcdir) + self.git('submodule update', cwd=self.srcdir) + self.git('commit -m submodule -a', cwd=self.srcdir) + + uri = 'gitsm://%s;protocol=file;subdir=${S}' % self.srcdir + + # Fetch once to generate the shallow tarball + fetcher, ud = self.fetch(uri) + + # Set up the mirror + mirrordir = os.path.join(self.tempdir, 'mirror') + os.rename(self.dldir, mirrordir) + self.d.setVar('PREMIRRORS', 'gitsm://.*/.* file://%s/\n' % mirrordir) + + # Fetch from the mirror + bb.utils.remove(self.dldir, recurse=True) + bb.utils.remove(self.gitdir, recurse=True) + self.fetch_and_unpack(uri) + + # Verify the main repository is shallow + self.assertRevCount(1) + + # Verify the gitsubmodule directory is present + assert os.listdir(os.path.join(self.gitdir, 'gitsubmodule')) + + # Verify the submodule is also shallow + self.assertRevCount(1, cwd=os.path.join(self.gitdir, 'gitsubmodule')) if any(os.path.exists(os.path.join(p, 'git-annex')) for p in os.environ.get('PATH').split(':')): def test_shallow_annex(self): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:43:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:43:57 +0000 Subject: [oe-commits] [bitbake] 01/02: fetch2/gitsm: Unpack shallow mirror tarballs In-Reply-To: <158393783685.7907.9714587112196760980@git.openembedded.org> References: <158393783685.7907.9714587112196760980@git.openembedded.org> Message-ID: <20200311144357.0180D233442@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 3987db953e414255ce278bc25a5f6cec0f2a30c7 Author: Paul Barker AuthorDate: Mon Mar 9 13:42:46 2020 +0000 fetch2/gitsm: Unpack shallow mirror tarballs When a shallow mirror tarball is used to satisfy a gitsm URI it needs to be unpacked temporarily so that the .gitmodules file can be examined. Signed-off-by: Paul Barker Signed-off-by: Richard Purdie --- lib/bb/fetch2/gitsm.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index aa121cb..e708300 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -20,6 +20,8 @@ NOTE: Switching a SRC_URI from "git://" to "gitsm://" requires a clean of your r import os import bb import copy +import shutil +import tempfile from bb.fetch2.git import Git from bb.fetch2 import runfetchcmd from bb.fetch2 import logger @@ -130,7 +132,7 @@ class GitSM(Git): ld.setVar('SRCPV', d.getVar('SRCPV')) ld.setVar('SRCREV_FORMAT', module) - function(ud, url, module, paths[module], ld) + function(ud, url, module, paths[module], workdir, ld) return submodules != [] @@ -152,7 +154,7 @@ class GitSM(Git): return False def download(self, ud, d): - def download_submodule(ud, url, module, modpath, d): + def download_submodule(ud, url, module, modpath, workdir, d): url += ";bareclone=1;nobranch=1" # Is the following still needed? @@ -163,16 +165,25 @@ class GitSM(Git): newfetch.download() # Drop a nugget to add each of the srcrevs we've fetched (used by need_update) runfetchcmd("%s config --add bitbake.srcrev %s" % \ - (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=ud.clonedir) + (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=workdir) except Exception as e: logger.error('gitsm: submodule download failed: %s %s' % (type(e).__name__, str(e))) raise Git.download(self, ud, d) - self.process_submodules(ud, ud.clonedir, download_submodule, d) + + # If we're using a shallow mirror tarball it needs to be unpacked + # temporarily so that we can examine the .gitmodules file + if ud.shallow and os.path.exists(ud.fullshallow) and self.need_update(ud, d): + tmpdir = tempfile.mkdtemp(dir=d.getVar("DL_DIR")) + runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=tmpdir) + self.process_submodules(ud, tmpdir, download_submodule, d) + shutil.rmtree(tmpdir) + else: + self.process_submodules(ud, ud.clonedir, download_submodule, d) def unpack(self, ud, destdir, d): - def unpack_submodules(ud, url, module, modpath, d): + def unpack_submodules(ud, url, module, modpath, workdir, d): url += ";bareclone=1;nobranch=1" # Figure out where we clone over the bare submodules... -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:05 +0000 Subject: [oe-commits] [bitbake] 02/15: bitbake: knotty: Handle logging messages with specific logger In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.7A22D23351F@git.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 3bde139fcd706d595719b5cc97cd46c900516288 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:40 2020 -0500 bitbake: knotty: Handle logging messages with specific logger Handles the log messages from the bitbake server with the specific logger that the event originated from. This allows hierarchical logging configurations to work as expected. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index cbb289b..a6a92b9 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -522,7 +522,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): event.msg = taskinfo['title'] + ': ' + event.msg if hasattr(event, 'fn'): event.msg = event.fn + ': ' + event.msg - logger.handle(event) + logging.getLogger(event.name).handle(event) continue if isinstance(event, bb.build.TaskFailedSilent): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:03 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (32c858a -> 0b87534) Message-ID: <158393784328.8253.9951983401297959754@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 32c858a tests: Add test for gitsm fetcher with shallow mirror tarballs discard 5f5f3fc fetch2/gitsm: Unpack shallow mirror tarballs discard 7e69bc4 bitbake-user-manual: Add documentation for BB_LOGCONFIG discard bdaf502 bitbake: Lower hash equivalence logging discard 6974dbe bitbake: Add autobuilder logging configuration discard efd3b57 bitbake: Log hash equivalence with a different logger discard 5e05a1a bitbake: worker: Remove unnecessary addDefaultLogFilter discard f459d48 bitbake: knotty: Setup logs with config helper discard a7fa136 bitbake: knotty: Remove dependency on format variable discard 2bbd26c bitbake: lib/bb/msg.py: Add helper to set logging config discard ac0fd90 bitbake: lib/bb/msg.py: Remove unused filters discard 41d6c17 bitbake: lib/bb/msg.py: Add filter utilities discard e3503f9 bitbake: knotty: Add commented logging_tree code discard 302bc9f bitbake: lib/bb/msg.py: Add repr for BBLogFormatter discard 8c042e6 bitbake: lib/bb/msg.py: Use log level instead of debug count discard 2e9af05 bitbake: knotty: Handle logging messages with specific logger discard 966bd64 bitbake: lib/bb/msg.py: Convert default domains to a dictionary add 3987db9 fetch2/gitsm: Unpack shallow mirror tarballs add 2e26e97 tests: Add test for gitsm fetcher with shallow mirror tarballs new 919216d bitbake: lib/bb/msg.py: Convert default domains to a dictionary new 3bde139 bitbake: knotty: Handle logging messages with specific logger new 105db36 bitbake: lib/bb/msg.py: Use log level instead of debug count new 6cdf80c bitbake: lib/bb/msg.py: Add repr for BBLogFormatter new a383ec1 bitbake: knotty: Add commented logging_tree code new 22da31f bitbake: lib/bb/msg.py: Add filter utilities new 28d758c bitbake: lib/bb/msg.py: Remove unused filters new 175a267 bitbake: lib/bb/msg.py: Add helper to set logging config new 2203fa3 bitbake: knotty: Remove dependency on format variable new 37a0138 bitbake: knotty: Setup logs with config helper new 23793c2 bitbake: worker: Remove unnecessary addDefaultLogFilter new a8972a6 bitbake: Log hash equivalence with a different logger new 170c7a6 bitbake: Add autobuilder logging configuration new 5d1151e bitbake: Lower hash equivalence logging new 0b87534 bitbake-user-manual: Add documentation for BB_LOGCONFIG 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 (32c858a) \ N -- N -- N refs/heads/master-next (0b87534) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:07 +0000 Subject: [oe-commits] [bitbake] 04/15: bitbake: lib/bb/msg.py: Add repr for BBLogFormatter In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.8E5CB233546@git.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 6cdf80c289622db9f9fbb68890d4a8a0ce0aa386 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:42 2020 -0500 bitbake: lib/bb/msg.py: Add repr for BBLogFormatter Adds a __repr__ function for BBLogFormatter. This allows it to get a human readable string when printed using the logging_tree module Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index ea6a954..c70fd80 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -98,6 +98,9 @@ class BBLogFormatter(logging.Formatter): def enable_color(self): self.color_enabled = True + def __repr__(self): + return "%s fmt='%s' color=%s" % (self.__class__.__name__, self._fmt, "True" if self.color_enabled else "False") + class BBLogFilter(object): def __init__(self, handler, level, debug_domains): self.stdlevel = level -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:04 +0000 Subject: [oe-commits] [bitbake] 01/15: bitbake: lib/bb/msg.py: Convert default domains to a dictionary In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.7038F23351D@git.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 919216d5da7ec61cece92318f3e1f72304b5369c Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:39 2020 -0500 bitbake: lib/bb/msg.py: Convert default domains to a dictionary Converts the default domain variable to a dictionary where the keys are the logging domains and the values are the logging level (instead of the debug count). This makes it easier to deal with the logging domains and the awkward conversion from a list to a dictionary only needs to be done once when logging is initialized. Finally, other code has been written that already assumes this variable is a dictionary, see: f04cd93109 ("bitbake: lib/bb: Optimise out debug messages from cooker") Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/__init__.py | 5 +++-- lib/bb/msg.py | 17 +++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index 88641e2..acd4af1 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -43,12 +43,13 @@ class BBLogger(Logger): Logger.__init__(self, name) def bbdebug(self, level, msg, *args, **kwargs): + loglevel = logging.DEBUG - level + 1 if not bb.event.worker_pid: - if self.name in bb.msg.loggerDefaultDomains and level > (bb.msg.loggerDefaultDomains[self.name]): + if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): return if level > (bb.msg.loggerDefaultDebugLevel): return - return self.log(logging.DEBUG - level + 1, msg, *args, **kwargs) + return self.log(loglevel, msg, *args, **kwargs) def plain(self, msg, *args, **kwargs): return self.log(logging.INFO + 1, msg, *args, **kwargs) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 33c0e2f..d1b0e92 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -138,7 +138,7 @@ class BBLogFilterStdOut(BBLogFilter): loggerDefaultDebugLevel = 0 loggerDefaultVerbose = False loggerVerboseLogs = False -loggerDefaultDomains = [] +loggerDefaultDomains = {} def init_msgconfig(verbose, debug, debug_domains=None): """ @@ -148,15 +148,16 @@ def init_msgconfig(verbose, debug, debug_domains=None): bb.msg.loggerDefaultVerbose = verbose if verbose: bb.msg.loggerVerboseLogs = True + + bb.msg.loggerDefaultDomains = {} if debug_domains: - bb.msg.loggerDefaultDomains = debug_domains - else: - bb.msg.loggerDefaultDomains = [] + for (domainarg, iterator) in groupby(debug_domains): + dlevel = len(tuple(iterator)) + bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 def constructLogOptions(): debug = loggerDefaultDebugLevel verbose = loggerDefaultVerbose - domains = loggerDefaultDomains if debug: level = BBLogFormatter.DEBUG - debug + 1 @@ -165,11 +166,7 @@ def constructLogOptions(): else: level = BBLogFormatter.NOTE - debug_domains = {} - for (domainarg, iterator) in groupby(domains): - dlevel = len(tuple(iterator)) - debug_domains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 - return level, debug_domains + return level, loggerDefaultDomains def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): level, debug_domains = constructLogOptions() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:06 +0000 Subject: [oe-commits] [bitbake] 03/15: bitbake: lib/bb/msg.py: Use log level instead of debug count In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.84EA2233520@git.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 105db365cd16b5a703988693dd527b979e41cade Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:41 2020 -0500 bitbake: lib/bb/msg.py: Use log level instead of debug count Passes around the actual logging level as the default log level variable instead of the debug count. This makes it easier to deal with logging levels since the conversion from debug count and verbose flag only has to occur once when logging is initialized and after that actual log levels can be used Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bin/bitbake-worker | 2 +- lib/bb/__init__.py | 2 +- lib/bb/msg.py | 22 +++++++++------------- lib/bb/runqueue.py | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 1e641e8..fc28a34 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -414,7 +414,7 @@ class BitbakeWorker(object): def handle_workerdata(self, data): self.workerdata = pickle.loads(data) - bb.msg.loggerDefaultDebugLevel = self.workerdata["logdefaultdebug"] + bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index acd4af1..dc5e91e 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -47,7 +47,7 @@ class BBLogger(Logger): if not bb.event.worker_pid: if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): return - if level > (bb.msg.loggerDefaultDebugLevel): + if loglevel > bb.msg.loggerDefaultLogLevel: return return self.log(loglevel, msg, *args, **kwargs) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index d1b0e92..ea6a954 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -135,7 +135,7 @@ class BBLogFilterStdOut(BBLogFilter): # Message control functions # -loggerDefaultDebugLevel = 0 +loggerDefaultLogLevel = BBLogFormatter.NOTE loggerDefaultVerbose = False loggerVerboseLogs = False loggerDefaultDomains = {} @@ -144,11 +144,17 @@ def init_msgconfig(verbose, debug, debug_domains=None): """ Set default verbosity and debug levels config the logger """ - bb.msg.loggerDefaultDebugLevel = debug bb.msg.loggerDefaultVerbose = verbose if verbose: bb.msg.loggerVerboseLogs = True + if debug: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.DEBUG - debug + 1 + elif verbose: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.VERBOSE + else: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.NOTE + bb.msg.loggerDefaultDomains = {} if debug_domains: for (domainarg, iterator) in groupby(debug_domains): @@ -156,17 +162,7 @@ def init_msgconfig(verbose, debug, debug_domains=None): bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 def constructLogOptions(): - debug = loggerDefaultDebugLevel - verbose = loggerDefaultVerbose - - if debug: - level = BBLogFormatter.DEBUG - debug + 1 - elif verbose: - level = BBLogFormatter.VERBOSE - else: - level = BBLogFormatter.NOTE - - return level, loggerDefaultDomains + return loggerDefaultLogLevel, loggerDefaultDomains def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): level, debug_domains = constructLogOptions() diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 32966b4..4106fa4 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1254,7 +1254,7 @@ class RunQueue: "fakerootdirs" : self.rqdata.dataCaches[mc].fakerootdirs, "fakerootnoenv" : self.rqdata.dataCaches[mc].fakerootnoenv, "sigdata" : bb.parse.siggen.get_taskdata(), - "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, + "logdefaultlevel" : bb.msg.loggerDefaultLogLevel, "logdefaultverbose" : bb.msg.loggerDefaultVerbose, "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, "logdefaultdomain" : bb.msg.loggerDefaultDomains, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:08 +0000 Subject: [oe-commits] [bitbake] 05/15: bitbake: knotty: Add commented logging_tree code In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.99097233548@git.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 a383ec1f1e7ee36d2041efb25db423e220be9e04 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:43 2020 -0500 bitbake: knotty: Add commented logging_tree code Adds a comment section that can be easily uncommented to enable dumping the logging tree. This module is extremely useful for debugging issued with logging configuration Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index a6a92b9..aac12cd 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -430,6 +430,11 @@ def main(server, eventHandler, params, tf = TerminalFilter): llevel, debug_domains = bb.msg.constructLogOptions() server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) + # The logging_tree module is *extremely* helpful in debugging logging + # domains. Uncomment here to dump the logging tree when bitbake starts + #import logging_tree + #logging_tree.printout() + universe = False if not params.observe_only: params.updateFromServer(server) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:09 +0000 Subject: [oe-commits] [bitbake] 06/15: bitbake: lib/bb/msg.py: Add filter utilities In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.A2FAD23354A@git.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 22da31f26c98760097ced333caac49062b3f8cec Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:44 2020 -0500 bitbake: lib/bb/msg.py: Add filter utilities Adds generic filter utilities that can be used to filter when the log level is greater than or equal to a defined value, or below a defined value, as well as a generic function to translate a string to a logging level (or bitbake logging level) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index c70fd80..8561826 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -135,6 +135,28 @@ class BBLogFilterStdOut(BBLogFilter): return True return False +class LogFilterGEQLevel(logging.Filter): + def __init__(self, level): + self.strlevel = str(level) + self.level = stringToLevel(level) + + def __repr__(self): + return "%s level >= %s (%d)" % (self.__class__.__name__, self.strlevel, self.level) + + def filter(self, record): + return (record.levelno >= self.level) + +class LogFilterLTLevel(logging.Filter): + def __init__(self, level): + self.strlevel = str(level) + self.level = stringToLevel(level) + + def __repr__(self): + return "%s level < %s (%d)" % (self.__class__.__name__, self.strlevel, self.level) + + def filter(self, record): + return (record.levelno < self.level) + # Message control functions # @@ -175,6 +197,19 @@ def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): cls(handler, level, debug_domains) +def stringToLevel(level): + try: + return int(level) + except ValueError: + pass + + try: + return getattr(logging, level) + except AttributeError: + pass + + return getattr(BBLogFormatter, level) + # # Message handling functions # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:10 +0000 Subject: [oe-commits] [bitbake] 07/15: bitbake: lib/bb/msg.py: Remove unused filters In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.ACD0523354B@git.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 28d758c4ddaa851f41ead61256e10ba3465f0863 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:45 2020 -0500 bitbake: lib/bb/msg.py: Remove unused filters Now that the filter are described using the python logging structure, these classes are no longer needed. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 8561826..cab079e 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -119,22 +119,6 @@ class BBLogFilter(object): return True return False -class BBLogFilterStdErr(BBLogFilter): - def filter(self, record): - if not BBLogFilter.filter(self, record): - return False - if record.levelno >= logging.ERROR: - return True - return False - -class BBLogFilterStdOut(BBLogFilter): - def filter(self, record): - if not BBLogFilter.filter(self, record): - return False - if record.levelno < logging.ERROR: - return True - return False - class LogFilterGEQLevel(logging.Filter): def __init__(self, level): self.strlevel = str(level) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:11 +0000 Subject: [oe-commits] [bitbake] 08/15: bitbake: lib/bb/msg.py: Add helper to set logging config In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.B697A233584@git.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 175a267252f7df2217bbae473ccd3052b238b672 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:46 2020 -0500 bitbake: lib/bb/msg.py: Add helper to set logging config Adds a helper function to setup the structure logging information in bitbake. The helper function takes a default configuration and an optional path to a user config file that can be merged into the default. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index cab079e..6259af0 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -13,6 +13,7 @@ Message handling infrastructure for bitbake import sys import copy import logging +import logging.config from itertools import groupby import bb import bb.event @@ -227,3 +228,95 @@ def has_console_handler(logger): if handler.stream in [sys.stderr, sys.stdout]: return True return False + +def setLoggingConfig(defaultconfig, userconfigfile=None): + logconfig = copy.deepcopy(defaultconfig) + + if userconfigfile: + with open(userconfigfile, 'r') as f: + if userconfigfile.endswith('.yml') or userconfigfile.endswith('.yaml'): + import yaml + userconfig = yaml.load(f) + elif userconfigfile.endswith('.json') or userconfigfile.endswith('.cfg'): + import json + userconfig = json.load(f) + else: + raise BaseException("Unrecognized file format: %s" % userconfigfile) + + if userconfig.get('bitbake_merge', True): + # Merge config with the default config + if userconfig.get('version') != logconfig['version']: + raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) + + # Set some defaults to make merging easier + userconfig.setdefault("loggers", {}) + + # If a handler, formatter, or filter is defined in the user + # config, it will replace an existing one in the default config + for k in ("handlers", "formatters", "filters"): + logconfig.setdefault(k, {}).update(userconfig.get(k, {})) + + seen_loggers = set() + for name, l in logconfig["loggers"].items(): + # If the merge option is set, merge the handlers and + # filters. Otherwise, if it is False, this logger won't get + # add to the set of seen loggers and will replace the + # existing one + if l.get('bitbake_merge', True): + ulogger = userconfig["loggers"].setdefault(name, {}) + ulogger.setdefault("handlers", []) + ulogger.setdefault("filters", []) + + # Merge lists + l.setdefault("handlers", []).extend(ulogger["handlers"]) + l.setdefault("filters", []).extend(ulogger["filters"]) + + # Replace other properties if present + if "level" in ulogger: + l["level"] = ulogger["level"] + + if "propagate" in ulogger: + l["propagate"] = ulogger["propagate"] + + seen_loggers.add(name) + + # Add all loggers present in the user config, but not any that + # have already been processed + for name in set(userconfig["loggers"].keys()) - seen_loggers: + logconfig["loggers"][name] = userconfig["loggers"][name] + + else: + # Replace the entire default config + logconfig = userconfig + + # Convert all level parameters to integers in case users want to use the + # bitbake defined level names + for h in logconfig["handlers"].values(): + if "level" in h: + h["level"] = bb.msg.stringToLevel(h["level"]) + + for l in logconfig["loggers"].values(): + if "level" in l: + l["level"] = bb.msg.stringToLevel(l["level"]) + + logging.config.dictConfig(logconfig) + + # The user may have specified logging domains they want at a higher debug + # level than the standard. + for name, l in logconfig["loggers"].items(): + if not name.startswith("BitBake."): + continue + + if not "level" in l: + continue + + curlevel = bb.msg.loggerDefaultDomains.get(name) + # Note: level parameter should already be a int because of conversion + # above + newlevel = int(l["level"]) + if curlevel is None or newlevel < curlevel: + bb.msg.loggerDefaultDomains[name] = newlevel + + # TODO: I don't think that setting the global log level should be necessary + #if newlevel < bb.msg.loggerDefaultLogLevel: + # bb.msg.loggerDefaultLogLevel = newlevel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:14 +0000 Subject: [oe-commits] [bitbake] 11/15: bitbake: worker: Remove unnecessary addDefaultLogFilter In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.D47192335E4@git.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 23793c2c8fa51d92ee1ed7407b866c71d4fbe125 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:49 2020 -0500 bitbake: worker: Remove unnecessary addDefaultLogFilter Adding the default log filter here is unnecessary because there are no defined logging domains when it is called, which means it does no actual filtering. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bin/bitbake-worker | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/bitbake-worker b/bin/bitbake-worker index fc28a34..97cc0fd 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -65,7 +65,6 @@ if 0: format_str = "%(levelname)s: %(message)s" conlogformat = bb.msg.BBLogFormatter(format_str) consolelog = logging.FileHandler(logfilename) - bb.msg.addDefaultlogFilter(consolelog) consolelog.setFormatter(conlogformat) logger.addHandler(consolelog) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:13 +0000 Subject: [oe-commits] [bitbake] 10/15: bitbake: knotty: Setup logs with config helper In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.CBC73233586@git.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 37a013856aea99fd40db52182f33d836531820e4 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:48 2020 -0500 bitbake: knotty: Setup logs with config helper Sets up logging in knotty to use python's structured logging config and the bb.msg.setLoggingConfig() helper to setup logging. This allows the user to specify additional logging mechanism in a config file with BB_LOGCONFIG Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 134 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 38 deletions(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index d5dce71..386f278 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -370,7 +370,11 @@ def _log_settings_from_server(server, observe_only): if error: logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error) raise BaseException(error) - return includelogs, loglines, consolelogfile + logconfigfile, error = server.runCommand([cmd, "BB_LOGCONFIG"]) + if error: + logger.error("Unable to get the value of BB_LOGCONFIG variable: %s" % error) + raise BaseException(error) + return includelogs, loglines, consolelogfile, logconfigfile _evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.LogRecord", "bb.build.TaskFailed", "bb.build.TaskBase", "bb.event.ParseStarted", @@ -387,7 +391,87 @@ def main(server, eventHandler, params, tf = TerminalFilter): if not params.observe_only: params.updateToServer(server, os.environ.copy()) - includelogs, loglines, consolelogfile = _log_settings_from_server(server, params.observe_only) + includelogs, loglines, consolelogfile, logconfigfile = _log_settings_from_server(server, params.observe_only) + + loglevel, _ = bb.msg.constructLogOptions() + + if params.options.quiet == 0: + console_loglevel = loglevel + elif params.options.quiet > 2: + console_loglevel = bb.msg.BBLogFormatter.ERROR + else: + console_loglevel = bb.msg.BBLogFormatter.WARNING + + logconfig = { + "version": 1, + "handlers": { + "BitBake.console": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": console_loglevel, + "stream": "ext://sys.stdout", + "filters": ["BitBake.stdoutFilter"], + }, + "BitBake.errconsole": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": loglevel, + "stream": "ext://sys.stderr", + "filters": ["BitBake.stderrFilter"], + }, + }, + "formatters": { + # This format instance will get color output enabled by the + # terminal + "BitBake.consoleFormatter" : { + "()": "bb.msg.BBLogFormatter", + "format": "%(levelname)s: %(message)s" + }, + # The file log requires a separate instance so that it doesn't get + # color enabled + "BitBake.logfileFormatter": { + "()": "bb.msg.BBLogFormatter", + "format": "%(levelname)s: %(message)s" + } + }, + "filters": { + "BitBake.stdoutFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": "ERROR" + }, + "BitBake.stderrFilter": { + "()": "bb.msg.LogFilterGEQLevel", + "level": "ERROR" + } + }, + "loggers": { + "BitBake": { + "level": loglevel, + "handlers": ["BitBake.console", "BitBake.errconsole"], + } + }, + "disable_existing_loggers": False + } + + # Enable the console log file if enabled + if consolelogfile and not params.options.show_environment and not params.options.show_versions: + logconfig["handlers"]["BitBake.consolelog"] ={ + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": "INFO", + "filename": consolelogfile, + } + logconfig["loggers"]["BitBake"]["handlers"].append("BitBake.consolelog") + + bb.utils.mkdirhier(os.path.dirname(consolelogfile)) + loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') + bb.utils.remove(loglink) + try: + os.symlink(os.path.basename(consolelogfile), loglink) + except OSError: + pass + + bb.msg.setLoggingConfig(logconfig, logconfigfile) if sys.stdin.isatty() and sys.stdout.isatty(): log_exec_tty = True @@ -396,23 +480,16 @@ def main(server, eventHandler, params, tf = TerminalFilter): helper = uihelper.BBUIHelper() - console = logging.StreamHandler(sys.stdout) - errconsole = logging.StreamHandler(sys.stderr) - format_str = "%(levelname)s: %(message)s" - format = bb.msg.BBLogFormatter(format_str) - if params.options.quiet == 0: - forcelevel = None - elif params.options.quiet > 2: - forcelevel = bb.msg.BBLogFormatter.ERROR - else: - forcelevel = bb.msg.BBLogFormatter.WARNING - bb.msg.addDefaultlogFilter(console, bb.msg.BBLogFilterStdOut, forcelevel) - bb.msg.addDefaultlogFilter(errconsole, bb.msg.BBLogFilterStdErr) - console.setFormatter(format) - errconsole.setFormatter(format) - if not bb.msg.has_console_handler(logger): - logger.addHandler(console) - logger.addHandler(errconsole) + # Look for the specially designated handlers which need to be passed to the + # terminal handler + console = None + errconsole = None + for h in logger.handlers: + name = getattr(h, '_name', None) + if name == 'BitBake.console': + console = h + elif name == 'BitBake.errconsole': + errconsole = h bb.utils.set_process_name("KnottyUI") @@ -420,21 +497,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): server.terminateServer() return - consolelog = None - if consolelogfile and not params.options.show_environment and not params.options.show_versions: - bb.utils.mkdirhier(os.path.dirname(consolelogfile)) - conlogformat = bb.msg.BBLogFormatter(format_str) - consolelog = logging.FileHandler(consolelogfile) - bb.msg.addDefaultlogFilter(consolelog) - consolelog.setFormatter(conlogformat) - logger.addHandler(consolelog) - loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') - bb.utils.remove(loglink) - try: - os.symlink(os.path.basename(consolelogfile), loglink) - except OSError: - pass - llevel, debug_domains = bb.msg.constructLogOptions() server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) @@ -761,8 +823,4 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass - if consolelog: - logger.removeHandler(consolelog) - consolelog.close() - return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:12 +0000 Subject: [oe-commits] [bitbake] 09/15: bitbake: knotty: Remove dependency on format variable In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.C1378233585@git.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 2203fa30691ca1301869a90cbca85907e36ac745 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:47 2020 -0500 bitbake: knotty: Remove dependency on format variable Passing around the log formatter variable was unnecessary since the log levels of interest can be accesses as class members of bb.msg.BBLogFormatter. Switching to do this will make using the structured python logging much easier, since it can be difficult to extract out the formatter for a specific handler. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 4 +--- lib/bb/ui/knotty.py | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 9560eb5..5c5be45 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -735,11 +735,9 @@ class Tinfoil: console = handler elif handler.stream == sys.stderr: errconsole = handler - format_str = "%(levelname)s: %(message)s" - format = bb.msg.BBLogFormatter(format_str) helper.shutdown = 0 parseprogress = None - termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, format, quiet=self.quiet) + termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet) try: while True: try: diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index aac12cd..d5dce71 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -109,12 +109,11 @@ def pluralise(singular, plural, qty): class InteractConsoleLogFilter(logging.Filter): - def __init__(self, tf, format): + def __init__(self, tf): self.tf = tf - self.format = format def filter(self, record): - if record.levelno == self.format.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): + if record.levelno == bb.msg.BBLogFormatter.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): return False self.tf.clearFooter() return True @@ -150,7 +149,7 @@ class TerminalFilter(object): cr = (25, 80) return cr - def __init__(self, main, helper, console, errconsole, format, quiet): + def __init__(self, main, helper, console, errconsole, quiet): self.main = main self.helper = helper self.cuu = None @@ -180,7 +179,16 @@ class TerminalFilter(object): termios.tcsetattr(fd, termios.TCSADRAIN, new) curses.setupterm() if curses.tigetnum("colors") > 2: - format.enable_color() + if console: + try: + console.formatter.enable_color() + except AttributeError: + pass + if errconsole: + try: + errconsole.formatter.enable_color() + except AttributeError: + pass self.ed = curses.tigetstr("ed") if self.ed: self.cuu = curses.tigetstr("cuu") @@ -197,9 +205,9 @@ class TerminalFilter(object): bb.note("Unable to use interactive mode for this terminal, using fallback") return if console: - console.addFilter(InteractConsoleLogFilter(self, format)) + console.addFilter(InteractConsoleLogFilter(self)) if errconsole: - errconsole.addFilter(InteractConsoleLogFilter(self, format)) + errconsole.addFilter(InteractConsoleLogFilter(self)) self.main_progress = None @@ -469,7 +477,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): printinterval = 5000 lastprint = time.time() - termfilter = tf(main, helper, console, errconsole, format, params.options.quiet) + termfilter = tf(main, helper, console, errconsole, params.options.quiet) atexit.register(termfilter.finish) while True: @@ -508,21 +516,21 @@ def main(server, eventHandler, params, tf = TerminalFilter): if isinstance(event, logging.LogRecord): lastprint = time.time() printinterval = 5000 - if event.levelno >= format.ERROR: + if event.levelno >= bb.msg.BBLogFormatter.ERROR: errors = errors + 1 return_value = 1 - elif event.levelno == format.WARNING: + elif event.levelno == bb.msg.BBLogFormatter.WARNING: warnings = warnings + 1 if event.taskpid != 0: # For "normal" logging conditions, don't show note logs from tasks # but do show them if the user has changed the default log level to # include verbose/debug messages - if event.levelno <= format.NOTE and (event.levelno < llevel or (event.levelno == format.NOTE and llevel != format.VERBOSE)): + if event.levelno <= bb.msg.BBLogFormatter.NOTE and (event.levelno < llevel or (event.levelno == bb.msg.BBLogFormatter.NOTE and llevel != bb.msg.BBLogFormatter.VERBOSE)): continue # Prefix task messages with recipe/task - if event.taskpid in helper.pidmap and event.levelno != format.PLAIN: + if event.taskpid in helper.pidmap and event.levelno != bb.msg.BBLogFormatter.PLAIN: taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]] event.msg = taskinfo['title'] + ': ' + event.msg if hasattr(event, 'fn'): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:16 +0000 Subject: [oe-commits] [bitbake] 13/15: bitbake: Add autobuilder logging configuration In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.E836F2335EB@git.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 170c7a61dfbba326342b54d6415d166c73ba0cfc Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:51 2020 -0500 bitbake: Add autobuilder logging configuration Adds a configuration file that the autobuilder can use to capture interesting logging domains above the ones that show up for normal users on stdout/stderr. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bitbake/contrib/autobuilderlog.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/bitbake/contrib/autobuilderlog.json b/bitbake/contrib/autobuilderlog.json new file mode 100644 index 0000000..103a114 --- /dev/null +++ b/bitbake/contrib/autobuilderlog.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "autobuilder.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:15 +0000 Subject: [oe-commits] [bitbake] 12/15: bitbake: Log hash equivalence with a different logger In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144403.DF73B2335EA@git.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 a8972a60452c2abef5da4c53f02eac6fad7e4185 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:50 2020 -0500 bitbake: Log hash equivalence with a different logger Switches the hash equivalence logging to use a different logger so that it can be easily filtered out with python's structured logging. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 11 ++++++----- lib/bb/siggen.py | 17 +++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 4106fa4..e84890b 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -27,6 +27,7 @@ import pprint bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") +hashequiv_logger = logging.getLogger("BitBake.RunQueue.HashEquiv") __find_sha256__ = re.compile( r'(?i)(?" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"") - logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) + hashequiv_logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) for tid in changed: if tid not in self.rqdata.runq_setscene_tids: @@ -2346,7 +2347,7 @@ class RunQueueExecute: # Check no tasks this covers are running for dep in self.sqdata.sq_covered_tasks[tid]: if dep in self.runq_running and dep not in self.runq_complete: - logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) + hashequiv_logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) valid = False break if not valid: @@ -2409,7 +2410,7 @@ class RunQueueExecute: for (tid, harddepfail, origvalid) in update_tasks: if tid in self.sqdata.valid and not origvalid: - logger.info("Setscene task %s became valid" % tid) + hashequiv_logger.info("Setscene task %s became valid" % tid) if harddepfail: self.sq_task_failoutright(tid) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index c2d0c73..0357b54 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -16,6 +16,7 @@ from bb import runqueue import hashserv logger = logging.getLogger('BitBake.SigGen') +hashequiv_logger = logging.getLogger('BitBake.SigGen.HashEquiv') def init(d): siggens = [obj for obj in globals().values() @@ -502,9 +503,9 @@ class SignatureGeneratorUniHashMixIn(object): # A unique hash equal to the taskhash is not very interesting, # so it is reported it at debug level 2. If they differ, that # is much more interesting, so it is reported at debug level 1 - bb.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) + hashequiv_logger.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) else: - bb.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) + hashequiv_logger.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) @@ -578,12 +579,12 @@ class SignatureGeneratorUniHashMixIn(object): new_unihash = data['unihash'] if new_unihash != unihash: - bb.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) + hashequiv_logger.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d) self.set_unihash(tid, new_unihash) d.setVar('BB_UNIHASH', new_unihash) else: - bb.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) + hashequiv_logger.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) finally: @@ -606,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object): method = method + self.extramethod[tid] data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) - bb.note('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) + hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) if data is None: bb.warn("Server unable to handle unihash report") @@ -615,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object): finalunihash = data['unihash'] if finalunihash == current_unihash: - bb.note('Task %s unihash %s unchanged by server' % (tid, finalunihash)) + hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) elif finalunihash == wanted_unihash: - bb.note('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) + hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) self.set_unihash(tid, finalunihash) return True else: # TODO: What to do here? - bb.note('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) + hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:17 +0000 Subject: [oe-commits] [bitbake] 14/15: bitbake: Lower hash equivalence logging In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144404.02074233518@git.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 5d1151e1d8446cfc618502221008594f32a7db00 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:52 2020 -0500 bitbake: Lower hash equivalence logging Lowers the level at which hash equivalence messages are logged so as to not annoy the majority of users. The autobuilder can use a custom logging configuration to log these to a file for debugging (see contrib/autobuilderlog.json) [YOCTO #13813] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 6 +++--- lib/bb/siggen.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index e84890b..cef9b0f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2264,7 +2264,7 @@ class RunQueueExecute: self.updated_taskhash_queue.remove((tid, unihash)) if unihash != self.rqdata.runtaskentries[tid].unihash: - hashequiv_logger.info("Task %s unihash changed to %s" % (tid, unihash)) + hashequiv_logger.verbose("Task %s unihash changed to %s" % (tid, unihash)) self.rqdata.runtaskentries[tid].unihash = unihash bb.parse.siggen.set_unihash(tid, unihash) toprocess.add(tid) @@ -2309,7 +2309,7 @@ class RunQueueExecute: elif tid in self.scenequeue_covered or tid in self.sq_live: # Already ran this setscene task or it running. Report the new taskhash bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) - hashequiv_logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) + hashequiv_logger.verbose("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) remapped = True if not remapped: @@ -2410,7 +2410,7 @@ class RunQueueExecute: for (tid, harddepfail, origvalid) in update_tasks: if tid in self.sqdata.valid and not origvalid: - hashequiv_logger.info("Setscene task %s became valid" % tid) + hashequiv_logger.verbose("Setscene task %s became valid" % tid) if harddepfail: self.sq_task_failoutright(tid) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 0357b54..8bfc452 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -607,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object): method = method + self.extramethod[tid] data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) - hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) + hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) if data is None: bb.warn("Server unable to handle unihash report") @@ -616,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object): finalunihash = data['unihash'] if finalunihash == current_unihash: - hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash %s unchanged by server' % (tid, finalunihash)) elif finalunihash == wanted_unihash: - hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) + hashequiv_logger.verbose('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) self.set_unihash(tid, finalunihash) return True else: # TODO: What to do here? - hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 14:44:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 14:44:18 +0000 Subject: [oe-commits] [bitbake] 15/15: bitbake-user-manual: Add documentation for BB_LOGCONFIG In-Reply-To: <158393784328.8253.9951983401297959754@git.openembedded.org> References: <158393784328.8253.9951983401297959754@git.openembedded.org> Message-ID: <20200311144404.1152323351D@git.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 0b875342857cb8590b3e691e2868febcf159e1e3 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:53 2020 -0500 bitbake-user-manual: Add documentation for BB_LOGCONFIG Adds documentation describing how to use the BB_LOGCONFIG variable to enable custom logging. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- .../bitbake-user-manual-execution.xml | 97 ++++++++++++++++++++++ .../bitbake-user-manual-ref-variables.xml | 11 +++ 2 files changed, 108 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml index 8f60667..3b31f74 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml @@ -929,4 +929,101 @@ section. + +
+ Logging + + In addition to the standard command line option to control how + verbose builds are when execute, bitbake also supports user defined + configuration of the + Python logging + facilities through the + BB_LOGCONFIG + variable. This variable defines a json or yaml + logging configuration + that will be intelligently merged into the default configuration. + The logging configuration is merged using the following rules: + + + The user defined configuration will completely replace the default + configuration if top level key + bitbake_merge is set to the value + False. In this case, all other rules + are ignored. + + + The user configuration must have a top level + version which must match the value of + the default configuration. + + + Any keys defined in the handlers, + formatters, or filters, + will be merged into the same section in the default + configuration, with the user specified keys taking + replacing a default one if there is a conflict. In + practice, this means that if both the default configuration + and user configuration specify a handler named + myhandler, the user defined one will + replace the default. To prevent the user from inadvertently + replacing a default handler, formatter, or filter, all of + the default ones are named with a prefix of + "BitBake." + + + If a logger is defined by the user with the key + bitbake_merge set to + False, that logger will be completely + replaced by user configuration. In this case, no other + rules will apply to that logger. + + + All user defined filter and + handlers properties for a given logger + will be merged with corresponding properties from the + default logger. For example, if the user configuration adds + a filter called myFilter to the + BitBake.SigGen, and the default + configuration adds a filter called + BitBake.defaultFilter, both filters + will be applied to the logger + + + + + + As an example, consider the following user logging configuration + file which logs all Hash Equivalence related messages of VERBOSE or + higher to a file called hashequiv.log + + { + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "hashequiv.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } + } + + +
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 bae01d9..c4bd1f2 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml @@ -539,6 +539,17 @@ + BB_LOGCONFIG + + + Specifies the name of a config file that contains the user + logging configuration. See + Logging for additional + information + + + + BB_LOGFMT -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 15:57:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 15:57:02 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (3173648 -> f5d2bf5) Message-ID: <158394222253.2899.15409994180538712837@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 3173648 dnf-plugin-tui: upgrade 1.0 -> 1.1 add 41eb6e1 python3-sqlparse: change shebang to python3 add cae26bb wireshark: Inherit mime and mime-xdg add cfb432a kronoset: Disable sign-compare with clang add 70f4648 abseil-cpp: Depend on libexecinfo on musl add 33440e8 minidlna: Use clock_gettime API insteaad of syscall add 3f6419c libde265: Update to 1.0.5 add 2773a9f kea: upgrade 1.7.4 -> 1.7.5 add 27d458c python-pandas: upgrade 0.23.4 -> 1.0.1 add a4b0a7c renderdoc: Upgrade to 1.7 add 72d4033 glmark2: Update to latest version add ad371d6 dbus-broker: upgrade 21 -> 22 add 73eb157 python3-lxml: upgrade 4.4.2 -> 4.5.0 add bf7de63 python3-pyperf: upgrade 1.7.0 -> 1.7.1 add 9b615bc python3-sqlparse: upgrade 0.3.0 -> 0.3.1 add 3a9f818 python3-jsonpatch: upgrade 1.24 -> 1.25 add 47a6b2b python3-wrapt: upgrade 1.11.2 -> 1.21.1 add 8b6cda1 python3-pyroute2: upgrade 0.5.7 -> 0.5.9 add 558d321 python3-protobuf: upgrade 3.9.2 -> 3.11.3 add e47b59f python3-tqdm: upgrade 4.41.1 -> 4.43.0 add bce68a4 python3-pymisp: upgrade 2.4.119.1 -> 2.4.122 add 6549c2d python3-pulsectl: upgrade 20.1.2 -> 20.2.4 add b650d80 python-parse: upgrade 1.14.0 -> 1.15.0 add f5d2bf5 python3-packaging: upgrade 20.0 -> 20.3 No new revisions were added by this update. Summary of changes: .../{libde265_1.0.2.bb => libde265_1.0.5.bb} | 7 +- .../recipes-multimedia/minidlna/minidlna.inc | 1 + ...heck-for-clock_gettime-seprately-from-__N.patch | 36 +++++++++ .../kea/{kea_1.7.4.bb => kea_1.7.5.bb} | 4 +- .../recipes-extended/kronosnet/kronosnet_1.15.bb | 6 ++ .../recipes-support/wireshark/wireshark_3.2.2.bb | 2 +- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 +- ...launch-improve-error-handling-for-opendir.patch | 48 ------------ ...nge-the-constant-used-for-invalid-timesta.patch | 86 ---------------------- ...3-dbus-socket-treat-MSG_CTRUNC-gracefully.patch | 83 --------------------- .../0004-launcher-fix-build-with-musl-libc.patch | 38 ---------- ...h-policy-fix-crash-when-importing-selinux.patch | 50 ------------- ...h-policy-fix-crash-when-exporting-selinux.patch | 59 --------------- .../dbus/{dbus-broker_21.bb => dbus-broker_22.bb} | 10 +-- .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 2 + .../{renderdoc_1.6.bb => renderdoc_1.7.bb} | 2 +- .../recipes-devtools/python/python-jsonpatch.inc | 4 +- .../recipes-devtools/python/python-lxml.inc | 4 +- .../recipes-devtools/python/python-packaging.inc | 4 +- .../recipes-devtools/python/python-pandas.inc | 4 +- .../recipes-devtools/python/python-parse.inc | 6 +- .../recipes-devtools/python/python-protobuf.inc | 4 +- .../recipes-devtools/python/python-pymisp.inc | 8 +- .../recipes-devtools/python/python-pyperf.inc | 4 +- .../recipes-devtools/python/python-pyroute2.inc | 4 +- .../recipes-devtools/python/python-sqlparse.inc | 6 +- .../recipes-devtools/python/python-tqdm.inc | 6 +- .../recipes-devtools/python/python-wrapt.inc | 4 +- ...jsonpatch_1.24.bb => python3-jsonpatch_1.25.bb} | 0 ...python3-lxml_4.4.2.bb => python3-lxml_4.5.0.bb} | 0 ...packaging_20.0.bb => python3-packaging_20.3.bb} | 0 ...n3-pandas_0.23.4.bb => python3-pandas_1.0.1.bb} | 0 ...on3-parse_1.14.0.bb => python3-parse_1.15.0.bb} | 0 ...rotobuf_3.9.2.bb => python3-protobuf_3.11.3.bb} | 0 ...lsectl_20.1.2.bb => python3-pulsectl_20.2.4.bb} | 4 +- ...misp_2.4.119.1.bb => python3-pymisp_2.4.122.bb} | 0 ...on3-pyperf_1.7.0.bb => python3-pyperf_1.7.1.bb} | 0 ...pyroute2_0.5.7.bb => python3-pyroute2_0.5.9.bb} | 0 .../0001-sqlparse-change-shebang-to-python3.patch | 51 +++++++++++++ ...sqlparse_0.3.0.bb => python3-sqlparse_0.3.1.bb} | 0 ...thon3-tqdm_4.41.1.bb => python3-tqdm_4.43.0.bb} | 0 ...on3-wrapt_1.11.2.bb => python3-wrapt_1.12.1.bb} | 0 42 files changed, 141 insertions(+), 410 deletions(-) rename meta-multimedia/recipes-multimedia/libde265/{libde265_1.0.2.bb => libde265_1.0.5.bb} (69%) create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure-Check-for-clock_gettime-seprately-from-__N.patch rename meta-networking/recipes-connectivity/kea/{kea_1.7.4.bb => kea_1.7.5.bb} (93%) delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0001-launch-improve-error-handling-for-opendir.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0005-launch-policy-fix-crash-when-importing-selinux.patch delete mode 100644 meta-oe/recipes-core/dbus/dbus-broker/0006-launch-policy-fix-crash-when-exporting-selinux.patch rename meta-oe/recipes-core/dbus/{dbus-broker_21.bb => dbus-broker_22.bb} (63%) rename meta-oe/recipes-graphics/renderdoc/{renderdoc_1.6.bb => renderdoc_1.7.bb} (95%) rename meta-python/recipes-devtools/python/{python3-jsonpatch_1.24.bb => python3-jsonpatch_1.25.bb} (100%) rename meta-python/recipes-devtools/python/{python3-lxml_4.4.2.bb => python3-lxml_4.5.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-packaging_20.0.bb => python3-packaging_20.3.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pandas_0.23.4.bb => python3-pandas_1.0.1.bb} (100%) rename meta-python/recipes-devtools/python/{python3-parse_1.14.0.bb => python3-parse_1.15.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-protobuf_3.9.2.bb => python3-protobuf_3.11.3.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pulsectl_20.1.2.bb => python3-pulsectl_20.2.4.bb} (76%) rename meta-python/recipes-devtools/python/{python3-pymisp_2.4.119.1.bb => python3-pymisp_2.4.122.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pyperf_1.7.0.bb => python3-pyperf_1.7.1.bb} (100%) rename meta-python/recipes-devtools/python/{python3-pyroute2_0.5.7.bb => python3-pyroute2_0.5.9.bb} (100%) create mode 100644 meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch rename meta-python/recipes-devtools/python/{python3-sqlparse_0.3.0.bb => python3-sqlparse_0.3.1.bb} (100%) rename meta-python/recipes-devtools/python/{python3-tqdm_4.41.1.bb => python3-tqdm_4.43.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-wrapt_1.11.2.bb => python3-wrapt_1.12.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 Mar 11 15:58:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 15:58:58 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (f5d2bf5 -> 9047a1d) Message-ID: <158394233815.3904.4805855504558491519@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 f5d2bf5 python3-packaging: upgrade 20.0 -> 20.3 new d178745 conf/layer.conf: add BBFILES_DYNAMIC and dynamic layers new f83f29a python3-cycler: add recipe for 0.10.0 new 9047a1d python3-kiwisolver: add recipe for version 1.1.0 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 | 5 +++++ .../speedtest-cli/speedtest-cli_2.1.2.bb | 0 .../meta-python}/recipes-bsp/rwmem/rwmem_1.2.bb | 0 ...001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 0 .../recipes-connectivity/lirc/lirc/lirc.tmpfiles | 0 .../recipes-connectivity/lirc/lirc/lirc_options.conf | 0 .../recipes-connectivity/lirc/lirc/lircd.conf | 0 .../recipes-connectivity/lirc/lirc/lircd.init | 0 .../recipes-connectivity/lirc/lirc/lircd.service | 0 .../recipes-connectivity/lirc/lirc/lircexec.init | 0 .../recipes-connectivity/lirc/lirc/pollfd.patch | 0 .../recipes-connectivity/lirc/lirc_0.9.4d.bb | 0 .../recipes-core/packagegroups/packagegroup-meta-oe.bb | 0 ...ntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch | 0 ...one-of-strerror_r-implementation-glibc-specific.patch | 0 .../0001-Support-deprecated-resolver-functions.patch | 0 ...scons-to-use-build-settings-from-environment-va.patch | 0 ..._GLIBC__-to-control-use-of-gnu_get_libc_version.patch | 0 .../mongodb/0001-Use-long-long-instead-of-int64_t.patch | 0 .../0001-asio-Dont-use-experimental-with-clang.patch | 0 ...d-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch | 0 .../mongodb/0002-Fix-default-stack-size-to-256K.patch | 0 .../mongodb/mongodb/0003-Fix-unknown-prefix-env.patch | 0 .../0004-wiredtiger-Disable-strtouq-on-musl.patch | 0 .../recipes-dbs/mongodb/mongodb/arm64-support.patch | 0 .../meta-python}/recipes-dbs/mongodb/mongodb_git.bb | 0 ...arallel-build-fix-port-internal-make-dependenci.patch | 0 .../0002-Include-limits.h-for-PATH_MAX-definition.patch | 0 .../lcdproc/0003-Fix-non-x86-platforms-on-musl.patch | 0 .../meta-python}/recipes-extended/lcdproc/lcdproc_git.bb | 0 .../mozjs/mozjs/0001-Port-build-to-python3.patch | 0 ....in-do-not-include-RequiredDefines.h-for-depend.patch | 0 .../0003-fix-cross-compilation-on-i586-targets.patch | 0 .../mozjs/0004-do-not-create-python-environment.patch | 0 .../mozjs/mozjs/0005-fix-cannot-find-link.patch | 0 .../0006-workaround-autoconf-2.13-detection-failed.patch | 0 .../mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch | 0 .../mozjs/mozjs/0008-add-riscv-support.patch | 0 .../mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch | 0 .../mozjs/mozjs/0010-format-overflow.patch | 0 .../mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch | 0 .../mozjs/mozjs/0012-JS_PUBLIC_API.patch | 0 .../mozjs/0013-riscv-Disable-atomic-operations.patch | 0 .../mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch | 0 .../0001-fix-compiling-failure-on-mips64-n32-bsp.patch | 0 .../mozjs/mozjs/musl/0001-support-musl.patch | 0 .../mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch | 0 .../meta-python}/recipes-extended/mozjs/mozjs_60.9.0.bb | 0 ...0001-smem-fix-support-for-source-option-python3.patch | 0 .../meta-python}/recipes-support/smem/smem_1.5.bb | 0 .../recipes-devtools/python/python3-cycler_0.10.0.bb | 16 ++++++++++++++++ .../recipes-devtools/python/python3-kiwisolver_1.1.0.bb | 16 ++++++++++++++++ 52 files changed, 37 insertions(+) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-bsp/rwmem/rwmem_1.2.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lirc.tmpfiles (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lirc_options.conf (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.conf (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.init (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.service (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircexec.init (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/pollfd.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc_0.9.4d.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-core/packagegroups/packagegroup-meta-oe.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/arm64-support.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb_git.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc_git.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0010-format-overflow.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs_60.9.0.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-support/smem/smem_1.5.bb (100%) create mode 100644 meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 15:58:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 15:58:59 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: conf/layer.conf: add BBFILES_DYNAMIC and dynamic layers In-Reply-To: <158394233815.3904.4805855504558491519@git.openembedded.org> References: <158394233815.3904.4805855504558491519@git.openembedded.org> Message-ID: <20200311155858.9AE1223354B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d178745cbf5c97b7cdcf274108a58c8e1f88d3ca Author: Changqing Li AuthorDate: Wed Mar 11 16:42:05 2020 +0800 conf/layer.conf: add BBFILES_DYNAMIC and dynamic layers some recipes under meta-oe have dependency on meta-python, and test_world of yocto-check-layer will failed with error like: ERROR: test_world (common.CommonCheckLayer) ERROR: Nothing PROVIDES 'python3-pytoml-native' (but /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb DEPENDS on or otherwise requires it). Close matches: python3-numpy-native python3-pycairo-native python3-rpm-native ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'mozjs', 'python3-pytoml-native'] fix by make these recipes only active when identified layers are present Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-oe/conf/layer.conf | 5 +++++ .../recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb | 0 .../{ => dynamic-layers/meta-python}/recipes-bsp/rwmem/rwmem_1.2.bb | 0 .../lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 0 .../meta-python}/recipes-connectivity/lirc/lirc/lirc.tmpfiles | 0 .../meta-python}/recipes-connectivity/lirc/lirc/lirc_options.conf | 0 .../meta-python}/recipes-connectivity/lirc/lirc/lircd.conf | 0 .../meta-python}/recipes-connectivity/lirc/lirc/lircd.init | 0 .../meta-python}/recipes-connectivity/lirc/lirc/lircd.service | 0 .../meta-python}/recipes-connectivity/lirc/lirc/lircexec.init | 0 .../meta-python}/recipes-connectivity/lirc/lirc/pollfd.patch | 0 .../meta-python}/recipes-connectivity/lirc/lirc_0.9.4d.bb | 0 .../meta-python}/recipes-core/packagegroups/packagegroup-meta-oe.bb | 0 .../0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch | 0 .../0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch | 0 .../mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch | 0 .../0001-Tell-scons-to-use-build-settings-from-environment-va.patch | 0 .../0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch | 0 .../mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch | 0 .../mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch | 0 .../0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch | 0 .../mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch | 0 .../recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch | 0 .../mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch | 0 .../meta-python}/recipes-dbs/mongodb/mongodb/arm64-support.patch | 0 .../meta-python}/recipes-dbs/mongodb/mongodb_git.bb | 0 .../0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch | 0 .../lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch | 0 .../lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch | 0 .../meta-python}/recipes-extended/lcdproc/lcdproc_git.bb | 0 .../recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch | 0 .../0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch | 0 .../mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch | 0 .../mozjs/mozjs/0004-do-not-create-python-environment.patch | 0 .../recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch | 0 .../mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch | 0 .../mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch | 0 .../recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch | 0 .../mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch | 0 .../recipes-extended/mozjs/mozjs/0010-format-overflow.patch | 0 .../mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch | 0 .../recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch | 0 .../mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch | 0 .../mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch | 0 .../mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch | 0 .../recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch | 0 .../mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch | 0 .../meta-python}/recipes-extended/mozjs/mozjs_60.9.0.bb | 0 .../smem/smem/0001-smem-fix-support-for-source-option-python3.patch | 0 .../meta-python}/recipes-support/smem/smem_1.5.bb | 0 50 files changed, 5 insertions(+) diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index c537736..652a378 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -23,6 +23,11 @@ BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_openembedded-layer = "6" +# only activates content when identified layers are present, +# to ensure yocto compatibility check pass +BBFILES_DYNAMIC += "meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ +" + # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_openembedded-layer = "1" diff --git a/meta-oe/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb similarity index 100% rename from meta-oe/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb rename to meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb diff --git a/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb similarity index 100% rename from meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb rename to meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb diff --git a/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc.tmpfiles similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc.tmpfiles diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc_options.conf similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lirc_options.conf diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.conf similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/lircd.conf rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.conf diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.init b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.init similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/lircd.init rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.init diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.service b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.service similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/lircd.service rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.service diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircexec.init similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/lircexec.init rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircexec.init diff --git a/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/pollfd.patch diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.9.4d.bb similarity index 100% rename from meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb rename to meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.9.4d.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bb similarity index 100% rename from meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb rename to meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bb diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/arm64-support.patch similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/arm64-support.patch diff --git a/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb similarity index 100% rename from meta-oe/recipes-dbs/mongodb/mongodb_git.bb rename to meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch similarity index 100% rename from meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch similarity index 100% rename from meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch similarity index 100% rename from meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb similarity index 100% rename from meta-oe/recipes-extended/lcdproc/lcdproc_git.bb rename to meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0010-format-overflow.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0010-format-overflow.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0010-format-overflow.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0010-format-overflow.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb similarity index 100% rename from meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb rename to meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb diff --git a/meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch similarity index 100% rename from meta-oe/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch rename to meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch diff --git a/meta-oe/recipes-support/smem/smem_1.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb similarity index 100% rename from meta-oe/recipes-support/smem/smem_1.5.bb rename to meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 15:59:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 15:59:00 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: python3-cycler: add recipe for 0.10.0 In-Reply-To: <158394233815.3904.4805855504558491519@git.openembedded.org> References: <158394233815.3904.4805855504558491519@git.openembedded.org> Message-ID: <20200311155858.A9E6A233584@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f83f29aa5d8906f43f9c53cd563cad8dc36e77b1 Author: nick83ola AuthorDate: Wed Mar 11 07:03:58 2020 +0000 python3-cycler: add recipe for 0.10.0 This is a dependency for python3-matplotlib Signed-off-by: Nicola Lunghi Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-cycler_0.10.0.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb new file mode 100644 index 0000000..cd21be8 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Composable style cycles" +HOMEPAGE = "http://github.com/matplotlib/cycler" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7713fe42cd766b15c710e19392bfa811" + +SRC_URI[md5sum] = "4cb42917ac5007d1cdff6cccfe2d016b" +SRC_URI[sha256sum] = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-core \ + python3-six \ +" + +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 Mar 11 15:59:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 15:59:01 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: python3-kiwisolver: add recipe for version 1.1.0 In-Reply-To: <158394233815.3904.4805855504558491519@git.openembedded.org> References: <158394233815.3904.4805855504558491519@git.openembedded.org> Message-ID: <20200311155858.B5549233585@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 9047a1db306adf957b001b5e3dee722cd7d3fea1 Author: nick83ola AuthorDate: Wed Mar 11 07:04:00 2020 +0000 python3-kiwisolver: add recipe for version 1.1.0 This is a dependency for python3-matplotlib Signed-off-by: Nicola Lunghi Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-kiwisolver_1.1.0.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb b/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb new file mode 100644 index 0000000..a108302 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "A fast implementation of the Cassowary constraint solver" +HOMEPAGE = "https://github.com/nucleic/kiwi" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://setup.py;endline=7;md5=1c177d169db050341d3b890c69fb80e3" + +SRC_URI[md5sum] = "fc8a614367f7ba0d34a02fd08c535afc" +SRC_URI[sha256sum] = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-core \ + python3-setuptools \ +" + +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 Mar 11 18:58:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 18:58:33 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: libcamera: Added the meta multimedia packagegroup in libcamera image Message-ID: <158395311374.25890.2184486446119601418@git.openembedded.org> 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 721f234 libcamera: Added the meta multimedia packagegroup in libcamera image 721f234 is described below commit 721f234bd2e99bf2e562c0fa79efeb01b7e9df10 Author: Madhavan Krishnan AuthorDate: Tue Mar 10 17:36:11 2020 +0100 libcamera: Added the meta multimedia packagegroup in libcamera image Added the packagegroup of meta multimedia in the libcamera core image After adding the meta multimedia packagegroup, we faced the faad2 componenet was unknown during bitbake parsing. In meta raspberrypi, faad has been included in gstreamer bbappend file, so we have upstream the faad to be included only when commercial license is whitelisted. Signed-off-by: Madhavan Krishnan Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb b/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb index 20f00ed..04501e9 100644 --- a/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb +++ b/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb @@ -4,7 +4,7 @@ DESCRIPTION = "libcamera image" LICENSE = "MIT" -require meta-multimedia-image-base.bb +require meta-multimedia-image.bb IMAGE_INSTALL += " \ kernel-modules \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 11 22:30:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 11 Mar 2020 22:30:19 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: openjpeg: Fix CVE-2020-6851 Message-ID: <158396581904.13902.6310457275974471980@git.openembedded.org> 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 6ce0a9c openjpeg: Fix CVE-2020-6851 6ce0a9c is described below commit 6ce0a9c9f74a448d3ba80e3b648f797e03220122 Author: Yue Tao AuthorDate: Wed Mar 11 12:11:48 2020 -0700 openjpeg: Fix CVE-2020-6851 Backport patch from upstream to fix heap-based buffer overflow Upstream-Status: Backport CVE: CVE-2020-6851 Signed-off-by: Yue Tao Signed-off-by: Sakib Sajal Signed-off-by: Khem Raj --- .../openjpeg/openjpeg/CVE-2020-6851.patch | 32 ++++++++++++++++++++++ .../recipes-graphics/openjpeg/openjpeg_2.3.1.bb | 1 + 2 files changed, 33 insertions(+) diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch new file mode 100644 index 0000000..9f2fc90 --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch @@ -0,0 +1,32 @@ +From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Sat, 11 Jan 2020 01:51:19 +0100 +Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose + coordinates are beyond INT_MAX (fixes #1228) + +--- + src/lib/openjp2/j2k.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c +index 14f6ff41..922550eb 100644 +--- a/src/lib/openjp2/j2k.c ++++ b/src/lib/openjp2/j2k.c +@@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim + l_img_comp = p_image->comps; + for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) { + OPJ_INT32 l_h, l_w; ++ if (p_image->x0 > (OPJ_UINT32)INT_MAX || ++ p_image->y0 > (OPJ_UINT32)INT_MAX || ++ p_image->x1 > (OPJ_UINT32)INT_MAX || ++ p_image->y1 > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(p_manager, EVT_ERROR, ++ "Image coordinates above INT_MAX are not supported\n"); ++ return OPJ_FALSE; ++ } + + l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0, + (OPJ_INT32)l_img_comp->dx); +-- +2.17.1 + diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb index ffd4099..4045148 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb @@ -8,6 +8,7 @@ DEPENDS = "libpng tiff lcms zlib" SRC_URI = " \ git://github.com/uclouvain/openjpeg.git \ file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ + file://CVE-2020-6851.patch \ " SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788" 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 Mar 12 00:28:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:23 +0000 Subject: [oe-commits] [openembedded-core] 02/13: glib-2.0: Correct multilib conflict In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.5721C2335ED@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 58449eca0777aca564583e60f9bc0e23ecc3a764 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:22:49 2020 -0700 glib-2.0: Correct multilib conflict Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 23c347d..edecc51 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -128,6 +128,9 @@ do_install_append_class-target () { rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test fi fi + if test "x${MLPREFIX}" != "x"; then + mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test + fi } # As we do not build python3 for windows, makes no sense to ship the script that's using it -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:22 +0000 Subject: [oe-commits] [openembedded-core] 01/13: babletrace2: make manpages multilib identical In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.4B3DD2335EC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2d0cbb97aefe0d9975347b97162515242f2a9730 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:22:48 2020 -0700 babletrace2: make manpages multilib identical Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Make-manpages-multilib-identical.patch | 28 ++++++++++++++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 29 insertions(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch new file mode 100644 index 0000000..2401b17 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch @@ -0,0 +1,28 @@ +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Mon, 9 Mar 2020 21:10:35 +0000 +Subject: [PATCH] Make manpages multilib identical + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman +--- + doc/man/asciidoc-attrs.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in +index ad1183f1..e11c7031 100644 +--- a/doc/man/asciidoc-attrs.conf.in ++++ b/doc/man/asciidoc-attrs.conf.in +@@ -1,7 +1,7 @@ + [attributes] + # default values +-system_plugin_path="@LIBDIR@/babeltrace2/plugins" +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers" ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins" ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers" + babeltrace_version="@PACKAGE_VERSION@" + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" + defrdport=5344 +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 16953d6..61bc7f5 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + file://0001-Make-manpages-multilib-identical.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:24 +0000 Subject: [oe-commits] [openembedded-core] 03/13: strace: Fix reproducibility issues In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.615C72335EE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit a020e04420d6ac6ee949faf1460f5bc59786334f Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:41 2020 -0700 strace: Fix reproducibility issues gen_tests script encodes its full path to itself in each script Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-strace-fix-reproducibilty-issues.patch | 39 ++++++++++++++++++++++ meta/recipes-devtools/strace/strace_5.5.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch new file mode 100644 index 0000000..c4c176e --- /dev/null +++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch @@ -0,0 +1,39 @@ +From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 19:56:55 +0000 +Subject: [PATCH] strace: fix reproducibilty issues + +The full path to the gen_tests.sh script is encoded in the tests + +Upstream-Status: Pending + +Signed-off-by: Jeremy Puhlman +--- + tests/gen_tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 5e1e7c9..1e65eac 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh +@@ -46,7 +46,7 @@ while read -r name arg0 args; do { + + hdr="\ + #!/bin/sh -efu +-# Generated by $0 from $input ($name $arg0 $args); do not edit." ++# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit." + + case "$arg0" in + +*) +@@ -80,7 +80,7 @@ while read -r name arg0 args; do { + + if [ -n "$names" ]; then + { +- printf '# Generated by %s from %s; do not edit.\n' "$0" "$input" ++ printf '# Generated by %s from %s; do not edit.\n' "$(basename $0)" "$input" + printf 'GEN_TESTS =' + printf ' %s.gen.test' $names + echo +-- +2.24.1 + diff --git a/meta/recipes-devtools/strace/strace_5.5.bb b/meta/recipes-devtools/strace/strace_5.5.bb index 6e7d639..ae552da 100644 --- a/meta/recipes-devtools/strace/strace_5.5.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -13,6 +13,7 @@ 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://0001-strace-fix-reproducibilty-issues.patch \ " SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:21 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (6f01a53 -> 7ef19aa) Message-ID: <158397290182.8345.4737497317128529055@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 6f01a53 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new 2d0cbb9 babletrace2: make manpages multilib identical new 58449ec glib-2.0: Correct multilib conflict new a020e04 strace: Fix reproducibility issues new bec9cf7 qemu: Fix reproducibilty issues new 3f6b8c5 ltp: fix reproducibilty issues new dfe8340 gtk-doc: Fix reproducibity issues new e896a48 dnf: fix reproducibilty issue new 3f45a0f boost: fix reproducibilty issues new 56c5d6f weston-init: Allow use of weston without input devices new cb3780e oeqa/runtime/context.py: fix typo new c9ff467 oeqa: enable testresults.json for testexport new 8722f01 curl: upgrade 7.69.0 -> 7.69.1 new 7ef19aa babeltrace2: initialize the other_entry pointer 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/lib/oeqa/core/context.py | 30 ++++++++++++++++- meta/lib/oeqa/core/runner.py | 13 ++++++-- meta/lib/oeqa/runtime/context.py | 4 +-- meta/recipes-core/glib-2.0/glib.inc | 3 ++ ...001-set-python-path-for-completion_helper.patch | 24 +++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + meta/recipes-devtools/qemu/qemu.inc | 2 ++ .../0001-strace-fix-reproducibilty-issues.patch | 39 ++++++++++++++++++++++ meta/recipes-devtools/strace/strace_5.5.bb | 1 + meta/recipes-extended/ltp/ltp_20200120.bb | 6 ++++ meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 12 +++++++ .../wayland/weston-init/weston.ini | 3 +- .../0001-Make-manpages-multilib-identical.patch | 28 ++++++++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 2 ++ meta/recipes-support/boost/boost.inc | 5 +++ .../curl/{curl_7.69.0.bb => curl_7.69.1.bb} | 4 +-- 16 files changed, 168 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch create mode 100644 meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch rename meta/recipes-support/curl/{curl_7.69.0.bb => curl_7.69.1.bb} (95%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:25 +0000 Subject: [oe-commits] [openembedded-core] 04/13: qemu: Fix reproducibilty issues In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.6BA5E2335EF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bec9cf789216718b0392f508f80d9831224d80ec Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:42 2020 -0700 qemu: Fix reproducibilty issues tests/qemu-iotests/common.env is generated from configure which we pass ${HOSTTOOLS_DIR}/python3 as our python to use, which gets copied into the ptests. Correct python3 path. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f3342ea..e6dbc6d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -56,6 +56,8 @@ do_install_ptest() { # Don't check the file genreated by configure sed -i -e '/wildcard config-host.mak/d' \ -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include + sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env } # QEMU_TARGETS is overridable variable -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:26 +0000 Subject: [oe-commits] [openembedded-core] 05/13: ltp: fix reproducibilty issues In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.7674E2335F0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3f6b8c58da96851c21dd918ccfd018041a45fc7a Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:43 2020 -0700 ltp: fix reproducibilty issues Man pages are copied in to the target filesystem from the configured build, which leaks paths in to the work directory Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-extended/ltp/ltp_20200120.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 5be9489..3e6cbc6 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -68,6 +68,12 @@ do_install(){ # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases + + # Makefile were configured in the build system + find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*--sysroot=[^ "]*@@g' } RDEPENDS_${PN} = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:28 +0000 Subject: [oe-commits] [openembedded-core] 07/13: dnf: fix reproducibilty issue In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.8A99B2335F3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e896a48ecacbca96cf3c4a8f2fbc5c97462c1729 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:45 2020 -0700 dnf: fix reproducibilty issue Script points to native python3 Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...001-set-python-path-for-completion_helper.patch | 24 ++++++++++++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + 2 files changed, 25 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch new file mode 100644 index 0000000..448f640 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch @@ -0,0 +1,24 @@ +From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 22:10:02 +0000 +Subject: [PATCH] set python path for completion_helper + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + dnf/cli/completion_helper.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in +index 351226759..2835cd3b6 100644 +--- a/dnf/cli/completion_helper.py.in ++++ b/dnf/cli/completion_helper.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/usr/bin/env python3 + # + # This file is part of dnf. + # +-- +2.23.0 + diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index 5244e10..a046ffc 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://Fix-SyntaxWarning.patch \ + file://0001-set-python-path-for-completion_helper.patch \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:29 +0000 Subject: [oe-commits] [openembedded-core] 08/13: boost: fix reproducibilty issues In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.95CA32335F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3f45a0fe641710a1f8c99af3d1712f6194a75d3e Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:46 2020 -0700 boost: fix reproducibilty issues fix cmake file references of image dir path Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index e15dce4..8eb9494 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -202,6 +202,11 @@ do_install() { fi done + # Cmake files reference full paths to image + find ${D}${libdir}/cmake -type f | \ + grep 'cmake$' | \ + xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i + } 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 Mar 12 00:28:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:27 +0000 Subject: [oe-commits] [openembedded-core] 06/13: gtk-doc: Fix reproducibity issues In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.80E1A2335F2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dfe8340e3534c82c5697f87a7ae9a6c69263c4be Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:44 2020 -0700 gtk-doc: Fix reproducibity issues path to pkg-config and python3 encoded in scripts Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb index 50d4d99..b508e62 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb @@ -36,6 +36,17 @@ do_configure_prepend() { sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac } +do_install_append () { + # configure values for python3 and pkg-config encoded in scripts + for fn in ${bindir}/gtkdoc-depscan \ + ${bindir}/gtkdoc-mkhtml2 \ + ${datadir}/gtk-doc/python/gtkdoc/config.py; do + sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ + -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + -i ${D}$fn + done +} + FILES_${PN} += "${datadir}/sgml" FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-doc = "" @@ -48,3 +59,4 @@ gtkdoc_makefiles_sysroot_preprocess() { -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make } + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:30 +0000 Subject: [oe-commits] [openembedded-core] 09/13: weston-init: Allow use of weston without input devices In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.A0E222335F5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 56c5d6f0386b7eac1e28adb8461b936fbdf08f26 Author: Domarys Correa AuthorDate: Wed Mar 11 13:52:21 2020 -0300 weston-init: Allow use of weston without input devices Don't force users to have input device in your targets. As the default option require-input is set to true, Weston only starts if we have a device in /dev/input/event* and this not a requirement for all applications, e.g. kiosk browser. Signed-off-by: Domarys Correa Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/weston.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init/weston.ini b/meta/recipes-graphics/wayland/weston-init/weston.ini index 1eecf48..1e6dff6 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta/recipes-graphics/wayland/weston-init/weston.ini @@ -1,9 +1,10 @@ # configuration file for Weston -#[core] +[core] #modules=xwayland.so,cms-colord.so #shell=desktop-shell.so #gbm-format=xrgb2101010 +require-input=false #[shell] #background-image=/usr/share/backgrounds/gnome/Aqua.jpg -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:31 +0000 Subject: [oe-commits] [openembedded-core] 10/13: oeqa/runtime/context.py: fix typo In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.AA3032335F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit cb3780e8873e7c948fb6fcff7686db5a689dfb6a Author: Stefan Kral AuthorDate: Wed Mar 11 17:36:49 2020 +0100 oeqa/runtime/context.py: fix typo Signed-off-by: Stefan Kral Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/context.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index 2ecb1a8..101434a 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -77,7 +77,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): runtime_group.add_argument('--packages-manifest', action='store', default=self.default_manifest, - help="Package manifest of the image under testi, default: %s" \ + help="Package manifest of the image under test, default: %s" \ % self.default_manifest) runtime_group.add_argument('--extract-dir', action='store', @@ -184,7 +184,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): except: obj = None return obj - + @staticmethod def readPackagesManifest(manifest): if not manifest or not os.path.exists(manifest): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:33 +0000 Subject: [oe-commits] [openembedded-core] 12/13: curl: upgrade 7.69.0 -> 7.69.1 In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.C22842335F8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8722f015f19a67020b46c2352c831d913b68ebdb Author: Pierre-Jean Texier AuthorDate: Wed Mar 11 17:38:38 2020 +0100 curl: upgrade 7.69.0 -> 7.69.1 Contains a number of fixes for issues discovered post-7.69.0. For details, see full changelog: https://curl.haxx.se/changes.html#7_69_1 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-support/curl/{curl_7.69.0.bb => curl_7.69.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.69.0.bb b/meta/recipes-support/curl/curl_7.69.1.bb similarity index 95% rename from meta/recipes-support/curl/curl_7.69.0.bb rename to meta/recipes-support/curl/curl_7.69.1.bb index 2e9b512..e854e8d 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.1.bb @@ -9,8 +9,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ " -SRC_URI[md5sum] = "04eb86d1138c2ff3dbfd497f7de85daa" -SRC_URI[sha256sum] = "668d451108a7316cff040b23c79bc766e7ed84122074e44f662b8982f2e76739" +SRC_URI[md5sum] = "ec5fc263f898a3dfef08e805f1ecca42" +SRC_URI[sha256sum] = "2ff5e5bd507adf6aa88ff4bbafd4c7af464867ffb688be93b9930717a56c4de8" CVE_PRODUCT = "curl libcurl" inherit autotools pkgconfig binconfig multilib_header -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:34 +0000 Subject: [oe-commits] [openembedded-core] 13/13: babeltrace2: initialize the other_entry pointer In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.CC0D52335F9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7ef19aa61ed426dc3597a9c167ba4e90df524538 Author: Mingli Yu AuthorDate: Wed Mar 11 21:49:33 2020 +0800 babeltrace2: initialize the other_entry pointer When add below line to local.conf to enable debug build: DEBUG_BUILD = "1" There comes below failure when run "bitbake babeltrace2" | ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': | ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] | 702 | !ds_index_entries_equal(entry, other_entry)) { So initialize the other_entry pointer to fix the above error. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 61bc7f5..e71ac1a 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -11,6 +11,7 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ file://0001-Make-manpages-multilib-identical.patch \ + file://0001-fs.c-initialize-other_entry.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:32 +0000 Subject: [oe-commits] [openembedded-core] 11/13: oeqa: enable testresults.json for testexport In-Reply-To: <158397290182.8345.4737497317128529055@git.openembedded.org> References: <158397290182.8345.4737497317128529055@git.openembedded.org> Message-ID: <20200312002822.B5B8F2335F7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c9ff467288563d21cccfd8fd0507aa05f319677b Author: Stefan Kral AuthorDate: Wed Mar 11 17:37:30 2020 +0100 oeqa: enable testresults.json for testexport Add the option --json-result-dir to oeqa core context to enable testresults.json creation for test runs via testexport. Eg. oe-test runtime --json-result-dir . Signed-off-by: Stefan Kral Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 30 +++++++++++++++++++++++++++++- meta/lib/oeqa/core/runner.py | 13 ++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 16320af..b9a28ce 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -116,6 +116,9 @@ class OETestContextExecutor(object): default=self.default_output_log, help="results output log, default: %s" % self.default_output_log) + self.parser.add_argument('--json-result-dir', action='store', + help="json result output dir, create testresults.json here if set") + group = self.parser.add_mutually_exclusive_group() group.add_argument('--run-tests', action='store', nargs='+', default=self.default_tests, @@ -178,6 +181,22 @@ class OETestContextExecutor(object): self.module_paths = args.CASES_PATHS + def _get_json_result_dir(self, args): + return args.json_result_dir + + def _get_configuration(self): + td = self.tc_kwargs['init']['td'] + configuration = {'TEST_TYPE': self.name, + 'MACHINE': td.get("MACHINE"), + 'DISTRO': td.get("DISTRO"), + 'IMAGE_BASENAME': td.get("IMAGE_BASENAME"), + 'DATETIME': td.get("DATETIME")} + return configuration + + def _get_result_id(self, configuration): + return '%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], + configuration['MACHINE'], configuration['DATETIME']) + def _pre_run(self): pass @@ -196,7 +215,16 @@ class OETestContextExecutor(object): else: self._pre_run() rc = self.tc.runTests(**self.tc_kwargs['run']) - rc.logDetails() + + json_result_dir = self._get_json_result_dir(args) + if json_result_dir: + configuration = self._get_configuration() + rc.logDetails(json_result_dir, + configuration, + self._get_result_id(configuration)) + else: + rc.logDetails() + rc.logSummary(self.name) output_link = os.path.join(os.path.dirname(args.output_log), diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index f656e1a..fc3872a 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py @@ -319,10 +319,17 @@ class OETestResultJSONHelper(object): the_file.write(file_content) def dump_testresult_file(self, write_dir, configuration, result_id, test_result): - bb.utils.mkdirhier(write_dir) - lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) + try: + import bb + has_bb = True + lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) + bb.utils.mkdirhier(write_dir, exist_ok=True) + except ImportError: + has_bb = False + os.makedirs(write_dir) test_results = self._get_existing_testresults_if_available(write_dir) test_results[result_id] = {'configuration': configuration, 'result': test_result} json_testresults = json.dumps(test_results, sort_keys=True, indent=4) self._write_file(write_dir, self.testresult_filename, json_testresults) - bb.utils.unlockfile(lf) + if has_bb: + bb.utils.unlockfile(lf) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:51 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (0b87534 -> ad6a2b4) Message-ID: <158397293182.9024.18231699951462307291@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 0b87534 bitbake-user-manual: Add documentation for BB_LOGCONFIG new 710d301 bitbake: knotty: Add logging cleanup new 3778e26 bitbake: msg: Add helper to merge logging configs new a07411e bitbake: knotty: Update hash equivalence logging new ad6a2b4 bitbake: runqueue: Lower setscene complete logging level 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: lib/bb/msg.py | 100 +++++++++++++++++++++++++++++++--------------------- lib/bb/runqueue.py | 2 +- lib/bb/ui/knotty.py | 70 +++++++++++++++++++++++++++++++----- 3 files changed, 122 insertions(+), 50 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:52 +0000 Subject: [oe-commits] [bitbake] 01/04: bitbake: knotty: Add logging cleanup In-Reply-To: <158397293182.9024.18231699951462307291@git.openembedded.org> References: <158397293182.9024.18231699951462307291@git.openembedded.org> Message-ID: <20200312002851.EFBA12335EE@git.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 710d301e515bcd38bbe6dc30df9a3190cafd0b84 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:44 2020 -0500 bitbake: knotty: Add logging cleanup Adds code to close all loggers when bitbake exits. This prevents unclosed file ResourceWarnings. A form of this closing existed previously, but was removed in the new logging code. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 11 +++++++++++ lib/bb/ui/knotty.py | 2 ++ 2 files changed, 13 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 6259af0..0564573 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -320,3 +320,14 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): # TODO: I don't think that setting the global log level should be necessary #if newlevel < bb.msg.loggerDefaultLogLevel: # bb.msg.loggerDefaultLogLevel = newlevel + +def cleanupLogging(): + # Iterate through all the handlers and close them if possible. Fixes + # 'Unclosed resource' warnings when bitbake exits, see + # https://bugs.python.org/issue23010 + handlers = set() + for logger_iter in logging.Logger.manager.loggerDict.keys(): + handlers.update(logging.getLogger(logger_iter).handlers) + + for h in handlers: + h.close() diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 386f278..695108a 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -823,4 +823,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass + bb.msg.cleanupLogging() + return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:53 +0000 Subject: [oe-commits] [bitbake] 02/04: bitbake: msg: Add helper to merge logging configs In-Reply-To: <158397293182.9024.18231699951462307291@git.openembedded.org> References: <158397293182.9024.18231699951462307291@git.openembedded.org> Message-ID: <20200312002852.05D8C2335EF@git.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 3778e2687d6855ab3224375e1a6b847cf0308d3a Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:45 2020 -0500 bitbake: msg: Add helper to merge logging configs Adds a function that can be used by UI front ends to merge logging configuration fragments. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 89 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 0564573..582165d 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -229,6 +229,53 @@ def has_console_handler(logger): return True return False +def mergeLoggingConfig(logconfig, userconfig): + logconfig = copy.deepcopy(logconfig) + userconfig = copy.deepcopy(userconfig) + + # Merge config with the default config + if userconfig.get('version') != logconfig['version']: + raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) + + # Set some defaults to make merging easier + userconfig.setdefault("loggers", {}) + + # If a handler, formatter, or filter is defined in the user + # config, it will replace an existing one in the default config + for k in ("handlers", "formatters", "filters"): + logconfig.setdefault(k, {}).update(userconfig.get(k, {})) + + seen_loggers = set() + for name, l in logconfig["loggers"].items(): + # If the merge option is set, merge the handlers and + # filters. Otherwise, if it is False, this logger won't get + # add to the set of seen loggers and will replace the + # existing one + if l.get('bitbake_merge', True): + ulogger = userconfig["loggers"].setdefault(name, {}) + ulogger.setdefault("handlers", []) + ulogger.setdefault("filters", []) + + # Merge lists + l.setdefault("handlers", []).extend(ulogger["handlers"]) + l.setdefault("filters", []).extend(ulogger["filters"]) + + # Replace other properties if present + if "level" in ulogger: + l["level"] = ulogger["level"] + + if "propagate" in ulogger: + l["propagate"] = ulogger["propagate"] + + seen_loggers.add(name) + + # Add all loggers present in the user config, but not any that + # have already been processed + for name in set(userconfig["loggers"].keys()) - seen_loggers: + logconfig["loggers"][name] = userconfig["loggers"][name] + + return logconfig + def setLoggingConfig(defaultconfig, userconfigfile=None): logconfig = copy.deepcopy(defaultconfig) @@ -244,47 +291,7 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): raise BaseException("Unrecognized file format: %s" % userconfigfile) if userconfig.get('bitbake_merge', True): - # Merge config with the default config - if userconfig.get('version') != logconfig['version']: - raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) - - # Set some defaults to make merging easier - userconfig.setdefault("loggers", {}) - - # If a handler, formatter, or filter is defined in the user - # config, it will replace an existing one in the default config - for k in ("handlers", "formatters", "filters"): - logconfig.setdefault(k, {}).update(userconfig.get(k, {})) - - seen_loggers = set() - for name, l in logconfig["loggers"].items(): - # If the merge option is set, merge the handlers and - # filters. Otherwise, if it is False, this logger won't get - # add to the set of seen loggers and will replace the - # existing one - if l.get('bitbake_merge', True): - ulogger = userconfig["loggers"].setdefault(name, {}) - ulogger.setdefault("handlers", []) - ulogger.setdefault("filters", []) - - # Merge lists - l.setdefault("handlers", []).extend(ulogger["handlers"]) - l.setdefault("filters", []).extend(ulogger["filters"]) - - # Replace other properties if present - if "level" in ulogger: - l["level"] = ulogger["level"] - - if "propagate" in ulogger: - l["propagate"] = ulogger["propagate"] - - seen_loggers.add(name) - - # Add all loggers present in the user config, but not any that - # have already been processed - for name in set(userconfig["loggers"].keys()) - seen_loggers: - logconfig["loggers"][name] = userconfig["loggers"][name] - + logconfig = mergeLoggingConfig(logconfig, userconfig) else: # Replace the entire default config logconfig = userconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:55 +0000 Subject: [oe-commits] [bitbake] 04/04: bitbake: runqueue: Lower setscene complete logging level In-Reply-To: <158397293182.9024.18231699951462307291@git.openembedded.org> References: <158397293182.9024.18231699951462307291@git.openembedded.org> Message-ID: <20200312002852.1DD472335F2@git.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 ad6a2b4d1826d9ef280f70700cd2bd1626dbf994 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:47 2020 -0500 bitbake: runqueue: Lower setscene complete logging level Lowers the level of the log message when setscene tasks have completed. This message can occur multiple times when hash equivalence is enabled, since the runqueue switches between executing setscene tasks and normal tasks. Since this is primarily of use when debugging hash equivalence, use the hash equivalence logger at VERBOSE level. [YOCTO #13813] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index cef9b0f..16f076f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2059,7 +2059,7 @@ class RunQueueExecute: self.update_holdofftasks() if not self.sq_live and not self.sqdone and not self.sq_deferred and not self.updated_taskhash_queue and not self.holdoff_tasks: - logger.info("Setscene tasks completed") + hashequiv_logger.verbose("Setscene tasks completed") err = self.summarise_scenequeue_errors() if err: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 00:28:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 00:28:54 +0000 Subject: [oe-commits] [bitbake] 03/04: bitbake: knotty: Update hash equivalence logging In-Reply-To: <158397293182.9024.18231699951462307291@git.openembedded.org> References: <158397293182.9024.18231699951462307291@git.openembedded.org> Message-ID: <20200312002852.106592335F0@git.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 a07411eb6628e1e712aabb7a38df7a3ee0ee8577 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:46 2020 -0500 bitbake: knotty: Update hash equivalence logging Updates hash equivalence logging so that the interesting VERBOSE messages are always logged to the consolelog file so that issues in individual user builds can be diagnosed. The autobuilder logging config then updates this so that they also are shown on stdout, since the consolelog file is not capture there. In order to facilitate this, 2 new logging handlers were added, "BitBake.verbconsole" and "BitBake.verbconsolelog". Neither of these handlers are attached to anything by default, but they will log any messages that wouldn't otherwise be logged by the normal console or consolelog handlers. Users can attach whatever loggers the desire to this handler to get them to appear on the console or in the consolelog, as demonstrated by the autobuilderlog.json file. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 68 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 695108a..24b7a77 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -419,6 +419,18 @@ def main(server, eventHandler, params, tf = TerminalFilter): "stream": "ext://sys.stderr", "filters": ["BitBake.stderrFilter"], }, + # This handler can be used if specific loggers should print on + # the console at a lower severity than the default. It will + # display any messages sent to it that are lower than then + # BitBake.console logging level (so as to prevent duplication of + # messages). Nothing is attached to this handler by default + "BitBake.verbconsole": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": 1, + "stream": "ext://sys.stdout", + "filters": ["BitBake.verbconsoleFilter"], + }, }, "formatters": { # This format instance will get color output enabled by the @@ -442,7 +454,11 @@ def main(server, eventHandler, params, tf = TerminalFilter): "BitBake.stderrFilter": { "()": "bb.msg.LogFilterGEQLevel", "level": "ERROR" - } + }, + "BitBake.verbconsoleFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": console_loglevel + }, }, "loggers": { "BitBake": { @@ -455,13 +471,49 @@ def main(server, eventHandler, params, tf = TerminalFilter): # Enable the console log file if enabled if consolelogfile and not params.options.show_environment and not params.options.show_versions: - logconfig["handlers"]["BitBake.consolelog"] ={ - "class": "logging.FileHandler", - "formatter": "BitBake.logfileFormatter", - "level": "INFO", - "filename": consolelogfile, - } - logconfig["loggers"]["BitBake"]["handlers"].append("BitBake.consolelog") + logconfig = bb.msg.mergeLoggingConfig(logconfig, { + "version": 1, + "handlers" : { + "BitBake.consolelog": { + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": loglevel, + "filename": consolelogfile, + }, + # Just like verbconsole, anything sent here will go to the + # log file, unless it would go to BitBake.consolelog + "BitBake.verbconsolelog" : { + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": 1, + "filename": consolelogfile, + "filters": ["BitBake.verbconsolelogFilter"], + }, + }, + "filters": { + "BitBake.verbconsolelogFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": loglevel, + }, + }, + "loggers": { + "BitBake": { + "handlers": ["BitBake.consolelog"], + }, + + # Other interesting things that we want to keep an eye on + # in the log files in case someone has an issue, but not + # necessarily show to the user on the console + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["BitBake.verbconsolelog"], + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["BitBake.verbconsolelog"], + } + } + }) bb.utils.mkdirhier(os.path.dirname(consolelogfile)) loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 07:24:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 07:24:14 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (7ef19aa -> b7c89cf) Message-ID: <158399785464.17810.16680905262155662482@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 7ef19aa babeltrace2: initialize the other_entry pointer new b7c89cf babeltrace2: initialize the other_entry pointer 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 (7ef19aa) \ N -- N -- N refs/heads/master-next (b7c89cf) 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-fs.c-initialize-other_entry.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 07:24:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 07:24:15 +0000 Subject: [oe-commits] [openembedded-core] 01/01: babeltrace2: initialize the other_entry pointer In-Reply-To: <158399785464.17810.16680905262155662482@git.openembedded.org> References: <158399785464.17810.16680905262155662482@git.openembedded.org> Message-ID: <20200312072414.F1B502335F0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b7c89cfd771afa8a1e170bc2ff8db2f74e04db24 Author: Mingli Yu AuthorDate: Wed Mar 11 21:49:33 2020 +0800 babeltrace2: initialize the other_entry pointer When add below line to local.conf to enable debug build: DEBUG_BUILD = "1" There comes below failure when run "bitbake babeltrace2" | ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': | ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] | 702 | !ds_index_entries_equal(entry, other_entry)) { So initialize the other_entry pointer to fix the above error. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- .../0001-fs.c-initialize-other_entry.patch | 33 ++++++++++++++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 34 insertions(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch new file mode 100644 index 0000000..b56b3bd --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch @@ -0,0 +1,33 @@ +From 42dae692b9057d03ce9a0651f061472e9dd90130 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 11 Mar 2020 08:44:42 +0000 +Subject: [PATCH] fs.c: initialize the other_entry variable + +Initialize the pointer other_entry to fix the below error: +| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': +| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] +| 702 | !ds_index_entries_equal(entry, other_entry)) { + +Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2020-March/029549.html] + +Signed-off-by: Mingli Yu +--- + src/plugins/ctf/fs-src/fs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c +index e87523a3..a6b5315f 100644 +--- a/src/plugins/ctf/fs-src/fs.c ++++ b/src/plugins/ctf/fs-src/fs.c +@@ -680,7 +680,7 @@ void ds_index_insert_ds_index_entry_sorted( + struct ctf_fs_ds_index_entry *entry) + { + guint i; +- struct ctf_fs_ds_index_entry *other_entry; ++ struct ctf_fs_ds_index_entry *other_entry = NULL; + + /* Find the spot where to insert this index entry. */ + for (i = 0; i < index->entries->len; i++) { +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 61bc7f5..e71ac1a 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -11,6 +11,7 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ file://0001-Make-manpages-multilib-identical.patch \ + file://0001-fs.c-initialize-other_entry.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 07:47:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 07:47:47 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: python3-pycryptodomex: add 3.9.4 recipe Message-ID: <158399926708.27734.12462883378427842466@git.openembedded.org> 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 ebcd510 python3-pycryptodomex: add 3.9.4 recipe ebcd510 is described below commit ebcd5103f3f452b3c5ef3a3b099b077609edd6f9 Author: Rajesh Ravi AuthorDate: Mon Mar 9 19:49:36 2020 -0700 python3-pycryptodomex: add 3.9.4 recipe Add python3-pycryptodomex 3.9.4 recipe needed to build such components as optee 3.8.0. Signed-off-by: Rajesh Ravi Signed-off-by: Scott Branden Reviewed-by: Tim Orling Signed-off-by: Khem Raj --- .../python/python3-pycryptodomex_3.9.4.bb | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb new file mode 100644 index 0000000..be6b10f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pycryptodomex_3.9.4.bb @@ -0,0 +1,30 @@ +SUMMARY = "Cryptographic library for Python" +DESCRIPTION = "PyCryptodome is a self-contained Python package of low-level\ + cryptographic primitives." +HOMEPAGE = "http://www.pycryptodome.org" +LICENSE = "PD & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=6dc0e2a13d2f25d6f123c434b761faba" + +SRC_URI[md5sum] = "46ba513d95b6e323734074d960a7d57b" +SRC_URI[sha256sum] = "22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167" + +inherit pypi +inherit setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-math \ +" + +RDEPENDS_${PN}-tests += " \ + ${PYTHON_PN}-unittest \ +" + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \ + ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/__pycache__/ \ +" + +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 Mar 12 07:57:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 07:57:11 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: fixup Message-ID: <158399983141.32427.18184075231723224172@git.openembedded.org> 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 fec9a87 fixup fec9a87 is described below commit fec9a872a1f70bd825da0cc5c003bf0642a23064 Author: Richard Purdie AuthorDate: Thu Mar 12 07:56:48 2020 +0000 fixup Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index fc3872a..1284295 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py @@ -322,11 +322,11 @@ class OETestResultJSONHelper(object): try: import bb has_bb = True + bb.utils.mkdirhier(write_dir) lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) - bb.utils.mkdirhier(write_dir, exist_ok=True) except ImportError: has_bb = False - os.makedirs(write_dir) + os.makedirs(write_dir, exist_ok=True) test_results = self._get_existing_testresults_if_available(write_dir) test_results[result_id] = {'configuration': configuration, 'result': test_result} json_testresults = json.dumps(test_results, sort_keys=True, indent=4) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:28 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (baecda5 -> d3af3cf) Message-ID: <158401718807.10988.5487502543936503949@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 baecda5 nspr: Move to meta-oe add 734475b base.bbclass: extend PACKAGECONFIG for conflict package configs add 8579673 glew/curl: specify exclusive package configs new bf959e6 oeqa/runtime/context.py: fix typo new d3af3cf curl: upgrade 7.69.0 -> 7.69.1 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/classes/base.bbclass | 20 +++++++++++++++++--- meta/lib/oeqa/runtime/context.py | 4 ++-- meta/recipes-graphics/glew/glew_2.1.0.bb | 4 ++-- .../curl/{curl_7.69.0.bb => curl_7.69.1.bb} | 8 ++++---- 4 files changed, 25 insertions(+), 11 deletions(-) rename meta/recipes-support/curl/{curl_7.69.0.bb => curl_7.69.1.bb} (92%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:30 +0000 Subject: [oe-commits] [openembedded-core] 02/02: curl: upgrade 7.69.0 -> 7.69.1 In-Reply-To: <158401718807.10988.5487502543936503949@git.openembedded.org> References: <158401718807.10988.5487502543936503949@git.openembedded.org> Message-ID: <20200312124628.5E6F82335F3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d3af3cf801ab5b235bce427bc73d2e6b29083368 Author: Pierre-Jean Texier AuthorDate: Wed Mar 11 17:38:38 2020 +0100 curl: upgrade 7.69.0 -> 7.69.1 Contains a number of fixes for issues discovered post-7.69.0. For details, see full changelog: https://curl.haxx.se/changes.html#7_69_1 Signed-off-by: Pierre-Jean Texier Signed-off-by: Richard Purdie --- meta/recipes-support/curl/{curl_7.69.0.bb => curl_7.69.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.69.0.bb b/meta/recipes-support/curl/curl_7.69.1.bb similarity index 95% rename from meta/recipes-support/curl/curl_7.69.0.bb rename to meta/recipes-support/curl/curl_7.69.1.bb index 2e9b512..e854e8d 100644 --- a/meta/recipes-support/curl/curl_7.69.0.bb +++ b/meta/recipes-support/curl/curl_7.69.1.bb @@ -9,8 +9,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://0001-replace-krb5-config-with-pkg-config.patch \ " -SRC_URI[md5sum] = "04eb86d1138c2ff3dbfd497f7de85daa" -SRC_URI[sha256sum] = "668d451108a7316cff040b23c79bc766e7ed84122074e44f662b8982f2e76739" +SRC_URI[md5sum] = "ec5fc263f898a3dfef08e805f1ecca42" +SRC_URI[sha256sum] = "2ff5e5bd507adf6aa88ff4bbafd4c7af464867ffb688be93b9930717a56c4de8" CVE_PRODUCT = "curl libcurl" inherit autotools pkgconfig binconfig multilib_header -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:29 +0000 Subject: [oe-commits] [openembedded-core] 01/02: oeqa/runtime/context.py: fix typo In-Reply-To: <158401718807.10988.5487502543936503949@git.openembedded.org> References: <158401718807.10988.5487502543936503949@git.openembedded.org> Message-ID: <20200312124628.5455C2335F2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit bf959e6fd175d0841a1c042bf925c54200bea3d4 Author: Stefan Kral AuthorDate: Wed Mar 11 17:36:49 2020 +0100 oeqa/runtime/context.py: fix typo Signed-off-by: Stefan Kral Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/context.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index 2ecb1a8..101434a 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -77,7 +77,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): runtime_group.add_argument('--packages-manifest', action='store', default=self.default_manifest, - help="Package manifest of the image under testi, default: %s" \ + help="Package manifest of the image under test, default: %s" \ % self.default_manifest) runtime_group.add_argument('--extract-dir', action='store', @@ -184,7 +184,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): except: obj = None return obj - + @staticmethod def readPackagesManifest(manifest): if not manifest or not os.path.exists(manifest): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:36 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (fec9a87 -> d485e77) Message-ID: <158401719649.11308.12800243563621716100@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 fec9a87 fixup discard b7c89cf babeltrace2: initialize the other_entry pointer discard 8722f01 curl: upgrade 7.69.0 -> 7.69.1 discard c9ff467 oeqa: enable testresults.json for testexport discard cb3780e oeqa/runtime/context.py: fix typo discard 56c5d6f weston-init: Allow use of weston without input devices discard 3f45a0f boost: fix reproducibilty issues discard e896a48 dnf: fix reproducibilty issue discard dfe8340 gtk-doc: Fix reproducibity issues discard 3f6b8c5 ltp: fix reproducibilty issues discard bec9cf7 qemu: Fix reproducibilty issues discard a020e04 strace: Fix reproducibility issues discard 58449ec glib-2.0: Correct multilib conflict discard 2d0cbb9 babletrace2: make manpages multilib identical discard 6f01a53 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 38ce012 HACK: signing: Add extra test debug add bf959e6 oeqa/runtime/context.py: fix typo add d3af3cf curl: upgrade 7.69.0 -> 7.69.1 new edabeb8 HACK: signing: Add extra test debug new 07b7e38 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new c83046a babletrace2: make manpages multilib identical new 6cedaf0 glib-2.0: Correct multilib conflict new 96ad3231 strace: Fix reproducibility issues new e69a9d8 qemu: Fix reproducibilty issues new dde53e5 ltp: fix reproducibilty issues new 7270d6b gtk-doc: Fix reproducibity issues new 81a181a dnf: fix reproducibilty issue new c7d155d boost: fix reproducibilty issues new 6d522f2 weston-init: Allow use of weston without input devices new da1611a oeqa: enable testresults.json for testexport new 002f99c babeltrace2: initialize the other_entry pointer new d485e77 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 (fec9a87) \ N -- N -- N refs/heads/master-next (d485e77) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:40 +0000 Subject: [oe-commits] [openembedded-core] 04/14: glib-2.0: Correct multilib conflict In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.B9A832335F8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6cedaf022998b144184d9d18b1b2c36ba498f0cd Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:22:49 2020 -0700 glib-2.0: Correct multilib conflict Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 23c347d..edecc51 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -128,6 +128,9 @@ do_install_append_class-target () { rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test fi fi + if test "x${MLPREFIX}" != "x"; then + mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test + fi } # As we do not build python3 for windows, makes no sense to ship the script that's using it -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:39 +0000 Subject: [oe-commits] [openembedded-core] 03/14: babletrace2: make manpages multilib identical In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.B17672335F7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c83046a95399cc1f945751b5577848f998596709 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:22:48 2020 -0700 babletrace2: make manpages multilib identical Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Make-manpages-multilib-identical.patch | 28 ++++++++++++++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 29 insertions(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch new file mode 100644 index 0000000..2401b17 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch @@ -0,0 +1,28 @@ +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Mon, 9 Mar 2020 21:10:35 +0000 +Subject: [PATCH] Make manpages multilib identical + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman +--- + doc/man/asciidoc-attrs.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in +index ad1183f1..e11c7031 100644 +--- a/doc/man/asciidoc-attrs.conf.in ++++ b/doc/man/asciidoc-attrs.conf.in +@@ -1,7 +1,7 @@ + [attributes] + # default values +-system_plugin_path="@LIBDIR@/babeltrace2/plugins" +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers" ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins" ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers" + babeltrace_version="@PACKAGE_VERSION@" + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" + defrdport=5344 +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 16953d6..61bc7f5 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + file://0001-Make-manpages-multilib-identical.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:37 +0000 Subject: [oe-commits] [openembedded-core] 01/14: HACK: signing: Add extra test debug In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.9D06F2335F5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit edabeb8106c5888a52073589f0dbaecd31fbfbeb 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/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..9db1a20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -221,4 +222,17 @@ 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 = runCmd('cat bitbake-cookerdaemon.log').output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) + 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 Thu Mar 12 12:46:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:38 +0000 Subject: [oe-commits] [openembedded-core] 02/14: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.A73742335F6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 07b7e388698b632d2d6f7e1ac8aadd235b744ceb 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 Thu Mar 12 12:46:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:41 +0000 Subject: [oe-commits] [openembedded-core] 05/14: strace: Fix reproducibility issues In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.C57C82335F9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 96ad323175ec76ee1eadc8a9a4bf8f58c580bb32 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:41 2020 -0700 strace: Fix reproducibility issues gen_tests script encodes its full path to itself in each script Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-strace-fix-reproducibilty-issues.patch | 39 ++++++++++++++++++++++ meta/recipes-devtools/strace/strace_5.5.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch new file mode 100644 index 0000000..c4c176e --- /dev/null +++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch @@ -0,0 +1,39 @@ +From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 19:56:55 +0000 +Subject: [PATCH] strace: fix reproducibilty issues + +The full path to the gen_tests.sh script is encoded in the tests + +Upstream-Status: Pending + +Signed-off-by: Jeremy Puhlman +--- + tests/gen_tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 5e1e7c9..1e65eac 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh +@@ -46,7 +46,7 @@ while read -r name arg0 args; do { + + hdr="\ + #!/bin/sh -efu +-# Generated by $0 from $input ($name $arg0 $args); do not edit." ++# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit." + + case "$arg0" in + +*) +@@ -80,7 +80,7 @@ while read -r name arg0 args; do { + + if [ -n "$names" ]; then + { +- printf '# Generated by %s from %s; do not edit.\n' "$0" "$input" ++ printf '# Generated by %s from %s; do not edit.\n' "$(basename $0)" "$input" + printf 'GEN_TESTS =' + printf ' %s.gen.test' $names + echo +-- +2.24.1 + diff --git a/meta/recipes-devtools/strace/strace_5.5.bb b/meta/recipes-devtools/strace/strace_5.5.bb index 6e7d639..ae552da 100644 --- a/meta/recipes-devtools/strace/strace_5.5.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -13,6 +13,7 @@ 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://0001-strace-fix-reproducibilty-issues.patch \ " SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:42 +0000 Subject: [oe-commits] [openembedded-core] 06/14: qemu: Fix reproducibilty issues In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.CEFFE2335FA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e69a9d8a9b7ec1e989755aaeaf9d0e9c748e07fb Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:42 2020 -0700 qemu: Fix reproducibilty issues tests/qemu-iotests/common.env is generated from configure which we pass ${HOSTTOOLS_DIR}/python3 as our python to use, which gets copied into the ptests. Correct python3 path. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f3342ea..e6dbc6d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -56,6 +56,8 @@ do_install_ptest() { # Don't check the file genreated by configure sed -i -e '/wildcard config-host.mak/d' \ -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include + sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env } # QEMU_TARGETS is overridable variable -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:43 +0000 Subject: [oe-commits] [openembedded-core] 07/14: ltp: fix reproducibilty issues In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.D8C952335FB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dde53e52ada07594836611509d6ddc84d915151d Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:43 2020 -0700 ltp: fix reproducibilty issues Man pages are copied in to the target filesystem from the configured build, which leaks paths in to the work directory Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-extended/ltp/ltp_20200120.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 5be9489..3e6cbc6 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -68,6 +68,12 @@ do_install(){ # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases + + # Makefile were configured in the build system + find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*--sysroot=[^ "]*@@g' } RDEPENDS_${PN} = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:44 +0000 Subject: [oe-commits] [openembedded-core] 08/14: gtk-doc: Fix reproducibity issues In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.E34272335FC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7270d6b1df82c89dc7652fc4b57cd2791e21bc3a Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:44 2020 -0700 gtk-doc: Fix reproducibity issues path to pkg-config and python3 encoded in scripts Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb index 50d4d99..b508e62 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb @@ -36,6 +36,17 @@ do_configure_prepend() { sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac } +do_install_append () { + # configure values for python3 and pkg-config encoded in scripts + for fn in ${bindir}/gtkdoc-depscan \ + ${bindir}/gtkdoc-mkhtml2 \ + ${datadir}/gtk-doc/python/gtkdoc/config.py; do + sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ + -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + -i ${D}$fn + done +} + FILES_${PN} += "${datadir}/sgml" FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-doc = "" @@ -48,3 +59,4 @@ gtkdoc_makefiles_sysroot_preprocess() { -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make } + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:46 +0000 Subject: [oe-commits] [openembedded-core] 10/14: boost: fix reproducibilty issues In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124637.066FC2335FE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit c7d155ddc2ed2223fd94f3d24dbc4bea6a7c94a5 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:46 2020 -0700 boost: fix reproducibilty issues fix cmake file references of image dir path Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index e15dce4..8eb9494 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -202,6 +202,11 @@ do_install() { fi done + # Cmake files reference full paths to image + find ${D}${libdir}/cmake -type f | \ + grep 'cmake$' | \ + xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i + } 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 Mar 12 12:46:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:47 +0000 Subject: [oe-commits] [openembedded-core] 11/14: weston-init: Allow use of weston without input devices In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124637.11368233600@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6d522f256d5cb23e992e68506d49e349c2f43b7c Author: Domarys Correa AuthorDate: Wed Mar 11 13:52:21 2020 -0300 weston-init: Allow use of weston without input devices Don't force users to have input device in your targets. As the default option require-input is set to true, Weston only starts if we have a device in /dev/input/event* and this not a requirement for all applications, e.g. kiosk browser. Signed-off-by: Domarys Correa Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/weston.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init/weston.ini b/meta/recipes-graphics/wayland/weston-init/weston.ini index 1eecf48..1e6dff6 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta/recipes-graphics/wayland/weston-init/weston.ini @@ -1,9 +1,10 @@ # configuration file for Weston -#[core] +[core] #modules=xwayland.so,cms-colord.so #shell=desktop-shell.so #gbm-format=xrgb2101010 +require-input=false #[shell] #background-image=/usr/share/backgrounds/gnome/Aqua.jpg -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:50 +0000 Subject: [oe-commits] [openembedded-core] 14/14: fixup In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124637.371FB2335F8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d485e77620c112c60efa586ffd582d08a9302b6a Author: Richard Purdie AuthorDate: Thu Mar 12 07:56:48 2020 +0000 fixup Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index fc3872a..1284295 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py @@ -322,11 +322,11 @@ class OETestResultJSONHelper(object): try: import bb has_bb = True + bb.utils.mkdirhier(write_dir) lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) - bb.utils.mkdirhier(write_dir, exist_ok=True) except ImportError: has_bb = False - os.makedirs(write_dir) + os.makedirs(write_dir, exist_ok=True) test_results = self._get_existing_testresults_if_available(write_dir) test_results[result_id] = {'configuration': configuration, 'result': test_result} json_testresults = json.dumps(test_results, sort_keys=True, indent=4) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:45 +0000 Subject: [oe-commits] [openembedded-core] 09/14: dnf: fix reproducibilty issue In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124636.EDD812335FD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 81a181a20bc806d18c5867ab00c4073c851c867a Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:45 2020 -0700 dnf: fix reproducibilty issue Script points to native python3 Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...001-set-python-path-for-completion_helper.patch | 24 ++++++++++++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + 2 files changed, 25 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch new file mode 100644 index 0000000..448f640 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch @@ -0,0 +1,24 @@ +From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 22:10:02 +0000 +Subject: [PATCH] set python path for completion_helper + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + dnf/cli/completion_helper.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in +index 351226759..2835cd3b6 100644 +--- a/dnf/cli/completion_helper.py.in ++++ b/dnf/cli/completion_helper.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/usr/bin/env python3 + # + # This file is part of dnf. + # +-- +2.23.0 + diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index 5244e10..a046ffc 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://Fix-SyntaxWarning.patch \ + file://0001-set-python-path-for-completion_helper.patch \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:49 +0000 Subject: [oe-commits] [openembedded-core] 13/14: babeltrace2: initialize the other_entry pointer In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124637.2AAA0233601@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 002f99c9fb2dc4d58a8305a588f8e823d75bb015 Author: Mingli Yu AuthorDate: Wed Mar 11 21:49:33 2020 +0800 babeltrace2: initialize the other_entry pointer When add below line to local.conf to enable debug build: DEBUG_BUILD = "1" There comes below failure when run "bitbake babeltrace2" | ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': | ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] | 702 | !ds_index_entries_equal(entry, other_entry)) { So initialize the other_entry pointer to fix the above error. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- .../0001-fs.c-initialize-other_entry.patch | 33 ++++++++++++++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 34 insertions(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch new file mode 100644 index 0000000..b56b3bd --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch @@ -0,0 +1,33 @@ +From 42dae692b9057d03ce9a0651f061472e9dd90130 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 11 Mar 2020 08:44:42 +0000 +Subject: [PATCH] fs.c: initialize the other_entry variable + +Initialize the pointer other_entry to fix the below error: +| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': +| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] +| 702 | !ds_index_entries_equal(entry, other_entry)) { + +Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2020-March/029549.html] + +Signed-off-by: Mingli Yu +--- + src/plugins/ctf/fs-src/fs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c +index e87523a3..a6b5315f 100644 +--- a/src/plugins/ctf/fs-src/fs.c ++++ b/src/plugins/ctf/fs-src/fs.c +@@ -680,7 +680,7 @@ void ds_index_insert_ds_index_entry_sorted( + struct ctf_fs_ds_index_entry *entry) + { + guint i; +- struct ctf_fs_ds_index_entry *other_entry; ++ struct ctf_fs_ds_index_entry *other_entry = NULL; + + /* Find the spot where to insert this index entry. */ + for (i = 0; i < index->entries->len; i++) { +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 61bc7f5..e71ac1a 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -11,6 +11,7 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ file://0001-Make-manpages-multilib-identical.patch \ + file://0001-fs.c-initialize-other_entry.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 12:46:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 12:46:48 +0000 Subject: [oe-commits] [openembedded-core] 12/14: oeqa: enable testresults.json for testexport In-Reply-To: <158401719649.11308.12800243563621716100@git.openembedded.org> References: <158401719649.11308.12800243563621716100@git.openembedded.org> Message-ID: <20200312124637.1FC302335F4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit da1611af42ee4efd11e7eae73e2278e74ed3fb1a Author: Stefan Kral AuthorDate: Wed Mar 11 17:37:30 2020 +0100 oeqa: enable testresults.json for testexport Add the option --json-result-dir to oeqa core context to enable testresults.json creation for test runs via testexport. Eg. oe-test runtime --json-result-dir . Signed-off-by: Stefan Kral Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 30 +++++++++++++++++++++++++++++- meta/lib/oeqa/core/runner.py | 13 ++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 16320af..b9a28ce 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -116,6 +116,9 @@ class OETestContextExecutor(object): default=self.default_output_log, help="results output log, default: %s" % self.default_output_log) + self.parser.add_argument('--json-result-dir', action='store', + help="json result output dir, create testresults.json here if set") + group = self.parser.add_mutually_exclusive_group() group.add_argument('--run-tests', action='store', nargs='+', default=self.default_tests, @@ -178,6 +181,22 @@ class OETestContextExecutor(object): self.module_paths = args.CASES_PATHS + def _get_json_result_dir(self, args): + return args.json_result_dir + + def _get_configuration(self): + td = self.tc_kwargs['init']['td'] + configuration = {'TEST_TYPE': self.name, + 'MACHINE': td.get("MACHINE"), + 'DISTRO': td.get("DISTRO"), + 'IMAGE_BASENAME': td.get("IMAGE_BASENAME"), + 'DATETIME': td.get("DATETIME")} + return configuration + + def _get_result_id(self, configuration): + return '%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], + configuration['MACHINE'], configuration['DATETIME']) + def _pre_run(self): pass @@ -196,7 +215,16 @@ class OETestContextExecutor(object): else: self._pre_run() rc = self.tc.runTests(**self.tc_kwargs['run']) - rc.logDetails() + + json_result_dir = self._get_json_result_dir(args) + if json_result_dir: + configuration = self._get_configuration() + rc.logDetails(json_result_dir, + configuration, + self._get_result_id(configuration)) + else: + rc.logDetails() + rc.logSummary(self.name) output_link = os.path.join(os.path.dirname(args.output_log), diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index f656e1a..fc3872a 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py @@ -319,10 +319,17 @@ class OETestResultJSONHelper(object): the_file.write(file_content) def dump_testresult_file(self, write_dir, configuration, result_id, test_result): - bb.utils.mkdirhier(write_dir) - lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) + try: + import bb + has_bb = True + lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) + bb.utils.mkdirhier(write_dir, exist_ok=True) + except ImportError: + has_bb = False + os.makedirs(write_dir) test_results = self._get_existing_testresults_if_available(write_dir) test_results[result_id] = {'configuration': configuration, 'result': test_result} json_testresults = json.dumps(test_results, sort_keys=True, indent=4) self._write_file(write_dir, self.testresult_filename, json_testresults) - bb.utils.unlockfile(lf) + if has_bb: + bb.utils.unlockfile(lf) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:21:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:21:22 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: scripts/oe-buildenv-internal: Add BB_LOGCONFIG Message-ID: <158401928284.22802.14863162041376100204@git.openembedded.org> 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 e44ba78 scripts/oe-buildenv-internal: Add BB_LOGCONFIG e44ba78 is described below commit e44ba789e42e81702eadf14b9b77fc64b2dc7d29 Author: Richard Purdie AuthorDate: Thu Mar 12 13:19:25 2020 +0000 scripts/oe-buildenv-internal: Add BB_LOGCONFIG We should allow the logging configurations to be specificed from the environment, for example for autobuilder setups. Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index c17cf4d..e4915bc 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -106,7 +106,8 @@ BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ -SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE" +SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE \ ++BB_LOGCONFIG" BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:23:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:23:46 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (e44ba78 -> 6b8ec5a) Message-ID: <158401942672.24001.5970222803991173278@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 e44ba78 scripts/oe-buildenv-internal: Add BB_LOGCONFIG new 6b8ec5a scripts/oe-buildenv-internal: Add BB_LOGCONFIG 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 (e44ba78) \ N -- N -- N refs/heads/master-next (6b8ec5a) 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: scripts/oe-buildenv-internal | 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 Thu Mar 12 13:23:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:23:47 +0000 Subject: [oe-commits] [openembedded-core] 01/01: scripts/oe-buildenv-internal: Add BB_LOGCONFIG In-Reply-To: <158401942672.24001.5970222803991173278@git.openembedded.org> References: <158401942672.24001.5970222803991173278@git.openembedded.org> Message-ID: <20200312132346.DD0242335F5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 6b8ec5a58057464528fc33b3e0f82b8e545ffaa3 Author: Richard Purdie AuthorDate: Thu Mar 12 13:19:25 2020 +0000 scripts/oe-buildenv-internal: Add BB_LOGCONFIG We should allow the logging configurations to be specificed from the environment, for example for autobuilder setups. Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index c17cf4d..8cbe346 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -106,7 +106,8 @@ BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ -SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE" +SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE \ +BB_LOGCONFIG" BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:00 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (ad6a2b4 -> fc726eb) Message-ID: <158402040058.2011.4878192953742999803@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 ad6a2b4 bitbake: runqueue: Lower setscene complete logging level discard a07411e bitbake: knotty: Update hash equivalence logging discard 3778e26 bitbake: msg: Add helper to merge logging configs discard 710d301 bitbake: knotty: Add logging cleanup discard 0b87534 bitbake-user-manual: Add documentation for BB_LOGCONFIG discard 5d1151e bitbake: Lower hash equivalence logging discard 170c7a6 bitbake: Add autobuilder logging configuration new a0e22f7 bitbake: Lower hash equivalence logging new 162df5b bitbake-user-manual: Add documentation for BB_LOGCONFIG new 47ba09b bitbake: knotty: Add logging cleanup new b7d5d10 bitbake: msg: Add helper to merge logging configs new 242ef2c bitbake: runqueue: Lower setscene complete logging level new 47d323f bitbake: Add autobuilder logging configuration new fc726eb bitbake: knotty: Update hash equivalence logging 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 (ad6a2b4) \ N -- N -- N refs/heads/master-next (fc726eb) 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: bitbake/contrib/autobuilderlog.json | 27 --------------------------- contrib/autobuilderlog.json | 13 +++++++++++++ 2 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 bitbake/contrib/autobuilderlog.json create mode 100644 contrib/autobuilderlog.json -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:01 +0000 Subject: [oe-commits] [bitbake] 01/07: bitbake: Lower hash equivalence logging In-Reply-To: <158402040058.2011.4878192953742999803@git.openembedded.org> References: <158402040058.2011.4878192953742999803@git.openembedded.org> Message-ID: <20200312134000.BDE7D2335FB@git.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 a0e22f7eb417109232bc0658bfc67f1640e44519 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:52 2020 -0500 bitbake: Lower hash equivalence logging Lowers the level at which hash equivalence messages are logged so as to not annoy the majority of users. The autobuilder can use a custom logging configuration to log these to a file for debugging (see contrib/autobuilderlog.json) [YOCTO #13813] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 6 +++--- lib/bb/siggen.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index e84890b..cef9b0f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2264,7 +2264,7 @@ class RunQueueExecute: self.updated_taskhash_queue.remove((tid, unihash)) if unihash != self.rqdata.runtaskentries[tid].unihash: - hashequiv_logger.info("Task %s unihash changed to %s" % (tid, unihash)) + hashequiv_logger.verbose("Task %s unihash changed to %s" % (tid, unihash)) self.rqdata.runtaskentries[tid].unihash = unihash bb.parse.siggen.set_unihash(tid, unihash) toprocess.add(tid) @@ -2309,7 +2309,7 @@ class RunQueueExecute: elif tid in self.scenequeue_covered or tid in self.sq_live: # Already ran this setscene task or it running. Report the new taskhash bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) - hashequiv_logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) + hashequiv_logger.verbose("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) remapped = True if not remapped: @@ -2410,7 +2410,7 @@ class RunQueueExecute: for (tid, harddepfail, origvalid) in update_tasks: if tid in self.sqdata.valid and not origvalid: - hashequiv_logger.info("Setscene task %s became valid" % tid) + hashequiv_logger.verbose("Setscene task %s became valid" % tid) if harddepfail: self.sq_task_failoutright(tid) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 0357b54..8bfc452 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -607,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object): method = method + self.extramethod[tid] data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) - hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) + hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) if data is None: bb.warn("Server unable to handle unihash report") @@ -616,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object): finalunihash = data['unihash'] if finalunihash == current_unihash: - hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash %s unchanged by server' % (tid, finalunihash)) elif finalunihash == wanted_unihash: - hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) + hashequiv_logger.verbose('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) self.set_unihash(tid, finalunihash) return True else: # TODO: What to do here? - hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:02 +0000 Subject: [oe-commits] [bitbake] 02/07: bitbake-user-manual: Add documentation for BB_LOGCONFIG In-Reply-To: <158402040058.2011.4878192953742999803@git.openembedded.org> References: <158402040058.2011.4878192953742999803@git.openembedded.org> Message-ID: <20200312134000.CD3612335FC@git.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 162df5b5a2fa142c6d5255b73573b97a68432153 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:53 2020 -0500 bitbake-user-manual: Add documentation for BB_LOGCONFIG Adds documentation describing how to use the BB_LOGCONFIG variable to enable custom logging. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- .../bitbake-user-manual-execution.xml | 97 ++++++++++++++++++++++ .../bitbake-user-manual-ref-variables.xml | 11 +++ 2 files changed, 108 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml index 8f60667..3b31f74 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml @@ -929,4 +929,101 @@ section. + +
+ Logging + + In addition to the standard command line option to control how + verbose builds are when execute, bitbake also supports user defined + configuration of the + Python logging + facilities through the + BB_LOGCONFIG + variable. This variable defines a json or yaml + logging configuration + that will be intelligently merged into the default configuration. + The logging configuration is merged using the following rules: + + + The user defined configuration will completely replace the default + configuration if top level key + bitbake_merge is set to the value + False. In this case, all other rules + are ignored. + + + The user configuration must have a top level + version which must match the value of + the default configuration. + + + Any keys defined in the handlers, + formatters, or filters, + will be merged into the same section in the default + configuration, with the user specified keys taking + replacing a default one if there is a conflict. In + practice, this means that if both the default configuration + and user configuration specify a handler named + myhandler, the user defined one will + replace the default. To prevent the user from inadvertently + replacing a default handler, formatter, or filter, all of + the default ones are named with a prefix of + "BitBake." + + + If a logger is defined by the user with the key + bitbake_merge set to + False, that logger will be completely + replaced by user configuration. In this case, no other + rules will apply to that logger. + + + All user defined filter and + handlers properties for a given logger + will be merged with corresponding properties from the + default logger. For example, if the user configuration adds + a filter called myFilter to the + BitBake.SigGen, and the default + configuration adds a filter called + BitBake.defaultFilter, both filters + will be applied to the logger + + + + + + As an example, consider the following user logging configuration + file which logs all Hash Equivalence related messages of VERBOSE or + higher to a file called hashequiv.log + + { + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "hashequiv.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } + } + + +
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 bae01d9..c4bd1f2 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml @@ -539,6 +539,17 @@ + BB_LOGCONFIG + + + Specifies the name of a config file that contains the user + logging configuration. See + Logging for additional + information + + + + BB_LOGFMT -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:03 +0000 Subject: [oe-commits] [bitbake] 03/07: bitbake: knotty: Add logging cleanup In-Reply-To: <158402040058.2011.4878192953742999803@git.openembedded.org> References: <158402040058.2011.4878192953742999803@git.openembedded.org> Message-ID: <20200312134000.D9F932335FD@git.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 47ba09b47c7b1d4afc8394dd390fad23986bfad9 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:44 2020 -0500 bitbake: knotty: Add logging cleanup Adds code to close all loggers when bitbake exits. This prevents unclosed file ResourceWarnings. A form of this closing existed previously, but was removed in the new logging code. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 11 +++++++++++ lib/bb/ui/knotty.py | 2 ++ 2 files changed, 13 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 6259af0..0564573 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -320,3 +320,14 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): # TODO: I don't think that setting the global log level should be necessary #if newlevel < bb.msg.loggerDefaultLogLevel: # bb.msg.loggerDefaultLogLevel = newlevel + +def cleanupLogging(): + # Iterate through all the handlers and close them if possible. Fixes + # 'Unclosed resource' warnings when bitbake exits, see + # https://bugs.python.org/issue23010 + handlers = set() + for logger_iter in logging.Logger.manager.loggerDict.keys(): + handlers.update(logging.getLogger(logger_iter).handlers) + + for h in handlers: + h.close() diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 386f278..695108a 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -823,4 +823,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass + bb.msg.cleanupLogging() + return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:04 +0000 Subject: [oe-commits] [bitbake] 04/07: bitbake: msg: Add helper to merge logging configs In-Reply-To: <158402040058.2011.4878192953742999803@git.openembedded.org> References: <158402040058.2011.4878192953742999803@git.openembedded.org> Message-ID: <20200312134000.E80F52335FE@git.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 b7d5d1011eed2c1e4b907605d41408d37031b924 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:45 2020 -0500 bitbake: msg: Add helper to merge logging configs Adds a function that can be used by UI front ends to merge logging configuration fragments. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 89 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 0564573..582165d 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -229,6 +229,53 @@ def has_console_handler(logger): return True return False +def mergeLoggingConfig(logconfig, userconfig): + logconfig = copy.deepcopy(logconfig) + userconfig = copy.deepcopy(userconfig) + + # Merge config with the default config + if userconfig.get('version') != logconfig['version']: + raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) + + # Set some defaults to make merging easier + userconfig.setdefault("loggers", {}) + + # If a handler, formatter, or filter is defined in the user + # config, it will replace an existing one in the default config + for k in ("handlers", "formatters", "filters"): + logconfig.setdefault(k, {}).update(userconfig.get(k, {})) + + seen_loggers = set() + for name, l in logconfig["loggers"].items(): + # If the merge option is set, merge the handlers and + # filters. Otherwise, if it is False, this logger won't get + # add to the set of seen loggers and will replace the + # existing one + if l.get('bitbake_merge', True): + ulogger = userconfig["loggers"].setdefault(name, {}) + ulogger.setdefault("handlers", []) + ulogger.setdefault("filters", []) + + # Merge lists + l.setdefault("handlers", []).extend(ulogger["handlers"]) + l.setdefault("filters", []).extend(ulogger["filters"]) + + # Replace other properties if present + if "level" in ulogger: + l["level"] = ulogger["level"] + + if "propagate" in ulogger: + l["propagate"] = ulogger["propagate"] + + seen_loggers.add(name) + + # Add all loggers present in the user config, but not any that + # have already been processed + for name in set(userconfig["loggers"].keys()) - seen_loggers: + logconfig["loggers"][name] = userconfig["loggers"][name] + + return logconfig + def setLoggingConfig(defaultconfig, userconfigfile=None): logconfig = copy.deepcopy(defaultconfig) @@ -244,47 +291,7 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): raise BaseException("Unrecognized file format: %s" % userconfigfile) if userconfig.get('bitbake_merge', True): - # Merge config with the default config - if userconfig.get('version') != logconfig['version']: - raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) - - # Set some defaults to make merging easier - userconfig.setdefault("loggers", {}) - - # If a handler, formatter, or filter is defined in the user - # config, it will replace an existing one in the default config - for k in ("handlers", "formatters", "filters"): - logconfig.setdefault(k, {}).update(userconfig.get(k, {})) - - seen_loggers = set() - for name, l in logconfig["loggers"].items(): - # If the merge option is set, merge the handlers and - # filters. Otherwise, if it is False, this logger won't get - # add to the set of seen loggers and will replace the - # existing one - if l.get('bitbake_merge', True): - ulogger = userconfig["loggers"].setdefault(name, {}) - ulogger.setdefault("handlers", []) - ulogger.setdefault("filters", []) - - # Merge lists - l.setdefault("handlers", []).extend(ulogger["handlers"]) - l.setdefault("filters", []).extend(ulogger["filters"]) - - # Replace other properties if present - if "level" in ulogger: - l["level"] = ulogger["level"] - - if "propagate" in ulogger: - l["propagate"] = ulogger["propagate"] - - seen_loggers.add(name) - - # Add all loggers present in the user config, but not any that - # have already been processed - for name in set(userconfig["loggers"].keys()) - seen_loggers: - logconfig["loggers"][name] = userconfig["loggers"][name] - + logconfig = mergeLoggingConfig(logconfig, userconfig) else: # Replace the entire default config logconfig = userconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:05 +0000 Subject: [oe-commits] [bitbake] 05/07: bitbake: runqueue: Lower setscene complete logging level In-Reply-To: <158402040058.2011.4878192953742999803@git.openembedded.org> References: <158402040058.2011.4878192953742999803@git.openembedded.org> Message-ID: <20200312134001.1AA21233600@git.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 242ef2c410e6493821334fd78b5c542b897d13e8 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:47 2020 -0500 bitbake: runqueue: Lower setscene complete logging level Lowers the level of the log message when setscene tasks have completed. This message can occur multiple times when hash equivalence is enabled, since the runqueue switches between executing setscene tasks and normal tasks. Since this is primarily of use when debugging hash equivalence, use the hash equivalence logger at VERBOSE level. [YOCTO #13813] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index cef9b0f..16f076f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2059,7 +2059,7 @@ class RunQueueExecute: self.update_holdofftasks() if not self.sq_live and not self.sqdone and not self.sq_deferred and not self.updated_taskhash_queue and not self.holdoff_tasks: - logger.info("Setscene tasks completed") + hashequiv_logger.verbose("Setscene tasks completed") err = self.summarise_scenequeue_errors() if err: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:06 +0000 Subject: [oe-commits] [bitbake] 06/07: bitbake: Add autobuilder logging configuration In-Reply-To: <158402040058.2011.4878192953742999803@git.openembedded.org> References: <158402040058.2011.4878192953742999803@git.openembedded.org> Message-ID: <20200312134001.38C0E233601@git.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 47d323fd226a1f1a713b0f29bf98279ed783daf6 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:51 2020 -0500 bitbake: Add autobuilder logging configuration Adds a configuration file that the autobuilder can use to capture interesting logging domains above the ones that show up for normal users on stdout/stderr. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- contrib/autobuilderlog.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/contrib/autobuilderlog.json b/contrib/autobuilderlog.json new file mode 100644 index 0000000..103a114 --- /dev/null +++ b/contrib/autobuilderlog.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "autobuilder.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 13:40:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 13:40:07 +0000 Subject: [oe-commits] [bitbake] 07/07: bitbake: knotty: Update hash equivalence logging In-Reply-To: <158402040058.2011.4878192953742999803@git.openembedded.org> References: <158402040058.2011.4878192953742999803@git.openembedded.org> Message-ID: <20200312134001.491B9233603@git.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 fc726ebbc53be0387a1ce8290fecd547b5643173 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:46 2020 -0500 bitbake: knotty: Update hash equivalence logging Updates hash equivalence logging so that the interesting VERBOSE messages are always logged to the consolelog file so that issues in individual user builds can be diagnosed. The autobuilder logging config then updates this so that they also are shown on stdout, since the consolelog file is not capture there. In order to facilitate this, 2 new logging handlers were added, "BitBake.verbconsole" and "BitBake.verbconsolelog". Neither of these handlers are attached to anything by default, but they will log any messages that wouldn't otherwise be logged by the normal console or consolelog handlers. Users can attach whatever loggers the desire to this handler to get them to appear on the console or in the consolelog, as demonstrated by the autobuilderlog.json file. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- contrib/autobuilderlog.json | 18 ++---------- lib/bb/ui/knotty.py | 68 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/contrib/autobuilderlog.json b/contrib/autobuilderlog.json index 103a114..193a675 100644 --- a/contrib/autobuilderlog.json +++ b/contrib/autobuilderlog.json @@ -1,27 +1,13 @@ { "version": 1, - "handlers": { - "autobuilderlog": { - "class": "logging.FileHandler", - "formatter": "logfileFormatter", - "level": "DEBUG", - "filename": "autobuilder.log", - "mode": "w" - } - }, - "formatters": { - "logfileFormatter": { - "format": "%(name)s: %(levelname)s: %(message)s" - } - }, "loggers": { "BitBake.SigGen.HashEquiv": { "level": "VERBOSE", - "handlers": ["autobuilderlog"] + "handlers": ["BitBake.verbconsole"] }, "BitBake.RunQueue.HashEquiv": { "level": "VERBOSE", - "handlers": ["autobuilderlog"] + "handlers": ["BitBake.verbconsole"] } } } diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 695108a..24b7a77 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -419,6 +419,18 @@ def main(server, eventHandler, params, tf = TerminalFilter): "stream": "ext://sys.stderr", "filters": ["BitBake.stderrFilter"], }, + # This handler can be used if specific loggers should print on + # the console at a lower severity than the default. It will + # display any messages sent to it that are lower than then + # BitBake.console logging level (so as to prevent duplication of + # messages). Nothing is attached to this handler by default + "BitBake.verbconsole": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": 1, + "stream": "ext://sys.stdout", + "filters": ["BitBake.verbconsoleFilter"], + }, }, "formatters": { # This format instance will get color output enabled by the @@ -442,7 +454,11 @@ def main(server, eventHandler, params, tf = TerminalFilter): "BitBake.stderrFilter": { "()": "bb.msg.LogFilterGEQLevel", "level": "ERROR" - } + }, + "BitBake.verbconsoleFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": console_loglevel + }, }, "loggers": { "BitBake": { @@ -455,13 +471,49 @@ def main(server, eventHandler, params, tf = TerminalFilter): # Enable the console log file if enabled if consolelogfile and not params.options.show_environment and not params.options.show_versions: - logconfig["handlers"]["BitBake.consolelog"] ={ - "class": "logging.FileHandler", - "formatter": "BitBake.logfileFormatter", - "level": "INFO", - "filename": consolelogfile, - } - logconfig["loggers"]["BitBake"]["handlers"].append("BitBake.consolelog") + logconfig = bb.msg.mergeLoggingConfig(logconfig, { + "version": 1, + "handlers" : { + "BitBake.consolelog": { + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": loglevel, + "filename": consolelogfile, + }, + # Just like verbconsole, anything sent here will go to the + # log file, unless it would go to BitBake.consolelog + "BitBake.verbconsolelog" : { + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": 1, + "filename": consolelogfile, + "filters": ["BitBake.verbconsolelogFilter"], + }, + }, + "filters": { + "BitBake.verbconsolelogFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": loglevel, + }, + }, + "loggers": { + "BitBake": { + "handlers": ["BitBake.consolelog"], + }, + + # Other interesting things that we want to keep an eye on + # in the log files in case someone has an issue, but not + # necessarily show to the user on the console + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["BitBake.verbconsolelog"], + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["BitBake.verbconsolelog"], + } + } + }) bb.utils.mkdirhier(os.path.dirname(consolelogfile)) loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 15:38:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 15:38:29 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (ebcd510 -> a12959c) Message-ID: <158402750985.11563.5378904104668826089@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 ebcd510 python3-pycryptodomex: add 3.9.4 recipe new dc426d1 xfce4-clipman-plugin: upgrade 1.4.3 -> 1.4.4 new 2145fad xfce4-whiskermenu-plugin: upgrade 2.4.2 -> 2.4.3 new a12959c xfce4-power-manager: upgrade 1.6.5 -> 1.6.6 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: .../{xfce4-clipman-plugin_1.4.3.bb => xfce4-clipman-plugin_1.4.4.bb} | 4 ++-- ...-whiskermenu-plugin_2.4.2.bb => xfce4-whiskermenu-plugin_2.4.3.bb} | 4 ++-- .../{xfce4-power-manager_1.6.5.bb => xfce4-power-manager_1.6.6.bb} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.4.3.bb => xfce4-clipman-plugin_1.4.4.bb} (76%) rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.4.2.bb => xfce4-whiskermenu-plugin_2.4.3.bb} (66%) rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.5.bb => xfce4-power-manager_1.6.6.bb} (89%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 15:38:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 15:38:30 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: xfce4-clipman-plugin: upgrade 1.4.3 -> 1.4.4 In-Reply-To: <158402750985.11563.5378904104668826089@git.openembedded.org> References: <158402750985.11563.5378904104668826089@git.openembedded.org> Message-ID: <20200312153830.425692335FC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dc426d114909fc3755fc792689b74171e7572f94 Author: Andreas M?ller AuthorDate: Thu Mar 12 15:21:38 2020 +0100 xfce4-clipman-plugin: upgrade 1.4.3 -> 1.4.4 Release notes for 1.4.4 ======================= This is a bugfix release. - settings: Improve layout - settings: Drop some GtkStock items - Update support URLs from goodies to docs.xfce.org (Bug #16141) - Drop deprecated Gtk style properties - Also show desktop file in Cinnamon (Bug #14058) - Fix getting modifier in gsd-clipboard-manager (Bug #14642) - Fix typo - Translation Updates: Albanian, Armenian (Armenia), Belarusian, Catalan, Chinese (China), Czech, Danish, Finnish, French, Galician, Hebrew, Icelandic, Italian, Kazakh, Norwegian Bokm?l, Polish, Portuguese, Slovak, Slovenian, Spanish, Turkish, Ukrainian Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../{xfce4-clipman-plugin_1.4.3.bb => xfce4-clipman-plugin_1.4.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.4.bb similarity index 76% rename from meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb rename to meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.4.bb index a1ac057..1648950 100644 --- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.3.bb +++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.4.bb @@ -8,8 +8,8 @@ inherit xfce-panel-plugin DEPENDS += "xfconf xorgproto libxtst" -SRC_URI[md5sum] = "fa0acd5f5e3298e56ebd47d2944cd02b" -SRC_URI[sha256sum] = "29cdb85efb54bd5c9c04cc695b7c4914d6dff972b9fd969cbfb5504e9c632ad2" +SRC_URI[md5sum] = "104c917ef53a66f7aa2dca01b43c3b77" +SRC_URI[sha256sum] = "08e14c5d0fcee9adb4bc77efc0ab4af2b12b3fe1ee5e2121fc60e877ac9c29a0" PACKAGECONFIG ??= "" PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 15:38:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 15:38:32 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: xfce4-power-manager: upgrade 1.6.5 -> 1.6.6 In-Reply-To: <158402750985.11563.5378904104668826089@git.openembedded.org> References: <158402750985.11563.5378904104668826089@git.openembedded.org> Message-ID: <20200312153830.5E0B42335FE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a12959c75ecb8f5d66e29d26a3987fc481d992c3 Author: Andreas M?ller AuthorDate: Thu Mar 12 15:21:40 2020 +0100 xfce4-power-manager: upgrade 1.6.5 -> 1.6.6 Release notes for 1.6.6 ======================= - Dismiss critical notification when connecting to AC - Fix inhibiting xfce4-screensaver (Bug #16364) - settings: Move % sign out of spinbutton (Bug #15994) - panel-plugin: Toggle presentation mode on middle click - panel-plugin: Properly show 'About' menu item - panel-plugin: Add missing about callback - panel-plugin: Properly hook up about signal - panel-plugin: Replace deprecated call - Switch to symbolic window-close icons Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../{xfce4-power-manager_1.6.5.bb => xfce4-power-manager_1.6.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb similarity index 89% rename from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb rename to meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb index 295e2e4..608990a 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.5.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.6.bb @@ -11,8 +11,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[md5sum] = "709efbc2de9ed84b4831847ff70bcd7f" -SRC_URI[sha256sum] = "10adb67899b181ca5fc577fc9bb7a698fb94e42073585f7e2be642c7db127a74" +SRC_URI[md5sum] = "19873fc8a6de5e37ed57036a0002a5ce" +SRC_URI[sha256sum] = "1b7bf0d3e8af69b10f7b6a518451e01fc7888e0d9d360bc33f6c89179bb6080b" EXTRA_OECONF = " \ --enable-network-manager \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 15:38:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 15:38:31 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: xfce4-whiskermenu-plugin: upgrade 2.4.2 -> 2.4.3 In-Reply-To: <158402750985.11563.5378904104668826089@git.openembedded.org> References: <158402750985.11563.5378904104668826089@git.openembedded.org> Message-ID: <20200312153830.4E9E92335FD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2145fad9e51a6a5c89c5cefb458c372d00aaebc9 Author: Andreas M?ller AuthorDate: Thu Mar 12 15:21:39 2020 +0100 xfce4-whiskermenu-plugin: upgrade 2.4.2 -> 2.4.3 Release notes for 2.4.3 ======================= - Fix loading incorrect icons for some applications. (bug #16461) - Translation updates: Bulgarian, Finnish, Greek, Icelandic, Interlingue, Nepali, Norwegian Bokmal, Russian, Slovak. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...-whiskermenu-plugin_2.4.2.bb => xfce4-whiskermenu-plugin_2.4.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb similarity index 66% rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb index 25fc72d..3da631b 100644 --- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.2.bb +++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake -SRC_URI[md5sum] = "f553d3be2ffebd8d9fa5b6415647e4ff" -SRC_URI[sha256sum] = "fb2e1d44744d851c5339900e7af9068397028efa9ee5235a66ab273e95740dee" +SRC_URI[md5sum] = "7b66438996127b759ad634f6579e003c" +SRC_URI[sha256sum] = "39faeee91ceb3cb727f9de09dbf20a8c73e524851a2c3b76a4b19a0732de5ff0" RRECOMMENDS_${PN} += "menulibre" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 16:58:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 16:58:03 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: nodejs: install gen-regexp-special-case only when icu is enabled Message-ID: <158403228377.13748.16471709072212763692@git.openembedded.org> 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 e331ce0 nodejs: install gen-regexp-special-case only when icu is enabled e331ce0 is described below commit e331ce08e417859a7e8028cd691a6674cf6ed1d9 Author: Jaga AuthorDate: Thu Mar 12 15:49:21 2020 +0000 nodejs: install gen-regexp-special-case only when icu is enabled Fixes install errors when icu packageconfig is disabled Signed-off-by: Jaga Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 4 +++- 1 file changed, 3 insertions(+), 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 1ea438c..a482c6b 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb @@ -138,7 +138,9 @@ do_install_append_class-native() { install -d ${D}${bindir} install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator - install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case + if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then + install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case + fi install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:17 +0000 Subject: [oe-commits] [openembedded-core] 01/12: babletrace2: make manpages multilib identical In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.1E9D1233600@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 67d38c62b4a02a1ee1b6d751fa0f2483dafa2fb1 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:22:48 2020 -0700 babletrace2: make manpages multilib identical Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-Make-manpages-multilib-identical.patch | 28 ++++++++++++++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 29 insertions(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch new file mode 100644 index 0000000..2401b17 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch @@ -0,0 +1,28 @@ +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Mon, 9 Mar 2020 21:10:35 +0000 +Subject: [PATCH] Make manpages multilib identical + +Upstream-Status: Pending +Signed-off-by: Jeremy Puhlman +--- + doc/man/asciidoc-attrs.conf.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in +index ad1183f1..e11c7031 100644 +--- a/doc/man/asciidoc-attrs.conf.in ++++ b/doc/man/asciidoc-attrs.conf.in +@@ -1,7 +1,7 @@ + [attributes] + # default values +-system_plugin_path="@LIBDIR@/babeltrace2/plugins" +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers" ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins" ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers" + babeltrace_version="@PACKAGE_VERSION@" + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@" + defrdport=5344 +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 16953d6..61bc7f5 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \ file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + file://0001-Make-manpages-multilib-identical.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:18 +0000 Subject: [oe-commits] [openembedded-core] 02/12: glib-2.0: Correct multilib conflict In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.2BF11233601@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c82076d68bc95b6f9e3f125bba44b4dbaee444bf Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:22:49 2020 -0700 glib-2.0: Correct multilib conflict Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 23c347d..edecc51 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -128,6 +128,9 @@ do_install_append_class-target () { rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test fi fi + if test "x${MLPREFIX}" != "x"; then + mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test + fi } # As we do not build python3 for windows, makes no sense to ship the script that's using it -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:16 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (d3af3cf -> 5ea3d9d) Message-ID: <158405353671.19829.5365165219011413654@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 d3af3cf curl: upgrade 7.69.0 -> 7.69.1 new 67d38c6 babletrace2: make manpages multilib identical new c82076d glib-2.0: Correct multilib conflict new 9e2db0a strace: Fix reproducibility issues new e8e5765 qemu: Fix reproducibilty issues new c4f6b04 ltp: fix reproducibilty issues new d5b051c gtk-doc: Fix reproducibity issues new 132c7ec dnf: fix reproducibilty issue new e12caa8 boost: fix reproducibilty issues new 43f4061 weston-init: Allow use of weston without input devices new 9d8edf3 oeqa: enable testresults.json for testexport new 1b98db3 babeltrace2: initialize the other_entry pointer new 5ea3d9d qemu: fix CVE-2020-7039 The 12 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 | 30 +++++++++- meta/lib/oeqa/core/runner.py | 13 ++++- meta/recipes-core/glib-2.0/glib.inc | 3 + ...001-set-python-path-for-completion_helper.patch | 24 ++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + meta/recipes-devtools/qemu/qemu.inc | 5 ++ .../qemu/qemu/CVE-2020-7039-1.patch | 44 +++++++++++++++ .../qemu/qemu/CVE-2020-7039-2.patch | 59 ++++++++++++++++++++ .../qemu/qemu/CVE-2020-7039-3.patch | 64 ++++++++++++++++++++++ .../0001-strace-fix-reproducibilty-issues.patch | 39 +++++++++++++ meta/recipes-devtools/strace/strace_5.5.bb | 1 + meta/recipes-extended/ltp/ltp_20200120.bb | 6 ++ meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 12 ++++ .../wayland/weston-init/weston.ini | 3 +- .../0001-Make-manpages-multilib-identical.patch | 28 ++++++++++ .../0001-fs.c-initialize-other_entry.patch | 33 +++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 2 + meta/recipes-support/boost/boost.inc | 5 ++ 18 files changed, 367 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch create mode 100644 meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:19 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:19 +0000 Subject: [oe-commits] [openembedded-core] 03/12: strace: Fix reproducibility issues In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.3B3F9233603@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9e2db0ab1d4cacedde59e8915dff9a091e1c2d2b Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:41 2020 -0700 strace: Fix reproducibility issues gen_tests script encodes its full path to itself in each script Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- .../0001-strace-fix-reproducibilty-issues.patch | 39 ++++++++++++++++++++++ meta/recipes-devtools/strace/strace_5.5.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch new file mode 100644 index 0000000..c4c176e --- /dev/null +++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch @@ -0,0 +1,39 @@ +From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 19:56:55 +0000 +Subject: [PATCH] strace: fix reproducibilty issues + +The full path to the gen_tests.sh script is encoded in the tests + +Upstream-Status: Pending + +Signed-off-by: Jeremy Puhlman +--- + tests/gen_tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 5e1e7c9..1e65eac 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh +@@ -46,7 +46,7 @@ while read -r name arg0 args; do { + + hdr="\ + #!/bin/sh -efu +-# Generated by $0 from $input ($name $arg0 $args); do not edit." ++# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit." + + case "$arg0" in + +*) +@@ -80,7 +80,7 @@ while read -r name arg0 args; do { + + if [ -n "$names" ]; then + { +- printf '# Generated by %s from %s; do not edit.\n' "$0" "$input" ++ printf '# Generated by %s from %s; do not edit.\n' "$(basename $0)" "$input" + printf 'GEN_TESTS =' + printf ' %s.gen.test' $names + echo +-- +2.24.1 + diff --git a/meta/recipes-devtools/strace/strace_5.5.bb b/meta/recipes-devtools/strace/strace_5.5.bb index 6e7d639..ae552da 100644 --- a/meta/recipes-devtools/strace/strace_5.5.bb +++ b/meta/recipes-devtools/strace/strace_5.5.bb @@ -13,6 +13,7 @@ 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://0001-strace-fix-reproducibilty-issues.patch \ " SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:24 +0000 Subject: [oe-commits] [openembedded-core] 08/12: boost: fix reproducibilty issues In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.82CED233608@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e12caa834bef6b5d0cad7e96f79374a0dbf86aea Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:46 2020 -0700 boost: fix reproducibilty issues fix cmake file references of image dir path Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index e15dce4..8eb9494 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -202,6 +202,11 @@ do_install() { fi done + # Cmake files reference full paths to image + find ${D}${libdir}/cmake -type f | \ + grep 'cmake$' | \ + xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i + } 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 Mar 12 22:52:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:20 +0000 Subject: [oe-commits] [openembedded-core] 04/12: qemu: Fix reproducibilty issues In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.4BD57233604@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit e8e5765cf2ad324a84634877eebc8289f1bc934f Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:42 2020 -0700 qemu: Fix reproducibilty issues tests/qemu-iotests/common.env is generated from configure which we pass ${HOSTTOOLS_DIR}/python3 as our python to use, which gets copied into the ptests. Correct python3 path. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index f3342ea..e6dbc6d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -56,6 +56,8 @@ do_install_ptest() { # Don't check the file genreated by configure sed -i -e '/wildcard config-host.mak/d' \ -e '$ {/endif/d}' ${D}${PTEST_PATH}/tests/Makefile.include + sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env } # QEMU_TARGETS is overridable variable -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:21 +0000 Subject: [oe-commits] [openembedded-core] 05/12: ltp: fix reproducibilty issues In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.58D12233605@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit c4f6b04450ef658d99c0d15f3ce9058c4a770152 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:43 2020 -0700 ltp: fix reproducibilty issues Man pages are copied in to the target filesystem from the configured build, which leaks paths in to the work directory Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-extended/ltp/ltp_20200120.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 5be9489..3e6cbc6 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -68,6 +68,12 @@ do_install(){ # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases + + # Makefile were configured in the build system + find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*--sysroot=[^ "]*@@g' } RDEPENDS_${PN} = "\ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:22 +0000 Subject: [oe-commits] [openembedded-core] 06/12: gtk-doc: Fix reproducibity issues In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.65850233606@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit d5b051cb9226a3c6b75f1e72a946e5f4e920d9a5 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:44 2020 -0700 gtk-doc: Fix reproducibity issues path to pkg-config and python3 encoded in scripts Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb index 50d4d99..b508e62 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.32.bb @@ -36,6 +36,17 @@ do_configure_prepend() { sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac } +do_install_append () { + # configure values for python3 and pkg-config encoded in scripts + for fn in ${bindir}/gtkdoc-depscan \ + ${bindir}/gtkdoc-mkhtml2 \ + ${datadir}/gtk-doc/python/gtkdoc/config.py; do + sed -e 's,${RECIPE_SYSROOT_NATIVE}/usr/bin/pkg-config,${bindir}/pkg-config,' \ + -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ + -i ${D}$fn + done +} + FILES_${PN} += "${datadir}/sgml" FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-doc = "" @@ -48,3 +59,4 @@ gtkdoc_makefiles_sysroot_preprocess() { -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make } + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:23 +0000 Subject: [oe-commits] [openembedded-core] 07/12: dnf: fix reproducibilty issue In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.72910233607@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 132c7ecd13955b20141fa01241f47753af60cb77 Author: Jeremy Puhlman AuthorDate: Wed Mar 11 15:25:45 2020 -0700 dnf: fix reproducibilty issue Script points to native python3 Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- ...001-set-python-path-for-completion_helper.patch | 24 ++++++++++++++++++++++ meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 + 2 files changed, 25 insertions(+) diff --git a/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch new file mode 100644 index 0000000..448f640 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch @@ -0,0 +1,24 @@ +From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 22:10:02 +0000 +Subject: [PATCH] set python path for completion_helper + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + dnf/cli/completion_helper.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in +index 351226759..2835cd3b6 100644 +--- a/dnf/cli/completion_helper.py.in ++++ b/dnf/cli/completion_helper.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/usr/bin/env python3 + # + # This file is part of dnf. + # +-- +2.23.0 + diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.2.bb index 5244e10..a046ffc 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0030-Run-python-scripts-using-env.patch \ file://Fix-SyntaxWarning.patch \ + file://0001-set-python-path-for-completion_helper.patch \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:25 +0000 Subject: [oe-commits] [openembedded-core] 09/12: weston-init: Allow use of weston without input devices In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.905CF23361B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 43f40613ecedb8c3a9e3aaac0630464efc7525e3 Author: Domarys Correa AuthorDate: Wed Mar 11 13:52:21 2020 -0300 weston-init: Allow use of weston without input devices Don't force users to have input device in your targets. As the default option require-input is set to true, Weston only starts if we have a device in /dev/input/event* and this not a requirement for all applications, e.g. kiosk browser. Signed-off-by: Domarys Correa Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init/weston.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init/weston.ini b/meta/recipes-graphics/wayland/weston-init/weston.ini index 1eecf48..1e6dff6 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston.ini +++ b/meta/recipes-graphics/wayland/weston-init/weston.ini @@ -1,9 +1,10 @@ # configuration file for Weston -#[core] +[core] #modules=xwayland.so,cms-colord.so #shell=desktop-shell.so #gbm-format=xrgb2101010 +require-input=false #[shell] #background-image=/usr/share/backgrounds/gnome/Aqua.jpg -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:28 +0000 Subject: [oe-commits] [openembedded-core] 12/12: qemu: fix CVE-2020-7039 In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.BCFAE233600@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 5ea3d9d83ed695827634e3216664c13fcff6d48a Author: Changqing Li AuthorDate: Thu Feb 27 13:25:46 2020 +0800 qemu: fix CVE-2020-7039 Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-devtools/qemu/qemu.inc | 3 + .../qemu/qemu/CVE-2020-7039-1.patch | 44 +++++++++++++++ .../qemu/qemu/CVE-2020-7039-2.patch | 59 ++++++++++++++++++++ .../qemu/qemu/CVE-2020-7039-3.patch | 64 ++++++++++++++++++++++ 4 files changed, 170 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index e6dbc6d..3ce14d9 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -30,6 +30,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ file://CVE-2019-15890.patch \ file://CVE-2020-1711.patch \ + file://CVE-2020-7039-1.patch \ + file://CVE-2020-7039-2.patch \ + file://CVE-2020-7039-3.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch new file mode 100644 index 0000000..df6bca6 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch @@ -0,0 +1,44 @@ +From b2663d527a1992ba98c0266458b21ada3b9d0d2e Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 12:07:35 +0800 +Subject: [PATCH] tcp_emu: Fix oob access + +The main loop only checks for one available byte, while we sometimes +need two bytes. + +CVE: CVE-2020-7039 +Upstream-Status: Backport +[https://gitlab.freedesktop.org/slirp/libslirp/commit/2655fffed7a9e765bcb4701dd876e9dab975f289] + +Signed-off-by: Changqing Li +--- + slirp/src/tcp_subr.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c +index d6dd133..4bea2d4 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -886,6 +886,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + break; + + case 5: ++ if (bptr == m->m_data + m->m_len - 1) ++ return 1; /* We need two bytes */ + /* + * The difference between versions 1.0 and + * 2.0 is here. For future versions of +@@ -901,6 +903,10 @@ int tcp_emu(struct socket *so, struct mbuf *m) + /* This is the field containing the port + * number that RA-player is listening to. + */ ++ ++ if (bptr == m->m_data + m->m_len - 1) ++ return 1; /* We need two bytes */ ++ + lport = (((uint8_t *)bptr)[0] << 8) + ((uint8_t *)bptr)[1]; + if (lport < 6970) + lport += 256; /* don't know why */ +-- +2.7.4 + diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch new file mode 100644 index 0000000..4a00fa2 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch @@ -0,0 +1,59 @@ +From 8f67e76e4148e37f3d8d2bcbdee7417fdedb7669 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 12:10:34 +0800 +Subject: [PATCH] slirp: use correct size while emulating commands + +While emulating services in tcp_emu(), it uses 'mbuf' size +'m->m_size' to write commands via snprintf(3). Use M_FREEROOM(m) +size to avoid possible OOB access. +Signed-off-by: default avatarPrasad J Pandit +Signed-off-by: Samuel Thibault's avatarSamuel Thibault + +Message-Id: <20200109094228.79764-3-ppandit at redhat.com> + +CVE: CVE-2020-7039 +Upstream-Status: Backport +[https://gitlab.freedesktop.org/slirp/libslirp/commit/82ebe9c370a0e2970fb5695aa19aa5214a6a1c80] + +Signed-off-by: Changqing Li +--- + slirp/src/tcp_subr.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c +index 4bea2d4..e8ed4ef 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -696,7 +696,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) + n4 = (laddr & 0xff); + + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += snprintf(bptr, m->m_size - m->m_len, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), + "ORT %d,%d,%d,%d,%d,%d\r\n%s", n1, n2, n3, n4, + n5, n6, x == 7 ? buff : ""); + return 1; +@@ -731,8 +731,7 @@ int tcp_emu(struct socket *so, struct mbuf *m) + n4 = (laddr & 0xff); + + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size - m->m_len, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), + "27 Entering Passive Mode (%d,%d,%d,%d,%d,%d)\r\n%s", + n1, n2, n3, n4, n5, n6, x == 7 ? buff : ""); + +@@ -758,8 +757,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + if (m->m_data[m->m_len - 1] == '\0' && lport != 0 && + (so = tcp_listen(slirp, INADDR_ANY, 0, so->so_laddr.s_addr, + htons(lport), SS_FACCEPTONCE)) != NULL) +- m->m_len = +- snprintf(m->m_data, m->m_size, "%d", ntohs(so->so_fport)) + 1; ++ m->m_len = snprintf(m->m_data, M_ROOM(m), ++ "%d", ntohs(so->so_fport)) + 1; + return 1; + + case EMU_IRC: +-- +2.7.4 + diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch new file mode 100644 index 0000000..70ce480 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch @@ -0,0 +1,64 @@ +From 0b03959b72036afce151783720d9e54988cf76ef Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 27 Feb 2020 12:15:04 +0800 +Subject: [PATCH] slirp: use correct size while emulating IRC commands + +While emulating IRC DCC commands, tcp_emu() uses 'mbuf' size +'m->m_size' to write DCC commands via snprintf(3). This may +lead to OOB write access, because 'bptr' points somewhere in +the middle of 'mbuf' buffer, not at the start. Use M_FREEROOM(m) +size to avoid OOB access. +Reported-by: default avatarVishnu Dev TJ +Signed-off-by: default avatarPrasad J Pandit +Reviewed-by: Samuel Thibault's avatarSamuel Thibault + +Message-Id: <20200109094228.79764-2-ppandit at redhat.com> + +CVE: CVE-2020-7039 +Upstream-Status: Backport +[https://gitlab.freedesktop.org/slirp/libslirp/commit/ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9] + +Signed-off-by: Changqing Li +--- + slirp/src/tcp_subr.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c +index e8ed4ef..3a4a8ee 100644 +--- a/slirp/src/tcp_subr.c ++++ b/slirp/src/tcp_subr.c +@@ -777,7 +777,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += snprintf(bptr, m->m_size, "DCC CHAT chat %lu %u%c\n", ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC CHAT chat %lu %u%c\n", + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), 1); + } else if (sscanf(bptr, "DCC SEND %256s %u %u %u", buff, &laddr, &lport, +@@ -787,8 +788,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size, "DCC SEND %s %lu %u %u%c\n", buff, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC SEND %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), n1, 1); + } else if (sscanf(bptr, "DCC MOVE %256s %u %u %u", buff, &laddr, &lport, +@@ -798,8 +799,8 @@ int tcp_emu(struct socket *so, struct mbuf *m) + return 1; + } + m->m_len = bptr - m->m_data; /* Adjust length */ +- m->m_len += +- snprintf(bptr, m->m_size, "DCC MOVE %s %lu %u %u%c\n", buff, ++ m->m_len += snprintf(bptr, M_FREEROOM(m), ++ "DCC MOVE %s %lu %u %u%c\n", buff, + (unsigned long)ntohl(so->so_faddr.s_addr), + ntohs(so->so_fport), n1, 1); + } +-- +2.7.4 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:26 +0000 Subject: [oe-commits] [openembedded-core] 10/12: oeqa: enable testresults.json for testexport In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.9D99823361C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 9d8edf33d1f5d89b310923b0aa3cc967317c7c49 Author: Stefan Kral AuthorDate: Wed Mar 11 17:37:30 2020 +0100 oeqa: enable testresults.json for testexport Add the option --json-result-dir to oeqa core context to enable testresults.json creation for test runs via testexport. Eg. oe-test runtime --json-result-dir . Signed-off-by: Stefan Kral Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/context.py | 30 +++++++++++++++++++++++++++++- meta/lib/oeqa/core/runner.py | 13 ++++++++++--- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 16320af..b9a28ce 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -116,6 +116,9 @@ class OETestContextExecutor(object): default=self.default_output_log, help="results output log, default: %s" % self.default_output_log) + self.parser.add_argument('--json-result-dir', action='store', + help="json result output dir, create testresults.json here if set") + group = self.parser.add_mutually_exclusive_group() group.add_argument('--run-tests', action='store', nargs='+', default=self.default_tests, @@ -178,6 +181,22 @@ class OETestContextExecutor(object): self.module_paths = args.CASES_PATHS + def _get_json_result_dir(self, args): + return args.json_result_dir + + def _get_configuration(self): + td = self.tc_kwargs['init']['td'] + configuration = {'TEST_TYPE': self.name, + 'MACHINE': td.get("MACHINE"), + 'DISTRO': td.get("DISTRO"), + 'IMAGE_BASENAME': td.get("IMAGE_BASENAME"), + 'DATETIME': td.get("DATETIME")} + return configuration + + def _get_result_id(self, configuration): + return '%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['IMAGE_BASENAME'], + configuration['MACHINE'], configuration['DATETIME']) + def _pre_run(self): pass @@ -196,7 +215,16 @@ class OETestContextExecutor(object): else: self._pre_run() rc = self.tc.runTests(**self.tc_kwargs['run']) - rc.logDetails() + + json_result_dir = self._get_json_result_dir(args) + if json_result_dir: + configuration = self._get_configuration() + rc.logDetails(json_result_dir, + configuration, + self._get_result_id(configuration)) + else: + rc.logDetails() + rc.logSummary(self.name) output_link = os.path.join(os.path.dirname(args.output_log), diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index f656e1a..1284295 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py @@ -319,10 +319,17 @@ class OETestResultJSONHelper(object): the_file.write(file_content) def dump_testresult_file(self, write_dir, configuration, result_id, test_result): - bb.utils.mkdirhier(write_dir) - lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) + try: + import bb + has_bb = True + bb.utils.mkdirhier(write_dir) + lf = bb.utils.lockfile(os.path.join(write_dir, 'jsontestresult.lock')) + except ImportError: + has_bb = False + os.makedirs(write_dir, exist_ok=True) test_results = self._get_existing_testresults_if_available(write_dir) test_results[result_id] = {'configuration': configuration, 'result': test_result} json_testresults = json.dumps(test_results, sort_keys=True, indent=4) self._write_file(write_dir, self.testresult_filename, json_testresults) - bb.utils.unlockfile(lf) + if has_bb: + bb.utils.unlockfile(lf) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:27 +0000 Subject: [oe-commits] [openembedded-core] 11/12: babeltrace2: initialize the other_entry pointer In-Reply-To: <158405353671.19829.5365165219011413654@git.openembedded.org> References: <158405353671.19829.5365165219011413654@git.openembedded.org> Message-ID: <20200312225217.B02712335FE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1b98db372a1fdaecf9bb897b0ee4b2e72af22f81 Author: Mingli Yu AuthorDate: Wed Mar 11 21:49:33 2020 +0800 babeltrace2: initialize the other_entry pointer When add below line to local.conf to enable debug build: DEBUG_BUILD = "1" There comes below failure when run "bitbake babeltrace2" | ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': | ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] | 702 | !ds_index_entries_equal(entry, other_entry)) { So initialize the other_entry pointer to fix the above error. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie --- .../0001-fs.c-initialize-other_entry.patch | 33 ++++++++++++++++++++++ meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb | 1 + 2 files changed, 34 insertions(+) diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch new file mode 100644 index 0000000..b56b3bd --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-fs.c-initialize-other_entry.patch @@ -0,0 +1,33 @@ +From 42dae692b9057d03ce9a0651f061472e9dd90130 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 11 Mar 2020 08:44:42 +0000 +Subject: [PATCH] fs.c: initialize the other_entry variable + +Initialize the pointer other_entry to fix the below error: +| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted': +| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized] +| 702 | !ds_index_entries_equal(entry, other_entry)) { + +Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2020-March/029549.html] + +Signed-off-by: Mingli Yu +--- + src/plugins/ctf/fs-src/fs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c +index e87523a3..a6b5315f 100644 +--- a/src/plugins/ctf/fs-src/fs.c ++++ b/src/plugins/ctf/fs-src/fs.c +@@ -680,7 +680,7 @@ void ds_index_insert_ds_index_entry_sorted( + struct ctf_fs_ds_index_entry *entry) + { + guint i; +- struct ctf_fs_ds_index_entry *other_entry; ++ struct ctf_fs_ds_index_entry *other_entry = NULL; + + /* Find the spot where to insert this index entry. */ + for (i = 0; i < index->entries->len; i++) { +-- +2.24.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb index 61bc7f5..e71ac1a 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb @@ -11,6 +11,7 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 file://run-ptest \ file://0001-tests-do-not-run-test-applications-from-.libs.patch \ file://0001-Make-manpages-multilib-identical.patch \ + file://0001-fs.c-initialize-other_entry.patch \ " SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:37 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (6b8ec5a -> 439a6d1) Message-ID: <158405355714.20449.12926044835546550965@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 6b8ec5a scripts/oe-buildenv-internal: Add BB_LOGCONFIG discard d485e77 fixup discard 002f99c babeltrace2: initialize the other_entry pointer discard da1611a oeqa: enable testresults.json for testexport discard 6d522f2 weston-init: Allow use of weston without input devices discard c7d155d boost: fix reproducibilty issues discard 81a181a dnf: fix reproducibilty issue discard 7270d6b gtk-doc: Fix reproducibity issues discard dde53e5 ltp: fix reproducibilty issues discard e69a9d8 qemu: Fix reproducibilty issues discard 96ad3231 strace: Fix reproducibility issues discard 6cedaf0 glib-2.0: Correct multilib conflict discard c83046a babletrace2: make manpages multilib identical discard 07b7e38 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard edabeb8 HACK: signing: Add extra test debug add 67d38c6 babletrace2: make manpages multilib identical add c82076d glib-2.0: Correct multilib conflict add 9e2db0a strace: Fix reproducibility issues add e8e5765 qemu: Fix reproducibilty issues add c4f6b04 ltp: fix reproducibilty issues add d5b051c gtk-doc: Fix reproducibity issues add 132c7ec dnf: fix reproducibilty issue add e12caa8 boost: fix reproducibilty issues add 43f4061 weston-init: Allow use of weston without input devices add 9d8edf3 oeqa: enable testresults.json for testexport add 1b98db3 babeltrace2: initialize the other_entry pointer add 5ea3d9d qemu: fix CVE-2020-7039 new 63e356c HACK: signing: Add extra test debug new d865bc5 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND new ea980b6 scripts/oe-buildenv-internal: Add BB_LOGCONFIG new 439a6d1 coreutils: Add extra hint about DEPENDS changes affect on -dev 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 (6b8ec5a) \ N -- N -- N refs/heads/master-next (439a6d1) 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/recipes-core/coreutils/coreutils_8.31.bb | 1 + meta/recipes-devtools/qemu/qemu.inc | 3 + .../qemu/qemu/CVE-2020-7039-1.patch | 44 +++++++++++++++ .../qemu/qemu/CVE-2020-7039-2.patch | 59 ++++++++++++++++++++ .../qemu/qemu/CVE-2020-7039-3.patch | 64 ++++++++++++++++++++++ 5 files changed, 171 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-2.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-7039-3.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:38 +0000 Subject: [oe-commits] [openembedded-core] 01/04: HACK: signing: Add extra test debug In-Reply-To: <158405355714.20449.12926044835546550965@git.openembedded.org> References: <158405355714.20449.12926044835546550965@git.openembedded.org> Message-ID: <20200312225237.7B3C1233604@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 63e356c9781deb0ecfac9ec1171eeecf1043806b 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/oe/sstatesig.py | 6 ++++++ meta/lib/oeqa/selftest/cases/signing.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e373..9db1a20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -105,6 +105,8 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } self.buildarch = data.getVar('BUILD_ARCH') self._internal = False + self.tempdebug = bool(data.getVar("TEMPDEBUG")) + pass def tasks_resolved(self, virtmap, virtpnmap, dataCache): @@ -192,10 +194,14 @@ class SignatureGeneratorOEBasicHashMixIn(object): self.lockedhashes[tid] = h_locked self._internal = True unihash = self.get_unihash(tid) + uh2 = self._get_unihash(tid) self._internal = False #bb.warn("Using %s %s %s" % (recipename, task, h)) + if self.tempdebug and recipename == "ed": + bb.warn("Using %s %s %s %s %s %s %s %s" % (recipename, task, h, h_locked, unihash, uh2, self.unihash[tid], self.taskhash[tid])) if h != h_locked and h_locked != unihash: + bb.warn("Mismatch warning") self.mismatch_msgs.append('The %s:%s sig is computed to be %s, but the sig is locked to %s in %s' % (recipename, task, h, h_locked, var)) diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 202d549..58f7efa 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py @@ -191,6 +191,7 @@ class LockedSignatures(OESelftestTestCase): feature = 'require %s\n' % locked_sigs_file feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' + feature += 'TEMPDEBUG = "1"\n' self.write_config(feature) # Build a locked recipe @@ -221,4 +222,17 @@ 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 = runCmd('cat bitbake-cookerdaemon.log').output + extradebug += bitbake(test_recipe + " -S none").output + extradebug += runCmd('ls -la tmp/stamps/*/ed/*').output + feature = 'SUMMARY_${PN} = "test locked signature2%s"\n' % uuid.uuid4() + write_file(recipe_append_path, feature) + 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 Thu Mar 12 22:52:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:40 +0000 Subject: [oe-commits] [openembedded-core] 03/04: scripts/oe-buildenv-internal: Add BB_LOGCONFIG In-Reply-To: <158405355714.20449.12926044835546550965@git.openembedded.org> References: <158405355714.20449.12926044835546550965@git.openembedded.org> Message-ID: <20200312225237.928A5233606@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit ea980b64bf57b002205bfafbaff0852a6b3e1d89 Author: Richard Purdie AuthorDate: Thu Mar 12 13:19:25 2020 +0000 scripts/oe-buildenv-internal: Add BB_LOGCONFIG We should allow the logging configurations to be specificed from the environment, for example for autobuilder setups. Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index c17cf4d..8cbe346 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -106,7 +106,8 @@ BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ -SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE" +SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE \ +BB_LOGCONFIG" BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:41 +0000 Subject: [oe-commits] [openembedded-core] 04/04: coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies In-Reply-To: <158405355714.20449.12926044835546550965@git.openembedded.org> References: <158405355714.20449.12926044835546550965@git.openembedded.org> Message-ID: <20200312225237.9DB67233607@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 439a6d18862afce4f0376cf6bab4535a9154b678 Author: Richard Purdie AuthorDate: Thu Mar 12 22:51:19 2020 +0000 coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies Add an extra comment about the implications of changing DEPENDS. Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index eac0163..2b196b7 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -150,6 +150,7 @@ inherit ptest RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy +# may need tweaking if DEPENDS changes RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:52:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:52:39 +0000 Subject: [oe-commits] [openembedded-core] 02/04: rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND In-Reply-To: <158405355714.20449.12926044835546550965@git.openembedded.org> References: <158405355714.20449.12926044835546550965@git.openembedded.org> Message-ID: <20200312225237.87245233605@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d865bc515b50b4d0d8e7d22450854ad1bc3e1bb4 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 Thu Mar 12 22:53:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:53:05 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (fc726eb -> b2a9288) Message-ID: <158405358558.21085.14572303987136162770@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 fc726eb bitbake: knotty: Update hash equivalence logging new 7b384f9 bitbake: msg: Return config object new 5a3234a bitbake: knotty: Treat verbconsole as a console output new b2a9288 bitbake: Use logging.shutdown() instead of bb.msg.cleanupLogging() 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/msg.py | 14 +++----------- lib/bb/ui/knotty.py | 42 +++++++++++++++++++----------------------- 2 files changed, 22 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:53:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:53:06 +0000 Subject: [oe-commits] [bitbake] 01/03: bitbake: msg: Return config object In-Reply-To: <158405358558.21085.14572303987136162770@git.openembedded.org> References: <158405358558.21085.14572303987136162770@git.openembedded.org> Message-ID: <20200312225305.C1F70233608@git.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 7b384f98dc2dc35bfd2d856d578496a2cf718bb5 Author: Joshua Watt AuthorDate: Thu Mar 12 13:30:02 2020 -0500 bitbake: msg: Return config object Returns the configuration object from setLoggingConfig(). This object has a config dictionary that contains all of the created handlers, filters and loggers, which makes it much easier to pull out items with specific names. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 582165d..2ba4824 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -306,7 +306,8 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): if "level" in l: l["level"] = bb.msg.stringToLevel(l["level"]) - logging.config.dictConfig(logconfig) + conf = logging.config.dictConfigClass(logconfig) + conf.configure() # The user may have specified logging domains they want at a higher debug # level than the standard. @@ -328,6 +329,8 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): #if newlevel < bb.msg.loggerDefaultLogLevel: # bb.msg.loggerDefaultLogLevel = newlevel + return conf + def cleanupLogging(): # Iterate through all the handlers and close them if possible. Fixes # 'Unclosed resource' warnings when bitbake exits, see -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:53:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:53:08 +0000 Subject: [oe-commits] [bitbake] 03/03: bitbake: Use logging.shutdown() instead of bb.msg.cleanupLogging() In-Reply-To: <158405358558.21085.14572303987136162770@git.openembedded.org> References: <158405358558.21085.14572303987136162770@git.openembedded.org> Message-ID: <20200312225305.DEB5123361C@git.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 b2a92887a208a3973453a7eda43bac2ca7660604 Author: Joshua Watt AuthorDate: Thu Mar 12 13:30:04 2020 -0500 bitbake: Use logging.shutdown() instead of bb.msg.cleanupLogging() The logging module provides a shutdown() function that does the same thing in a much better way Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 11 ----------- lib/bb/ui/knotty.py | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 2ba4824..c0b344e 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -330,14 +330,3 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): # bb.msg.loggerDefaultLogLevel = newlevel return conf - -def cleanupLogging(): - # Iterate through all the handlers and close them if possible. Fixes - # 'Unclosed resource' warnings when bitbake exits, see - # https://bugs.python.org/issue23010 - handlers = set() - for logger_iter in logging.Logger.manager.loggerDict.keys(): - handlers.update(logging.getLogger(logger_iter).handlers) - - for h in handlers: - h.close() diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 826aa8c..87e873d 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -871,6 +871,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass - bb.msg.cleanupLogging() + logging.shutdown() return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 22:53:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 22:53:07 +0000 Subject: [oe-commits] [bitbake] 02/03: bitbake: knotty: Treat verbconsole as a console output In-Reply-To: <158405358558.21085.14572303987136162770@git.openembedded.org> References: <158405358558.21085.14572303987136162770@git.openembedded.org> Message-ID: <20200312225305.D128C23361B@git.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 5a3234af144fcead97114737c9887caa54d0c403 Author: Joshua Watt AuthorDate: Thu Mar 12 13:30:03 2020 -0500 bitbake: knotty: Treat verbconsole as a console output The BitBake.verbconsole needs to be treated like a console output logger (meaning that the TerminalFilter attaches an InteractConsoleLogFilter to it), even if it's not directly attached to the root 'BitBake' logger. First, assign a special "is_console" property to the relevant handlers, then look for the property in the handlers from the configuration object return by bb.msg.setLoggingConfig(). Finally, pass the list of all handlers to the TerminalFilter object; it doesn't care about the difference between console and errconsole, so pass all the relevant handlers as a list. This fixes cases where the console output was corrupted when messages were sent to the 'BitBake.verbconsole' handler. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 24b7a77..826aa8c 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -149,7 +149,7 @@ class TerminalFilter(object): cr = (25, 80) return cr - def __init__(self, main, helper, console, errconsole, quiet): + def __init__(self, main, helper, handlers, quiet): self.main = main self.helper = helper self.cuu = None @@ -179,14 +179,9 @@ class TerminalFilter(object): termios.tcsetattr(fd, termios.TCSADRAIN, new) curses.setupterm() if curses.tigetnum("colors") > 2: - if console: + for h in handlers: try: - console.formatter.enable_color() - except AttributeError: - pass - if errconsole: - try: - errconsole.formatter.enable_color() + h.formatter.enable_color() except AttributeError: pass self.ed = curses.tigetstr("ed") @@ -204,10 +199,9 @@ class TerminalFilter(object): self.interactive = False bb.note("Unable to use interactive mode for this terminal, using fallback") return - if console: - console.addFilter(InteractConsoleLogFilter(self)) - if errconsole: - errconsole.addFilter(InteractConsoleLogFilter(self)) + + for h in handlers: + h.addFilter(InteractConsoleLogFilter(self)) self.main_progress = None @@ -411,6 +405,9 @@ def main(server, eventHandler, params, tf = TerminalFilter): "level": console_loglevel, "stream": "ext://sys.stdout", "filters": ["BitBake.stdoutFilter"], + ".": { + "is_console": True, + }, }, "BitBake.errconsole": { "class": "logging.StreamHandler", @@ -418,6 +415,9 @@ def main(server, eventHandler, params, tf = TerminalFilter): "level": loglevel, "stream": "ext://sys.stderr", "filters": ["BitBake.stderrFilter"], + ".": { + "is_console": True, + }, }, # This handler can be used if specific loggers should print on # the console at a lower severity than the default. It will @@ -430,6 +430,9 @@ def main(server, eventHandler, params, tf = TerminalFilter): "level": 1, "stream": "ext://sys.stdout", "filters": ["BitBake.verbconsoleFilter"], + ".": { + "is_console": True, + }, }, }, "formatters": { @@ -523,7 +526,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): except OSError: pass - bb.msg.setLoggingConfig(logconfig, logconfigfile) + conf = bb.msg.setLoggingConfig(logconfig, logconfigfile) if sys.stdin.isatty() and sys.stdout.isatty(): log_exec_tty = True @@ -534,14 +537,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): # Look for the specially designated handlers which need to be passed to the # terminal handler - console = None - errconsole = None - for h in logger.handlers: - name = getattr(h, '_name', None) - if name == 'BitBake.console': - console = h - elif name == 'BitBake.errconsole': - errconsole = h + console_handlers = [h for h in conf.config['handlers'].values() if getattr(h, 'is_console', False)] bb.utils.set_process_name("KnottyUI") @@ -591,7 +587,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): printinterval = 5000 lastprint = time.time() - termfilter = tf(main, helper, console, errconsole, params.options.quiet) + termfilter = tf(main, helper, console_handlers, params.options.quiet) atexit.register(termfilter.finish) while True: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:11 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (5ea3d9d -> ce20c91) Message-ID: <158405425110.24247.342493132833993854@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 5ea3d9d qemu: fix CVE-2020-7039 new 66c9234 scripts/oe-buildenv-internal: Add BB_LOGCONFIG new ce20c91 coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies 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/coreutils/coreutils_8.31.bb | 1 + scripts/oe-buildenv-internal | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:12 +0000 Subject: [oe-commits] [openembedded-core] 01/02: scripts/oe-buildenv-internal: Add BB_LOGCONFIG In-Reply-To: <158405425110.24247.342493132833993854@git.openembedded.org> References: <158405425110.24247.342493132833993854@git.openembedded.org> Message-ID: <20200312230411.3B4EE233608@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 66c9234b71791d2aab87068496aebdbd4eb1f5e2 Author: Richard Purdie AuthorDate: Thu Mar 12 13:19:25 2020 +0000 scripts/oe-buildenv-internal: Add BB_LOGCONFIG We should allow the logging configurations to be specificed from the environment, for example for autobuilder setups. Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index c17cf4d..8cbe346 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -106,7 +106,8 @@ BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ -SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE" +SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA BB_SETSCENE_ENFORCE \ +BB_LOGCONFIG" BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:13 +0000 Subject: [oe-commits] [openembedded-core] 02/02: coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies In-Reply-To: <158405425110.24247.342493132833993854@git.openembedded.org> References: <158405425110.24247.342493132833993854@git.openembedded.org> Message-ID: <20200312230411.45D5123361B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit ce20c915019d350bf9663b2f27eccf3cef2e29fc Author: Richard Purdie AuthorDate: Thu Mar 12 22:51:19 2020 +0000 coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies Add an extra comment about the implications of changing DEPENDS. Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_8.31.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index eac0163..2b196b7 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb @@ -150,6 +150,7 @@ inherit ptest RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl libmodule-build-perl make perl perl-module-file-stat python3-core sed shadow" # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy +# may need tweaking if DEPENDS changes RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:16 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (439a6d1 -> ce20c91) Message-ID: <158405425668.24516.11510759767679614469@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 439a6d1 coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies discard ea980b6 scripts/oe-buildenv-internal: Add BB_LOGCONFIG discard d865bc5 rootfs-postcommands: Remove spaces before ; in -ROOTFS_..._COMMAND discard 63e356c HACK: signing: Add extra test debug add 66c9234 scripts/oe-buildenv-internal: Add BB_LOGCONFIG add ce20c91 coreutils: Add extra hint about DEPENDS changes affect on -dev 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 (439a6d1) \ N -- N -- N refs/heads/master-next (ce20c91) 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/classes/rootfs-postcommands.bbclass | 8 ++++---- meta/lib/oe/sstatesig.py | 6 ------ meta/lib/oeqa/selftest/cases/signing.py | 16 +--------------- 3 files changed, 5 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:30 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (b2a9288 -> 970cd2f) Message-ID: <158405427096.24885.15475470183231469365@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 b2a9288 bitbake: Use logging.shutdown() instead of bb.msg.cleanupLogging() discard 5a3234a bitbake: knotty: Treat verbconsole as a console output discard 7b384f9 bitbake: msg: Return config object discard fc726eb bitbake: knotty: Update hash equivalence logging discard 47d323f bitbake: Add autobuilder logging configuration discard 242ef2c bitbake: runqueue: Lower setscene complete logging level discard b7d5d10 bitbake: msg: Add helper to merge logging configs discard 47ba09b bitbake: knotty: Add logging cleanup discard 162df5b bitbake-user-manual: Add documentation for BB_LOGCONFIG discard a0e22f7 bitbake: Lower hash equivalence logging discard a8972a6 bitbake: Log hash equivalence with a different logger discard 23793c2 bitbake: worker: Remove unnecessary addDefaultLogFilter discard 37a0138 bitbake: knotty: Setup logs with config helper discard 2203fa3 bitbake: knotty: Remove dependency on format variable discard 175a267 bitbake: lib/bb/msg.py: Add helper to set logging config discard 28d758c bitbake: lib/bb/msg.py: Remove unused filters discard 22da31f bitbake: lib/bb/msg.py: Add filter utilities discard a383ec1 bitbake: knotty: Add commented logging_tree code discard 6cdf80c bitbake: lib/bb/msg.py: Add repr for BBLogFormatter discard 105db36 bitbake: lib/bb/msg.py: Use log level instead of debug count discard 3bde139 bitbake: knotty: Handle logging messages with specific logger discard 919216d bitbake: lib/bb/msg.py: Convert default domains to a dictionary new f32a8bc lib/bb/msg: Convert default domains to a dictionary new 9624d42 knotty: Handle logging messages with specific logger new 41bd155 lib/bb/msg: Use log level instead of debug count new 5ff962d lib/bb/msg: Add repr for BBLogFormatter new 3046131 knotty: Add commented logging_tree code new 8ebe8a7 lib/bb/msg: Add filter utilities new 2cb16e0 lib/bb/msg: Remove unused filters new 14c98d3 lib/bb/msg: Add helper to set logging config new c1c867d knotty: Remove dependency on format variable new 646a68a knotty: Setup logs with config helper new dcdb8f2 bitbake-worker: Remove unnecessary addDefaultLogFilter new 20bb29e runqueue/siggen: Log hash equivalence with a different logger new 2ddb649 runqueue/siggen: Lower hash equivalence logging new e225659 bitbake-user-manual: Add documentation for BB_LOGCONFIG new b3f3779 knotty: Add logging cleanup new e860d93 msg: Add helper to merge logging configs new 7dd5b39 runqueue: Lower setscene complete logging level new 2259b51 contrib: Add autobuilder logging configuration new 766587c knotty: Update hash equivalence logging new 93c98a8 msg: Return config object new 2010be5 knotty: Treat verbconsole as a console output new 970cd2f knotty/msg: Use logging.shutdown() instead of bb.msg.cleanupLogging() 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 (b2a9288) \ N -- N -- N refs/heads/master-next (970cd2f) 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 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:32 +0000 Subject: [oe-commits] [bitbake] 02/22: knotty: Handle logging messages with specific logger In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.4841823361B@git.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 9624d42133e024fd044d0d089c7017ed53eed874 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:40 2020 -0500 knotty: Handle logging messages with specific logger Handles the log messages from the bitbake server with the specific logger that the event originated from. This allows hierarchical logging configurations to work as expected. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index cbb289b..a6a92b9 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -522,7 +522,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): event.msg = taskinfo['title'] + ': ' + event.msg if hasattr(event, 'fn'): event.msg = event.fn + ': ' + event.msg - logger.handle(event) + logging.getLogger(event.name).handle(event) continue if isinstance(event, bb.build.TaskFailedSilent): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:31 +0000 Subject: [oe-commits] [bitbake] 01/22: lib/bb/msg: Convert default domains to a dictionary In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.2C4AB233608@git.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 f32a8bc7ff7a0b0750b6934a96f5d48391b1383a Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:39 2020 -0500 lib/bb/msg: Convert default domains to a dictionary Converts the default domain variable to a dictionary where the keys are the logging domains and the values are the logging level (instead of the debug count). This makes it easier to deal with the logging domains and the awkward conversion from a list to a dictionary only needs to be done once when logging is initialized. Finally, other code has been written that already assumes this variable is a dictionary, see: f04cd93109 ("bitbake: lib/bb: Optimise out debug messages from cooker") Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/__init__.py | 5 +++-- lib/bb/msg.py | 17 +++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index 88641e2..acd4af1 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -43,12 +43,13 @@ class BBLogger(Logger): Logger.__init__(self, name) def bbdebug(self, level, msg, *args, **kwargs): + loglevel = logging.DEBUG - level + 1 if not bb.event.worker_pid: - if self.name in bb.msg.loggerDefaultDomains and level > (bb.msg.loggerDefaultDomains[self.name]): + if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): return if level > (bb.msg.loggerDefaultDebugLevel): return - return self.log(logging.DEBUG - level + 1, msg, *args, **kwargs) + return self.log(loglevel, msg, *args, **kwargs) def plain(self, msg, *args, **kwargs): return self.log(logging.INFO + 1, msg, *args, **kwargs) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 33c0e2f..d1b0e92 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -138,7 +138,7 @@ class BBLogFilterStdOut(BBLogFilter): loggerDefaultDebugLevel = 0 loggerDefaultVerbose = False loggerVerboseLogs = False -loggerDefaultDomains = [] +loggerDefaultDomains = {} def init_msgconfig(verbose, debug, debug_domains=None): """ @@ -148,15 +148,16 @@ def init_msgconfig(verbose, debug, debug_domains=None): bb.msg.loggerDefaultVerbose = verbose if verbose: bb.msg.loggerVerboseLogs = True + + bb.msg.loggerDefaultDomains = {} if debug_domains: - bb.msg.loggerDefaultDomains = debug_domains - else: - bb.msg.loggerDefaultDomains = [] + for (domainarg, iterator) in groupby(debug_domains): + dlevel = len(tuple(iterator)) + bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 def constructLogOptions(): debug = loggerDefaultDebugLevel verbose = loggerDefaultVerbose - domains = loggerDefaultDomains if debug: level = BBLogFormatter.DEBUG - debug + 1 @@ -165,11 +166,7 @@ def constructLogOptions(): else: level = BBLogFormatter.NOTE - debug_domains = {} - for (domainarg, iterator) in groupby(domains): - dlevel = len(tuple(iterator)) - debug_domains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 - return level, debug_domains + return level, loggerDefaultDomains def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): level, debug_domains = constructLogOptions() -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:33 +0000 Subject: [oe-commits] [bitbake] 03/22: lib/bb/msg: Use log level instead of debug count In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.66E9823361C@git.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 41bd155faf7f65cb0727fcce972715769b26ca89 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:41 2020 -0500 lib/bb/msg: Use log level instead of debug count Passes around the actual logging level as the default log level variable instead of the debug count. This makes it easier to deal with logging levels since the conversion from debug count and verbose flag only has to occur once when logging is initialized and after that actual log levels can be used Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bin/bitbake-worker | 2 +- lib/bb/__init__.py | 2 +- lib/bb/msg.py | 22 +++++++++------------- lib/bb/runqueue.py | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 1e641e8..fc28a34 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -414,7 +414,7 @@ class BitbakeWorker(object): def handle_workerdata(self, data): self.workerdata = pickle.loads(data) - bb.msg.loggerDefaultDebugLevel = self.workerdata["logdefaultdebug"] + bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index acd4af1..dc5e91e 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -47,7 +47,7 @@ class BBLogger(Logger): if not bb.event.worker_pid: if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): return - if level > (bb.msg.loggerDefaultDebugLevel): + if loglevel > bb.msg.loggerDefaultLogLevel: return return self.log(loglevel, msg, *args, **kwargs) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index d1b0e92..ea6a954 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -135,7 +135,7 @@ class BBLogFilterStdOut(BBLogFilter): # Message control functions # -loggerDefaultDebugLevel = 0 +loggerDefaultLogLevel = BBLogFormatter.NOTE loggerDefaultVerbose = False loggerVerboseLogs = False loggerDefaultDomains = {} @@ -144,11 +144,17 @@ def init_msgconfig(verbose, debug, debug_domains=None): """ Set default verbosity and debug levels config the logger """ - bb.msg.loggerDefaultDebugLevel = debug bb.msg.loggerDefaultVerbose = verbose if verbose: bb.msg.loggerVerboseLogs = True + if debug: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.DEBUG - debug + 1 + elif verbose: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.VERBOSE + else: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.NOTE + bb.msg.loggerDefaultDomains = {} if debug_domains: for (domainarg, iterator) in groupby(debug_domains): @@ -156,17 +162,7 @@ def init_msgconfig(verbose, debug, debug_domains=None): bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 def constructLogOptions(): - debug = loggerDefaultDebugLevel - verbose = loggerDefaultVerbose - - if debug: - level = BBLogFormatter.DEBUG - debug + 1 - elif verbose: - level = BBLogFormatter.VERBOSE - else: - level = BBLogFormatter.NOTE - - return level, loggerDefaultDomains + return loggerDefaultLogLevel, loggerDefaultDomains def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): level, debug_domains = constructLogOptions() diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 32966b4..4106fa4 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1254,7 +1254,7 @@ class RunQueue: "fakerootdirs" : self.rqdata.dataCaches[mc].fakerootdirs, "fakerootnoenv" : self.rqdata.dataCaches[mc].fakerootnoenv, "sigdata" : bb.parse.siggen.get_taskdata(), - "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, + "logdefaultlevel" : bb.msg.loggerDefaultLogLevel, "logdefaultverbose" : bb.msg.loggerDefaultVerbose, "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, "logdefaultdomain" : bb.msg.loggerDefaultDomains, -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:34 +0000 Subject: [oe-commits] [bitbake] 04/22: lib/bb/msg: Add repr for BBLogFormatter In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.75713233626@git.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 5ff962dca71f4ef16a3aa11b41a23f2227fe8c21 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:42 2020 -0500 lib/bb/msg: Add repr for BBLogFormatter Adds a __repr__ function for BBLogFormatter. This allows it to get a human readable string when printed using the logging_tree module Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index ea6a954..c70fd80 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -98,6 +98,9 @@ class BBLogFormatter(logging.Formatter): def enable_color(self): self.color_enabled = True + def __repr__(self): + return "%s fmt='%s' color=%s" % (self.__class__.__name__, self._fmt, "True" if self.color_enabled else "False") + class BBLogFilter(object): def __init__(self, handler, level, debug_domains): self.stdlevel = level -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:35 +0000 Subject: [oe-commits] [bitbake] 05/22: knotty: Add commented logging_tree code In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.84E19233627@git.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 30461310915f911b80f92e03df694af7c1eb1f46 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:43 2020 -0500 knotty: Add commented logging_tree code Adds a comment section that can be easily uncommented to enable dumping the logging tree. This module is extremely useful for debugging issued with logging configuration Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index a6a92b9..aac12cd 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -430,6 +430,11 @@ def main(server, eventHandler, params, tf = TerminalFilter): llevel, debug_domains = bb.msg.constructLogOptions() server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) + # The logging_tree module is *extremely* helpful in debugging logging + # domains. Uncomment here to dump the logging tree when bitbake starts + #import logging_tree + #logging_tree.printout() + universe = False if not params.observe_only: params.updateFromServer(server) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:36 +0000 Subject: [oe-commits] [bitbake] 06/22: lib/bb/msg: Add filter utilities In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.91D18233628@git.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 8ebe8a7662200fad9b88be8b08376262a61c85c4 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:44 2020 -0500 lib/bb/msg: Add filter utilities Adds generic filter utilities that can be used to filter when the log level is greater than or equal to a defined value, or below a defined value, as well as a generic function to translate a string to a logging level (or bitbake logging level) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index c70fd80..8561826 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -135,6 +135,28 @@ class BBLogFilterStdOut(BBLogFilter): return True return False +class LogFilterGEQLevel(logging.Filter): + def __init__(self, level): + self.strlevel = str(level) + self.level = stringToLevel(level) + + def __repr__(self): + return "%s level >= %s (%d)" % (self.__class__.__name__, self.strlevel, self.level) + + def filter(self, record): + return (record.levelno >= self.level) + +class LogFilterLTLevel(logging.Filter): + def __init__(self, level): + self.strlevel = str(level) + self.level = stringToLevel(level) + + def __repr__(self): + return "%s level < %s (%d)" % (self.__class__.__name__, self.strlevel, self.level) + + def filter(self, record): + return (record.levelno < self.level) + # Message control functions # @@ -175,6 +197,19 @@ def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): cls(handler, level, debug_domains) +def stringToLevel(level): + try: + return int(level) + except ValueError: + pass + + try: + return getattr(logging, level) + except AttributeError: + pass + + return getattr(BBLogFormatter, level) + # # Message handling functions # -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:37 +0000 Subject: [oe-commits] [bitbake] 07/22: lib/bb/msg: Remove unused filters In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.9C780233629@git.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 2cb16e0c61609f3fb8a86530ddedf8ad0e69428e Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:45 2020 -0500 lib/bb/msg: Remove unused filters Now that the filter are described using the python logging structure, these classes are no longer needed. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 8561826..cab079e 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -119,22 +119,6 @@ class BBLogFilter(object): return True return False -class BBLogFilterStdErr(BBLogFilter): - def filter(self, record): - if not BBLogFilter.filter(self, record): - return False - if record.levelno >= logging.ERROR: - return True - return False - -class BBLogFilterStdOut(BBLogFilter): - def filter(self, record): - if not BBLogFilter.filter(self, record): - return False - if record.levelno < logging.ERROR: - return True - return False - class LogFilterGEQLevel(logging.Filter): def __init__(self, level): self.strlevel = str(level) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:38 +0000 Subject: [oe-commits] [bitbake] 08/22: lib/bb/msg: Add helper to set logging config In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.A7F9823362A@git.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 14c98d36b74c1599b4649078170b6e72df79ba2a Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:46 2020 -0500 lib/bb/msg: Add helper to set logging config Adds a helper function to setup the structure logging information in bitbake. The helper function takes a default configuration and an optional path to a user config file that can be merged into the default. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index cab079e..6259af0 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -13,6 +13,7 @@ Message handling infrastructure for bitbake import sys import copy import logging +import logging.config from itertools import groupby import bb import bb.event @@ -227,3 +228,95 @@ def has_console_handler(logger): if handler.stream in [sys.stderr, sys.stdout]: return True return False + +def setLoggingConfig(defaultconfig, userconfigfile=None): + logconfig = copy.deepcopy(defaultconfig) + + if userconfigfile: + with open(userconfigfile, 'r') as f: + if userconfigfile.endswith('.yml') or userconfigfile.endswith('.yaml'): + import yaml + userconfig = yaml.load(f) + elif userconfigfile.endswith('.json') or userconfigfile.endswith('.cfg'): + import json + userconfig = json.load(f) + else: + raise BaseException("Unrecognized file format: %s" % userconfigfile) + + if userconfig.get('bitbake_merge', True): + # Merge config with the default config + if userconfig.get('version') != logconfig['version']: + raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) + + # Set some defaults to make merging easier + userconfig.setdefault("loggers", {}) + + # If a handler, formatter, or filter is defined in the user + # config, it will replace an existing one in the default config + for k in ("handlers", "formatters", "filters"): + logconfig.setdefault(k, {}).update(userconfig.get(k, {})) + + seen_loggers = set() + for name, l in logconfig["loggers"].items(): + # If the merge option is set, merge the handlers and + # filters. Otherwise, if it is False, this logger won't get + # add to the set of seen loggers and will replace the + # existing one + if l.get('bitbake_merge', True): + ulogger = userconfig["loggers"].setdefault(name, {}) + ulogger.setdefault("handlers", []) + ulogger.setdefault("filters", []) + + # Merge lists + l.setdefault("handlers", []).extend(ulogger["handlers"]) + l.setdefault("filters", []).extend(ulogger["filters"]) + + # Replace other properties if present + if "level" in ulogger: + l["level"] = ulogger["level"] + + if "propagate" in ulogger: + l["propagate"] = ulogger["propagate"] + + seen_loggers.add(name) + + # Add all loggers present in the user config, but not any that + # have already been processed + for name in set(userconfig["loggers"].keys()) - seen_loggers: + logconfig["loggers"][name] = userconfig["loggers"][name] + + else: + # Replace the entire default config + logconfig = userconfig + + # Convert all level parameters to integers in case users want to use the + # bitbake defined level names + for h in logconfig["handlers"].values(): + if "level" in h: + h["level"] = bb.msg.stringToLevel(h["level"]) + + for l in logconfig["loggers"].values(): + if "level" in l: + l["level"] = bb.msg.stringToLevel(l["level"]) + + logging.config.dictConfig(logconfig) + + # The user may have specified logging domains they want at a higher debug + # level than the standard. + for name, l in logconfig["loggers"].items(): + if not name.startswith("BitBake."): + continue + + if not "level" in l: + continue + + curlevel = bb.msg.loggerDefaultDomains.get(name) + # Note: level parameter should already be a int because of conversion + # above + newlevel = int(l["level"]) + if curlevel is None or newlevel < curlevel: + bb.msg.loggerDefaultDomains[name] = newlevel + + # TODO: I don't think that setting the global log level should be necessary + #if newlevel < bb.msg.loggerDefaultLogLevel: + # bb.msg.loggerDefaultLogLevel = newlevel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:39 +0000 Subject: [oe-commits] [bitbake] 09/22: knotty: Remove dependency on format variable In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.B6F01233607@git.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 c1c867df24b4ef204027d485acac7c75c63f2bc0 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:47 2020 -0500 knotty: Remove dependency on format variable Passing around the log formatter variable was unnecessary since the log levels of interest can be accesses as class members of bb.msg.BBLogFormatter. Switching to do this will make using the structured python logging much easier, since it can be difficult to extract out the formatter for a specific handler. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 4 +--- lib/bb/ui/knotty.py | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 9560eb5..5c5be45 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -735,11 +735,9 @@ class Tinfoil: console = handler elif handler.stream == sys.stderr: errconsole = handler - format_str = "%(levelname)s: %(message)s" - format = bb.msg.BBLogFormatter(format_str) helper.shutdown = 0 parseprogress = None - termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, format, quiet=self.quiet) + termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet) try: while True: try: diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index aac12cd..d5dce71 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -109,12 +109,11 @@ def pluralise(singular, plural, qty): class InteractConsoleLogFilter(logging.Filter): - def __init__(self, tf, format): + def __init__(self, tf): self.tf = tf - self.format = format def filter(self, record): - if record.levelno == self.format.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): + if record.levelno == bb.msg.BBLogFormatter.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): return False self.tf.clearFooter() return True @@ -150,7 +149,7 @@ class TerminalFilter(object): cr = (25, 80) return cr - def __init__(self, main, helper, console, errconsole, format, quiet): + def __init__(self, main, helper, console, errconsole, quiet): self.main = main self.helper = helper self.cuu = None @@ -180,7 +179,16 @@ class TerminalFilter(object): termios.tcsetattr(fd, termios.TCSADRAIN, new) curses.setupterm() if curses.tigetnum("colors") > 2: - format.enable_color() + if console: + try: + console.formatter.enable_color() + except AttributeError: + pass + if errconsole: + try: + errconsole.formatter.enable_color() + except AttributeError: + pass self.ed = curses.tigetstr("ed") if self.ed: self.cuu = curses.tigetstr("cuu") @@ -197,9 +205,9 @@ class TerminalFilter(object): bb.note("Unable to use interactive mode for this terminal, using fallback") return if console: - console.addFilter(InteractConsoleLogFilter(self, format)) + console.addFilter(InteractConsoleLogFilter(self)) if errconsole: - errconsole.addFilter(InteractConsoleLogFilter(self, format)) + errconsole.addFilter(InteractConsoleLogFilter(self)) self.main_progress = None @@ -469,7 +477,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): printinterval = 5000 lastprint = time.time() - termfilter = tf(main, helper, console, errconsole, format, params.options.quiet) + termfilter = tf(main, helper, console, errconsole, params.options.quiet) atexit.register(termfilter.finish) while True: @@ -508,21 +516,21 @@ def main(server, eventHandler, params, tf = TerminalFilter): if isinstance(event, logging.LogRecord): lastprint = time.time() printinterval = 5000 - if event.levelno >= format.ERROR: + if event.levelno >= bb.msg.BBLogFormatter.ERROR: errors = errors + 1 return_value = 1 - elif event.levelno == format.WARNING: + elif event.levelno == bb.msg.BBLogFormatter.WARNING: warnings = warnings + 1 if event.taskpid != 0: # For "normal" logging conditions, don't show note logs from tasks # but do show them if the user has changed the default log level to # include verbose/debug messages - if event.levelno <= format.NOTE and (event.levelno < llevel or (event.levelno == format.NOTE and llevel != format.VERBOSE)): + if event.levelno <= bb.msg.BBLogFormatter.NOTE and (event.levelno < llevel or (event.levelno == bb.msg.BBLogFormatter.NOTE and llevel != bb.msg.BBLogFormatter.VERBOSE)): continue # Prefix task messages with recipe/task - if event.taskpid in helper.pidmap and event.levelno != format.PLAIN: + if event.taskpid in helper.pidmap and event.levelno != bb.msg.BBLogFormatter.PLAIN: taskinfo = helper.running_tasks[helper.pidmap[event.taskpid]] event.msg = taskinfo['title'] + ': ' + event.msg if hasattr(event, 'fn'): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:40 +0000 Subject: [oe-commits] [bitbake] 10/22: knotty: Setup logs with config helper In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.C1B1B233608@git.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 646a68a49364b50a42168b4b16308f7217eec0dc Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:48 2020 -0500 knotty: Setup logs with config helper Sets up logging in knotty to use python's structured logging config and the bb.msg.setLoggingConfig() helper to setup logging. This allows the user to specify additional logging mechanism in a config file with BB_LOGCONFIG Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 134 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 38 deletions(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index d5dce71..386f278 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -370,7 +370,11 @@ def _log_settings_from_server(server, observe_only): if error: logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error) raise BaseException(error) - return includelogs, loglines, consolelogfile + logconfigfile, error = server.runCommand([cmd, "BB_LOGCONFIG"]) + if error: + logger.error("Unable to get the value of BB_LOGCONFIG variable: %s" % error) + raise BaseException(error) + return includelogs, loglines, consolelogfile, logconfigfile _evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.LogRecord", "bb.build.TaskFailed", "bb.build.TaskBase", "bb.event.ParseStarted", @@ -387,7 +391,87 @@ def main(server, eventHandler, params, tf = TerminalFilter): if not params.observe_only: params.updateToServer(server, os.environ.copy()) - includelogs, loglines, consolelogfile = _log_settings_from_server(server, params.observe_only) + includelogs, loglines, consolelogfile, logconfigfile = _log_settings_from_server(server, params.observe_only) + + loglevel, _ = bb.msg.constructLogOptions() + + if params.options.quiet == 0: + console_loglevel = loglevel + elif params.options.quiet > 2: + console_loglevel = bb.msg.BBLogFormatter.ERROR + else: + console_loglevel = bb.msg.BBLogFormatter.WARNING + + logconfig = { + "version": 1, + "handlers": { + "BitBake.console": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": console_loglevel, + "stream": "ext://sys.stdout", + "filters": ["BitBake.stdoutFilter"], + }, + "BitBake.errconsole": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": loglevel, + "stream": "ext://sys.stderr", + "filters": ["BitBake.stderrFilter"], + }, + }, + "formatters": { + # This format instance will get color output enabled by the + # terminal + "BitBake.consoleFormatter" : { + "()": "bb.msg.BBLogFormatter", + "format": "%(levelname)s: %(message)s" + }, + # The file log requires a separate instance so that it doesn't get + # color enabled + "BitBake.logfileFormatter": { + "()": "bb.msg.BBLogFormatter", + "format": "%(levelname)s: %(message)s" + } + }, + "filters": { + "BitBake.stdoutFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": "ERROR" + }, + "BitBake.stderrFilter": { + "()": "bb.msg.LogFilterGEQLevel", + "level": "ERROR" + } + }, + "loggers": { + "BitBake": { + "level": loglevel, + "handlers": ["BitBake.console", "BitBake.errconsole"], + } + }, + "disable_existing_loggers": False + } + + # Enable the console log file if enabled + if consolelogfile and not params.options.show_environment and not params.options.show_versions: + logconfig["handlers"]["BitBake.consolelog"] ={ + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": "INFO", + "filename": consolelogfile, + } + logconfig["loggers"]["BitBake"]["handlers"].append("BitBake.consolelog") + + bb.utils.mkdirhier(os.path.dirname(consolelogfile)) + loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') + bb.utils.remove(loglink) + try: + os.symlink(os.path.basename(consolelogfile), loglink) + except OSError: + pass + + bb.msg.setLoggingConfig(logconfig, logconfigfile) if sys.stdin.isatty() and sys.stdout.isatty(): log_exec_tty = True @@ -396,23 +480,16 @@ def main(server, eventHandler, params, tf = TerminalFilter): helper = uihelper.BBUIHelper() - console = logging.StreamHandler(sys.stdout) - errconsole = logging.StreamHandler(sys.stderr) - format_str = "%(levelname)s: %(message)s" - format = bb.msg.BBLogFormatter(format_str) - if params.options.quiet == 0: - forcelevel = None - elif params.options.quiet > 2: - forcelevel = bb.msg.BBLogFormatter.ERROR - else: - forcelevel = bb.msg.BBLogFormatter.WARNING - bb.msg.addDefaultlogFilter(console, bb.msg.BBLogFilterStdOut, forcelevel) - bb.msg.addDefaultlogFilter(errconsole, bb.msg.BBLogFilterStdErr) - console.setFormatter(format) - errconsole.setFormatter(format) - if not bb.msg.has_console_handler(logger): - logger.addHandler(console) - logger.addHandler(errconsole) + # Look for the specially designated handlers which need to be passed to the + # terminal handler + console = None + errconsole = None + for h in logger.handlers: + name = getattr(h, '_name', None) + if name == 'BitBake.console': + console = h + elif name == 'BitBake.errconsole': + errconsole = h bb.utils.set_process_name("KnottyUI") @@ -420,21 +497,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): server.terminateServer() return - consolelog = None - if consolelogfile and not params.options.show_environment and not params.options.show_versions: - bb.utils.mkdirhier(os.path.dirname(consolelogfile)) - conlogformat = bb.msg.BBLogFormatter(format_str) - consolelog = logging.FileHandler(consolelogfile) - bb.msg.addDefaultlogFilter(consolelog) - consolelog.setFormatter(conlogformat) - logger.addHandler(consolelog) - loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') - bb.utils.remove(loglink) - try: - os.symlink(os.path.basename(consolelogfile), loglink) - except OSError: - pass - llevel, debug_domains = bb.msg.constructLogOptions() server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) @@ -761,8 +823,4 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass - if consolelog: - logger.removeHandler(consolelog) - consolelog.close() - return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:45 +0000 Subject: [oe-commits] [bitbake] 15/22: knotty: Add logging cleanup In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.0FDA9233626@git.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 b3f3779adf63c0d970462a558a6205da1d30c0ed Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:44 2020 -0500 knotty: Add logging cleanup Adds code to close all loggers when bitbake exits. This prevents unclosed file ResourceWarnings. A form of this closing existed previously, but was removed in the new logging code. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 11 +++++++++++ lib/bb/ui/knotty.py | 2 ++ 2 files changed, 13 insertions(+) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 6259af0..0564573 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -320,3 +320,14 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): # TODO: I don't think that setting the global log level should be necessary #if newlevel < bb.msg.loggerDefaultLogLevel: # bb.msg.loggerDefaultLogLevel = newlevel + +def cleanupLogging(): + # Iterate through all the handlers and close them if possible. Fixes + # 'Unclosed resource' warnings when bitbake exits, see + # https://bugs.python.org/issue23010 + handlers = set() + for logger_iter in logging.Logger.manager.loggerDict.keys(): + handlers.update(logging.getLogger(logger_iter).handlers) + + for h in handlers: + h.close() diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 386f278..695108a 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -823,4 +823,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass + bb.msg.cleanupLogging() + return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:47 +0000 Subject: [oe-commits] [bitbake] 17/22: runqueue: Lower setscene complete logging level In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.2ABCC23362F@git.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 7dd5b3900622008ff34ec70d71c6e994f460a46f Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:47 2020 -0500 runqueue: Lower setscene complete logging level Lowers the level of the log message when setscene tasks have completed. This message can occur multiple times when hash equivalence is enabled, since the runqueue switches between executing setscene tasks and normal tasks. Since this is primarily of use when debugging hash equivalence, use the hash equivalence logger at VERBOSE level. [YOCTO #13813] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index cef9b0f..16f076f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2059,7 +2059,7 @@ class RunQueueExecute: self.update_holdofftasks() if not self.sq_live and not self.sqdone and not self.sq_deferred and not self.updated_taskhash_queue and not self.holdoff_tasks: - logger.info("Setscene tasks completed") + hashequiv_logger.verbose("Setscene tasks completed") err = self.summarise_scenequeue_errors() if err: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:41 +0000 Subject: [oe-commits] [bitbake] 11/22: bitbake-worker: Remove unnecessary addDefaultLogFilter In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.CF6E223361B@git.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 dcdb8f2c14f09ce34d0a1facc33a441570912c05 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:49 2020 -0500 bitbake-worker: Remove unnecessary addDefaultLogFilter Adding the default log filter here is unnecessary because there are no defined logging domains when it is called, which means it does no actual filtering. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bin/bitbake-worker | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/bitbake-worker b/bin/bitbake-worker index fc28a34..97cc0fd 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -65,7 +65,6 @@ if 0: format_str = "%(levelname)s: %(message)s" conlogformat = bb.msg.BBLogFormatter(format_str) consolelog = logging.FileHandler(logfilename) - bb.msg.addDefaultlogFilter(consolelog) consolelog.setFormatter(conlogformat) logger.addHandler(consolelog) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:42 +0000 Subject: [oe-commits] [bitbake] 12/22: runqueue/siggen: Log hash equivalence with a different logger In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.DCE2723362B@git.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 20bb29ef973e9c5483eb50a74550ea207637367b Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:50 2020 -0500 runqueue/siggen: Log hash equivalence with a different logger Switches the hash equivalence logging to use a different logger so that it can be easily filtered out with python's structured logging. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 11 ++++++----- lib/bb/siggen.py | 17 +++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 4106fa4..e84890b 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -27,6 +27,7 @@ import pprint bblogger = logging.getLogger("BitBake") logger = logging.getLogger("BitBake.RunQueue") +hashequiv_logger = logging.getLogger("BitBake.RunQueue.HashEquiv") __find_sha256__ = re.compile( r'(?i)(?" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"") - logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) + hashequiv_logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) for tid in changed: if tid not in self.rqdata.runq_setscene_tids: @@ -2346,7 +2347,7 @@ class RunQueueExecute: # Check no tasks this covers are running for dep in self.sqdata.sq_covered_tasks[tid]: if dep in self.runq_running and dep not in self.runq_complete: - logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) + hashequiv_logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) valid = False break if not valid: @@ -2409,7 +2410,7 @@ class RunQueueExecute: for (tid, harddepfail, origvalid) in update_tasks: if tid in self.sqdata.valid and not origvalid: - logger.info("Setscene task %s became valid" % tid) + hashequiv_logger.info("Setscene task %s became valid" % tid) if harddepfail: self.sq_task_failoutright(tid) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index c2d0c73..0357b54 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -16,6 +16,7 @@ from bb import runqueue import hashserv logger = logging.getLogger('BitBake.SigGen') +hashequiv_logger = logging.getLogger('BitBake.SigGen.HashEquiv') def init(d): siggens = [obj for obj in globals().values() @@ -502,9 +503,9 @@ class SignatureGeneratorUniHashMixIn(object): # A unique hash equal to the taskhash is not very interesting, # so it is reported it at debug level 2. If they differ, that # is much more interesting, so it is reported at debug level 1 - bb.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) + hashequiv_logger.debug((1, 2)[unihash == taskhash], 'Found unihash %s in place of %s for %s from %s' % (unihash, taskhash, tid, self.server)) else: - bb.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) + hashequiv_logger.debug(2, 'No reported unihash for %s:%s from %s' % (tid, taskhash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) @@ -578,12 +579,12 @@ class SignatureGeneratorUniHashMixIn(object): new_unihash = data['unihash'] if new_unihash != unihash: - bb.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) + hashequiv_logger.debug(1, 'Task %s unihash changed %s -> %s by server %s' % (taskhash, unihash, new_unihash, self.server)) bb.event.fire(bb.runqueue.taskUniHashUpdate(fn + ':do_' + task, new_unihash), d) self.set_unihash(tid, new_unihash) d.setVar('BB_UNIHASH', new_unihash) else: - bb.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) + hashequiv_logger.debug(1, 'Reported task %s as unihash %s to %s' % (taskhash, unihash, self.server)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) finally: @@ -606,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object): method = method + self.extramethod[tid] data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) - bb.note('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) + hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) if data is None: bb.warn("Server unable to handle unihash report") @@ -615,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object): finalunihash = data['unihash'] if finalunihash == current_unihash: - bb.note('Task %s unihash %s unchanged by server' % (tid, finalunihash)) + hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) elif finalunihash == wanted_unihash: - bb.note('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) + hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) self.set_unihash(tid, finalunihash) return True else: # TODO: What to do here? - bb.note('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) + hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:43 +0000 Subject: [oe-commits] [bitbake] 13/22: runqueue/siggen: Lower hash equivalence logging In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230431.EB36A23362D@git.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 2ddb649ea31afe052f08e3969e36abf6fb515bc2 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:52 2020 -0500 runqueue/siggen: Lower hash equivalence logging Lowers the level at which hash equivalence messages are logged so as to not annoy the majority of users. The autobuilder can use a custom logging configuration to log these to a file for debugging (see contrib/autobuilderlog.json) [YOCTO #13813] Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/runqueue.py | 6 +++--- lib/bb/siggen.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index e84890b..cef9b0f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2264,7 +2264,7 @@ class RunQueueExecute: self.updated_taskhash_queue.remove((tid, unihash)) if unihash != self.rqdata.runtaskentries[tid].unihash: - hashequiv_logger.info("Task %s unihash changed to %s" % (tid, unihash)) + hashequiv_logger.verbose("Task %s unihash changed to %s" % (tid, unihash)) self.rqdata.runtaskentries[tid].unihash = unihash bb.parse.siggen.set_unihash(tid, unihash) toprocess.add(tid) @@ -2309,7 +2309,7 @@ class RunQueueExecute: elif tid in self.scenequeue_covered or tid in self.sq_live: # Already ran this setscene task or it running. Report the new taskhash bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) - hashequiv_logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) + hashequiv_logger.verbose("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) remapped = True if not remapped: @@ -2410,7 +2410,7 @@ class RunQueueExecute: for (tid, harddepfail, origvalid) in update_tasks: if tid in self.sqdata.valid and not origvalid: - hashequiv_logger.info("Setscene task %s became valid" % tid) + hashequiv_logger.verbose("Setscene task %s became valid" % tid) if harddepfail: self.sq_task_failoutright(tid) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 0357b54..8bfc452 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -607,7 +607,7 @@ class SignatureGeneratorUniHashMixIn(object): method = method + self.extramethod[tid] data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) - hashequiv_logger.info('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) + hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) if data is None: bb.warn("Server unable to handle unihash report") @@ -616,14 +616,14 @@ class SignatureGeneratorUniHashMixIn(object): finalunihash = data['unihash'] if finalunihash == current_unihash: - hashequiv_logger.info('Task %s unihash %s unchanged by server' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash %s unchanged by server' % (tid, finalunihash)) elif finalunihash == wanted_unihash: - hashequiv_logger.info('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) + hashequiv_logger.verbose('Task %s unihash changed %s -> %s as wanted' % (tid, current_unihash, finalunihash)) self.set_unihash(tid, finalunihash) return True else: # TODO: What to do here? - hashequiv_logger.info('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) + hashequiv_logger.verbose('Task %s unihash reported as unwanted hash %s' % (tid, finalunihash)) except hashserv.client.HashConnectionError as e: bb.warn('Error contacting Hash Equivalence Server %s: %s' % (self.server, str(e))) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:44 +0000 Subject: [oe-commits] [bitbake] 14/22: bitbake-user-manual: Add documentation for BB_LOGCONFIG In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.0564C23361C@git.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 e22565968828c86983162e67f52ebb106242ca76 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:53 2020 -0500 bitbake-user-manual: Add documentation for BB_LOGCONFIG Adds documentation describing how to use the BB_LOGCONFIG variable to enable custom logging. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- .../bitbake-user-manual-execution.xml | 97 ++++++++++++++++++++++ .../bitbake-user-manual-ref-variables.xml | 11 +++ 2 files changed, 108 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml index 8f60667..3b31f74 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml @@ -929,4 +929,101 @@ section. + +
+ Logging + + In addition to the standard command line option to control how + verbose builds are when execute, bitbake also supports user defined + configuration of the + Python logging + facilities through the + BB_LOGCONFIG + variable. This variable defines a json or yaml + logging configuration + that will be intelligently merged into the default configuration. + The logging configuration is merged using the following rules: + + + The user defined configuration will completely replace the default + configuration if top level key + bitbake_merge is set to the value + False. In this case, all other rules + are ignored. + + + The user configuration must have a top level + version which must match the value of + the default configuration. + + + Any keys defined in the handlers, + formatters, or filters, + will be merged into the same section in the default + configuration, with the user specified keys taking + replacing a default one if there is a conflict. In + practice, this means that if both the default configuration + and user configuration specify a handler named + myhandler, the user defined one will + replace the default. To prevent the user from inadvertently + replacing a default handler, formatter, or filter, all of + the default ones are named with a prefix of + "BitBake." + + + If a logger is defined by the user with the key + bitbake_merge set to + False, that logger will be completely + replaced by user configuration. In this case, no other + rules will apply to that logger. + + + All user defined filter and + handlers properties for a given logger + will be merged with corresponding properties from the + default logger. For example, if the user configuration adds + a filter called myFilter to the + BitBake.SigGen, and the default + configuration adds a filter called + BitBake.defaultFilter, both filters + will be applied to the logger + + + + + + As an example, consider the following user logging configuration + file which logs all Hash Equivalence related messages of VERBOSE or + higher to a file called hashequiv.log + + { + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "hashequiv.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } + } + + +
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 bae01d9..c4bd1f2 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml @@ -539,6 +539,17 @@ + BB_LOGCONFIG + + + Specifies the name of a config file that contains the user + logging configuration. See + Logging for additional + information + + + + BB_LOGFMT -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:50 +0000 Subject: [oe-commits] [bitbake] 20/22: msg: Return config object In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.530EC233607@git.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 93c98a85cb10d3795b3cebc9cd97214d0f4748e5 Author: Joshua Watt AuthorDate: Thu Mar 12 13:30:02 2020 -0500 msg: Return config object Returns the configuration object from setLoggingConfig(). This object has a config dictionary that contains all of the created handlers, filters and loggers, which makes it much easier to pull out items with specific names. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 582165d..2ba4824 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -306,7 +306,8 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): if "level" in l: l["level"] = bb.msg.stringToLevel(l["level"]) - logging.config.dictConfig(logconfig) + conf = logging.config.dictConfigClass(logconfig) + conf.configure() # The user may have specified logging domains they want at a higher debug # level than the standard. @@ -328,6 +329,8 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): #if newlevel < bb.msg.loggerDefaultLogLevel: # bb.msg.loggerDefaultLogLevel = newlevel + return conf + def cleanupLogging(): # Iterate through all the handlers and close them if possible. Fixes # 'Unclosed resource' warnings when bitbake exits, see -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:49 +0000 Subject: [oe-commits] [bitbake] 19/22: knotty: Update hash equivalence logging In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.45E19233628@git.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 766587c0baaaeb5cda3e9454395edbb70e33f756 Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:46 2020 -0500 knotty: Update hash equivalence logging Updates hash equivalence logging so that the interesting VERBOSE messages are always logged to the consolelog file so that issues in individual user builds can be diagnosed. The autobuilder logging config then updates this so that they also are shown on stdout, since the consolelog file is not capture there. In order to facilitate this, 2 new logging handlers were added, "BitBake.verbconsole" and "BitBake.verbconsolelog". Neither of these handlers are attached to anything by default, but they will log any messages that wouldn't otherwise be logged by the normal console or consolelog handlers. Users can attach whatever loggers the desire to this handler to get them to appear on the console or in the consolelog, as demonstrated by the autobuilderlog.json file. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- contrib/autobuilderlog.json | 18 ++---------- lib/bb/ui/knotty.py | 68 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/contrib/autobuilderlog.json b/contrib/autobuilderlog.json index 103a114..193a675 100644 --- a/contrib/autobuilderlog.json +++ b/contrib/autobuilderlog.json @@ -1,27 +1,13 @@ { "version": 1, - "handlers": { - "autobuilderlog": { - "class": "logging.FileHandler", - "formatter": "logfileFormatter", - "level": "DEBUG", - "filename": "autobuilder.log", - "mode": "w" - } - }, - "formatters": { - "logfileFormatter": { - "format": "%(name)s: %(levelname)s: %(message)s" - } - }, "loggers": { "BitBake.SigGen.HashEquiv": { "level": "VERBOSE", - "handlers": ["autobuilderlog"] + "handlers": ["BitBake.verbconsole"] }, "BitBake.RunQueue.HashEquiv": { "level": "VERBOSE", - "handlers": ["autobuilderlog"] + "handlers": ["BitBake.verbconsole"] } } } diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 695108a..24b7a77 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -419,6 +419,18 @@ def main(server, eventHandler, params, tf = TerminalFilter): "stream": "ext://sys.stderr", "filters": ["BitBake.stderrFilter"], }, + # This handler can be used if specific loggers should print on + # the console at a lower severity than the default. It will + # display any messages sent to it that are lower than then + # BitBake.console logging level (so as to prevent duplication of + # messages). Nothing is attached to this handler by default + "BitBake.verbconsole": { + "class": "logging.StreamHandler", + "formatter": "BitBake.consoleFormatter", + "level": 1, + "stream": "ext://sys.stdout", + "filters": ["BitBake.verbconsoleFilter"], + }, }, "formatters": { # This format instance will get color output enabled by the @@ -442,7 +454,11 @@ def main(server, eventHandler, params, tf = TerminalFilter): "BitBake.stderrFilter": { "()": "bb.msg.LogFilterGEQLevel", "level": "ERROR" - } + }, + "BitBake.verbconsoleFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": console_loglevel + }, }, "loggers": { "BitBake": { @@ -455,13 +471,49 @@ def main(server, eventHandler, params, tf = TerminalFilter): # Enable the console log file if enabled if consolelogfile and not params.options.show_environment and not params.options.show_versions: - logconfig["handlers"]["BitBake.consolelog"] ={ - "class": "logging.FileHandler", - "formatter": "BitBake.logfileFormatter", - "level": "INFO", - "filename": consolelogfile, - } - logconfig["loggers"]["BitBake"]["handlers"].append("BitBake.consolelog") + logconfig = bb.msg.mergeLoggingConfig(logconfig, { + "version": 1, + "handlers" : { + "BitBake.consolelog": { + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": loglevel, + "filename": consolelogfile, + }, + # Just like verbconsole, anything sent here will go to the + # log file, unless it would go to BitBake.consolelog + "BitBake.verbconsolelog" : { + "class": "logging.FileHandler", + "formatter": "BitBake.logfileFormatter", + "level": 1, + "filename": consolelogfile, + "filters": ["BitBake.verbconsolelogFilter"], + }, + }, + "filters": { + "BitBake.verbconsolelogFilter": { + "()": "bb.msg.LogFilterLTLevel", + "level": loglevel, + }, + }, + "loggers": { + "BitBake": { + "handlers": ["BitBake.consolelog"], + }, + + # Other interesting things that we want to keep an eye on + # in the log files in case someone has an issue, but not + # necessarily show to the user on the console + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["BitBake.verbconsolelog"], + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["BitBake.verbconsolelog"], + } + } + }) bb.utils.mkdirhier(os.path.dirname(consolelogfile)) loglink = os.path.join(os.path.dirname(consolelogfile), 'console-latest.log') -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:48 +0000 Subject: [oe-commits] [bitbake] 18/22: contrib: Add autobuilder logging configuration In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.3752B233627@git.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 2259b5172b37442a4e0420a16a7bde9e21ffa086 Author: Joshua Watt AuthorDate: Mon Mar 9 11:33:51 2020 -0500 contrib: Add autobuilder logging configuration Adds a configuration file that the autobuilder can use to capture interesting logging domains above the ones that show up for normal users on stdout/stderr. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- contrib/autobuilderlog.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/contrib/autobuilderlog.json b/contrib/autobuilderlog.json new file mode 100644 index 0000000..103a114 --- /dev/null +++ b/contrib/autobuilderlog.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "handlers": { + "autobuilderlog": { + "class": "logging.FileHandler", + "formatter": "logfileFormatter", + "level": "DEBUG", + "filename": "autobuilder.log", + "mode": "w" + } + }, + "formatters": { + "logfileFormatter": { + "format": "%(name)s: %(levelname)s: %(message)s" + } + }, + "loggers": { + "BitBake.SigGen.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + }, + "BitBake.RunQueue.HashEquiv": { + "level": "VERBOSE", + "handlers": ["autobuilderlog"] + } + } +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:46 +0000 Subject: [oe-commits] [bitbake] 16/22: msg: Add helper to merge logging configs In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.1CF0523362E@git.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 e860d93b76c142fdae90226bc68e4fe6e7b6a9db Author: Joshua Watt AuthorDate: Wed Mar 11 18:28:45 2020 -0500 msg: Add helper to merge logging configs Adds a function that can be used by UI front ends to merge logging configuration fragments. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 89 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 0564573..582165d 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -229,6 +229,53 @@ def has_console_handler(logger): return True return False +def mergeLoggingConfig(logconfig, userconfig): + logconfig = copy.deepcopy(logconfig) + userconfig = copy.deepcopy(userconfig) + + # Merge config with the default config + if userconfig.get('version') != logconfig['version']: + raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) + + # Set some defaults to make merging easier + userconfig.setdefault("loggers", {}) + + # If a handler, formatter, or filter is defined in the user + # config, it will replace an existing one in the default config + for k in ("handlers", "formatters", "filters"): + logconfig.setdefault(k, {}).update(userconfig.get(k, {})) + + seen_loggers = set() + for name, l in logconfig["loggers"].items(): + # If the merge option is set, merge the handlers and + # filters. Otherwise, if it is False, this logger won't get + # add to the set of seen loggers and will replace the + # existing one + if l.get('bitbake_merge', True): + ulogger = userconfig["loggers"].setdefault(name, {}) + ulogger.setdefault("handlers", []) + ulogger.setdefault("filters", []) + + # Merge lists + l.setdefault("handlers", []).extend(ulogger["handlers"]) + l.setdefault("filters", []).extend(ulogger["filters"]) + + # Replace other properties if present + if "level" in ulogger: + l["level"] = ulogger["level"] + + if "propagate" in ulogger: + l["propagate"] = ulogger["propagate"] + + seen_loggers.add(name) + + # Add all loggers present in the user config, but not any that + # have already been processed + for name in set(userconfig["loggers"].keys()) - seen_loggers: + logconfig["loggers"][name] = userconfig["loggers"][name] + + return logconfig + def setLoggingConfig(defaultconfig, userconfigfile=None): logconfig = copy.deepcopy(defaultconfig) @@ -244,47 +291,7 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): raise BaseException("Unrecognized file format: %s" % userconfigfile) if userconfig.get('bitbake_merge', True): - # Merge config with the default config - if userconfig.get('version') != logconfig['version']: - raise BaseException("Bad user configuration version. Expected %r, got %r" % (logconfig['version'], userconfig.get('version'))) - - # Set some defaults to make merging easier - userconfig.setdefault("loggers", {}) - - # If a handler, formatter, or filter is defined in the user - # config, it will replace an existing one in the default config - for k in ("handlers", "formatters", "filters"): - logconfig.setdefault(k, {}).update(userconfig.get(k, {})) - - seen_loggers = set() - for name, l in logconfig["loggers"].items(): - # If the merge option is set, merge the handlers and - # filters. Otherwise, if it is False, this logger won't get - # add to the set of seen loggers and will replace the - # existing one - if l.get('bitbake_merge', True): - ulogger = userconfig["loggers"].setdefault(name, {}) - ulogger.setdefault("handlers", []) - ulogger.setdefault("filters", []) - - # Merge lists - l.setdefault("handlers", []).extend(ulogger["handlers"]) - l.setdefault("filters", []).extend(ulogger["filters"]) - - # Replace other properties if present - if "level" in ulogger: - l["level"] = ulogger["level"] - - if "propagate" in ulogger: - l["propagate"] = ulogger["propagate"] - - seen_loggers.add(name) - - # Add all loggers present in the user config, but not any that - # have already been processed - for name in set(userconfig["loggers"].keys()) - seen_loggers: - logconfig["loggers"][name] = userconfig["loggers"][name] - + logconfig = mergeLoggingConfig(logconfig, userconfig) else: # Replace the entire default config logconfig = userconfig -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:52 +0000 Subject: [oe-commits] [bitbake] 22/22: knotty/msg: Use logging.shutdown() instead of bb.msg.cleanupLogging() In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.6E5B1233629@git.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 970cd2fc4f0bbc93069dee5a15a608dd76081c67 Author: Joshua Watt AuthorDate: Thu Mar 12 13:30:04 2020 -0500 knotty/msg: Use logging.shutdown() instead of bb.msg.cleanupLogging() The logging module provides a shutdown() function that does the same thing in a much better way Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/msg.py | 11 ----------- lib/bb/ui/knotty.py | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index 2ba4824..c0b344e 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -330,14 +330,3 @@ def setLoggingConfig(defaultconfig, userconfigfile=None): # bb.msg.loggerDefaultLogLevel = newlevel return conf - -def cleanupLogging(): - # Iterate through all the handlers and close them if possible. Fixes - # 'Unclosed resource' warnings when bitbake exits, see - # https://bugs.python.org/issue23010 - handlers = set() - for logger_iter in logging.Logger.manager.loggerDict.keys(): - handlers.update(logging.getLogger(logger_iter).handlers) - - for h in handlers: - h.close() diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 826aa8c..87e873d 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -871,6 +871,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): if e.errno == errno.EPIPE: pass - bb.msg.cleanupLogging() + logging.shutdown() return return_value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:04:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:04:51 +0000 Subject: [oe-commits] [bitbake] 21/22: knotty: Treat verbconsole as a console output In-Reply-To: <158405427096.24885.15475470183231469365@git.openembedded.org> References: <158405427096.24885.15475470183231469365@git.openembedded.org> Message-ID: <20200312230432.60F67233608@git.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 2010be588c74a99256df7b565a309c84c2973546 Author: Joshua Watt AuthorDate: Thu Mar 12 13:30:03 2020 -0500 knotty: Treat verbconsole as a console output The BitBake.verbconsole needs to be treated like a console output logger (meaning that the TerminalFilter attaches an InteractConsoleLogFilter to it), even if it's not directly attached to the root 'BitBake' logger. First, assign a special "is_console" property to the relevant handlers, then look for the property in the handlers from the configuration object return by bb.msg.setLoggingConfig(). Finally, pass the list of all handlers to the TerminalFilter object; it doesn't care about the difference between console and errconsole, so pass all the relevant handlers as a list. This fixes cases where the console output was corrupted when messages were sent to the 'BitBake.verbconsole' handler. Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- lib/bb/ui/knotty.py | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 24b7a77..826aa8c 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -149,7 +149,7 @@ class TerminalFilter(object): cr = (25, 80) return cr - def __init__(self, main, helper, console, errconsole, quiet): + def __init__(self, main, helper, handlers, quiet): self.main = main self.helper = helper self.cuu = None @@ -179,14 +179,9 @@ class TerminalFilter(object): termios.tcsetattr(fd, termios.TCSADRAIN, new) curses.setupterm() if curses.tigetnum("colors") > 2: - if console: + for h in handlers: try: - console.formatter.enable_color() - except AttributeError: - pass - if errconsole: - try: - errconsole.formatter.enable_color() + h.formatter.enable_color() except AttributeError: pass self.ed = curses.tigetstr("ed") @@ -204,10 +199,9 @@ class TerminalFilter(object): self.interactive = False bb.note("Unable to use interactive mode for this terminal, using fallback") return - if console: - console.addFilter(InteractConsoleLogFilter(self)) - if errconsole: - errconsole.addFilter(InteractConsoleLogFilter(self)) + + for h in handlers: + h.addFilter(InteractConsoleLogFilter(self)) self.main_progress = None @@ -411,6 +405,9 @@ def main(server, eventHandler, params, tf = TerminalFilter): "level": console_loglevel, "stream": "ext://sys.stdout", "filters": ["BitBake.stdoutFilter"], + ".": { + "is_console": True, + }, }, "BitBake.errconsole": { "class": "logging.StreamHandler", @@ -418,6 +415,9 @@ def main(server, eventHandler, params, tf = TerminalFilter): "level": loglevel, "stream": "ext://sys.stderr", "filters": ["BitBake.stderrFilter"], + ".": { + "is_console": True, + }, }, # This handler can be used if specific loggers should print on # the console at a lower severity than the default. It will @@ -430,6 +430,9 @@ def main(server, eventHandler, params, tf = TerminalFilter): "level": 1, "stream": "ext://sys.stdout", "filters": ["BitBake.verbconsoleFilter"], + ".": { + "is_console": True, + }, }, }, "formatters": { @@ -523,7 +526,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): except OSError: pass - bb.msg.setLoggingConfig(logconfig, logconfigfile) + conf = bb.msg.setLoggingConfig(logconfig, logconfigfile) if sys.stdin.isatty() and sys.stdout.isatty(): log_exec_tty = True @@ -534,14 +537,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): # Look for the specially designated handlers which need to be passed to the # terminal handler - console = None - errconsole = None - for h in logger.handlers: - name = getattr(h, '_name', None) - if name == 'BitBake.console': - console = h - elif name == 'BitBake.errconsole': - errconsole = h + console_handlers = [h for h in conf.config['handlers'].values() if getattr(h, 'is_console', False)] bb.utils.set_process_name("KnottyUI") @@ -591,7 +587,7 @@ def main(server, eventHandler, params, tf = TerminalFilter): printinterval = 5000 lastprint = time.time() - termfilter = tf(main, helper, console, errconsole, params.options.quiet) + termfilter = tf(main, helper, console_handlers, params.options.quiet) atexit.register(termfilter.finish) while True: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:11:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:11:26 +0000 Subject: [oe-commits] [openembedded-core] 01/05: scritpts/tiny/ksize: Cleanup some python2 leftover in ksize.py In-Reply-To: <158405468567.27105.12245531069417058550@git.openembedded.org> References: <158405468567.27105.12245531069417058550@git.openembedded.org> Message-ID: <20200312231125.ED784233626@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit bd17a7e60264bb40df340fa38c425a7d7372516e Author: jan AuthorDate: Thu Mar 12 21:44:44 2020 +0100 scritpts/tiny/ksize: Cleanup some python2 leftover in ksize.py Although the script was running with Python3, almost no detailed output was generated. Signed-off-by: Jan Vermaete Signed-off-by: Richard Purdie --- scripts/tiny/ksize.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/tiny/ksize.py b/scripts/tiny/ksize.py index bc11919..8316b85 100755 --- a/scripts/tiny/ksize.py +++ b/scripts/tiny/ksize.py @@ -27,7 +27,7 @@ def usage(): class Sizes: def __init__(self, glob): self.title = glob - p = Popen("size -t " + str(glob), shell=True, stdout=PIPE, stderr=PIPE) + p = Popen("size -t " + str(glob), shell=True, stdout=PIPE, stderr=PIPE, universal_newlines=True) output = p.communicate()[0].splitlines() if len(output) > 2: sizes = output[-1].split()[0:4] @@ -49,14 +49,14 @@ class Report: path = os.path.dirname(filename) p = Popen("ls " + str(path) + "/*.o | grep -v built-in.o", - shell=True, stdout=PIPE, stderr=PIPE) + shell=True, stdout=PIPE, stderr=PIPE, universal_newlines=True) glob = ' '.join(p.communicate()[0].splitlines()) oreport = Report(glob, str(path) + "/*.o") oreport.sizes.title = str(path) + "/*.o" r.parts.append(oreport) if subglob: - p = Popen("ls " + subglob, shell=True, stdout=PIPE, stderr=PIPE) + p = Popen("ls " + subglob, shell=True, stdout=PIPE, stderr=PIPE, universal_newlines=True) for f in p.communicate()[0].splitlines(): path = os.path.dirname(f) r.parts.append(Report.create(f, path, str(path) + "/*/built-in.o")) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:11:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:11:25 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ce20c91 -> b065467) Message-ID: <158405468567.27105.12245531069417058550@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 ce20c91 coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies new bd17a7e scritpts/tiny/ksize: Cleanup some python2 leftover in ksize.py new e571ef7 weston-init: Launch weston with WESTON_DISABLE_ATOMIC on musl/x86 new aaa1c3e libsdl2: upgrade 2.0.10 -> 2.0.12 new 1f9d367 oeqa/qemuarm64: Ignore logind: failed to get session seat new b065467 gcc: Upgrade to 9.3 bugfix release 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/conf/distro/include/maintainers.inc | 2 +- meta/lib/oeqa/runtime/cases/parselogs.py | 1 + ...x-up-libsanitizer-build-with-master-glibc.patch | 70 --- .../gcc/gcc-9.2/CVE-2019-15847_1.patch | 521 --------------------- .../gcc/gcc-9.2/CVE-2019-15847_2.patch | 77 --- .../gcc/gcc-9.2/CVE-2019-15847_3.patch | 62 --- .../gcc/{gcc-9.2.inc => gcc-9.3.inc} | 22 +- .../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 6 +- .../0002-gcc-poison-system-directories.patch | 24 +- .../0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 6 +- .../0004-64-bit-multilib-hack.patch | 6 +- .../0005-optional-libstdc.patch | 12 +- .../0006-COLLECT_GCC_OPTIONS.patch | 6 +- ...efaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 14 +- .../0008-fortran-cross-compile-hack.patch | 6 +- .../0009-cpp-honor-sysroot.patch | 6 +- .../0010-MIPS64-Default-to-N64-ABI.patch | 8 +- ...C_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 7 +- ...0012-gcc-Fix-argument-list-too-long-error.patch | 10 +- .../{gcc-9.2 => gcc-9.3}/0013-Disable-sdt.patch | 20 +- .../gcc/{gcc-9.2 => gcc-9.3}/0014-libtool.patch | 6 +- ...4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 6 +- ...tilib-config-files-from-B-instead-of-usin.patch | 14 +- ...-libdir-from-.la-which-usually-points-to-.patch | 6 +- .../gcc/{gcc-9.2 => gcc-9.3}/0018-export-CPP.patch | 6 +- ...Ensure-target-gcc-headers-can-be-included.patch | 19 +- ...-t-build-with-disable-dependency-tracking.patch | 6 +- ...h-host-directory-during-relink-if-inst_pr.patch | 6 +- ...IBS_DIR-replacement-instead-of-hardcoding.patch | 6 +- .../0023-aarch64-Add-support-for-musl-ldso.patch | 6 +- ...ibcc1-fix-libcc1-s-install-path-and-rpath.patch | 6 +- ...-handle-sysroot-support-for-nativesdk-gcc.patch | 187 ++------ ...et-sysroot-gcc-version-specific-dirs-with.patch | 12 +- ...-various-_FOR_BUILD-and-related-variables.patch | 14 +- .../0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 6 +- ...shared-to-link-commandline-for-musl-targe.patch | 6 +- .../0030-ldbl128-config.patch} | 16 +- ...bgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 6 +- ...e-alias-for-__cpu_indicator_init-instead-.patch | 10 +- .../0033-sync-gcc-stddef.h-with-musl.patch | 6 +- ...ation-fault-in-precompiled-header-generat.patch | 6 +- .../0035-Fix-for-testsuite-failure.patch | 6 +- ...0036-Re-introduce-spe-commandline-options.patch | 6 +- ...50-Check-zero-value-in-simple_object_elf.patch} | 24 +- ...modes-Do-not-use-__LINE__-for-maintainin.patch} | 21 +- ...operands-Don-t-match-user-defined-regs-o.patch} | 15 +- ...s-canadian_9.2.bb => gcc-cross-canadian_9.3.bb} | 0 .../gcc/{gcc-cross_9.2.bb => gcc-cross_9.3.bb} | 0 .../{gcc-crosssdk_9.2.bb => gcc-crosssdk_9.3.bb} | 0 .../gcc/{gcc-runtime_9.2.bb => gcc-runtime_9.3.bb} | 0 ...gcc-sanitizers_9.2.bb => gcc-sanitizers_9.3.bb} | 0 .../gcc/{gcc-source_9.2.bb => gcc-source_9.3.bb} | 0 .../gcc/{gcc_9.2.bb => gcc_9.3.bb} | 0 ...libgcc-initial_9.2.bb => libgcc-initial_9.3.bb} | 0 .../gcc/{libgcc_9.2.bb => libgcc_9.3.bb} | 0 .../gcc/{libgfortran_9.2.bb => libgfortran_9.3.bb} | 0 ...538-validate-image-size-when-loading-BMP-.patch | 34 -- ...heck-for-build-dir-when-building-version-.patch | 53 --- ...797-SDL-fails-to-compile-with-Mesa-Master.patch | 41 -- .../{libsdl2_2.0.10.bb => libsdl2_2.0.12.bb} | 15 +- meta/recipes-graphics/wayland/weston-init.bb | 14 +- .../wayland/weston-init/weston.env | 0 scripts/tiny/ksize.py | 6 +- 63 files changed, 263 insertions(+), 1214 deletions(-) delete mode 100644 meta/recipes-devtools/gcc/gcc-9.2/0037-Fix-up-libsanitizer-build-with-master-glibc.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch rename meta/recipes-devtools/gcc/{gcc-9.2.inc => gcc-9.3.inc} (87%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (89%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0002-gcc-poison-system-directories.patch (92%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (95%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0004-64-bit-multilib-hack.patch (98%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0005-optional-libstdc.patch (94%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0006-COLLECT_GCC_OPTIONS.patch (89%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (91%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0008-fortran-cross-compile-hack.patch (91%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0009-cpp-honor-sysroot.patch (94%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0010-MIPS64-Default-to-N64-ABI.patch (89%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (98%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0012-gcc-Fix-argument-list-too-long-error.patch (85%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0013-Disable-sdt.patch (89%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0014-libtool.patch (91%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (91%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch (89%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (84%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0018-export-CPP.patch (95%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0019-Ensure-target-gcc-headers-can-be-included.patch (80%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch (92%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch (87%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (86%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0023-aarch64-Add-support-for-musl-ldso.patch (87%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch (93%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0025-handle-sysroot-support-for-nativesdk-gcc.patch (55%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch (90%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0027-Fix-various-_FOR_BUILD-and-related-variables.patch (94%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch (84%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch (95%) rename meta/recipes-devtools/gcc/{gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch => gcc-9.3/0030-ldbl128-config.patch} (84%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (86%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (92%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0033-sync-gcc-stddef.h-with-musl.patch (95%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0034-fix-segmentation-fault-in-precompiled-header-generat.patch (93%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0035-Fix-for-testsuite-failure.patch (98%) rename meta/recipes-devtools/gcc/{gcc-9.2 => gcc-9.3}/0036-Re-introduce-spe-commandline-options.patch (88%) rename meta/recipes-devtools/gcc/{gcc-9.2/CVE-2019-14250.patch => gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch} (59%) rename meta/recipes-devtools/gcc/{gcc-9.2/gen-no-line-numbers.patch => gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch} (93%) rename meta/recipes-devtools/gcc/{gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch => gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch} (88%) rename meta/recipes-devtools/gcc/{gcc-cross-canadian_9.2.bb => gcc-cross-canadian_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-cross_9.2.bb => gcc-cross_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-crosssdk_9.2.bb => gcc-crosssdk_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-runtime_9.2.bb => gcc-runtime_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-sanitizers_9.2.bb => gcc-sanitizers_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc-source_9.2.bb => gcc-source_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{gcc_9.2.bb => gcc_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc-initial_9.2.bb => libgcc-initial_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{libgcc_9.2.bb => libgcc_9.3.bb} (100%) rename meta/recipes-devtools/gcc/{libgfortran_9.2.bb => libgfortran_9.3.bb} (100%) delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.10.bb => libsdl2_2.0.12.bb} (81%) copy scripts/pybootchartgui/pybootchartgui/__init__.py => meta/recipes-graphics/wayland/weston-init/weston.env (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:11:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:11:28 +0000 Subject: [oe-commits] [openembedded-core] 03/05: libsdl2: upgrade 2.0.10 -> 2.0.12 In-Reply-To: <158405468567.27105.12245531069417058550@git.openembedded.org> References: <158405468567.27105.12245531069417058550@git.openembedded.org> Message-ID: <20200312231126.15070233628@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit aaa1c3ee0fe782fb08a58f100bc04686824de815 Author: Andreas M?ller AuthorDate: Thu Mar 12 15:43:31 2020 +0100 libsdl2: upgrade 2.0.10 -> 2.0.12 * checked all hunks: backported patches can go * for machines with neon in TUNE_FEATURES enable new configure option --enable-arm-neon. If enabled, license must be extended to MIT * license checksum changed by copyright year Signed-off-by: Andreas M?ller Signed-off-by: Richard Purdie --- ...538-validate-image-size-when-loading-BMP-.patch | 34 -------------- ...heck-for-build-dir-when-building-version-.patch | 53 ---------------------- ...797-SDL-fails-to-compile-with-Mesa-Master.patch | 41 ----------------- .../{libsdl2_2.0.10.bb => libsdl2_2.0.12.bb} | 15 +++--- 4 files changed, 9 insertions(+), 134 deletions(-) diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch deleted file mode 100644 index 674decc..0000000 --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 85138c1ec673e05263ae666baf61f79384daf7e0 Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Tue, 30 Jul 2019 11:00:00 -0700 -Subject: [PATCH] Fixed bug 4538 - validate image size when loading BMP files - -Upstream-Status: Backport -[https://hg.libsdl.org/SDL/rev/e7ba650a643a] - -CVE: CVE-2019-13616 - -Signed-off-by: Yi Zhao ---- - src/video/SDL_bmp.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c -index 0b68918..a06b0c9 100644 ---- a/src/video/SDL_bmp.c -+++ b/src/video/SDL_bmp.c -@@ -226,6 +226,11 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc) - SDL_RWseek(src, (biSize - headerSize), RW_SEEK_CUR); - } - } -+ if (biWidth <= 0 || biHeight == 0) { -+ SDL_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight); -+ was_error = SDL_TRUE; -+ goto done; -+ } - if (biHeight < 0) { - topDown = SDL_TRUE; - biHeight = -biHeight; --- -2.7.4 - diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch b/meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch deleted file mode 100644 index b383bd6..0000000 --- a/meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch +++ /dev/null @@ -1,53 +0,0 @@ -# HG changeset patch -# User Anuj Mittal -# Date 1573631462 -10800 -# Node ID 1fb1880d5edfc7c5a370846e13f90b260263627c -# Parent 007002587d5d34d781c2b628c05e992e0ac5f52d -configure: check for build dir when building version res (fix bug #4858) -Fixes a race where we try to build version res file in build directory -before it has even been created. Prevents errors like: - -/bin/bash ../SDL2-2.0.10/build-scripts/updaterev.sh -/bin/bash ../SDL2-2.0.10/build-scripts/mkinstalldirs build -mkdir -p -- build -x86_64-pokysdk-mingw32-windres --include-dir=/home/pokybuild/yocto-worker/meta-mingw/build/build/tmp/work/x86_64-nativesdk-mingw32-pokysdk-mingw32/nativesdk-libsdl2/2.0.10-r0/recipe-sysroot/opt/poky/3.0/sysroots/x86_64-pokysdk-mingw32/usr/include ../SDL2-2.0.10/src/main/windows/version.rc build/version.o -x86_64-pokysdk-mingw32-windres: build/version.o: No such file or directory -Makefile:692: recipe for target 'build/version.o' failed -make: *** [build/version.o] Error 1 -make: *** Waiting for unfinished jobs.... -touch build/.created -WARNING: exit code 1 from a shell command. - -Extension of fix: -https://hg.libsdl.org/SDL/rev/99d8b18acf8a - -Upstream-Status: Backport -Signed-off-by: Anuj Mittal ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff -r 007002587d5d -r 1fb1880d5edf configure ---- a/configure Tue Nov 12 17:24:37 2019 -0500 -+++ b/configure Wed Nov 13 10:51:02 2019 +0300 -@@ -25493,7 +25493,7 @@ - VERSION_DEPENDS=`echo $VERSION_SOURCES` - VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[^ ]*/\([^ ]*\)\.rc,$(objects)/\1.o,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([^ ]*\\)/\\([^ ]*\\)\\.rc,\\\\ --\\$(objects)/\\2.o: \\1/\\2.rc\\\\ -+\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\ - \\$(WINDRES) \\$< \\$@,g"` - - SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` -diff -r 007002587d5d -r 1fb1880d5edf configure.ac ---- a/configure.ac Tue Nov 12 17:24:37 2019 -0500 -+++ b/configure.ac Wed Nov 13 10:51:02 2019 +0300 -@@ -4177,7 +4177,7 @@ - VERSION_DEPENDS=`echo $VERSION_SOURCES` - VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ --\\$(objects)/\\2.o: \\1/\\2.rc\\\\ -+\\$(objects)/\\2.o: \\1/\\2.rc \\$(objects)/.created\\\\ - \\$(WINDRES) \\$< \\$@,g"` - - SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` diff --git a/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch b/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch deleted file mode 100644 index 8f5b6a0..0000000 --- a/meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch +++ /dev/null @@ -1,41 +0,0 @@ -# HG changeset patch -# User Sylvain Becker -# Date 1570898876 -7200 -# Sat Oct 12 18:47:56 2019 +0200 -# Node ID 369b01006eb2f6fd563f7c315d29ae3fe503c432 -# Parent 4cbaffd0083b8cd17070dbd9d4ab1ce0fa9fca2d -Fixed bug 4797 - SDL fails to compile with Mesa Master (thanks Michael Olbrich!) - -fix building with Mesa 19.2 - -With Mesa 19.2 building fails with: - -/include/GLES/gl.h:63:25: error: conflicting types for 'GLsizeiptr' - -The same type is defined in include/SDL_opengl.h for OpenGL and the two -headers should not be included at the same time. -This was just never noticed because the same header guard '__gl_h_' was -used. This was changed in Mesa. The result is this error. - -Fix this the same way GLES2 already handles this: Don't include the GLES -header when the OpenGL header was already included. -(https://hg.libsdl.org/SDL/rev/a60b3c292f0f) - -Upstream-Status: Backport [https://hg.libsdl.org/SDL/rev/369b01006eb2] -Signed-off-by: Alistair Francis - -diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c ---- a/src/video/SDL_video.c -+++ b/src/video/SDL_video.c -@@ -37,9 +37,9 @@ - #include "SDL_opengl.h" - #endif /* SDL_VIDEO_OPENGL */ - --#if SDL_VIDEO_OPENGL_ES -+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL - #include "SDL_opengles.h" --#endif /* SDL_VIDEO_OPENGL_ES */ -+#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */ - - /* GL and GLES2 headers conflict on Linux 32 bits */ - #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb similarity index 81% rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb index 413f534..c1c941e 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb @@ -8,21 +8,22 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" SECTION = "libs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=504a9454ceb89fd75a2583473b11409e" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=2d4af6adb4d89aad0cdedbcc18c9a32f" + +# arm-neon adds MIT license +LICENSE_append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', '& MIT', '', d)}" +LIC_FILES_CHKSUM_append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'file://src/video/arm/pixman-arm-neon-asm.h;md5=9a9cc1e51abbf1da58f4d9528ec9d49b;beginline=1;endline=24', '', d)}" PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ - file://0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch \ - file://0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch \ - file://0001-configure-check-for-build-dir-when-building-version-.patch \ " S = "${WORKDIR}/SDL2-${PV}" -SRC_URI[md5sum] = "5a2114f2a6f348bdab5bf52b994811db" -SRC_URI[sha256sum] = "b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57" +SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" +SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" inherit autotools lib_package binconfig-disabled pkgconfig @@ -50,8 +51,10 @@ PACKAGECONFIG ??= " \ ${PACKAGECONFIG_GL} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ + ${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \ " PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," +PACKAGECONFIG[arm-neon] = "--enable-arm-neon,--disable-arm-neon" PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,virtual/libgles2" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:11:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:11:29 +0000 Subject: [oe-commits] [openembedded-core] 04/05: oeqa/qemuarm64: Ignore logind: failed to get session seat In-Reply-To: <158405468567.27105.12245531069417058550@git.openembedded.org> References: <158405468567.27105.12245531069417058550@git.openembedded.org> Message-ID: <20200312231126.22B7C233629@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1f9d36722132c93c19651ea59062b3d5be01bb72 Author: Khem Raj AuthorDate: Thu Mar 12 00:50:14 2020 -0700 oeqa/qemuarm64: Ignore logind: failed to get session seat When booting weston images this error is seen commonly, but Qemu boots the image fine, session seat error is thrown by libweston perhaps using --seat option or setting XDG_SEAT variable in weston.ini could fix it [YOCTO #13828] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/cases/parselogs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 6444fe8..cc4f5f8 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -131,6 +131,7 @@ ignore_errors = { '(EE) Server terminated with error (1). Closing log file.', 'dmi: Firmware registration failed.', 'irq: type mismatch, failed to map hwirq-27 for /intc', + 'logind: failed to get session seat', ] + common_errors, 'intel-core2-32' : [ 'ACPI: No _BQC method, cannot determine initial brightness', -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:11:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:11:27 +0000 Subject: [oe-commits] [openembedded-core] 02/05: weston-init: Launch weston with WESTON_DISABLE_ATOMIC on musl/x86 In-Reply-To: <158405468567.27105.12245531069417058550@git.openembedded.org> References: <158405468567.27105.12245531069417058550@git.openembedded.org> Message-ID: <20200312231126.0806A233627@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit e571ef707d76cf3aceb0d56fd588b37f9b5092ff Author: Khem Raj AuthorDate: Thu Mar 12 16:02:38 2020 -0700 weston-init: Launch weston with WESTON_DISABLE_ATOMIC on musl/x86 Since we enabled drm/kms backend for qemux86, it does not work with musl fdbdev worked ok, we see this error [18:58:45.628] launching '/usr/libexec/weston-desktop-shell' [18:58:45.737] atomic: couldn't commit new state: Invalid argument [18:58:45.737] repaint-flush failed: Invalid argument There seems to be some problem with atomics in libdrm, until that gets diagnosed, simple solution is to not use it on musl when drm backend is used thats why WESTON_DISABLE_ATOMIC=Y is set in environment file for such cases Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-graphics/wayland/weston-init.bb | 14 ++++++++++++-- meta/recipes-graphics/wayland/weston-init/weston.env | 0 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index e3e739e..40aa762 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "file://init \ + file://weston.env \ file://weston.ini \ file://weston at .service \ file://71-weston-drm.rules \ @@ -15,6 +16,7 @@ S = "${WORKDIR}" do_install() { install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini + install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston # Install Weston systemd service and accompanying udev rule install -D -p -m0644 ${WORKDIR}/weston at .service ${D}${systemd_system_unitdir}/weston at .service @@ -30,6 +32,14 @@ do_install() { sed -i 's, at LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start } +do_install_append_libc-musl_qemux86() { + echo "WESTON_DISABLE_ATOMIC=Y" >> ${D}${sysconfdir}/default/weston +} + +do_install_append_libc-musl_qemux86-64() { + echo "WESTON_DISABLE_ATOMIC=Y" >> ${D}${sysconfdir}/default/weston +} + inherit update-rc.d features_check systemd # rdepends on weston which depends on virtual/egl @@ -40,9 +50,9 @@ RDEPENDS_${PN} = "weston kbd" INITSCRIPT_NAME = "weston" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." -FILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini ${systemd_system_unitdir}/weston at .service" +FILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini ${systemd_system_unitdir}/weston at .service ${sysconfdir}/default/weston" -CONFFILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini" +CONFFILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" SYSTEMD_SERVICE_${PN} = "weston@%i.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta/recipes-graphics/wayland/weston-init/weston.env b/meta/recipes-graphics/wayland/weston-init/weston.env 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 Mar 12 23:11:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:11:30 +0000 Subject: [oe-commits] [openembedded-core] 05/05: gcc: Upgrade to 9.3 bugfix release In-Reply-To: <158405468567.27105.12245531069417058550@git.openembedded.org> References: <158405468567.27105.12245531069417058550@git.openembedded.org> Message-ID: <20200312231126.446A723362A@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b0654673ef1f9513d4770626f108fdd2441e8f56 Author: Khem Raj AuthorDate: Thu Mar 12 16:08:40 2020 -0700 gcc: Upgrade to 9.3 bugfix release This brings ~157 bugfixes [1] to gcc-9 with no features Drop backports which are already part of the release now [1] https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&list_id=260610&resolution=FIXED&target_milestone=9.3 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 +- ...x-up-libsanitizer-build-with-master-glibc.patch | 70 --- .../gcc/gcc-9.2/CVE-2019-15847_1.patch | 521 --------------------- .../gcc/gcc-9.2/CVE-2019-15847_2.patch | 77 --- .../gcc/gcc-9.2/CVE-2019-15847_3.patch | 62 --- .../gcc/{gcc-9.2.inc => gcc-9.3.inc} | 22 +- .../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 6 +- .../0002-gcc-poison-system-directories.patch | 24 +- .../0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 6 +- .../0004-64-bit-multilib-hack.patch | 6 +- .../0005-optional-libstdc.patch | 12 +- .../0006-COLLECT_GCC_OPTIONS.patch | 6 +- ...efaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 14 +- .../0008-fortran-cross-compile-hack.patch | 6 +- .../0009-cpp-honor-sysroot.patch | 6 +- .../0010-MIPS64-Default-to-N64-ABI.patch | 8 +- ...C_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 7 +- ...0012-gcc-Fix-argument-list-too-long-error.patch | 10 +- .../{gcc-9.2 => gcc-9.3}/0013-Disable-sdt.patch | 20 +- .../gcc/{gcc-9.2 => gcc-9.3}/0014-libtool.patch | 6 +- ...4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 6 +- ...tilib-config-files-from-B-instead-of-usin.patch | 14 +- ...-libdir-from-.la-which-usually-points-to-.patch | 6 +- .../gcc/{gcc-9.2 => gcc-9.3}/0018-export-CPP.patch | 6 +- ...Ensure-target-gcc-headers-can-be-included.patch | 19 +- ...-t-build-with-disable-dependency-tracking.patch | 6 +- ...h-host-directory-during-relink-if-inst_pr.patch | 6 +- ...IBS_DIR-replacement-instead-of-hardcoding.patch | 6 +- .../0023-aarch64-Add-support-for-musl-ldso.patch | 6 +- ...ibcc1-fix-libcc1-s-install-path-and-rpath.patch | 6 +- ...-handle-sysroot-support-for-nativesdk-gcc.patch | 187 ++------ ...et-sysroot-gcc-version-specific-dirs-with.patch | 12 +- ...-various-_FOR_BUILD-and-related-variables.patch | 14 +- .../0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 6 +- ...shared-to-link-commandline-for-musl-targe.patch | 6 +- .../0030-ldbl128-config.patch} | 16 +- ...bgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 6 +- ...e-alias-for-__cpu_indicator_init-instead-.patch | 10 +- .../0033-sync-gcc-stddef.h-with-musl.patch | 6 +- ...ation-fault-in-precompiled-header-generat.patch | 6 +- .../0035-Fix-for-testsuite-failure.patch | 6 +- ...0036-Re-introduce-spe-commandline-options.patch | 6 +- ...50-Check-zero-value-in-simple_object_elf.patch} | 24 +- ...modes-Do-not-use-__LINE__-for-maintainin.patch} | 21 +- ...operands-Don-t-match-user-defined-regs-o.patch} | 15 +- ...s-canadian_9.2.bb => gcc-cross-canadian_9.3.bb} | 0 .../gcc/{gcc-cross_9.2.bb => gcc-cross_9.3.bb} | 0 .../{gcc-crosssdk_9.2.bb => gcc-crosssdk_9.3.bb} | 0 .../gcc/{gcc-runtime_9.2.bb => gcc-runtime_9.3.bb} | 0 ...gcc-sanitizers_9.2.bb => gcc-sanitizers_9.3.bb} | 0 .../gcc/{gcc-source_9.2.bb => gcc-source_9.3.bb} | 0 .../gcc/{gcc_9.2.bb => gcc_9.3.bb} | 0 ...libgcc-initial_9.2.bb => libgcc-initial_9.3.bb} | 0 .../gcc/{libgcc_9.2.bb => libgcc_9.3.bb} | 0 .../gcc/{libgfortran_9.2.bb => libgfortran_9.3.bb} | 0 55 files changed, 238 insertions(+), 1075 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 33f8044..40e90f7 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -194,7 +194,7 @@ RECIPE_MAINTAINER_pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj -Date: Sun, 22 Dec 2019 02:58:24 +0000 -Subject: [PATCH] Fix up libsanitizer build with master glibc - -2019-11-26 Jakub Jelinek - - PR sanitizer/92154 - * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick - llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce. - * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. - -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b02486e0951bc0ed38310a03be73e479fc6f3e7a;hp=3feeac76ffc38427de2d7d086e2928e63eee2d44] -Signed-off-by: Auto Builder ---- - .../sanitizer_platform_limits_posix.cc | 5 +++-- - .../sanitizer_platform_limits_posix.h | 15 +-------------- - 2 files changed, 4 insertions(+), 16 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index 6cd4a5bac..d823a1219 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -1156,8 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); - CHECK_SIZE_AND_OFFSET(ipc_perm, gid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); --#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) --/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ -+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) -+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit -+ on many architectures. */ - CHECK_SIZE_AND_OFFSET(ipc_perm, mode); - #endif - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index 73af92af1..6a673a7c9 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -211,26 +211,13 @@ namespace __sanitizer { - u64 __unused1; - u64 __unused2; - #elif defined(__sparc__) --#if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --#else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; --#endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; --#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) -- unsigned int mode; -- unsigned short __seq; -- unsigned short __pad1; -- unsigned long __unused1; -- unsigned long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) --- -2.17.1 - diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch deleted file mode 100644 index 227fd47..0000000 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch +++ /dev/null @@ -1,521 +0,0 @@ -From 8c61566116d23063ff597271884f8e00d94ab1a1 Mon Sep 17 00:00:00 2001 -From: segher -Date: Fri, 30 Aug 2019 13:48:48 +0000 -Subject: [PATCH] Backport from trunk 2019-08-22 Segher Boessenkool - - - * config/rs6000/altivec.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32, - UNSPEC_DARN_RAW, UNSPEC_CMPRB, UNSPEC_CMPRB2, UNSPEC_CMPEQB; move to... - * config/rs6000/rs6000.md (unspec): ... here. - * config/rs6000/altivec.md (darn_32, darn_raw, darn, cmprb, - *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal, - cmpeqb, *cmpeqb_internal): Delete, move to... - * config/rs6000/rs6000.md (darn_32, darn_raw, darn, cmprb, - *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal, - cmpeqb, *cmpeqb_internal): ... here. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 275170 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2019-15847 p1 -Affects <= 9.2.0 -Dropped Changelog changes -Signed-off-by: Armin Kuster - ---- - gcc/config/rs6000/altivec.md | 223 ---------------------------------- - gcc/config/rs6000/rs6000.md | 224 +++++++++++++++++++++++++++++++++++ - 3 files changed, 239 insertions(+), 223 deletions(-) - -Index: gcc-9.2.0/gcc/config/rs6000/altivec.md -=================================================================== ---- gcc-9.2.0.orig/gcc/config/rs6000/altivec.md -+++ gcc-9.2.0/gcc/config/rs6000/altivec.md -@@ -80,9 +80,6 @@ - UNSPEC_VUPKHPX - UNSPEC_VUPKLPX - UNSPEC_CONVERT_4F32_8I16 -- UNSPEC_DARN -- UNSPEC_DARN_32 -- UNSPEC_DARN_RAW - UNSPEC_DST - UNSPEC_DSTT - UNSPEC_DSTST -@@ -161,9 +158,6 @@ - UNSPEC_BCDADD - UNSPEC_BCDSUB - UNSPEC_BCD_OVERFLOW -- UNSPEC_CMPRB -- UNSPEC_CMPRB2 -- UNSPEC_CMPEQB - UNSPEC_VRLMI - UNSPEC_VRLNM - ]) -@@ -4101,223 +4095,6 @@ - "bcd. %0,%1,%2,%3" - [(set_attr "type" "vecsimple")]) - --(define_insn "darn_32" -- [(set (match_operand:SI 0 "register_operand" "=r") -- (unspec:SI [(const_int 0)] UNSPEC_DARN_32))] -- "TARGET_P9_MISC" -- "darn %0,0" -- [(set_attr "type" "integer")]) -- --(define_insn "darn_raw" -- [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] -- "TARGET_P9_MISC && TARGET_64BIT" -- "darn %0,2" -- [(set_attr "type" "integer")]) -- --(define_insn "darn" -- [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN))] -- "TARGET_P9_MISC && TARGET_64BIT" -- "darn %0,1" -- [(set_attr "type" "integer")]) -- --;; Test byte within range. --;; --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the range specified by operand 2. --;; The bytes of operand 2 are organized as xx:xx:hi:lo. --;; --;; Return in target register operand 0 a value of 1 if lo <= vv and --;; vv <= hi. Otherwise, set register operand 0 to 0. --;; --;; Though the instructions to which this expansion maps operate on --;; 64-bit registers, the current implementation only operates on --;; SI-mode operands as the high-order bits provide no information --;; that is not already available in the low-order bits. To avoid the --;; costs of data widening operations, future enhancements might allow --;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. --(define_expand "cmprb" -- [(set (match_dup 3) -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB)) -- (set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_dup 3) -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 3) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" --{ -- operands[3] = gen_reg_rtx (CCmode); --}) -- --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the range specified by operand 2. --;; The bytes of operand 2 are organized as xx:xx:hi:lo. --;; --;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if --;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other --;; 3 bits of the target CR register are all set to 0. --(define_insn "*cmprb_internal" -- [(set (match_operand:CC 0 "cc_reg_operand" "=y") -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB))] -- "TARGET_P9_MISC" -- "cmprb %0,0,%1,%2" -- [(set_attr "type" "logical")]) -- --;; Set operand 0 register to -1 if the LT bit (0x8) of condition --;; register operand 1 is on. Otherwise, set operand 0 register to 1 --;; if the GT bit (0x4) of condition register operand 1 is on. --;; Otherwise, set operand 0 to 0. Note that the result stored into --;; register operand 0 is non-zero iff either the LT or GT bits are on --;; within condition register operand 1. --(define_insn "setb_signed" -- [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y") -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 1) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" -- "setb %0,%1" -- [(set_attr "type" "logical")]) -- --(define_insn "setb_unsigned" -- [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y") -- (const_int 0)) -- (const_int -1) -- (if_then_else (gtu (match_dup 1) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" -- "setb %0,%1" -- [(set_attr "type" "logical")]) -- --;; Test byte within two ranges. --;; --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the range specified by operand 2. --;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. --;; --;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and --;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register --;; operand 0 to 0. --;; --;; Though the instructions to which this expansion maps operate on --;; 64-bit registers, the current implementation only operates on --;; SI-mode operands as the high-order bits provide no information --;; that is not already available in the low-order bits. To avoid the --;; costs of data widening operations, future enhancements might allow --;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. --(define_expand "cmprb2" -- [(set (match_dup 3) -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB2)) -- (set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_dup 3) -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 3) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" --{ -- operands[3] = gen_reg_rtx (CCmode); --}) -- --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the ranges specified by operand 2. --;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. --;; --;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if --;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). --;; Otherwise, set the GT bit to 0. The other 3 bits of the target --;; CR register are all set to 0. --(define_insn "*cmprb2_internal" -- [(set (match_operand:CC 0 "cc_reg_operand" "=y") -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB2))] -- "TARGET_P9_MISC" -- "cmprb %0,1,%1,%2" -- [(set_attr "type" "logical")]) -- --;; Test byte membership within set of 8 bytes. --;; --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the set specified by operand 2. --;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. --;; --;; Return in target register operand 0 a value of 1 if vv equals one --;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set --;; register operand 0 to 0. Note that the 8 byte values held within --;; operand 2 need not be unique. --;; --;; Though the instructions to which this expansion maps operate on --;; 64-bit registers, the current implementation requires that operands --;; 0 and 1 have mode SI as the high-order bits provide no information --;; that is not already available in the low-order bits. To avoid the --;; costs of data widening operations, future enhancements might allow --;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. --(define_expand "cmpeqb" -- [(set (match_dup 3) -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:DI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPEQB)) -- (set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_dup 3) -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 3) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC && TARGET_64BIT" --{ -- operands[3] = gen_reg_rtx (CCmode); --}) -- --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the set specified by operand 2. --;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. --;; --;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv --;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, --;; set the GT bit to zero. The other 3 bits of the target CR register --;; are all set to 0. --(define_insn "*cmpeqb_internal" -- [(set (match_operand:CC 0 "cc_reg_operand" "=y") -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:DI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPEQB))] -- "TARGET_P9_MISC && TARGET_64BIT" -- "cmpeqb %0,%1,%2" -- [(set_attr "type" "logical")]) -- - (define_expand "bcd_" - [(parallel [(set (reg:CCFP CR6_REGNO) - (compare:CCFP -Index: gcc-9.2.0/gcc/config/rs6000/rs6000.md -=================================================================== ---- gcc-9.2.0.orig/gcc/config/rs6000/rs6000.md -+++ gcc-9.2.0/gcc/config/rs6000/rs6000.md -@@ -137,6 +137,12 @@ - UNSPEC_LSQ - UNSPEC_FUSION_GPR - UNSPEC_STACK_CHECK -+ UNSPEC_DARN -+ UNSPEC_DARN_32 -+ UNSPEC_DARN_RAW -+ UNSPEC_CMPRB -+ UNSPEC_CMPRB2 -+ UNSPEC_CMPEQB - UNSPEC_ADD_ROUND_TO_ODD - UNSPEC_SUB_ROUND_TO_ODD - UNSPEC_MUL_ROUND_TO_ODD -@@ -14322,7 +14328,225 @@ - "xscmpuqp %0,%1,%2" - [(set_attr "type" "veccmp") - (set_attr "size" "128")]) -+ -+;; Miscellaneous ISA 3.0 (power9) instructions -+ -+(define_insn "darn_32" -+ [(set (match_operand:SI 0 "register_operand" "=r") -+ (unspec:SI [(const_int 0)] UNSPEC_DARN_32))] -+ "TARGET_P9_MISC" -+ "darn %0,0" -+ [(set_attr "type" "integer")]) -+ -+(define_insn "darn_raw" -+ [(set (match_operand:DI 0 "register_operand" "=r") -+ (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+ "darn %0,2" -+ [(set_attr "type" "integer")]) -+ -+(define_insn "darn" -+ [(set (match_operand:DI 0 "register_operand" "=r") -+ (unspec:DI [(const_int 0)] UNSPEC_DARN))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+ "darn %0,1" -+ [(set_attr "type" "integer")]) -+ -+;; Test byte within range. -+;; -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the range specified by operand 2. -+;; The bytes of operand 2 are organized as xx:xx:hi:lo. -+;; -+;; Return in target register operand 0 a value of 1 if lo <= vv and -+;; vv <= hi. Otherwise, set register operand 0 to 0. -+;; -+;; Though the instructions to which this expansion maps operate on -+;; 64-bit registers, the current implementation only operates on -+;; SI-mode operands as the high-order bits provide no information -+;; that is not already available in the low-order bits. To avoid the -+;; costs of data widening operations, future enhancements might allow -+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. -+(define_expand "cmprb" -+ [(set (match_dup 3) -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB)) -+ (set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_dup 3) -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 3) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+{ -+ operands[3] = gen_reg_rtx (CCmode); -+}) -+ -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the range specified by operand 2. -+;; The bytes of operand 2 are organized as xx:xx:hi:lo. -+;; -+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if -+;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other -+;; 3 bits of the target CR register are all set to 0. -+(define_insn "*cmprb_internal" -+ [(set (match_operand:CC 0 "cc_reg_operand" "=y") -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB))] -+ "TARGET_P9_MISC" -+ "cmprb %0,0,%1,%2" -+ [(set_attr "type" "logical")]) -+ -+;; Set operand 0 register to -1 if the LT bit (0x8) of condition -+;; register operand 1 is on. Otherwise, set operand 0 register to 1 -+;; if the GT bit (0x4) of condition register operand 1 is on. -+;; Otherwise, set operand 0 to 0. Note that the result stored into -+;; register operand 0 is non-zero iff either the LT or GT bits are on -+;; within condition register operand 1. -+(define_insn "setb_signed" -+ [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y") -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 1) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+ "setb %0,%1" -+ [(set_attr "type" "logical")]) - -+(define_insn "setb_unsigned" -+ [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y") -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gtu (match_dup 1) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+ "setb %0,%1" -+ [(set_attr "type" "logical")]) -+ -+;; Test byte within two ranges. -+;; -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the range specified by operand 2. -+;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. -+;; -+;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and -+;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register -+;; operand 0 to 0. -+;; -+;; Though the instructions to which this expansion maps operate on -+;; 64-bit registers, the current implementation only operates on -+;; SI-mode operands as the high-order bits provide no information -+;; that is not already available in the low-order bits. To avoid the -+;; costs of data widening operations, future enhancements might allow -+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. -+(define_expand "cmprb2" -+ [(set (match_dup 3) -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB2)) -+ (set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_dup 3) -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 3) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+{ -+ operands[3] = gen_reg_rtx (CCmode); -+}) -+ -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the ranges specified by operand 2. -+;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. -+;; -+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if -+;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). -+;; Otherwise, set the GT bit to 0. The other 3 bits of the target -+;; CR register are all set to 0. -+(define_insn "*cmprb2_internal" -+ [(set (match_operand:CC 0 "cc_reg_operand" "=y") -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB2))] -+ "TARGET_P9_MISC" -+ "cmprb %0,1,%1,%2" -+ [(set_attr "type" "logical")]) -+ -+;; Test byte membership within set of 8 bytes. -+;; -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the set specified by operand 2. -+;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. -+;; -+;; Return in target register operand 0 a value of 1 if vv equals one -+;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set -+;; register operand 0 to 0. Note that the 8 byte values held within -+;; operand 2 need not be unique. -+;; -+;; Though the instructions to which this expansion maps operate on -+;; 64-bit registers, the current implementation requires that operands -+;; 0 and 1 have mode SI as the high-order bits provide no information -+;; that is not already available in the low-order bits. To avoid the -+;; costs of data widening operations, future enhancements might allow -+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. -+(define_expand "cmpeqb" -+ [(set (match_dup 3) -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:DI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPEQB)) -+ (set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_dup 3) -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 3) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+{ -+ operands[3] = gen_reg_rtx (CCmode); -+}) -+ -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the set specified by operand 2. -+;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. -+;; -+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv -+;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, -+;; set the GT bit to zero. The other 3 bits of the target CR register -+;; are all set to 0. -+(define_insn "*cmpeqb_internal" -+ [(set (match_operand:CC 0 "cc_reg_operand" "=y") -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:DI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPEQB))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+ "cmpeqb %0,%1,%2" -+ [(set_attr "type" "logical")]) - - - (include "sync.md") diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch deleted file mode 100644 index de7a83c..0000000 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 87bc784a7ca3a43182f7272241597a50d7491342 Mon Sep 17 00:00:00 2001 -From: segher -Date: Fri, 30 Aug 2019 13:51:26 +0000 -Subject: [PATCH] Backport from trunk 2019-08-22 Segher Boessenkool - - - PR target/91481 - * config/rs6000/rs6000.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32, - and UNSPEC_DARN_RAW. - (unspecv): New enumerator values UNSPECV_DARN, UNSPECV_DARN_32, and - UNSPECV_DARN_RAW. - (darn_32): Use an unspec_volatile, and UNSPECV_DARN_32. - (darn_raw): Use an unspec_volatile, and UNSPECV_DARN_RAW. - (darn): Use an unspec_volatile, and UNSPECV_DARN. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 275175 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2019-15847 p2 -Affects <= 9.2.0 -Dropped Changelog changes -Signed-off-by: Armin Kuster - ---- - gcc/config/rs6000/rs6000.md | 12 ++++++------ - 2 files changed, 20 insertions(+), 6 deletions(-) - -Index: gcc-9.2.0/gcc/config/rs6000/rs6000.md -=================================================================== ---- gcc-9.2.0.orig/gcc/config/rs6000/rs6000.md -+++ gcc-9.2.0/gcc/config/rs6000/rs6000.md -@@ -137,9 +137,6 @@ - UNSPEC_LSQ - UNSPEC_FUSION_GPR - UNSPEC_STACK_CHECK -- UNSPEC_DARN -- UNSPEC_DARN_32 -- UNSPEC_DARN_RAW - UNSPEC_CMPRB - UNSPEC_CMPRB2 - UNSPEC_CMPEQB -@@ -170,6 +167,9 @@ - UNSPECV_EH_RR ; eh_reg_restore - UNSPECV_ISYNC ; isync instruction - UNSPECV_MFTB ; move from time base -+ UNSPECV_DARN ; darn 1 (deliver a random number) -+ UNSPECV_DARN_32 ; darn 2 -+ UNSPECV_DARN_RAW ; darn 0 - UNSPECV_NLGR ; non-local goto receiver - UNSPECV_MFFS ; Move from FPSCR - UNSPECV_MFFSL ; Move from FPSCR light instruction version -@@ -14333,21 +14333,21 @@ - - (define_insn "darn_32" - [(set (match_operand:SI 0 "register_operand" "=r") -- (unspec:SI [(const_int 0)] UNSPEC_DARN_32))] -+ (unspec_volatile:SI [(const_int 0)] UNSPECV_DARN_32))] - "TARGET_P9_MISC" - "darn %0,0" - [(set_attr "type" "integer")]) - - (define_insn "darn_raw" - [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] -+ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN_RAW))] - "TARGET_P9_MISC && TARGET_64BIT" - "darn %0,2" - [(set_attr "type" "integer")]) - - (define_insn "darn" - [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN))] -+ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN))] - "TARGET_P9_MISC && TARGET_64BIT" - "darn %0,1" - [(set_attr "type" "integer")]) diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch deleted file mode 100644 index ba7130c..0000000 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch +++ /dev/null @@ -1,62 +0,0 @@ -From dc4c8dd9dbe70740ec7a684b0f35620249fb036a Mon Sep 17 00:00:00 2001 -From: segher -Date: Fri, 30 Aug 2019 13:53:11 +0000 -Subject: [PATCH] Backport from trunk 2019-08-23 Segher Boessenkool - - -gcc/testsuite/ - PR target/91481 - * gcc.target/powerpc/darn-3.c: New testcase. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 275176 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2019-15847 p3 -Affects <= 9.2.0 -Dropped Changelog changes -Signed-off-by: Armin Kuster - ---- - gcc/testsuite/ChangeLog | 6 ++++++ - gcc/testsuite/gcc.target/powerpc/darn-3.c | 16 ++++++++++++++++ - 2 files changed, 22 insertions(+) - create mode 100644 gcc/testsuite/gcc.target/powerpc/darn-3.c - -Index: gcc-9.2.0/gcc/testsuite/gcc.target/powerpc/darn-3.c -=================================================================== ---- /dev/null -+++ gcc-9.2.0/gcc/testsuite/gcc.target/powerpc/darn-3.c -@@ -0,0 +1,16 @@ -+/* { dg-do compile { target { powerpc*-*-* } } } */ -+/* { dg-skip-if "" { powerpc*-*-aix* } } */ -+/* { dg-options "-O2 -mdejagnu-cpu=power9" } */ -+ -+static int darn32(void) { return __builtin_darn_32(); } -+ -+int four(void) -+{ -+ int sum = 0; -+ int i; -+ for (i = 0; i < 4; i++) -+ sum += darn32(); -+ return sum; -+} -+ -+/* { dg-final { scan-assembler-times {(?n)\mdarn .*,0\M} 4 } } */ -Index: gcc-9.2.0/gcc/testsuite/ChangeLog -=================================================================== ---- gcc-9.2.0.orig/gcc/testsuite/ChangeLog -+++ gcc-9.2.0/gcc/testsuite/ChangeLog -@@ -1,3 +1,11 @@ -+2019-08-30 Segher Boessenkool -+ -+ Backport from trunk -+ 2019-08-23 Segher Boessenkool -+ -+ PR target/91481 -+ * gcc.target/powerpc/darn-3.c: New testcase. -+ - 2019-08-12 Release Manager - - * GCC 9.2.0 released. diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.3.inc similarity index 87% rename from meta/recipes-devtools/gcc/gcc-9.2.inc rename to meta/recipes-devtools/gcc/gcc-9.3.inc index 2368f35..b041107 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.3.inc @@ -2,13 +2,13 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "9.2.0" +PV = "9.3.0" # BINV should be incremented to a revision after a minor gcc release -BINV = "9.2.0" +BINV = "9.3.0" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.2:${FILE_DIRNAME}/gcc-9.2/backport:" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.3:${FILE_DIRNAME}/gcc-9.3/backport:" DEPENDS =+ "mpfr gmp libmpc zlib flex-native" NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native" @@ -57,25 +57,19 @@ SRC_URI = "\ file://0027-Fix-various-_FOR_BUILD-and-related-variables.patch \ file://0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ file://0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ - file://0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \ + file://0030-ldbl128-config.patch \ file://0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ file://0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ file://0033-sync-gcc-stddef.h-with-musl.patch \ file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \ file://0035-Fix-for-testsuite-failure.patch \ file://0036-Re-introduce-spe-commandline-options.patch \ - file://0037-Fix-up-libsanitizer-build-with-master-glibc.patch \ - file://CVE-2019-14250.patch \ - 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 \ - file://gen-no-line-numbers.patch \ + file://0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch \ + file://0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ + file://0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" -SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" -SRC_URI[sha256sum] = "ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206" - +SRC_URI[sha256sum] = "71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1" # For dev release snapshotting #S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/official-gcc-${RELEASE}" #B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch index 9065c30..0d9222d 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch @@ -1,7 +1,7 @@ -From 863325ec3c6eb4987be63509ac407b2d13617342 Mon Sep 17 00:00:00 2001 +From 02b1789dbbb184726782b5038a4dd96515ec790c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 08:37:11 +0400 -Subject: [PATCH 01/36] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET +Subject: [PATCH 01/39] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET Signed-off-by: Khem Raj @@ -38,5 +38,5 @@ index 9db4fd14aa2..aad93c4d183 100644 *" newlib "*) case " $target_configargs " in -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch index a1116e7..f427ee6 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch @@ -1,7 +1,7 @@ -From 68e78bc15de215fa15c7d8b56bd2e2b0539b34fa Mon Sep 17 00:00:00 2001 +From 5368cd0293ce50a69ced6e4b25ba6c8d8e014256 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 08:59:00 +0400 -Subject: [PATCH 02/36] gcc: poison-system-directories +Subject: [PATCH 02/39] gcc: poison-system-directories Add /sw/include and /opt/include based on the original zecke-no-host-includes.patch patch. The original patch checked for @@ -58,10 +58,10 @@ index a718ceaf3da..5713342efb1 100644 optimizer and back end) to be checked for dynamic type safety at runtime. This is quite expensive. */ diff --git a/gcc/configure b/gcc/configure -index 481071b4265..a6ea3a8a84c 100755 +index a065ba23728..2e26dd33310 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -995,6 +995,7 @@ with_system_zlib +@@ -996,6 +996,7 @@ with_system_zlib enable_maintainer_mode enable_link_mutex enable_version_specific_runtime_libs @@ -69,7 +69,7 @@ index 481071b4265..a6ea3a8a84c 100755 enable_plugin enable_host_shared enable_libquadmath_support -@@ -1748,6 +1749,8 @@ Optional Features: +@@ -1749,6 +1750,8 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory @@ -78,7 +78,7 @@ index 481071b4265..a6ea3a8a84c 100755 --enable-plugin enable plugin support --enable-host-shared build host code as shared libraries --disable-libquadmath-support -@@ -29750,6 +29753,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : +@@ -29753,6 +29756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi @@ -99,10 +99,10 @@ index 481071b4265..a6ea3a8a84c 100755 diff --git a/gcc/configure.ac b/gcc/configure.ac -index ce2825580c6..d42bbd4fd1c 100644 +index 3a7251102ef..12d1d04e645 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -6378,6 +6378,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, +@@ -6380,6 +6380,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [specify that runtime libraries should be installed in a compiler-specific directory])]) @@ -120,10 +120,10 @@ index ce2825580c6..d42bbd4fd1c 100644 AC_SUBST(subdirs) AC_SUBST(srcdir) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 6ef36ce02aa..09414d8cc05 100644 +index 0ab6c9c6449..c3d3d51a28f 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -332,6 +332,7 @@ Objective-C and Objective-C++ Dialects}. +@@ -333,6 +333,7 @@ Objective-C and Objective-C++ Dialects}. -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol -Wparentheses -Wno-pedantic-ms-format @gol -Wplacement-new -Wplacement-new=@var{n} @gol @@ -131,7 +131,7 @@ index 6ef36ce02aa..09414d8cc05 100644 -Wpointer-arith -Wpointer-compare -Wno-pointer-to-int-cast @gol -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol -Wrestrict -Wno-return-local-addr @gol -@@ -6289,6 +6290,14 @@ made up of data only and thus requires no special treatment. But, for +@@ -6290,6 +6291,14 @@ made up of data only and thus requires no special treatment. But, for most targets, it is made up of code and thus requires the stack to be made executable in order for the program to work properly. @@ -199,5 +199,5 @@ index bcbe2082905..5752298bbf2 100644 /* Use given -I paths for #include "..." but not #include <...>, and -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch index 23039d2..23ec5bc 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch @@ -1,7 +1,7 @@ -From f8d60c4114acb92361c7b2f4a4561d4661e8da9d Mon Sep 17 00:00:00 2001 +From df90dbdba7a85c20bad95de71525f0f400a849d2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:08:31 +0400 -Subject: [PATCH 03/36] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET +Subject: [PATCH 03/39] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it. @@ -69,5 +69,5 @@ index b121088d778..93aae5bb26f 100755 # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch index a79c40c..17ec898 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch @@ -1,7 +1,7 @@ -From c2081c51db589471ea713870c72f13999abda815 Mon Sep 17 00:00:00 2001 +From 2e00d0a9a809153f693659e977c1e0550665e65c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:10:06 +0400 -Subject: [PATCH 04/36] 64-bit multilib hack. +Subject: [PATCH 04/39] 64-bit multilib hack. GCC has internal multilib handling code but it assumes a very specific rigid directory layout. The build system implementation of multilib layout is very generic and allows @@ -115,5 +115,5 @@ index f3c6e2be1d9..bd0393155fa 100644 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c $(COMPILE) $< -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch index f4fac91..3c28aea 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch @@ -1,7 +1,7 @@ -From e7e504f4a90cfa395e7f8ee779f8c3ed687802ca Mon Sep 17 00:00:00 2001 +From 435e45592e944018f33bff32f1202b0872a23141 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:12:56 +0400 -Subject: [PATCH 05/36] optional libstdc +Subject: [PATCH 05/39] optional libstdc gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ will not run correctly since by default the linker will try to link against libstdc++ @@ -52,7 +52,7 @@ index 6c4574a837d..0e2657f00ee 100644 library = -1; break; diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 09414d8cc05..a43969bc9f0 100644 +index c3d3d51a28f..2f7ffe456c3 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -228,6 +228,9 @@ in the following sections. @@ -65,7 +65,7 @@ index 09414d8cc05..a43969bc9f0 100644 -fext-numeric-literals @gol -Wabi=@var{n} -Wabi-tag -Wconversion-null -Wctor-dtor-privacy @gol -Wdelete-non-virtual-dtor -Wdeprecated-copy -Wdeprecated-copy-dtor @gol -@@ -538,7 +541,7 @@ Objective-C and Objective-C++ Dialects}. +@@ -539,7 +542,7 @@ Objective-C and Objective-C++ Dialects}. -pie -pthread -r -rdynamic @gol -s -static -static-pie -static-libgcc -static-libstdc++ @gol -static-libasan -static-libtsan -static-liblsan -static-libubsan @gol @@ -74,7 +74,7 @@ index 09414d8cc05..a43969bc9f0 100644 -T @var{script} -Wl, at var{option} -Xlinker @var{option} @gol -u @var{symbol} -z @var{keyword}} -@@ -13312,6 +13315,33 @@ Specify that the program entry point is @var{entry}. The argument is +@@ -13321,6 +13324,33 @@ Specify that the program entry point is @var{entry}. The argument is interpreted by the linker; the GNU linker accepts either a symbol name or an address. @@ -121,5 +121,5 @@ index a2601a6bb06..cd6c6fc95db 100644 #endif -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch index 9f7e603..906f3a7 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch @@ -1,7 +1,7 @@ -From b9260cd3ac26b0302824ed466a548464c864d95f Mon Sep 17 00:00:00 2001 +From c99684477ec66f290ec74efe732acd3c24db7dcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:16:28 +0400 -Subject: [PATCH 06/36] COLLECT_GCC_OPTIONS +Subject: [PATCH 06/39] COLLECT_GCC_OPTIONS This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to invoke collect2. @@ -34,5 +34,5 @@ index cd6c6fc95db..7da9c5d457b 100644 { const char *const *args; -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch index 28f8fc2..68a876c 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch @@ -1,7 +1,7 @@ -From 88e728dad53d48c4a19f15e19f66fd23f4820b4a Mon Sep 17 00:00:00 2001 +From d6f4edaab0ad0e742fb1e3a6f76908a2ac9927d5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:17:25 +0400 -Subject: [PATCH 07/36] Use the defaults.h in ${B} instead of ${S}, and t-oe in +Subject: [PATCH 07/39] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that @@ -27,7 +27,7 @@ Signed-off-by: Hongxu Jia 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 5f43d9de00e..41f0f592ff4 100644 +index abae872cd63..fef6c4c61e3 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -540,7 +540,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ @@ -40,10 +40,10 @@ index 5f43d9de00e..41f0f592ff4 100644 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ diff --git a/gcc/configure b/gcc/configure -index a6ea3a8a84c..e3bcf8abe9a 100755 +index 2e26dd33310..ed7931daed3 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -12341,8 +12341,8 @@ for f in $tm_file; do +@@ -12342,8 +12342,8 @@ for f in $tm_file; do tm_include_list="${tm_include_list} $f" ;; defaults.h ) @@ -55,7 +55,7 @@ index a6ea3a8a84c..e3bcf8abe9a 100755 * ) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" diff --git a/gcc/configure.ac b/gcc/configure.ac -index d42bbd4fd1c..2ebc377a74d 100644 +index 12d1d04e645..e0500e30d50 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1968,8 +1968,8 @@ for f in $tm_file; do @@ -92,5 +92,5 @@ index 308b87d0cc1..19068cbc24a 100644 # Add multiple inclusion protection guard, part two. -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch index 24e3abe..6acd2b0 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch @@ -1,7 +1,7 @@ -From 010f09f2963ede24e85134e5fab2fa627a9afa05 Mon Sep 17 00:00:00 2001 +From 2c514ada36ffbf70177909f633e9f68811de61e0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:20:01 +0400 -Subject: [PATCH 08/36] fortran cross-compile hack. +Subject: [PATCH 08/39] fortran cross-compile hack. * Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross @@ -42,5 +42,5 @@ index 7cfce28ab69..6cd515ee1a4 100644 # extra LD Flags which are required for targets -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch index 6af0a01..5a9e527 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch @@ -1,7 +1,7 @@ -From 45e9cd39d9c62454d46b9e9473a0c1034ceca15d Mon Sep 17 00:00:00 2001 +From 0a7c03a9cf925ba09a510a32e684f01ec5a50650 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:22:00 +0400 -Subject: [PATCH 09/36] cpp: honor sysroot. +Subject: [PATCH 09/39] cpp: honor sysroot. Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location @@ -50,5 +50,5 @@ index 7da9c5d457b..4e7c45b268c 100644 {"@assembler", "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch index bc0c6d5..a8103b9 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch @@ -1,7 +1,7 @@ -From 1ff4108d707b34e399e9dc418ad1ecc42f72676d Mon Sep 17 00:00:00 2001 +From 374aab6a88200fbd7343467d97f7ee6455bbce61 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:23:08 +0400 -Subject: [PATCH 10/36] MIPS64: Default to N64 ABI +Subject: [PATCH 10/39] MIPS64: Default to N64 ABI MIPS64 defaults to n32 ABI, this patch makes it so that it defaults to N64 ABI @@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [OE config specific] 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc -index ddd3b8f4d9d..fdfc0bd3e82 100644 +index b2282ecdf0b..69c0e4a005b 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2282,29 +2282,29 @@ mips*-*-linux*) # Linux MIPS, either endian. @@ -53,5 +53,5 @@ index ddd3b8f4d9d..fdfc0bd3e82 100644 ;; esac -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 66fb24d..d9d563d 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -1,7 +1,7 @@ -From 72fc3975bcd720b2f8040fa87cd23d3db4c5975a Mon Sep 17 00:00:00 2001 +From dcd7891d6aea5327969132fea6ca4c199f14e985 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:24:50 +0400 -Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER +Subject: [PATCH 11/39] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER relative to SYSTEMLIBS_DIR This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER @@ -241,3 +241,6 @@ index 789d1df4bd5..b920c680fb1 100644 #ifdef SPARC_BI_ARCH +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch similarity index 85% rename from meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch index 6053979..9d98878 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch @@ -1,7 +1,7 @@ -From 2cb227cd8069c73242286f64183fb203f8d2618a Mon Sep 17 00:00:00 2001 +From faa0f712a67005ef0260f95eebe7c7c57a6f8360 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:26:37 +0400 -Subject: [PATCH 12/36] gcc: Fix argument list too long error. +Subject: [PATCH 12/39] gcc: Fix argument list too long error. There would be an "Argument list too long" error when the build directory is longer than 200, this is caused by: @@ -23,10 +23,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 41f0f592ff4..0064a282488 100644 +index fef6c4c61e3..57cf7804f0a 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in -@@ -3537,7 +3537,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype +@@ -3538,7 +3538,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype # We keep the directory structure for files in config or c-family and .def # files. All other files are flattened to a single directory. $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) @@ -36,5 +36,5 @@ index 41f0f592ff4..0064a282488 100644 for file in $$headers; do \ if [ -f $$file ] ; then \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch index a21a63c..4558583 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch @@ -1,7 +1,7 @@ -From aea5ffa9d704f4eb8fa93366884d3c26a1dbec49 Mon Sep 17 00:00:00 2001 +From 4df5a747265983092afd6fbc5329dd808cc1da3c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:28:10 +0400 -Subject: [PATCH 13/36] Disable sdt. +Subject: [PATCH 13/39] Disable sdt. We don't list dtrace in DEPENDS so we shouldn't be depending on this header. It may or may not exist from preivous builds though. To be determinstic, disable @@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [hack] 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gcc/configure b/gcc/configure -index e3bcf8abe9a..1f1d22ca666 100755 +index ed7931daed3..52f52b0ec86 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -29332,12 +29332,12 @@ fi +@@ -29333,12 +29333,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; } have_sys_sdt_h=no @@ -48,7 +48,7 @@ index e3bcf8abe9a..1f1d22ca666 100755 $as_echo "$have_sys_sdt_h" >&6; } diff --git a/gcc/configure.ac b/gcc/configure.ac -index 2ebc377a74d..ddc85197588 100644 +index e0500e30d50..242ad28ec83 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5995,15 +5995,15 @@ fi @@ -77,10 +77,10 @@ index 2ebc377a74d..ddc85197588 100644 # Check if TFmode long double should be used by default or not. # Some glibc targets used DFmode long double, but with glibc 2.4 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 5acf79cba54..191bc6c5796 100755 +index 1225edc596b..3b89b880fc8 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -22085,11 +22085,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -22325,11 +22325,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -96,10 +96,10 @@ index 5acf79cba54..191bc6c5796 100755 $as_echo "$glibcxx_cv_sys_sdt_h" >&6; } diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac -index dadd8827b49..6b1ce9957d3 100644 +index d8455e41574..844cf1acbce 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac -@@ -230,7 +230,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN +@@ -232,7 +232,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN GLIBCXX_CHECK_SC_NPROC_ONLN GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP GLIBCXX_CHECK_SYSCTL_HW_NCPU @@ -109,5 +109,5 @@ index dadd8827b49..6b1ce9957d3 100644 # Check for available headers. AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch b/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch index 7a8f3af..2953859 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch @@ -1,7 +1,7 @@ -From 6c4d0c303ebc3e1c7e554d54a8bb807d77ed41fd Mon Sep 17 00:00:00 2001 +From 34977d994666a90983c96a9240dfa3540562da35 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:29:11 +0400 -Subject: [PATCH 14/36] libtool +Subject: [PATCH 14/39] libtool libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 when running on am x86_64 build host. @@ -38,5 +38,5 @@ index 79f9ba89af5..8e222f7c16b 100644 oldlibs= if test -z "$rpath"; then -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch index d06ae27..d444524 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch @@ -1,7 +1,7 @@ -From c5662ff1e7dea2291b9cb7a83cfff3001dd31f53 Mon Sep 17 00:00:00 2001 +From 4558ba7fa020c111f9a204021a418c0ce55d77f9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:30:32 +0400 -Subject: [PATCH 15/36] gcc: armv4: pass fix-v4bx to linker to support EABI. +Subject: [PATCH 15/39] gcc: armv4: pass fix-v4bx to linker to support EABI. The LINK_SPEC for linux gets overwritten by linux-eabi.h which means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result @@ -39,5 +39,5 @@ index e4ade2e2ab0..108863f69d2 100644 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch index 310caec..6f0833c 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch @@ -1,7 +1,7 @@ -From e3b693b9d6dc9496f7c98a13b28182d23084215c Mon Sep 17 00:00:00 2001 +From 7effc632d65c2d72bf6fa32a219ec2f82fef9405 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:33:04 +0400 -Subject: [PATCH 16/36] Use the multilib config files from ${B} instead of +Subject: [PATCH 16/39] Use the multilib config files from ${B} instead of using the ones from ${S} Use the multilib config files from ${B} instead of using the ones from ${S} @@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration] 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/gcc/configure b/gcc/configure -index 1f1d22ca666..911de2cf017 100755 +index 52f52b0ec86..a5f208af7cf 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -12321,10 +12321,20 @@ done +@@ -12322,10 +12322,20 @@ done tmake_file_= for f in ${tmake_file} do @@ -46,7 +46,7 @@ index 1f1d22ca666..911de2cf017 100755 done tmake_file="${tmake_file_}" -@@ -12335,6 +12345,10 @@ tm_file_list="options.h" +@@ -12336,6 +12346,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in $tm_file; do case $f in @@ -58,7 +58,7 @@ index 1f1d22ca666..911de2cf017 100755 f=`echo $f | sed 's/^..//'` tm_file_list="${tm_file_list} $f" diff --git a/gcc/configure.ac b/gcc/configure.ac -index ddc85197588..b413ae9bf25 100644 +index 242ad28ec83..b7a7ead1c02 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1948,10 +1948,20 @@ done @@ -98,5 +98,5 @@ index ddc85197588..b413ae9bf25 100644 f=`echo $f | sed 's/^..//'` tm_file_list="${tm_file_list} $f" -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch similarity index 84% rename from meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch index ad1d1d4..96da013 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch @@ -1,7 +1,7 @@ -From 09d9ccc1d471020949d1285a5276f17504fd60dd Mon Sep 17 00:00:00 2001 +From a2b2bf77621f344a849e55ab179ece8587d19234 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 09:39:38 +0000 -Subject: [PATCH 17/36] Avoid using libdir from .la which usually points to a +Subject: [PATCH 17/39] Avoid using libdir from .la which usually points to a host path Upstream-Status: Inappropriate [embedded specific] @@ -27,5 +27,5 @@ index 8e222f7c16b..0a93b4e5c3b 100644 absdir="$libdir" fi -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch index 0f728ec..2385099 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch @@ -1,7 +1,7 @@ -From 987338cd847a723de533bb317e452a60b1e52165 Mon Sep 17 00:00:00 2001 +From cafb6a621c05c1f238679d52fc026446f38c8af5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 09:40:59 +0000 -Subject: [PATCH 18/36] export CPP +Subject: [PATCH 18/39] export CPP The OE environment sets and exports CPP as being the target gcc. When building gcc-cross-canadian for a mingw targetted sdk, the following can be found @@ -49,5 +49,5 @@ index 64e091ba71d..255822e3f27 100644 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX_FOR_BUILD)"; export CXX; \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch similarity index 80% rename from meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch index 53f9e99..e0129d1 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch @@ -1,7 +1,7 @@ -From d27ba49e2e5c608c43265462d6831363cc7f565b Mon Sep 17 00:00:00 2001 +From 182057b80891edc0e8d46835e2d8bfd28330a55a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 10:25:11 +0000 -Subject: [PATCH 19/36] Ensure target gcc headers can be included +Subject: [PATCH 19/39] Ensure target gcc headers can be included There are a few headers installed as part of the OpenEmbedded gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe @@ -18,10 +18,10 @@ Signed-off-by: Khem Raj --- gcc/Makefile.in | 2 ++ gcc/cppdefault.c | 4 ++++ - gcc/defaults.h | 9 +++++++++ - gcc/gcc.c | 7 ------- - 4 files changed, 15 insertions(+), 7 deletions(-) + 2 files changed, 6 insertions(+) +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 57cf7804f0a..7772342ad5e 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -618,6 +618,7 @@ libexecdir = @libexecdir@ @@ -32,7 +32,7 @@ Signed-off-by: Khem Raj # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) # Directory in which all plugin resources are installed -@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localed +@@ -2867,6 +2868,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ @@ -40,9 +40,11 @@ Signed-off-by: Khem Raj -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ +diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c +index c4796385643..980e2bd47a7 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c -@@ -59,6 +59,10 @@ const struct default_include cpp_include +@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[] /* This is the dir for gcc's private headers. */ { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, #endif @@ -53,3 +55,6 @@ Signed-off-by: Khem Raj #ifdef LOCAL_INCLUDE_DIR /* /usr/local/include comes before the fixincluded header files. */ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch index b0f96d0..1d21821 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch @@ -1,7 +1,7 @@ -From 83bcd4cc47ae63971c888c117abd00dfd506532c Mon Sep 17 00:00:00 2001 +From a4740f1290e6a602fbbfa27b863be2e3b2675685 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 11:17:19 +0000 -Subject: [PATCH 20/36] gcc 4.8+ won't build with --disable-dependency-tracking +Subject: [PATCH 20/39] gcc 4.8+ won't build with --disable-dependency-tracking since the *.Ppo files don't get created unless --enable-dependency-tracking is true. @@ -50,5 +50,5 @@ index 29324e3e0ac..d5cdb4259ef 100644 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) M_FILE = $(PAT_BASE)_n.c -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch similarity index 87% rename from meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch index f36ca29..e363c7d 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch @@ -1,7 +1,7 @@ -From 667cc8d43e8fb4ac09654ee408da482f96b09580 Mon Sep 17 00:00:00 2001 +From f3edad81d80dde5d64bf77e6abafda54db10b824 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 3 Mar 2015 08:21:19 +0000 -Subject: [PATCH 21/36] Don't search host directory during "relink" if +Subject: [PATCH 21/39] Don't search host directory during "relink" if $inst_prefix is provided http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html @@ -34,5 +34,5 @@ index 0a93b4e5c3b..6de6ed2f9a0 100644 esac fi -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch similarity index 86% rename from meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch index d5b9150..846c0de 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch @@ -1,7 +1,7 @@ -From 279c4de48e3fd61e2f268787ed3f1d69ed9224f8 Mon Sep 17 00:00:00 2001 +From b8ea2c2c7d33376f5dd651646c7e822000e47749 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Apr 2015 23:15:27 -0700 -Subject: [PATCH 22/36] Use SYSTEMLIBS_DIR replacement instead of hardcoding +Subject: [PATCH 22/39] Use SYSTEMLIBS_DIR replacement instead of hardcoding base_libdir Upstream-Status: Pending @@ -25,5 +25,5 @@ index 5e8b34ded03..7e628bf661e 100644 #undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch similarity index 87% rename from meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch index f811306..102d6fc 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch @@ -1,7 +1,7 @@ -From 1277d12058334087443828dfd57d44e3b1dfcc9a Mon Sep 17 00:00:00 2001 +From 8645b57e7c0dfd93afee5caeaa534c714f449ba1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Apr 2015 23:18:39 -0700 -Subject: [PATCH 23/36] aarch64: Add support for musl ldso +Subject: [PATCH 23/39] aarch64: Add support for musl ldso Upstream-Status: Pending @@ -24,5 +24,5 @@ index 7e628bf661e..1717cbe5471 100644 #undef ASAN_CC1_SPEC #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch index 298b096..443e0a2 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch @@ -1,7 +1,7 @@ -From 4a0487ad75accd780dd155aa59086cc4b11cfc47 Mon Sep 17 00:00:00 2001 +From b1666565e4e133ee41f32fa8032165bcb06afe9a Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 5 Jul 2015 20:25:18 -0700 -Subject: [PATCH 24/36] libcc1: fix libcc1's install path and rpath +Subject: [PATCH 24/39] libcc1: fix libcc1's install path and rpath * Install libcc1.so and libcc1plugin.so into $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we @@ -50,5 +50,5 @@ index 7104b649026..2103c477468 100644 @ENABLE_PLUGIN_TRUE at cc1lib_LTLIBRARIES = libcc1.la shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch similarity index 55% rename from meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch index 2e7a444..c81a532 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch @@ -1,7 +1,7 @@ -From a183c82ea2af934a8d30055a791dc1d80c9067a9 Mon Sep 17 00:00:00 2001 +From 7d614a84709d7dc4a2529c3d529e2da8541f9fd4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:39:54 +0000 -Subject: [PATCH 25/36] handle sysroot support for nativesdk-gcc +Subject: [PATCH 25/39] handle sysroot support for nativesdk-gcc Being able to build a nativesdk gcc is useful, particularly in cases where the host compiler may be of an incompatible version (or a 32 @@ -24,32 +24,22 @@ Upstream-Status: Inappropriate RP 2015/7/28 Signed-off-by: Khem Raj - -Added PREFIXVAR and EXEC_PREFIXVAR to support runtime relocation. Without -these as part of the gccrelocprefix the system can't do runtime relocation -if the executable is moved. (These paths were missed in the original -implementation.) - -Signed-off-by: Mark Hatle --- - c-family/c-opts.c | 4 +-- - cppdefault.c | 63 +++++++++++++++++++++++++++++++++--------------------- - cppdefault.h | 13 ++++------- - gcc.c | 20 ++++++++++++----- - incpath.c | 12 +++++----- - prefix.c | 4 +-- - 6 files changed, 68 insertions(+), 48 deletions(-) + gcc/cppdefault.c | 50 +++++++++++++++++++++++++++++++++++------------- + gcc/cppdefault.h | 3 ++- + gcc/gcc.c | 20 +++++++++++++------ + 3 files changed, 53 insertions(+), 20 deletions(-) -Index: gcc-9.2.0/gcc/cppdefault.c -=================================================================== ---- gcc-9.2.0.orig/gcc/cppdefault.c -+++ gcc-9.2.0/gcc/cppdefault.c +diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c +index 980e2bd47a7..39b6059efdc 100644 +--- a/gcc/cppdefault.c ++++ b/gcc/cppdefault.c @@ -35,6 +35,30 @@ # undef CROSS_INCLUDE_DIR #endif +static char GPLUSPLUS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_INCLUDE_DIR; -+char GCC_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GCC_INCLUDE_DIR; ++static char GCC_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GCC_INCLUDE_DIR; +static char GPLUSPLUS_TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_TOOL_INCLUDE_DIR; +static char GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_BACKWARD_INCLUDE_DIR; +static char STANDARD_STARTFILE_PREFIX_2VAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET; @@ -75,7 +65,7 @@ Index: gcc-9.2.0/gcc/cppdefault.c const struct default_include cpp_include_defaults[] #ifdef INCLUDE_DEFAULTS = INCLUDE_DEFAULTS; -@@ -42,38 +66,38 @@ const struct default_include cpp_include +@@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[] = { #ifdef GPLUSPLUS_INCLUDE_DIR /* Pick up GNU C++ generic include files. */ @@ -123,7 +113,7 @@ Index: gcc-9.2.0/gcc/cppdefault.c /* A multilib suffix needs adding if different multilibs use different headers. */ #ifdef SYSROOT_HEADERS_SUFFIX_SPEC -@@ -85,33 +109,24 @@ const struct default_include cpp_include +@@ -85,16 +109,16 @@ const struct default_include cpp_include_defaults[] #endif #ifdef CROSS_INCLUDE_DIR /* One place the target system's headers might be. */ @@ -144,29 +134,10 @@ Index: gcc-9.2.0/gcc/cppdefault.c #endif { 0, 0, 0, 0, 0, 0 } }; - #endif /* no INCLUDE_DEFAULTS */ - --#ifdef GCC_INCLUDE_DIR --const char cpp_GCC_INCLUDE_DIR[] = GCC_INCLUDE_DIR; --const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8; --#else --const char cpp_GCC_INCLUDE_DIR[] = ""; --const size_t cpp_GCC_INCLUDE_DIR_len = 0; --#endif -- - /* The configured prefix. */ --const char cpp_PREFIX[] = PREFIX; --const size_t cpp_PREFIX_len = sizeof PREFIX - 1; --const char cpp_EXEC_PREFIX[] = STANDARD_EXEC_PREFIX; -+char PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX; -+char EXEC_PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX; - - /* This value is set by cpp_relocated at runtime */ - const char *gcc_exec_prefix; -Index: gcc-9.2.0/gcc/cppdefault.h -=================================================================== ---- gcc-9.2.0.orig/gcc/cppdefault.h -+++ gcc-9.2.0/gcc/cppdefault.h +diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h +index e2d96f1e760..29fa5f815c8 100644 +--- a/gcc/cppdefault.h ++++ b/gcc/cppdefault.h @@ -33,7 +33,8 @@ struct default_include @@ -177,31 +148,10 @@ Index: gcc-9.2.0/gcc/cppdefault.h const char *const component; /* The component containing the directory (see update_path in prefix.c) */ const char cplusplus; /* Only look here if we're compiling C++. */ -@@ -50,17 +51,13 @@ struct default_include - }; - - extern const struct default_include cpp_include_defaults[]; --extern const char cpp_GCC_INCLUDE_DIR[]; --extern const size_t cpp_GCC_INCLUDE_DIR_len; -+extern char GCC_INCLUDE_DIRVAR[] __attribute__ ((section (".gccrelocprefix"))); - - /* The configure-time prefix, i.e., the value supplied as the argument - to --prefix=. */ --extern const char cpp_PREFIX[]; -+extern char PREFIXVAR[] __attribute__ ((section (".gccrelocprefix"))); - /* The length of the configure-time prefix. */ --extern const size_t cpp_PREFIX_len; --/* The configure-time execution prefix. This is typically the lib/gcc -- subdirectory of cpp_PREFIX. */ --extern const char cpp_EXEC_PREFIX[]; -+extern char EXEC_PREFIXVAR[] __attribute__ ((section (".gccrelocprefix"))); - /* The run-time execution prefix. This is typically the lib/gcc - subdirectory of the actual installation. */ - extern const char *gcc_exec_prefix; -Index: gcc-9.2.0/gcc/gcc.c -=================================================================== ---- gcc-9.2.0.orig/gcc/gcc.c -+++ gcc-9.2.0/gcc/gcc.c +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 4e7c45b268c..59fb64f5fd5 100644 +--- a/gcc/gcc.c ++++ b/gcc/gcc.c @@ -253,6 +253,8 @@ FILE *report_times_to_file = NULL; #endif static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; @@ -211,7 +161,7 @@ Index: gcc-9.2.0/gcc/gcc.c /* Nonzero means pass the updated target_system_root to the compiler. */ static int target_system_root_changed; -@@ -527,6 +529,7 @@ or with constant text in a single argume +@@ -527,6 +529,7 @@ or with constant text in a single argument. %G process LIBGCC_SPEC as a spec. %R Output the concatenation of target_system_root and target_sysroot_suffix. @@ -234,7 +184,7 @@ Index: gcc-9.2.0/gcc/gcc.c /* For native compilers, these are well-known paths containing components that may be provided by the system. For cross -@@ -1511,9 +1514,9 @@ static const char *const standard_startf +@@ -1511,9 +1514,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX; static const char *md_exec_prefix = MD_EXEC_PREFIX; static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1; @@ -246,7 +196,7 @@ Index: gcc-9.2.0/gcc/gcc.c = STANDARD_STARTFILE_PREFIX_2; /* A relative path to be used in finding the location of tools -@@ -5922,6 +5925,11 @@ do_spec_1 (const char *spec, int inswitc +@@ -5922,6 +5925,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part) } break; @@ -258,89 +208,6 @@ Index: gcc-9.2.0/gcc/gcc.c case 'S': value = do_spec_1 (startfile_spec, 0, NULL); if (value != 0) -Index: gcc-9.2.0/gcc/c-family/c-opts.c -=================================================================== ---- gcc-9.2.0.orig/gcc/c-family/c-opts.c -+++ gcc-9.2.0/gcc/c-family/c-opts.c -@@ -1382,8 +1382,8 @@ add_prefixed_path (const char *suffix, i - size_t prefix_len, suffix_len; - - suffix_len = strlen (suffix); -- prefix = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR; -- prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len; -+ prefix = iprefix ? iprefix : GCC_INCLUDE_DIRVAR; -+ prefix_len = iprefix ? strlen (iprefix) : strlen(GCC_INCLUDE_DIRVAR) - 7; - - path = (char *) xmalloc (prefix_len + suffix_len + 1); - memcpy (path, prefix, prefix_len); -Index: gcc-9.2.0/gcc/incpath.c -=================================================================== ---- gcc-9.2.0.orig/gcc/incpath.c -+++ gcc-9.2.0/gcc/incpath.c -@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, - int relocated = cpp_relocated (); - size_t len; - -- if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0) -+ if (iprefix && (len = strlen(GCC_INCLUDE_DIRVAR) - 7) != 0) - { - /* Look for directories that start with the standard prefix. - "Translate" them, i.e. replace /usr/local/lib/gcc... with -@@ -145,7 +145,7 @@ add_standard_paths (const char *sysroot, - now. */ - if (sysroot && p->add_sysroot) - continue; -- if (!filename_ncmp (p->fname, cpp_GCC_INCLUDE_DIR, len)) -+ if (!filename_ncmp (p->fname, GCC_INCLUDE_DIRVAR, len)) - { - char *str = concat (iprefix, p->fname + len, NULL); - if (p->multilib == 1 && imultilib) -@@ -185,7 +185,7 @@ add_standard_paths (const char *sysroot, - free (sysroot_no_trailing_dir_separator); - } - else if (!p->add_sysroot && relocated -- && !filename_ncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len)) -+ && !filename_ncmp (p->fname, PREFIXVAR, strlen(PREFIXVAR))) - { - static const char *relocated_prefix; - char *ostr; -@@ -202,12 +202,12 @@ add_standard_paths (const char *sysroot, - dummy = concat (gcc_exec_prefix, "dummy", NULL); - relocated_prefix - = make_relative_prefix (dummy, -- cpp_EXEC_PREFIX, -- cpp_PREFIX); -+ EXEC_PREFIXVAR, -+ PREFIXVAR); - free (dummy); - } - ostr = concat (relocated_prefix, -- p->fname + cpp_PREFIX_len, -+ p->fname + strlen(PREFIXVAR), - NULL); - str = update_path (ostr, p->component); - free (ostr); -Index: gcc-9.2.0/gcc/prefix.c -=================================================================== ---- gcc-9.2.0.orig/gcc/prefix.c -+++ gcc-9.2.0/gcc/prefix.c -@@ -72,7 +72,9 @@ License along with GCC; see the file COP - #include "prefix.h" - #include "common/common-target.h" - --static const char *std_prefix = PREFIX; -+static const char PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX; -+ -+static const char *std_prefix = PREFIXVAR; - - static const char *get_key_value (char *); - static char *translate_name (char *); -@@ -212,7 +214,7 @@ translate_name (char *name) - prefix = getenv (key); - - if (prefix == 0) -- prefix = PREFIX; -+ prefix = PREFIXVAR; - - /* We used to strip trailing DIR_SEPARATORs here, but that can - sometimes yield a result with no separator when one was coded +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch similarity index 90% rename from meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch index fde206e..abfa751 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch @@ -1,7 +1,7 @@ -From dab4db14e319f3239a2b4c7d1fbf2971936e27ba Mon Sep 17 00:00:00 2001 +From 6c39a22c3e85d20dee9e2fc2274e95da980de4d0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:41:45 +0000 -Subject: [PATCH 26/36] Search target sysroot gcc version specific dirs with +Subject: [PATCH 26/39] Search target sysroot gcc version specific dirs with multilib. We install the gcc libraries (such as crtbegin.p) into @@ -51,10 +51,10 @@ Signed-off-by: Khem Raj 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gcc/gcc.c b/gcc/gcc.c -index db0e2934038..1c21d1b08eb 100644 +index 59fb64f5fd5..3e79da4238c 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c -@@ -2610,7 +2610,7 @@ for_each_path (const struct path_prefix *paths, +@@ -2617,7 +2617,7 @@ for_each_path (const struct path_prefix *paths, if (path == NULL) { len = paths->max_len + extra_space + 1; @@ -63,7 +63,7 @@ index db0e2934038..1c21d1b08eb 100644 path = XNEWVEC (char, len); } -@@ -2622,6 +2622,33 @@ for_each_path (const struct path_prefix *paths, +@@ -2629,6 +2629,33 @@ for_each_path (const struct path_prefix *paths, /* Look first in MACHINE/VERSION subdirectory. */ if (!skip_multi_dir) { @@ -98,5 +98,5 @@ index db0e2934038..1c21d1b08eb 100644 ret = callback (path, callback_info); if (ret) -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch index 5d89e8e..ae8acc7 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch @@ -1,7 +1,7 @@ -From 8e84bb09d2b7a60487a30e438bb109f31c2c254b Mon Sep 17 00:00:00 2001 +From 07db34b16b6c8e3d948b417f2fc052500ffb77d3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:42:45 +0000 -Subject: [PATCH 27/36] Fix various _FOR_BUILD and related variables +Subject: [PATCH 27/39] Fix various _FOR_BUILD and related variables When doing a FOR_BUILD thing, you have to override CFLAGS with CFLAGS_FOR_BUILD. And if you use C++, you also have to override @@ -94,7 +94,7 @@ index 41cae58a267..d3f6b79acdc 100644 CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 21472745c2c..8c93f03ffdc 100644 +index 7772342ad5e..02fec881b6d 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -805,7 +805,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@ @@ -107,10 +107,10 @@ index 21472745c2c..8c93f03ffdc 100644 # Actual name to use when installing a native compiler. GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') diff --git a/gcc/configure b/gcc/configure -index 911de2cf017..325ace34cdf 100755 +index a5f208af7cf..0788b7bf0b5 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -11965,7 +11965,7 @@ else +@@ -11966,7 +11966,7 @@ else CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ @@ -120,7 +120,7 @@ index 911de2cf017..325ace34cdf 100755 --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias diff --git a/gcc/configure.ac b/gcc/configure.ac -index b413ae9bf25..72a6c95121b 100644 +index b7a7ead1c02..5ab50fae0f3 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1743,7 +1743,7 @@ else @@ -133,5 +133,5 @@ index b413ae9bf25..72a6c95121b 100644 --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch similarity index 84% rename from meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch index 84d92a3..52a5d97 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch @@ -1,7 +1,7 @@ -From 5647f773e28b528a67800ef06ca44730f9f5dc7e Mon Sep 17 00:00:00 2001 +From 59543e897eb35194fb47288f7762e40a18fff611 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 2 Feb 2016 10:26:10 -0800 -Subject: [PATCH 28/36] nios2: Define MUSL_DYNAMIC_LINKER +Subject: [PATCH 28/39] nios2: Define MUSL_DYNAMIC_LINKER Upstream-Status: Pending @@ -24,5 +24,5 @@ index 698734add35..eeee60ecfea 100644 #undef LINK_SPEC #define LINK_SPEC LINK_SPEC_ENDIAN \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch index d19e5a0..bfa7e19 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -1,7 +1,7 @@ -From 474043ca7a064ca7b0a32308a0ed6f7c546f17b2 Mon Sep 17 00:00:00 2001 +From 8df99af0a65ef740bcf2b7dc9a109cc57f15c3aa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Jun 2017 18:10:54 -0700 -Subject: [PATCH 29/36] Add ssp_nonshared to link commandline for musl targets +Subject: [PATCH 29/39] Add ssp_nonshared to link commandline for musl targets when -fstack-protector options are enabled we need to link with ssp_shared on musl since it does not provide @@ -83,5 +83,5 @@ index 45a9a7cae59..d1e88a40e82 100644 %{!static-pie: \ %{rdynamic:-export-dynamic} \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch similarity index 84% rename from meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch index 38eab5a..f8e8c07 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch @@ -1,7 +1,7 @@ -From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001 +From 1bfae624b27ea4a1f5c5a92050d741b511e7b3d5 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 28 Feb 2018 00:54:05 +0000 -Subject: [PATCH 10/12] ldbl128 config +Subject: [PATCH 30/39] ldbl128 config Upstream-Status: Pending @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/gcc/configure b/gcc/configure -index 6121e163259..07ff8597d48 100755 +index 0788b7bf0b5..eb1a45bb263 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then : +@@ -29370,6 +29370,15 @@ if test "${with_long_double_128+set}" = set; then : withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128" else @@ -31,7 +31,7 @@ index 6121e163259..07ff8597d48 100755 if test $glibc_version_major -gt 2 \ || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then : gcc_cv_target_ldbl128=yes -@@ -29320,6 +29329,10 @@ else +@@ -29381,6 +29390,10 @@ else && gcc_cv_target_ldbl128=yes fi @@ -43,10 +43,10 @@ index 6121e163259..07ff8597d48 100755 ;; diff --git a/gcc/configure.ac b/gcc/configure.ac -index b066cc609e1..6c15ed898c0 100644 +index 5ab50fae0f3..7ffe35ee1c3 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -5971,13 +5971,25 @@ case "$target" in +@@ -6030,13 +6030,25 @@ case "$target" in AC_ARG_WITH(long-double-128, [AS_HELP_STRING([--with-long-double-128], [use 128-bit long double by default])], @@ -75,5 +75,5 @@ index b066cc609e1..6c15ed898c0 100644 esac if test x$gcc_cv_target_ldbl128 = xyes; then -- -2.17.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch similarity index 86% rename from meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch index dc2141d..60a29fc 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch @@ -1,7 +1,7 @@ -From 266dcc78e4d9d38de2809118977d97dc9270cf1f Mon Sep 17 00:00:00 2001 +From 31d008f5573627c6192ce9fcf729f0be464a7cf5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 May 2016 21:11:34 -0700 -Subject: [PATCH 31/36] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS +Subject: [PATCH 31/39] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS Upstream-Status: Pending @@ -25,5 +25,5 @@ index 099bf23e62f..436b277a79f 100644 $(SHLIB_OBJS) $(SHLIB_LC) && \ rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch index 8dde016..6f048da 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch @@ -1,7 +1,7 @@ -From 9975b6ed3570bbf7c7d2d82f4d5f733d24ccacf5 Mon Sep 17 00:00:00 2001 +From 761fa6e3e37608cfd1b288e721a2ff89288cd6aa Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sat, 24 Oct 2015 20:09:53 +0000 -Subject: [PATCH 32/36] libgcc_s: Use alias for __cpu_indicator_init instead of +Subject: [PATCH 32/39] libgcc_s: Use alias for __cpu_indicator_init instead of symver Adapter from @@ -39,10 +39,10 @@ Signed-off-by: Khem Raj 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index 2b37296e537..dd380ddba88 100644 +index 1bca5a7eea6..096c4bc8e25 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c -@@ -36658,10 +36658,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, +@@ -36685,10 +36685,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, { case IX86_BUILTIN_CPU_INIT: { @@ -82,5 +82,5 @@ index 8506a635790..564296f788e 100644 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS) CRTSTUFF_T_CFLAGS += $(CET_FLAGS) -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch index b99ac42..f080b05 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch @@ -1,7 +1,7 @@ -From 39e2f61d262f9f6c7a91068998dea80791ef665e Mon Sep 17 00:00:00 2001 +From 126e342fb39d7af70c1e5a6df8ffafc8dfc3bf08 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Feb 2017 12:56:00 -0800 -Subject: [PATCH 33/36] sync gcc stddef.h with musl +Subject: [PATCH 33/39] sync gcc stddef.h with musl musl defines ptrdiff_t size_t and wchar_t so dont define them here if musl is definining them @@ -87,5 +87,5 @@ index da692e1c01a..9a00c261adb 100644 #endif /* _STDDEF_H or __need_wchar_t. */ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch b/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch index 06a3c9f..3b7ccb3 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch @@ -1,7 +1,7 @@ -From aaa896a57b0004a74c1d474e74b21f41147a65cb Mon Sep 17 00:00:00 2001 +From d26fa9ededccc7e1ec47ead7f18afc80971483a3 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Mon, 19 Mar 2018 22:31:20 -0700 -Subject: [PATCH 34/36] fix segmentation fault in precompiled header generation +Subject: [PATCH 34/39] fix segmentation fault in precompiled header generation Prevent a segmentation fault which occurs when using incorrect structure trying to access name of some named operators, such as @@ -56,5 +56,5 @@ index eedfcbb3146..15040a1b1f0 100644 buffer = _cpp_spell_ident_ucns (buffer, token->val.node.node); break; -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch b/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch index 7470cbf..5e199fb 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch @@ -1,7 +1,7 @@ -From 0f9d449c739df03782ce9d29f6b68d9af976a607 Mon Sep 17 00:00:00 2001 +From fb5bdf8f8527228d587e8af9fc700e5164b3c18c Mon Sep 17 00:00:00 2001 From: RAGHUNATH LOLUR Date: Wed, 6 Dec 2017 22:52:26 -0800 -Subject: [PATCH 35/36] Fix for testsuite failure +Subject: [PATCH 35/39] Fix for testsuite failure 2017-11-16 Raghunath Lolur @@ -254,5 +254,5 @@ index 6cda1534311..26e37f5b8ba 100644 __attribute__((vector_size((elcount)*sizeof(type)))) type -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch similarity index 88% rename from meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch index 4dbcd98..825e070 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch @@ -1,7 +1,7 @@ -From 71e99c2b58a9eb00cdd65a04aeb6fb78227e3297 Mon Sep 17 00:00:00 2001 +From dc23cabac6a7b2ca85b02d2a58a8916c98f382e0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 6 Jun 2018 12:10:22 -0700 -Subject: [PATCH 36/36] Re-introduce spe commandline options +Subject: [PATCH 36/39] Re-introduce spe commandline options This should ensure that we keep accepting spe options @@ -37,5 +37,5 @@ index f4b5c91e11f..69869350fce 100644 Target RejectNegative Var(rs6000_altivec_abi) Save Use the AltiVec ABI extensions. -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch b/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch similarity index 59% rename from meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch index 65ea345..f268a4e 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch @@ -1,7 +1,10 @@ -From 517b211a3d78366ca8d5929f580e8ca72fd2c004 Mon Sep 17 00:00:00 2001 +From ac4af583bd59f6631671ad4abf985799ce4a53d9 Mon Sep 17 00:00:00 2001 From: rguenth Date: Thu, 25 Jul 2019 10:46:54 +0000 -Subject: [PATCH] 2019-07-25 Richard Biener +Subject: [PATCH 37/39] CVE-2019-14250: Check zero value in + simple_object_elf_match + +2019-07-25 Richard Biener PR lto/90924 Backport from mainline @@ -10,7 +13,6 @@ Subject: [PATCH] 2019-07-25 Richard Biener * simple-object-elf.c (simple_object_elf_match): Check zero value shstrndx. - git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 273793 138bc75d-0d04-0410-961f-82ee72b054a4 Upstream-Status: Backport @@ -18,16 +20,15 @@ Affectes: < 9.2 CVE: CVE-2019-14250 Dropped changelog Signed-off-by: Armin Kuster - --- libiberty/simple-object-elf.c | 8 ++++++++ - 2 files changed, 17 insertions(+) + 1 file changed, 8 insertions(+) -Index: gcc-9.2.0/libiberty/simple-object-elf.c -=================================================================== ---- gcc-9.2.0.orig/libiberty/simple-object-elf.c -+++ gcc-9.2.0/libiberty/simple-object-elf.c -@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char h +diff --git a/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c +index 3d49f339631..c00cebdb6c7 100644 +--- a/libiberty/simple-object-elf.c ++++ b/libiberty/simple-object-elf.c +@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN], return NULL; } @@ -42,3 +43,6 @@ Index: gcc-9.2.0/libiberty/simple-object-elf.c return (void *) eor; } +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch b/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch index 8e2c3f5..a79fc03 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch @@ -1,11 +1,23 @@ -Inserting line numbers into generated code means its not always reproducible wth +From 075e0929e04913538391052c32178b6a14ef0ae3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 12 Mar 2020 14:41:40 -0700 +Subject: [PATCH 38/39] gentypes/genmodes: Do not use __LINE__ for maintaining + reproducibility + +Inserting line numbers into generated code means its not always reproducible wth differing versions of host gcc. Void the issue by not adding these. Upstream-Status: Inappropriate [OE Reproducibility specific] + Signed-off-by: Richard Purdie +Signed-off-by: Khem Raj +--- + gcc/gengtype.c | 6 +++--- + gcc/genmodes.c | 32 ++++++++++++++++---------------- + 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gcc/gengtype.c b/gcc/gengtype.c -index 53317337c..bbb261516 100644 +index 53317337cf8..bbb26151671 100644 --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, @@ -36,7 +48,7 @@ index 53317337c..bbb261516 100644 POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); diff --git a/gcc/genmodes.c b/gcc/genmodes.c -index f33eefa24..07bef9eeb 100644 +index f33eefa2494..07bef9eebe2 100644 --- a/gcc/genmodes.c +++ b/gcc/genmodes.c @@ -429,7 +429,7 @@ complete_all_modes (void) @@ -168,3 +180,6 @@ index f33eefa24..07bef9eeb 100644 #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) +-- +2.25.1 + 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.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch similarity index 88% rename from meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch index c37e0bb..b69114d 100644 --- 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.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch @@ -1,8 +1,10 @@ -From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 +From e75bcc2ec4f1e7e081ce18713f0a25913ba15340 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) +Subject: [PATCH 39/39] process_alt_operands: Don't match user defined regs + only if they are early clobbers + +PR target/91102 (aarch64 ICE on Linux kernel with -Os starting with r270266) 2019-07-10 Vladimir Makarov @@ -26,7 +28,7 @@ Signed-off-by: Taras Kondratiuk 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 +index cf33da8013e..6382dbf852b 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) @@ -63,7 +65,7 @@ index cf33da8013e4..6382dbf852b6 100644 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 +index 00000000000..70b99045a48 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c @@ -0,0 +1,26 @@ @@ -93,3 +95,6 @@ index 000000000000..70b99045a48e + b.h = foo (b.h, c.h); + } +} +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb rename to meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-cross_9.2.bb b/meta/recipes-devtools/gcc/gcc-cross_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-cross_9.2.bb rename to meta/recipes-devtools/gcc/gcc-cross_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb rename to meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-runtime_9.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-runtime_9.2.bb rename to meta/recipes-devtools/gcc/gcc-runtime_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb rename to meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-source_9.2.bb b/meta/recipes-devtools/gcc/gcc-source_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-source_9.2.bb rename to meta/recipes-devtools/gcc/gcc-source_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc_9.2.bb b/meta/recipes-devtools/gcc/gcc_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc_9.2.bb rename to meta/recipes-devtools/gcc/gcc_9.3.bb diff --git a/meta/recipes-devtools/gcc/libgcc-initial_9.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc-initial_9.2.bb rename to meta/recipes-devtools/gcc/libgcc-initial_9.3.bb diff --git a/meta/recipes-devtools/gcc/libgcc_9.2.bb b/meta/recipes-devtools/gcc/libgcc_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc_9.2.bb rename to meta/recipes-devtools/gcc/libgcc_9.3.bb diff --git a/meta/recipes-devtools/gcc/libgfortran_9.2.bb b/meta/recipes-devtools/gcc/libgfortran_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgfortran_9.2.bb rename to meta/recipes-devtools/gcc/libgfortran_9.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 12 23:49:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 12 Mar 2020 23:49:56 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: cryptsetup: upgrade 2.3.0 -> 2.3.1 Message-ID: <158405699645.3916.34555518270965570@git.openembedded.org> 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 a76744d cryptsetup: upgrade 2.3.0 -> 2.3.1 a76744d is described below commit a76744d8ba6cf6be4a2131f79396ea3a9e1271bd Author: Pierre-Jean Texier AuthorDate: Thu Mar 12 23:00:49 2020 +0100 cryptsetup: upgrade 2.3.0 -> 2.3.1 This is a bug-fix release, see full changelog: - https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.3/v2.3.1-ReleaseNotes Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../cryptsetup/{cryptsetup_2.3.0.bb => cryptsetup_2.3.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb similarity index 96% rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.bb index 0e36ed4..ec375fe 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.0.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.1.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] = "48be3bd7c557d051f638047d280e93ee" -SRC_URI[sha256sum] = "395690de99509428354d3cd15cf023bed01487e6f1565b2181e013dc847bbc85" +SRC_URI[md5sum] = "cef482c0579f34d9524311ac70c0875f" +SRC_URI[sha256sum] = "92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2" 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 Mar 13 07:17:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 07:17:20 +0000 Subject: [oe-commits] [bitbake] branch master-next updated: tinfoil: Update to knotty console changes Message-ID: <158408384014.20961.10324170922837173379@git.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 66ac17e tinfoil: Update to knotty console changes 66ac17e is described below commit 66ac17e0ea1b9c7ac9599039e6affcf4f5eb7a1c Author: Richard Purdie AuthorDate: Fri Mar 13 07:16:36 2020 +0000 tinfoil: Update to knotty console changes Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 5c5be45..fd06807 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -725,19 +725,9 @@ class Tinfoil: # Borrowed from knotty, instead somewhat hackily we use the helper # as the object to store "shutdown" on helper = bb.ui.uihelper.BBUIHelper() - # We set up logging optionally in the constructor so now we need to - # grab the handlers to pass to TerminalFilter - console = None - errconsole = None - for handler in self.logger.handlers: - if isinstance(handler, logging.StreamHandler): - if handler.stream == sys.stdout: - console = handler - elif handler.stream == sys.stderr: - errconsole = handler helper.shutdown = 0 parseprogress = None - termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet) + termfilter = bb.ui.knotty.TerminalFilter(helper, helper, quiet=self.quiet) try: while True: try: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 08:21:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 08:21:57 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (66ac17e -> 08bc685) Message-ID: <158408771732.12457.8460960532579304054@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 66ac17e tinfoil: Update to knotty console changes new 08bc685 tinfoil: Update to knotty console changes 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 (66ac17e) \ N -- N -- N refs/heads/master-next (08bc685) 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: lib/bb/tinfoil.py | 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 Mar 13 08:21:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 08:21:58 +0000 Subject: [oe-commits] [bitbake] 01/01: tinfoil: Update to knotty console changes In-Reply-To: <158408771732.12457.8460960532579304054@git.openembedded.org> References: <158408771732.12457.8460960532579304054@git.openembedded.org> Message-ID: <20200313082157.71BB823362F@git.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 08bc685d8ef92f7d2e93d9569b9a6f0fcc76180c Author: Richard Purdie AuthorDate: Fri Mar 13 07:16:36 2020 +0000 tinfoil: Update to knotty console changes Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 5c5be45..a8e835d 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -725,19 +725,9 @@ class Tinfoil: # Borrowed from knotty, instead somewhat hackily we use the helper # as the object to store "shutdown" on helper = bb.ui.uihelper.BBUIHelper() - # We set up logging optionally in the constructor so now we need to - # grab the handlers to pass to TerminalFilter - console = None - errconsole = None - for handler in self.logger.handlers: - if isinstance(handler, logging.StreamHandler): - if handler.stream == sys.stdout: - console = handler - elif handler.stream == sys.stderr: - errconsole = handler helper.shutdown = 0 parseprogress = None - termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet) + termfilter = bb.ui.knotty.TerminalFilter(helper, helper, self.logger.handlers, quiet=self.quiet) try: while True: try: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 11:29:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 11:29:59 +0000 Subject: [oe-commits] [bitbake] 01/01: tinfoil: Update to match recent knotty console changes In-Reply-To: <158409899856.9424.2762037637546721256@git.openembedded.org> References: <158409899856.9424.2762037637546721256@git.openembedded.org> Message-ID: <20200313112958.B139B233630@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 e67dfa4a4d0d63e4752655f25367582e5a95f1da Author: Richard Purdie AuthorDate: Fri Mar 13 07:16:36 2020 +0000 tinfoil: Update to match recent knotty console changes This updates tinfoil to match recent changes to the logging code in knotty. Signed-off-by: Richard Purdie --- lib/bb/tinfoil.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index 5c5be45..a8e835d 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -725,19 +725,9 @@ class Tinfoil: # Borrowed from knotty, instead somewhat hackily we use the helper # as the object to store "shutdown" on helper = bb.ui.uihelper.BBUIHelper() - # We set up logging optionally in the constructor so now we need to - # grab the handlers to pass to TerminalFilter - console = None - errconsole = None - for handler in self.logger.handlers: - if isinstance(handler, logging.StreamHandler): - if handler.stream == sys.stdout: - console = handler - elif handler.stream == sys.stderr: - errconsole = handler helper.shutdown = 0 parseprogress = None - termfilter = bb.ui.knotty.TerminalFilter(helper, helper, console, errconsole, quiet=self.quiet) + termfilter = bb.ui.knotty.TerminalFilter(helper, helper, self.logger.handlers, quiet=self.quiet) try: while True: try: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 11:29:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 11:29:58 +0000 Subject: [oe-commits] [bitbake] branch master updated (2e26e97 -> e67dfa4) Message-ID: <158409899856.9424.2762037637546721256@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 2e26e97 tests: Add test for gitsm fetcher with shallow mirror tarballs add f32a8bc lib/bb/msg: Convert default domains to a dictionary add 9624d42 knotty: Handle logging messages with specific logger add 41bd155 lib/bb/msg: Use log level instead of debug count add 5ff962d lib/bb/msg: Add repr for BBLogFormatter add 3046131 knotty: Add commented logging_tree code add 8ebe8a7 lib/bb/msg: Add filter utilities add 2cb16e0 lib/bb/msg: Remove unused filters add 14c98d3 lib/bb/msg: Add helper to set logging config add c1c867d knotty: Remove dependency on format variable add 646a68a knotty: Setup logs with config helper add dcdb8f2 bitbake-worker: Remove unnecessary addDefaultLogFilter add 20bb29e runqueue/siggen: Log hash equivalence with a different logger add 2ddb649 runqueue/siggen: Lower hash equivalence logging add e225659 bitbake-user-manual: Add documentation for BB_LOGCONFIG add b3f3779 knotty: Add logging cleanup add e860d93 msg: Add helper to merge logging configs add 7dd5b39 runqueue: Lower setscene complete logging level add 2259b51 contrib: Add autobuilder logging configuration add 766587c knotty: Update hash equivalence logging add 93c98a8 msg: Return config object add 2010be5 knotty: Treat verbconsole as a console output add 970cd2f knotty/msg: Use logging.shutdown() instead of bb.msg.cleanupLogging() new e67dfa4 tinfoil: Update to match recent knotty console changes 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: bin/bitbake-worker | 3 +- contrib/autobuilderlog.json | 13 ++ .../bitbake-user-manual-execution.xml | 97 +++++++++ .../bitbake-user-manual-ref-variables.xml | 11 + lib/bb/__init__.py | 7 +- lib/bb/msg.py | 182 ++++++++++++++--- lib/bb/runqueue.py | 15 +- lib/bb/siggen.py | 17 +- lib/bb/tinfoil.py | 14 +- lib/bb/ui/knotty.py | 225 ++++++++++++++++----- 10 files changed, 467 insertions(+), 117 deletions(-) create mode 100644 contrib/autobuilderlog.json -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 11:30:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 11:30:13 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (08bc685 -> e67dfa4) Message-ID: <158409901328.10011.2178986582432332822@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 08bc685 tinfoil: Update to knotty console changes add e67dfa4 tinfoil: Update to match recent knotty console changes 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 (08bc685) \ N -- N -- N refs/heads/master-next (e67dfa4) 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 11:32:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 11:32:29 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (ce20c91 -> 1f9d367) Message-ID: <158409914933.10857.16246808519969415970@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 ce20c91 coreutils: Add extra hint about DEPENDS changes affect on -dev dependencies add bd17a7e scritpts/tiny/ksize: Cleanup some python2 leftover in ksize.py add e571ef7 weston-init: Launch weston with WESTON_DISABLE_ATOMIC on musl/x86 add aaa1c3e libsdl2: upgrade 2.0.10 -> 2.0.12 add 1f9d367 oeqa/qemuarm64: Ignore logind: failed to get session seat No new revisions were added by this update. Summary of changes: meta/lib/oeqa/runtime/cases/parselogs.py | 1 + ...538-validate-image-size-when-loading-BMP-.patch | 34 -------------- ...heck-for-build-dir-when-building-version-.patch | 53 ---------------------- ...797-SDL-fails-to-compile-with-Mesa-Master.patch | 41 ----------------- .../{libsdl2_2.0.10.bb => libsdl2_2.0.12.bb} | 15 +++--- meta/recipes-graphics/wayland/weston-init.bb | 14 +++++- .../wayland/weston-init/weston.env | 0 scripts/tiny/ksize.py | 6 +-- 8 files changed, 25 insertions(+), 139 deletions(-) delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.10.bb => libsdl2_2.0.12.bb} (81%) copy scripts/pybootchartgui/pybootchartgui/__init__.py => meta/recipes-graphics/wayland/weston-init/weston.env (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 13:36:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:36:27 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: gcc: Upgrade to 9.3 bugfix release Message-ID: <158410658707.12801.16920548280157774693@git.openembedded.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 caf80e4 gcc: Upgrade to 9.3 bugfix release caf80e4 is described below commit caf80e4e245132bdc3bbe219b567013f2c5d2f46 Author: Khem Raj AuthorDate: Thu Mar 12 16:08:40 2020 -0700 gcc: Upgrade to 9.3 bugfix release This brings ~157 bugfixes [1] to gcc-9 with no features Drop backports which are already part of the release now [1] https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&list_id=260610&resolution=FIXED&target_milestone=9.3 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 2 +- ...x-up-libsanitizer-build-with-master-glibc.patch | 70 --- .../gcc/gcc-9.2/CVE-2019-15847_1.patch | 521 --------------------- .../gcc/gcc-9.2/CVE-2019-15847_2.patch | 77 --- .../gcc/gcc-9.2/CVE-2019-15847_3.patch | 62 --- .../gcc/{gcc-9.2.inc => gcc-9.3.inc} | 22 +- .../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 6 +- .../0002-gcc-poison-system-directories.patch | 24 +- .../0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 6 +- .../0004-64-bit-multilib-hack.patch | 6 +- .../0005-optional-libstdc.patch | 12 +- .../0006-COLLECT_GCC_OPTIONS.patch | 6 +- ...efaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 14 +- .../0008-fortran-cross-compile-hack.patch | 6 +- .../0009-cpp-honor-sysroot.patch | 6 +- .../0010-MIPS64-Default-to-N64-ABI.patch | 8 +- ...C_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 7 +- ...0012-gcc-Fix-argument-list-too-long-error.patch | 10 +- .../{gcc-9.2 => gcc-9.3}/0013-Disable-sdt.patch | 20 +- .../gcc/{gcc-9.2 => gcc-9.3}/0014-libtool.patch | 6 +- ...4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 6 +- ...tilib-config-files-from-B-instead-of-usin.patch | 14 +- ...-libdir-from-.la-which-usually-points-to-.patch | 6 +- .../gcc/{gcc-9.2 => gcc-9.3}/0018-export-CPP.patch | 6 +- ...Ensure-target-gcc-headers-can-be-included.patch | 19 +- ...-t-build-with-disable-dependency-tracking.patch | 6 +- ...h-host-directory-during-relink-if-inst_pr.patch | 6 +- ...IBS_DIR-replacement-instead-of-hardcoding.patch | 6 +- .../0023-aarch64-Add-support-for-musl-ldso.patch | 6 +- ...ibcc1-fix-libcc1-s-install-path-and-rpath.patch | 6 +- ...-handle-sysroot-support-for-nativesdk-gcc.patch | 40 +- ...et-sysroot-gcc-version-specific-dirs-with.patch | 12 +- ...-various-_FOR_BUILD-and-related-variables.patch | 14 +- .../0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 6 +- ...shared-to-link-commandline-for-musl-targe.patch | 6 +- .../0030-ldbl128-config.patch} | 16 +- ...bgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 6 +- ...e-alias-for-__cpu_indicator_init-instead-.patch | 10 +- .../0033-sync-gcc-stddef.h-with-musl.patch | 6 +- ...ation-fault-in-precompiled-header-generat.patch | 6 +- .../0035-Fix-for-testsuite-failure.patch | 6 +- ...0036-Re-introduce-spe-commandline-options.patch | 6 +- ...50-Check-zero-value-in-simple_object_elf.patch} | 24 +- ...modes-Do-not-use-__LINE__-for-maintainin.patch} | 21 +- ...operands-Don-t-match-user-defined-regs-o.patch} | 15 +- ...s-canadian_9.2.bb => gcc-cross-canadian_9.3.bb} | 0 .../gcc/{gcc-cross_9.2.bb => gcc-cross_9.3.bb} | 0 .../{gcc-crosssdk_9.2.bb => gcc-crosssdk_9.3.bb} | 0 .../gcc/{gcc-runtime_9.2.bb => gcc-runtime_9.3.bb} | 0 ...gcc-sanitizers_9.2.bb => gcc-sanitizers_9.3.bb} | 0 .../gcc/{gcc-source_9.2.bb => gcc-source_9.3.bb} | 0 .../gcc/{gcc_9.2.bb => gcc_9.3.bb} | 0 ...libgcc-initial_9.2.bb => libgcc-initial_9.3.bb} | 0 .../gcc/{libgcc_9.2.bb => libgcc_9.3.bb} | 0 .../gcc/{libgfortran_9.2.bb => libgfortran_9.3.bb} | 0 55 files changed, 231 insertions(+), 935 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 33f8044..40e90f7 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -194,7 +194,7 @@ RECIPE_MAINTAINER_pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj -Date: Sun, 22 Dec 2019 02:58:24 +0000 -Subject: [PATCH] Fix up libsanitizer build with master glibc - -2019-11-26 Jakub Jelinek - - PR sanitizer/92154 - * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick - llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce. - * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. - -Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b02486e0951bc0ed38310a03be73e479fc6f3e7a;hp=3feeac76ffc38427de2d7d086e2928e63eee2d44] -Signed-off-by: Auto Builder ---- - .../sanitizer_platform_limits_posix.cc | 5 +++-- - .../sanitizer_platform_limits_posix.h | 15 +-------------- - 2 files changed, 4 insertions(+), 16 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index 6cd4a5bac..d823a1219 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -1156,8 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); - CHECK_SIZE_AND_OFFSET(ipc_perm, gid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); - CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); --#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) --/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ -+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31) -+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit -+ on many architectures. */ - CHECK_SIZE_AND_OFFSET(ipc_perm, mode); - #endif - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index 73af92af1..6a673a7c9 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -211,26 +211,13 @@ namespace __sanitizer { - u64 __unused1; - u64 __unused2; - #elif defined(__sparc__) --#if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --#else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; --#endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; --#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__) -- unsigned int mode; -- unsigned short __seq; -- unsigned short __pad1; -- unsigned long __unused1; -- unsigned long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) --- -2.17.1 - diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch deleted file mode 100644 index 227fd47..0000000 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch +++ /dev/null @@ -1,521 +0,0 @@ -From 8c61566116d23063ff597271884f8e00d94ab1a1 Mon Sep 17 00:00:00 2001 -From: segher -Date: Fri, 30 Aug 2019 13:48:48 +0000 -Subject: [PATCH] Backport from trunk 2019-08-22 Segher Boessenkool - - - * config/rs6000/altivec.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32, - UNSPEC_DARN_RAW, UNSPEC_CMPRB, UNSPEC_CMPRB2, UNSPEC_CMPEQB; move to... - * config/rs6000/rs6000.md (unspec): ... here. - * config/rs6000/altivec.md (darn_32, darn_raw, darn, cmprb, - *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal, - cmpeqb, *cmpeqb_internal): Delete, move to... - * config/rs6000/rs6000.md (darn_32, darn_raw, darn, cmprb, - *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal, - cmpeqb, *cmpeqb_internal): ... here. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 275170 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2019-15847 p1 -Affects <= 9.2.0 -Dropped Changelog changes -Signed-off-by: Armin Kuster - ---- - gcc/config/rs6000/altivec.md | 223 ---------------------------------- - gcc/config/rs6000/rs6000.md | 224 +++++++++++++++++++++++++++++++++++ - 3 files changed, 239 insertions(+), 223 deletions(-) - -Index: gcc-9.2.0/gcc/config/rs6000/altivec.md -=================================================================== ---- gcc-9.2.0.orig/gcc/config/rs6000/altivec.md -+++ gcc-9.2.0/gcc/config/rs6000/altivec.md -@@ -80,9 +80,6 @@ - UNSPEC_VUPKHPX - UNSPEC_VUPKLPX - UNSPEC_CONVERT_4F32_8I16 -- UNSPEC_DARN -- UNSPEC_DARN_32 -- UNSPEC_DARN_RAW - UNSPEC_DST - UNSPEC_DSTT - UNSPEC_DSTST -@@ -161,9 +158,6 @@ - UNSPEC_BCDADD - UNSPEC_BCDSUB - UNSPEC_BCD_OVERFLOW -- UNSPEC_CMPRB -- UNSPEC_CMPRB2 -- UNSPEC_CMPEQB - UNSPEC_VRLMI - UNSPEC_VRLNM - ]) -@@ -4101,223 +4095,6 @@ - "bcd. %0,%1,%2,%3" - [(set_attr "type" "vecsimple")]) - --(define_insn "darn_32" -- [(set (match_operand:SI 0 "register_operand" "=r") -- (unspec:SI [(const_int 0)] UNSPEC_DARN_32))] -- "TARGET_P9_MISC" -- "darn %0,0" -- [(set_attr "type" "integer")]) -- --(define_insn "darn_raw" -- [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] -- "TARGET_P9_MISC && TARGET_64BIT" -- "darn %0,2" -- [(set_attr "type" "integer")]) -- --(define_insn "darn" -- [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN))] -- "TARGET_P9_MISC && TARGET_64BIT" -- "darn %0,1" -- [(set_attr "type" "integer")]) -- --;; Test byte within range. --;; --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the range specified by operand 2. --;; The bytes of operand 2 are organized as xx:xx:hi:lo. --;; --;; Return in target register operand 0 a value of 1 if lo <= vv and --;; vv <= hi. Otherwise, set register operand 0 to 0. --;; --;; Though the instructions to which this expansion maps operate on --;; 64-bit registers, the current implementation only operates on --;; SI-mode operands as the high-order bits provide no information --;; that is not already available in the low-order bits. To avoid the --;; costs of data widening operations, future enhancements might allow --;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. --(define_expand "cmprb" -- [(set (match_dup 3) -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB)) -- (set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_dup 3) -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 3) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" --{ -- operands[3] = gen_reg_rtx (CCmode); --}) -- --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the range specified by operand 2. --;; The bytes of operand 2 are organized as xx:xx:hi:lo. --;; --;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if --;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other --;; 3 bits of the target CR register are all set to 0. --(define_insn "*cmprb_internal" -- [(set (match_operand:CC 0 "cc_reg_operand" "=y") -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB))] -- "TARGET_P9_MISC" -- "cmprb %0,0,%1,%2" -- [(set_attr "type" "logical")]) -- --;; Set operand 0 register to -1 if the LT bit (0x8) of condition --;; register operand 1 is on. Otherwise, set operand 0 register to 1 --;; if the GT bit (0x4) of condition register operand 1 is on. --;; Otherwise, set operand 0 to 0. Note that the result stored into --;; register operand 0 is non-zero iff either the LT or GT bits are on --;; within condition register operand 1. --(define_insn "setb_signed" -- [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y") -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 1) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" -- "setb %0,%1" -- [(set_attr "type" "logical")]) -- --(define_insn "setb_unsigned" -- [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y") -- (const_int 0)) -- (const_int -1) -- (if_then_else (gtu (match_dup 1) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" -- "setb %0,%1" -- [(set_attr "type" "logical")]) -- --;; Test byte within two ranges. --;; --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the range specified by operand 2. --;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. --;; --;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and --;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register --;; operand 0 to 0. --;; --;; Though the instructions to which this expansion maps operate on --;; 64-bit registers, the current implementation only operates on --;; SI-mode operands as the high-order bits provide no information --;; that is not already available in the low-order bits. To avoid the --;; costs of data widening operations, future enhancements might allow --;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. --(define_expand "cmprb2" -- [(set (match_dup 3) -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB2)) -- (set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_dup 3) -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 3) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC" --{ -- operands[3] = gen_reg_rtx (CCmode); --}) -- --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the ranges specified by operand 2. --;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. --;; --;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if --;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). --;; Otherwise, set the GT bit to 0. The other 3 bits of the target --;; CR register are all set to 0. --(define_insn "*cmprb2_internal" -- [(set (match_operand:CC 0 "cc_reg_operand" "=y") -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:SI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPRB2))] -- "TARGET_P9_MISC" -- "cmprb %0,1,%1,%2" -- [(set_attr "type" "logical")]) -- --;; Test byte membership within set of 8 bytes. --;; --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the set specified by operand 2. --;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. --;; --;; Return in target register operand 0 a value of 1 if vv equals one --;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set --;; register operand 0 to 0. Note that the 8 byte values held within --;; operand 2 need not be unique. --;; --;; Though the instructions to which this expansion maps operate on --;; 64-bit registers, the current implementation requires that operands --;; 0 and 1 have mode SI as the high-order bits provide no information --;; that is not already available in the low-order bits. To avoid the --;; costs of data widening operations, future enhancements might allow --;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. --(define_expand "cmpeqb" -- [(set (match_dup 3) -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:DI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPEQB)) -- (set (match_operand:SI 0 "gpc_reg_operand" "=r") -- (if_then_else:SI (lt (match_dup 3) -- (const_int 0)) -- (const_int -1) -- (if_then_else (gt (match_dup 3) -- (const_int 0)) -- (const_int 1) -- (const_int 0))))] -- "TARGET_P9_MISC && TARGET_64BIT" --{ -- operands[3] = gen_reg_rtx (CCmode); --}) -- --;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx --;; represents a byte whose value is ignored in this context and --;; vv, the least significant byte, holds the byte value that is to --;; be tested for membership within the set specified by operand 2. --;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. --;; --;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv --;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, --;; set the GT bit to zero. The other 3 bits of the target CR register --;; are all set to 0. --(define_insn "*cmpeqb_internal" -- [(set (match_operand:CC 0 "cc_reg_operand" "=y") -- (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -- (match_operand:DI 2 "gpc_reg_operand" "r")] -- UNSPEC_CMPEQB))] -- "TARGET_P9_MISC && TARGET_64BIT" -- "cmpeqb %0,%1,%2" -- [(set_attr "type" "logical")]) -- - (define_expand "bcd_" - [(parallel [(set (reg:CCFP CR6_REGNO) - (compare:CCFP -Index: gcc-9.2.0/gcc/config/rs6000/rs6000.md -=================================================================== ---- gcc-9.2.0.orig/gcc/config/rs6000/rs6000.md -+++ gcc-9.2.0/gcc/config/rs6000/rs6000.md -@@ -137,6 +137,12 @@ - UNSPEC_LSQ - UNSPEC_FUSION_GPR - UNSPEC_STACK_CHECK -+ UNSPEC_DARN -+ UNSPEC_DARN_32 -+ UNSPEC_DARN_RAW -+ UNSPEC_CMPRB -+ UNSPEC_CMPRB2 -+ UNSPEC_CMPEQB - UNSPEC_ADD_ROUND_TO_ODD - UNSPEC_SUB_ROUND_TO_ODD - UNSPEC_MUL_ROUND_TO_ODD -@@ -14322,7 +14328,225 @@ - "xscmpuqp %0,%1,%2" - [(set_attr "type" "veccmp") - (set_attr "size" "128")]) -+ -+;; Miscellaneous ISA 3.0 (power9) instructions -+ -+(define_insn "darn_32" -+ [(set (match_operand:SI 0 "register_operand" "=r") -+ (unspec:SI [(const_int 0)] UNSPEC_DARN_32))] -+ "TARGET_P9_MISC" -+ "darn %0,0" -+ [(set_attr "type" "integer")]) -+ -+(define_insn "darn_raw" -+ [(set (match_operand:DI 0 "register_operand" "=r") -+ (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+ "darn %0,2" -+ [(set_attr "type" "integer")]) -+ -+(define_insn "darn" -+ [(set (match_operand:DI 0 "register_operand" "=r") -+ (unspec:DI [(const_int 0)] UNSPEC_DARN))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+ "darn %0,1" -+ [(set_attr "type" "integer")]) -+ -+;; Test byte within range. -+;; -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the range specified by operand 2. -+;; The bytes of operand 2 are organized as xx:xx:hi:lo. -+;; -+;; Return in target register operand 0 a value of 1 if lo <= vv and -+;; vv <= hi. Otherwise, set register operand 0 to 0. -+;; -+;; Though the instructions to which this expansion maps operate on -+;; 64-bit registers, the current implementation only operates on -+;; SI-mode operands as the high-order bits provide no information -+;; that is not already available in the low-order bits. To avoid the -+;; costs of data widening operations, future enhancements might allow -+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. -+(define_expand "cmprb" -+ [(set (match_dup 3) -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB)) -+ (set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_dup 3) -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 3) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+{ -+ operands[3] = gen_reg_rtx (CCmode); -+}) -+ -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the range specified by operand 2. -+;; The bytes of operand 2 are organized as xx:xx:hi:lo. -+;; -+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if -+;; lo <= vv and vv <= hi. Otherwise, set the GT bit to 0. The other -+;; 3 bits of the target CR register are all set to 0. -+(define_insn "*cmprb_internal" -+ [(set (match_operand:CC 0 "cc_reg_operand" "=y") -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB))] -+ "TARGET_P9_MISC" -+ "cmprb %0,0,%1,%2" -+ [(set_attr "type" "logical")]) -+ -+;; Set operand 0 register to -1 if the LT bit (0x8) of condition -+;; register operand 1 is on. Otherwise, set operand 0 register to 1 -+;; if the GT bit (0x4) of condition register operand 1 is on. -+;; Otherwise, set operand 0 to 0. Note that the result stored into -+;; register operand 0 is non-zero iff either the LT or GT bits are on -+;; within condition register operand 1. -+(define_insn "setb_signed" -+ [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_operand:CC 1 "cc_reg_operand" "y") -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 1) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+ "setb %0,%1" -+ [(set_attr "type" "logical")]) - -+(define_insn "setb_unsigned" -+ [(set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (ltu (match_operand:CCUNS 1 "cc_reg_operand" "y") -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gtu (match_dup 1) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+ "setb %0,%1" -+ [(set_attr "type" "logical")]) -+ -+;; Test byte within two ranges. -+;; -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the range specified by operand 2. -+;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. -+;; -+;; Return in target register operand 0 a value of 1 if (lo_1 <= vv and -+;; vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). Otherwise, set register -+;; operand 0 to 0. -+;; -+;; Though the instructions to which this expansion maps operate on -+;; 64-bit registers, the current implementation only operates on -+;; SI-mode operands as the high-order bits provide no information -+;; that is not already available in the low-order bits. To avoid the -+;; costs of data widening operations, future enhancements might allow -+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. -+(define_expand "cmprb2" -+ [(set (match_dup 3) -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB2)) -+ (set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_dup 3) -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 3) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC" -+{ -+ operands[3] = gen_reg_rtx (CCmode); -+}) -+ -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the ranges specified by operand 2. -+;; The bytes of operand 2 are organized as hi_1:lo_1:hi_2:lo_2. -+;; -+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if -+;; (lo_1 <= vv and vv <= hi_1) or if (lo_2 <= vv and vv <= hi_2). -+;; Otherwise, set the GT bit to 0. The other 3 bits of the target -+;; CR register are all set to 0. -+(define_insn "*cmprb2_internal" -+ [(set (match_operand:CC 0 "cc_reg_operand" "=y") -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:SI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPRB2))] -+ "TARGET_P9_MISC" -+ "cmprb %0,1,%1,%2" -+ [(set_attr "type" "logical")]) -+ -+;; Test byte membership within set of 8 bytes. -+;; -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the set specified by operand 2. -+;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. -+;; -+;; Return in target register operand 0 a value of 1 if vv equals one -+;; of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, set -+;; register operand 0 to 0. Note that the 8 byte values held within -+;; operand 2 need not be unique. -+;; -+;; Though the instructions to which this expansion maps operate on -+;; 64-bit registers, the current implementation requires that operands -+;; 0 and 1 have mode SI as the high-order bits provide no information -+;; that is not already available in the low-order bits. To avoid the -+;; costs of data widening operations, future enhancements might allow -+;; DI mode for operand 0 and/or might allow operand 1 to be QI mode. -+(define_expand "cmpeqb" -+ [(set (match_dup 3) -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:DI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPEQB)) -+ (set (match_operand:SI 0 "gpc_reg_operand" "=r") -+ (if_then_else:SI (lt (match_dup 3) -+ (const_int 0)) -+ (const_int -1) -+ (if_then_else (gt (match_dup 3) -+ (const_int 0)) -+ (const_int 1) -+ (const_int 0))))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+{ -+ operands[3] = gen_reg_rtx (CCmode); -+}) -+ -+;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx -+;; represents a byte whose value is ignored in this context and -+;; vv, the least significant byte, holds the byte value that is to -+;; be tested for membership within the set specified by operand 2. -+;; The bytes of operand 2 are organized as e0:e1:e2:e3:e4:e5:e6:e7. -+;; -+;; Set bit 1 (the GT bit, 0x4) of CR register operand 0 to 1 if vv -+;; equals one of the values e0, e1, e2, e3, e4, e5, e6, or e7. Otherwise, -+;; set the GT bit to zero. The other 3 bits of the target CR register -+;; are all set to 0. -+(define_insn "*cmpeqb_internal" -+ [(set (match_operand:CC 0 "cc_reg_operand" "=y") -+ (unspec:CC [(match_operand:SI 1 "gpc_reg_operand" "r") -+ (match_operand:DI 2 "gpc_reg_operand" "r")] -+ UNSPEC_CMPEQB))] -+ "TARGET_P9_MISC && TARGET_64BIT" -+ "cmpeqb %0,%1,%2" -+ [(set_attr "type" "logical")]) - - - (include "sync.md") diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch deleted file mode 100644 index de7a83c..0000000 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 87bc784a7ca3a43182f7272241597a50d7491342 Mon Sep 17 00:00:00 2001 -From: segher -Date: Fri, 30 Aug 2019 13:51:26 +0000 -Subject: [PATCH] Backport from trunk 2019-08-22 Segher Boessenkool - - - PR target/91481 - * config/rs6000/rs6000.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32, - and UNSPEC_DARN_RAW. - (unspecv): New enumerator values UNSPECV_DARN, UNSPECV_DARN_32, and - UNSPECV_DARN_RAW. - (darn_32): Use an unspec_volatile, and UNSPECV_DARN_32. - (darn_raw): Use an unspec_volatile, and UNSPECV_DARN_RAW. - (darn): Use an unspec_volatile, and UNSPECV_DARN. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 275175 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2019-15847 p2 -Affects <= 9.2.0 -Dropped Changelog changes -Signed-off-by: Armin Kuster - ---- - gcc/config/rs6000/rs6000.md | 12 ++++++------ - 2 files changed, 20 insertions(+), 6 deletions(-) - -Index: gcc-9.2.0/gcc/config/rs6000/rs6000.md -=================================================================== ---- gcc-9.2.0.orig/gcc/config/rs6000/rs6000.md -+++ gcc-9.2.0/gcc/config/rs6000/rs6000.md -@@ -137,9 +137,6 @@ - UNSPEC_LSQ - UNSPEC_FUSION_GPR - UNSPEC_STACK_CHECK -- UNSPEC_DARN -- UNSPEC_DARN_32 -- UNSPEC_DARN_RAW - UNSPEC_CMPRB - UNSPEC_CMPRB2 - UNSPEC_CMPEQB -@@ -170,6 +167,9 @@ - UNSPECV_EH_RR ; eh_reg_restore - UNSPECV_ISYNC ; isync instruction - UNSPECV_MFTB ; move from time base -+ UNSPECV_DARN ; darn 1 (deliver a random number) -+ UNSPECV_DARN_32 ; darn 2 -+ UNSPECV_DARN_RAW ; darn 0 - UNSPECV_NLGR ; non-local goto receiver - UNSPECV_MFFS ; Move from FPSCR - UNSPECV_MFFSL ; Move from FPSCR light instruction version -@@ -14333,21 +14333,21 @@ - - (define_insn "darn_32" - [(set (match_operand:SI 0 "register_operand" "=r") -- (unspec:SI [(const_int 0)] UNSPEC_DARN_32))] -+ (unspec_volatile:SI [(const_int 0)] UNSPECV_DARN_32))] - "TARGET_P9_MISC" - "darn %0,0" - [(set_attr "type" "integer")]) - - (define_insn "darn_raw" - [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] -+ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN_RAW))] - "TARGET_P9_MISC && TARGET_64BIT" - "darn %0,2" - [(set_attr "type" "integer")]) - - (define_insn "darn" - [(set (match_operand:DI 0 "register_operand" "=r") -- (unspec:DI [(const_int 0)] UNSPEC_DARN))] -+ (unspec_volatile:DI [(const_int 0)] UNSPECV_DARN))] - "TARGET_P9_MISC && TARGET_64BIT" - "darn %0,1" - [(set_attr "type" "integer")]) diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch deleted file mode 100644 index ba7130c..0000000 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch +++ /dev/null @@ -1,62 +0,0 @@ -From dc4c8dd9dbe70740ec7a684b0f35620249fb036a Mon Sep 17 00:00:00 2001 -From: segher -Date: Fri, 30 Aug 2019 13:53:11 +0000 -Subject: [PATCH] Backport from trunk 2019-08-23 Segher Boessenkool - - -gcc/testsuite/ - PR target/91481 - * gcc.target/powerpc/darn-3.c: New testcase. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 275176 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -CVE: CVE-2019-15847 p3 -Affects <= 9.2.0 -Dropped Changelog changes -Signed-off-by: Armin Kuster - ---- - gcc/testsuite/ChangeLog | 6 ++++++ - gcc/testsuite/gcc.target/powerpc/darn-3.c | 16 ++++++++++++++++ - 2 files changed, 22 insertions(+) - create mode 100644 gcc/testsuite/gcc.target/powerpc/darn-3.c - -Index: gcc-9.2.0/gcc/testsuite/gcc.target/powerpc/darn-3.c -=================================================================== ---- /dev/null -+++ gcc-9.2.0/gcc/testsuite/gcc.target/powerpc/darn-3.c -@@ -0,0 +1,16 @@ -+/* { dg-do compile { target { powerpc*-*-* } } } */ -+/* { dg-skip-if "" { powerpc*-*-aix* } } */ -+/* { dg-options "-O2 -mdejagnu-cpu=power9" } */ -+ -+static int darn32(void) { return __builtin_darn_32(); } -+ -+int four(void) -+{ -+ int sum = 0; -+ int i; -+ for (i = 0; i < 4; i++) -+ sum += darn32(); -+ return sum; -+} -+ -+/* { dg-final { scan-assembler-times {(?n)\mdarn .*,0\M} 4 } } */ -Index: gcc-9.2.0/gcc/testsuite/ChangeLog -=================================================================== ---- gcc-9.2.0.orig/gcc/testsuite/ChangeLog -+++ gcc-9.2.0/gcc/testsuite/ChangeLog -@@ -1,3 +1,11 @@ -+2019-08-30 Segher Boessenkool -+ -+ Backport from trunk -+ 2019-08-23 Segher Boessenkool -+ -+ PR target/91481 -+ * gcc.target/powerpc/darn-3.c: New testcase. -+ - 2019-08-12 Release Manager - - * GCC 9.2.0 released. diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc b/meta/recipes-devtools/gcc/gcc-9.3.inc similarity index 87% rename from meta/recipes-devtools/gcc/gcc-9.2.inc rename to meta/recipes-devtools/gcc/gcc-9.3.inc index 2368f35..b041107 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2.inc +++ b/meta/recipes-devtools/gcc/gcc-9.3.inc @@ -2,13 +2,13 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "9.2.0" +PV = "9.3.0" # BINV should be incremented to a revision after a minor gcc release -BINV = "9.2.0" +BINV = "9.3.0" -FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.2:${FILE_DIRNAME}/gcc-9.2/backport:" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-9.3:${FILE_DIRNAME}/gcc-9.3/backport:" DEPENDS =+ "mpfr gmp libmpc zlib flex-native" NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native" @@ -57,25 +57,19 @@ SRC_URI = "\ file://0027-Fix-various-_FOR_BUILD-and-related-variables.patch \ file://0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch \ file://0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \ - file://0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch \ + file://0030-ldbl128-config.patch \ file://0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \ file://0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \ file://0033-sync-gcc-stddef.h-with-musl.patch \ file://0034-fix-segmentation-fault-in-precompiled-header-generat.patch \ file://0035-Fix-for-testsuite-failure.patch \ file://0036-Re-introduce-spe-commandline-options.patch \ - file://0037-Fix-up-libsanitizer-build-with-master-glibc.patch \ - file://CVE-2019-14250.patch \ - 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 \ - file://gen-no-line-numbers.patch \ + file://0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch \ + file://0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \ + file://0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch \ " S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" -SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78" -SRC_URI[sha256sum] = "ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206" - +SRC_URI[sha256sum] = "71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1" # For dev release snapshotting #S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/official-gcc-${RELEASE}" #B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch index 9065c30..0d9222d 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch @@ -1,7 +1,7 @@ -From 863325ec3c6eb4987be63509ac407b2d13617342 Mon Sep 17 00:00:00 2001 +From 02b1789dbbb184726782b5038a4dd96515ec790c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 08:37:11 +0400 -Subject: [PATCH 01/36] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET +Subject: [PATCH 01/39] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET Signed-off-by: Khem Raj @@ -38,5 +38,5 @@ index 9db4fd14aa2..aad93c4d183 100644 *" newlib "*) case " $target_configargs " in -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch index a1116e7..f427ee6 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0002-gcc-poison-system-directories.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0002-gcc-poison-system-directories.patch @@ -1,7 +1,7 @@ -From 68e78bc15de215fa15c7d8b56bd2e2b0539b34fa Mon Sep 17 00:00:00 2001 +From 5368cd0293ce50a69ced6e4b25ba6c8d8e014256 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 08:59:00 +0400 -Subject: [PATCH 02/36] gcc: poison-system-directories +Subject: [PATCH 02/39] gcc: poison-system-directories Add /sw/include and /opt/include based on the original zecke-no-host-includes.patch patch. The original patch checked for @@ -58,10 +58,10 @@ index a718ceaf3da..5713342efb1 100644 optimizer and back end) to be checked for dynamic type safety at runtime. This is quite expensive. */ diff --git a/gcc/configure b/gcc/configure -index 481071b4265..a6ea3a8a84c 100755 +index a065ba23728..2e26dd33310 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -995,6 +995,7 @@ with_system_zlib +@@ -996,6 +996,7 @@ with_system_zlib enable_maintainer_mode enable_link_mutex enable_version_specific_runtime_libs @@ -69,7 +69,7 @@ index 481071b4265..a6ea3a8a84c 100755 enable_plugin enable_host_shared enable_libquadmath_support -@@ -1748,6 +1749,8 @@ Optional Features: +@@ -1749,6 +1750,8 @@ Optional Features: --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory @@ -78,7 +78,7 @@ index 481071b4265..a6ea3a8a84c 100755 --enable-plugin enable plugin support --enable-host-shared build host code as shared libraries --disable-libquadmath-support -@@ -29750,6 +29753,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : +@@ -29753,6 +29756,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then : fi @@ -99,10 +99,10 @@ index 481071b4265..a6ea3a8a84c 100755 diff --git a/gcc/configure.ac b/gcc/configure.ac -index ce2825580c6..d42bbd4fd1c 100644 +index 3a7251102ef..12d1d04e645 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -6378,6 +6378,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, +@@ -6380,6 +6380,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs, [specify that runtime libraries should be installed in a compiler-specific directory])]) @@ -120,10 +120,10 @@ index ce2825580c6..d42bbd4fd1c 100644 AC_SUBST(subdirs) AC_SUBST(srcdir) diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 6ef36ce02aa..09414d8cc05 100644 +index 0ab6c9c6449..c3d3d51a28f 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -332,6 +332,7 @@ Objective-C and Objective-C++ Dialects}. +@@ -333,6 +333,7 @@ Objective-C and Objective-C++ Dialects}. -Wpacked -Wpacked-bitfield-compat -Wpacked-not-aligned -Wpadded @gol -Wparentheses -Wno-pedantic-ms-format @gol -Wplacement-new -Wplacement-new=@var{n} @gol @@ -131,7 +131,7 @@ index 6ef36ce02aa..09414d8cc05 100644 -Wpointer-arith -Wpointer-compare -Wno-pointer-to-int-cast @gol -Wno-pragmas -Wno-prio-ctor-dtor -Wredundant-decls @gol -Wrestrict -Wno-return-local-addr @gol -@@ -6289,6 +6290,14 @@ made up of data only and thus requires no special treatment. But, for +@@ -6290,6 +6291,14 @@ made up of data only and thus requires no special treatment. But, for most targets, it is made up of code and thus requires the stack to be made executable in order for the program to work properly. @@ -199,5 +199,5 @@ index bcbe2082905..5752298bbf2 100644 /* Use given -I paths for #include "..." but not #include <...>, and -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch index 23039d2..23ec5bc 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch @@ -1,7 +1,7 @@ -From f8d60c4114acb92361c7b2f4a4561d4661e8da9d Mon Sep 17 00:00:00 2001 +From df90dbdba7a85c20bad95de71525f0f400a849d2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:08:31 +0400 -Subject: [PATCH 03/36] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET +Subject: [PATCH 03/39] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it. @@ -69,5 +69,5 @@ index b121088d778..93aae5bb26f 100755 # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch index a79c40c..17ec898 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0004-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0004-64-bit-multilib-hack.patch @@ -1,7 +1,7 @@ -From c2081c51db589471ea713870c72f13999abda815 Mon Sep 17 00:00:00 2001 +From 2e00d0a9a809153f693659e977c1e0550665e65c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:10:06 +0400 -Subject: [PATCH 04/36] 64-bit multilib hack. +Subject: [PATCH 04/39] 64-bit multilib hack. GCC has internal multilib handling code but it assumes a very specific rigid directory layout. The build system implementation of multilib layout is very generic and allows @@ -115,5 +115,5 @@ index f3c6e2be1d9..bd0393155fa 100644 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c $(COMPILE) $< -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch index f4fac91..3c28aea 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0005-optional-libstdc.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0005-optional-libstdc.patch @@ -1,7 +1,7 @@ -From e7e504f4a90cfa395e7f8ee779f8c3ed687802ca Mon Sep 17 00:00:00 2001 +From 435e45592e944018f33bff32f1202b0872a23141 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:12:56 +0400 -Subject: [PATCH 05/36] optional libstdc +Subject: [PATCH 05/39] optional libstdc gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ will not run correctly since by default the linker will try to link against libstdc++ @@ -52,7 +52,7 @@ index 6c4574a837d..0e2657f00ee 100644 library = -1; break; diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 09414d8cc05..a43969bc9f0 100644 +index c3d3d51a28f..2f7ffe456c3 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -228,6 +228,9 @@ in the following sections. @@ -65,7 +65,7 @@ index 09414d8cc05..a43969bc9f0 100644 -fext-numeric-literals @gol -Wabi=@var{n} -Wabi-tag -Wconversion-null -Wctor-dtor-privacy @gol -Wdelete-non-virtual-dtor -Wdeprecated-copy -Wdeprecated-copy-dtor @gol -@@ -538,7 +541,7 @@ Objective-C and Objective-C++ Dialects}. +@@ -539,7 +542,7 @@ Objective-C and Objective-C++ Dialects}. -pie -pthread -r -rdynamic @gol -s -static -static-pie -static-libgcc -static-libstdc++ @gol -static-libasan -static-libtsan -static-liblsan -static-libubsan @gol @@ -74,7 +74,7 @@ index 09414d8cc05..a43969bc9f0 100644 -T @var{script} -Wl, at var{option} -Xlinker @var{option} @gol -u @var{symbol} -z @var{keyword}} -@@ -13312,6 +13315,33 @@ Specify that the program entry point is @var{entry}. The argument is +@@ -13321,6 +13324,33 @@ Specify that the program entry point is @var{entry}. The argument is interpreted by the linker; the GNU linker accepts either a symbol name or an address. @@ -121,5 +121,5 @@ index a2601a6bb06..cd6c6fc95db 100644 #endif -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch index 9f7e603..906f3a7 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0006-COLLECT_GCC_OPTIONS.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0006-COLLECT_GCC_OPTIONS.patch @@ -1,7 +1,7 @@ -From b9260cd3ac26b0302824ed466a548464c864d95f Mon Sep 17 00:00:00 2001 +From c99684477ec66f290ec74efe732acd3c24db7dcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:16:28 +0400 -Subject: [PATCH 06/36] COLLECT_GCC_OPTIONS +Subject: [PATCH 06/39] COLLECT_GCC_OPTIONS This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to invoke collect2. @@ -34,5 +34,5 @@ index cd6c6fc95db..7da9c5d457b 100644 { const char *const *args; -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch index 28f8fc2..68a876c 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch @@ -1,7 +1,7 @@ -From 88e728dad53d48c4a19f15e19f66fd23f4820b4a Mon Sep 17 00:00:00 2001 +From d6f4edaab0ad0e742fb1e3a6f76908a2ac9927d5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:17:25 +0400 -Subject: [PATCH 07/36] Use the defaults.h in ${B} instead of ${S}, and t-oe in +Subject: [PATCH 07/39] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that @@ -27,7 +27,7 @@ Signed-off-by: Hongxu Jia 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 5f43d9de00e..41f0f592ff4 100644 +index abae872cd63..fef6c4c61e3 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -540,7 +540,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ @@ -40,10 +40,10 @@ index 5f43d9de00e..41f0f592ff4 100644 TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ diff --git a/gcc/configure b/gcc/configure -index a6ea3a8a84c..e3bcf8abe9a 100755 +index 2e26dd33310..ed7931daed3 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -12341,8 +12341,8 @@ for f in $tm_file; do +@@ -12342,8 +12342,8 @@ for f in $tm_file; do tm_include_list="${tm_include_list} $f" ;; defaults.h ) @@ -55,7 +55,7 @@ index a6ea3a8a84c..e3bcf8abe9a 100755 * ) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" diff --git a/gcc/configure.ac b/gcc/configure.ac -index d42bbd4fd1c..2ebc377a74d 100644 +index 12d1d04e645..e0500e30d50 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1968,8 +1968,8 @@ for f in $tm_file; do @@ -92,5 +92,5 @@ index 308b87d0cc1..19068cbc24a 100644 # Add multiple inclusion protection guard, part two. -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch index 24e3abe..6acd2b0 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0008-fortran-cross-compile-hack.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0008-fortran-cross-compile-hack.patch @@ -1,7 +1,7 @@ -From 010f09f2963ede24e85134e5fab2fa627a9afa05 Mon Sep 17 00:00:00 2001 +From 2c514ada36ffbf70177909f633e9f68811de61e0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:20:01 +0400 -Subject: [PATCH 08/36] fortran cross-compile hack. +Subject: [PATCH 08/39] fortran cross-compile hack. * Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross @@ -42,5 +42,5 @@ index 7cfce28ab69..6cd515ee1a4 100644 # extra LD Flags which are required for targets -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch index 6af0a01..5a9e527 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0009-cpp-honor-sysroot.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0009-cpp-honor-sysroot.patch @@ -1,7 +1,7 @@ -From 45e9cd39d9c62454d46b9e9473a0c1034ceca15d Mon Sep 17 00:00:00 2001 +From 0a7c03a9cf925ba09a510a32e684f01ec5a50650 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:22:00 +0400 -Subject: [PATCH 09/36] cpp: honor sysroot. +Subject: [PATCH 09/39] cpp: honor sysroot. Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location @@ -50,5 +50,5 @@ index 7da9c5d457b..4e7c45b268c 100644 {"@assembler", "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch index bc0c6d5..a8103b9 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0010-MIPS64-Default-to-N64-ABI.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0010-MIPS64-Default-to-N64-ABI.patch @@ -1,7 +1,7 @@ -From 1ff4108d707b34e399e9dc418ad1ecc42f72676d Mon Sep 17 00:00:00 2001 +From 374aab6a88200fbd7343467d97f7ee6455bbce61 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:23:08 +0400 -Subject: [PATCH 10/36] MIPS64: Default to N64 ABI +Subject: [PATCH 10/39] MIPS64: Default to N64 ABI MIPS64 defaults to n32 ABI, this patch makes it so that it defaults to N64 ABI @@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [OE config specific] 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc -index ddd3b8f4d9d..fdfc0bd3e82 100644 +index b2282ecdf0b..69c0e4a005b 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2282,29 +2282,29 @@ mips*-*-linux*) # Linux MIPS, either endian. @@ -53,5 +53,5 @@ index ddd3b8f4d9d..fdfc0bd3e82 100644 ;; esac -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch index 66fb24d..d9d563d 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch @@ -1,7 +1,7 @@ -From 72fc3975bcd720b2f8040fa87cd23d3db4c5975a Mon Sep 17 00:00:00 2001 +From dcd7891d6aea5327969132fea6ca4c199f14e985 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:24:50 +0400 -Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER +Subject: [PATCH 11/39] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER relative to SYSTEMLIBS_DIR This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER @@ -241,3 +241,6 @@ index 789d1df4bd5..b920c680fb1 100644 #ifdef SPARC_BI_ARCH +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch similarity index 85% rename from meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch index 6053979..9d98878 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0012-gcc-Fix-argument-list-too-long-error.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0012-gcc-Fix-argument-list-too-long-error.patch @@ -1,7 +1,7 @@ -From 2cb227cd8069c73242286f64183fb203f8d2618a Mon Sep 17 00:00:00 2001 +From faa0f712a67005ef0260f95eebe7c7c57a6f8360 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:26:37 +0400 -Subject: [PATCH 12/36] gcc: Fix argument list too long error. +Subject: [PATCH 12/39] gcc: Fix argument list too long error. There would be an "Argument list too long" error when the build directory is longer than 200, this is caused by: @@ -23,10 +23,10 @@ Upstream-Status: Pending 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 41f0f592ff4..0064a282488 100644 +index fef6c4c61e3..57cf7804f0a 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in -@@ -3537,7 +3537,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype +@@ -3538,7 +3538,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype # We keep the directory structure for files in config or c-family and .def # files. All other files are flattened to a single directory. $(mkinstalldirs) $(DESTDIR)$(plugin_includedir) @@ -36,5 +36,5 @@ index 41f0f592ff4..0064a282488 100644 for file in $$headers; do \ if [ -f $$file ] ; then \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch index a21a63c..4558583 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0013-Disable-sdt.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0013-Disable-sdt.patch @@ -1,7 +1,7 @@ -From aea5ffa9d704f4eb8fa93366884d3c26a1dbec49 Mon Sep 17 00:00:00 2001 +From 4df5a747265983092afd6fbc5329dd808cc1da3c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:28:10 +0400 -Subject: [PATCH 13/36] Disable sdt. +Subject: [PATCH 13/39] Disable sdt. We don't list dtrace in DEPENDS so we shouldn't be depending on this header. It may or may not exist from preivous builds though. To be determinstic, disable @@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [hack] 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gcc/configure b/gcc/configure -index e3bcf8abe9a..1f1d22ca666 100755 +index ed7931daed3..52f52b0ec86 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -29332,12 +29332,12 @@ fi +@@ -29333,12 +29333,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5 $as_echo_n "checking sys/sdt.h in the target C library... " >&6; } have_sys_sdt_h=no @@ -48,7 +48,7 @@ index e3bcf8abe9a..1f1d22ca666 100755 $as_echo "$have_sys_sdt_h" >&6; } diff --git a/gcc/configure.ac b/gcc/configure.ac -index 2ebc377a74d..ddc85197588 100644 +index e0500e30d50..242ad28ec83 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5995,15 +5995,15 @@ fi @@ -77,10 +77,10 @@ index 2ebc377a74d..ddc85197588 100644 # Check if TFmode long double should be used by default or not. # Some glibc targets used DFmode long double, but with glibc 2.4 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 5acf79cba54..191bc6c5796 100755 +index 1225edc596b..3b89b880fc8 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -22085,11 +22085,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -22325,11 +22325,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -96,10 +96,10 @@ index 5acf79cba54..191bc6c5796 100755 $as_echo "$glibcxx_cv_sys_sdt_h" >&6; } diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac -index dadd8827b49..6b1ce9957d3 100644 +index d8455e41574..844cf1acbce 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac -@@ -230,7 +230,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN +@@ -232,7 +232,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN GLIBCXX_CHECK_SC_NPROC_ONLN GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP GLIBCXX_CHECK_SYSCTL_HW_NCPU @@ -109,5 +109,5 @@ index dadd8827b49..6b1ce9957d3 100644 # Check for available headers. AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch b/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch index 7a8f3af..2953859 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0014-libtool.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0014-libtool.patch @@ -1,7 +1,7 @@ -From 6c4d0c303ebc3e1c7e554d54a8bb807d77ed41fd Mon Sep 17 00:00:00 2001 +From 34977d994666a90983c96a9240dfa3540562da35 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:29:11 +0400 -Subject: [PATCH 14/36] libtool +Subject: [PATCH 14/39] libtool libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64 when running on am x86_64 build host. @@ -38,5 +38,5 @@ index 79f9ba89af5..8e222f7c16b 100644 oldlibs= if test -z "$rpath"; then -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch similarity index 91% rename from meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch index d06ae27..d444524 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch @@ -1,7 +1,7 @@ -From c5662ff1e7dea2291b9cb7a83cfff3001dd31f53 Mon Sep 17 00:00:00 2001 +From 4558ba7fa020c111f9a204021a418c0ce55d77f9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:30:32 +0400 -Subject: [PATCH 15/36] gcc: armv4: pass fix-v4bx to linker to support EABI. +Subject: [PATCH 15/39] gcc: armv4: pass fix-v4bx to linker to support EABI. The LINK_SPEC for linux gets overwritten by linux-eabi.h which means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result @@ -39,5 +39,5 @@ index e4ade2e2ab0..108863f69d2 100644 LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch similarity index 89% rename from meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch index 310caec..6f0833c 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch @@ -1,7 +1,7 @@ -From e3b693b9d6dc9496f7c98a13b28182d23084215c Mon Sep 17 00:00:00 2001 +From 7effc632d65c2d72bf6fa32a219ec2f82fef9405 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:33:04 +0400 -Subject: [PATCH 16/36] Use the multilib config files from ${B} instead of +Subject: [PATCH 16/39] Use the multilib config files from ${B} instead of using the ones from ${S} Use the multilib config files from ${B} instead of using the ones from ${S} @@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration] 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/gcc/configure b/gcc/configure -index 1f1d22ca666..911de2cf017 100755 +index 52f52b0ec86..a5f208af7cf 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -12321,10 +12321,20 @@ done +@@ -12322,10 +12322,20 @@ done tmake_file_= for f in ${tmake_file} do @@ -46,7 +46,7 @@ index 1f1d22ca666..911de2cf017 100755 done tmake_file="${tmake_file_}" -@@ -12335,6 +12345,10 @@ tm_file_list="options.h" +@@ -12336,6 +12346,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in $tm_file; do case $f in @@ -58,7 +58,7 @@ index 1f1d22ca666..911de2cf017 100755 f=`echo $f | sed 's/^..//'` tm_file_list="${tm_file_list} $f" diff --git a/gcc/configure.ac b/gcc/configure.ac -index ddc85197588..b413ae9bf25 100644 +index 242ad28ec83..b7a7ead1c02 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1948,10 +1948,20 @@ done @@ -98,5 +98,5 @@ index ddc85197588..b413ae9bf25 100644 f=`echo $f | sed 's/^..//'` tm_file_list="${tm_file_list} $f" -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch similarity index 84% rename from meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch index ad1d1d4..96da013 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch @@ -1,7 +1,7 @@ -From 09d9ccc1d471020949d1285a5276f17504fd60dd Mon Sep 17 00:00:00 2001 +From a2b2bf77621f344a849e55ab179ece8587d19234 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 09:39:38 +0000 -Subject: [PATCH 17/36] Avoid using libdir from .la which usually points to a +Subject: [PATCH 17/39] Avoid using libdir from .la which usually points to a host path Upstream-Status: Inappropriate [embedded specific] @@ -27,5 +27,5 @@ index 8e222f7c16b..0a93b4e5c3b 100644 absdir="$libdir" fi -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch index 0f728ec..2385099 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0018-export-CPP.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0018-export-CPP.patch @@ -1,7 +1,7 @@ -From 987338cd847a723de533bb317e452a60b1e52165 Mon Sep 17 00:00:00 2001 +From cafb6a621c05c1f238679d52fc026446f38c8af5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 09:40:59 +0000 -Subject: [PATCH 18/36] export CPP +Subject: [PATCH 18/39] export CPP The OE environment sets and exports CPP as being the target gcc. When building gcc-cross-canadian for a mingw targetted sdk, the following can be found @@ -49,5 +49,5 @@ index 64e091ba71d..255822e3f27 100644 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX_FOR_BUILD)"; export CXX; \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch similarity index 80% rename from meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch index 53f9e99..e0129d1 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0019-Ensure-target-gcc-headers-can-be-included.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0019-Ensure-target-gcc-headers-can-be-included.patch @@ -1,7 +1,7 @@ -From d27ba49e2e5c608c43265462d6831363cc7f565b Mon Sep 17 00:00:00 2001 +From 182057b80891edc0e8d46835e2d8bfd28330a55a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 10:25:11 +0000 -Subject: [PATCH 19/36] Ensure target gcc headers can be included +Subject: [PATCH 19/39] Ensure target gcc headers can be included There are a few headers installed as part of the OpenEmbedded gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe @@ -18,10 +18,10 @@ Signed-off-by: Khem Raj --- gcc/Makefile.in | 2 ++ gcc/cppdefault.c | 4 ++++ - gcc/defaults.h | 9 +++++++++ - gcc/gcc.c | 7 ------- - 4 files changed, 15 insertions(+), 7 deletions(-) + 2 files changed, 6 insertions(+) +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 57cf7804f0a..7772342ad5e 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -618,6 +618,7 @@ libexecdir = @libexecdir@ @@ -32,7 +32,7 @@ Signed-off-by: Khem Raj # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) # Directory in which all plugin resources are installed -@@ -2866,6 +2867,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localed +@@ -2867,6 +2868,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ @@ -40,9 +40,11 @@ Signed-off-by: Khem Raj -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ +diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c +index c4796385643..980e2bd47a7 100644 --- a/gcc/cppdefault.c +++ b/gcc/cppdefault.c -@@ -59,6 +59,10 @@ const struct default_include cpp_include +@@ -59,6 +59,10 @@ const struct default_include cpp_include_defaults[] /* This is the dir for gcc's private headers. */ { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, #endif @@ -53,3 +55,6 @@ Signed-off-by: Khem Raj #ifdef LOCAL_INCLUDE_DIR /* /usr/local/include comes before the fixincluded header files. */ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch index b0f96d0..1d21821 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0020-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch @@ -1,7 +1,7 @@ -From 83bcd4cc47ae63971c888c117abd00dfd506532c Mon Sep 17 00:00:00 2001 +From a4740f1290e6a602fbbfa27b863be2e3b2675685 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 11:17:19 +0000 -Subject: [PATCH 20/36] gcc 4.8+ won't build with --disable-dependency-tracking +Subject: [PATCH 20/39] gcc 4.8+ won't build with --disable-dependency-tracking since the *.Ppo files don't get created unless --enable-dependency-tracking is true. @@ -50,5 +50,5 @@ index 29324e3e0ac..d5cdb4259ef 100644 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) M_FILE = $(PAT_BASE)_n.c -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch similarity index 87% rename from meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch index f36ca29..e363c7d 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0021-Don-t-search-host-directory-during-relink-if-inst_pr.patch @@ -1,7 +1,7 @@ -From 667cc8d43e8fb4ac09654ee408da482f96b09580 Mon Sep 17 00:00:00 2001 +From f3edad81d80dde5d64bf77e6abafda54db10b824 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 3 Mar 2015 08:21:19 +0000 -Subject: [PATCH 21/36] Don't search host directory during "relink" if +Subject: [PATCH 21/39] Don't search host directory during "relink" if $inst_prefix is provided http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html @@ -34,5 +34,5 @@ index 0a93b4e5c3b..6de6ed2f9a0 100644 esac fi -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch similarity index 86% rename from meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch index d5b9150..846c0de 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0022-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch @@ -1,7 +1,7 @@ -From 279c4de48e3fd61e2f268787ed3f1d69ed9224f8 Mon Sep 17 00:00:00 2001 +From b8ea2c2c7d33376f5dd651646c7e822000e47749 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Apr 2015 23:15:27 -0700 -Subject: [PATCH 22/36] Use SYSTEMLIBS_DIR replacement instead of hardcoding +Subject: [PATCH 22/39] Use SYSTEMLIBS_DIR replacement instead of hardcoding base_libdir Upstream-Status: Pending @@ -25,5 +25,5 @@ index 5e8b34ded03..7e628bf661e 100644 #undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch similarity index 87% rename from meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch index f811306..102d6fc 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0023-aarch64-Add-support-for-musl-ldso.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0023-aarch64-Add-support-for-musl-ldso.patch @@ -1,7 +1,7 @@ -From 1277d12058334087443828dfd57d44e3b1dfcc9a Mon Sep 17 00:00:00 2001 +From 8645b57e7c0dfd93afee5caeaa534c714f449ba1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Apr 2015 23:18:39 -0700 -Subject: [PATCH 23/36] aarch64: Add support for musl ldso +Subject: [PATCH 23/39] aarch64: Add support for musl ldso Upstream-Status: Pending @@ -24,5 +24,5 @@ index 7e628bf661e..1717cbe5471 100644 #undef ASAN_CC1_SPEC #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch index 298b096..443e0a2 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0024-libcc1-fix-libcc1-s-install-path-and-rpath.patch @@ -1,7 +1,7 @@ -From 4a0487ad75accd780dd155aa59086cc4b11cfc47 Mon Sep 17 00:00:00 2001 +From b1666565e4e133ee41f32fa8032165bcb06afe9a Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 5 Jul 2015 20:25:18 -0700 -Subject: [PATCH 24/36] libcc1: fix libcc1's install path and rpath +Subject: [PATCH 24/39] libcc1: fix libcc1's install path and rpath * Install libcc1.so and libcc1plugin.so into $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we @@ -50,5 +50,5 @@ index 7104b649026..2103c477468 100644 @ENABLE_PLUGIN_TRUE at cc1lib_LTLIBRARIES = libcc1.la shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch index 2e7a444..59ac97e 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0025-handle-sysroot-support-for-nativesdk-gcc.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0025-handle-sysroot-support-for-nativesdk-gcc.patch @@ -1,7 +1,7 @@ -From a183c82ea2af934a8d30055a791dc1d80c9067a9 Mon Sep 17 00:00:00 2001 +From 7d614a84709d7dc4a2529c3d529e2da8541f9fd4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:39:54 +0000 -Subject: [PATCH 25/36] handle sysroot support for nativesdk-gcc +Subject: [PATCH 25/39] handle sysroot support for nativesdk-gcc Being able to build a nativesdk gcc is useful, particularly in cases where the host compiler may be of an incompatible version (or a 32 @@ -40,10 +40,10 @@ Signed-off-by: Mark Hatle prefix.c | 4 +-- 6 files changed, 68 insertions(+), 48 deletions(-) -Index: gcc-9.2.0/gcc/cppdefault.c +Index: gcc-9.3.0/gcc/cppdefault.c =================================================================== ---- gcc-9.2.0.orig/gcc/cppdefault.c -+++ gcc-9.2.0/gcc/cppdefault.c +--- gcc-9.3.0.orig/gcc/cppdefault.c ++++ gcc-9.3.0/gcc/cppdefault.c @@ -35,6 +35,30 @@ # undef CROSS_INCLUDE_DIR #endif @@ -163,10 +163,10 @@ Index: gcc-9.2.0/gcc/cppdefault.c /* This value is set by cpp_relocated at runtime */ const char *gcc_exec_prefix; -Index: gcc-9.2.0/gcc/cppdefault.h +Index: gcc-9.3.0/gcc/cppdefault.h =================================================================== ---- gcc-9.2.0.orig/gcc/cppdefault.h -+++ gcc-9.2.0/gcc/cppdefault.h +--- gcc-9.3.0.orig/gcc/cppdefault.h ++++ gcc-9.3.0/gcc/cppdefault.h @@ -33,7 +33,8 @@ struct default_include @@ -198,10 +198,10 @@ Index: gcc-9.2.0/gcc/cppdefault.h /* The run-time execution prefix. This is typically the lib/gcc subdirectory of the actual installation. */ extern const char *gcc_exec_prefix; -Index: gcc-9.2.0/gcc/gcc.c +Index: gcc-9.3.0/gcc/gcc.c =================================================================== ---- gcc-9.2.0.orig/gcc/gcc.c -+++ gcc-9.2.0/gcc/gcc.c +--- gcc-9.3.0.orig/gcc/gcc.c ++++ gcc-9.3.0/gcc/gcc.c @@ -253,6 +253,8 @@ FILE *report_times_to_file = NULL; #endif static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT; @@ -258,10 +258,10 @@ Index: gcc-9.2.0/gcc/gcc.c case 'S': value = do_spec_1 (startfile_spec, 0, NULL); if (value != 0) -Index: gcc-9.2.0/gcc/c-family/c-opts.c +Index: gcc-9.3.0/gcc/c-family/c-opts.c =================================================================== ---- gcc-9.2.0.orig/gcc/c-family/c-opts.c -+++ gcc-9.2.0/gcc/c-family/c-opts.c +--- gcc-9.3.0.orig/gcc/c-family/c-opts.c ++++ gcc-9.3.0/gcc/c-family/c-opts.c @@ -1382,8 +1382,8 @@ add_prefixed_path (const char *suffix, i size_t prefix_len, suffix_len; @@ -273,10 +273,10 @@ Index: gcc-9.2.0/gcc/c-family/c-opts.c path = (char *) xmalloc (prefix_len + suffix_len + 1); memcpy (path, prefix, prefix_len); -Index: gcc-9.2.0/gcc/incpath.c +Index: gcc-9.3.0/gcc/incpath.c =================================================================== ---- gcc-9.2.0.orig/gcc/incpath.c -+++ gcc-9.2.0/gcc/incpath.c +--- gcc-9.3.0.orig/gcc/incpath.c ++++ gcc-9.3.0/gcc/incpath.c @@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, int relocated = cpp_relocated (); size_t len; @@ -320,10 +320,10 @@ Index: gcc-9.2.0/gcc/incpath.c NULL); str = update_path (ostr, p->component); free (ostr); -Index: gcc-9.2.0/gcc/prefix.c +Index: gcc-9.3.0/gcc/prefix.c =================================================================== ---- gcc-9.2.0.orig/gcc/prefix.c -+++ gcc-9.2.0/gcc/prefix.c +--- gcc-9.3.0.orig/gcc/prefix.c ++++ gcc-9.3.0/gcc/prefix.c @@ -72,7 +72,9 @@ License along with GCC; see the file COP #include "prefix.h" #include "common/common-target.h" diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch similarity index 90% rename from meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch index fde206e..abfa751 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0026-Search-target-sysroot-gcc-version-specific-dirs-with.patch @@ -1,7 +1,7 @@ -From dab4db14e319f3239a2b4c7d1fbf2971936e27ba Mon Sep 17 00:00:00 2001 +From 6c39a22c3e85d20dee9e2fc2274e95da980de4d0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:41:45 +0000 -Subject: [PATCH 26/36] Search target sysroot gcc version specific dirs with +Subject: [PATCH 26/39] Search target sysroot gcc version specific dirs with multilib. We install the gcc libraries (such as crtbegin.p) into @@ -51,10 +51,10 @@ Signed-off-by: Khem Raj 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gcc/gcc.c b/gcc/gcc.c -index db0e2934038..1c21d1b08eb 100644 +index 59fb64f5fd5..3e79da4238c 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c -@@ -2610,7 +2610,7 @@ for_each_path (const struct path_prefix *paths, +@@ -2617,7 +2617,7 @@ for_each_path (const struct path_prefix *paths, if (path == NULL) { len = paths->max_len + extra_space + 1; @@ -63,7 +63,7 @@ index db0e2934038..1c21d1b08eb 100644 path = XNEWVEC (char, len); } -@@ -2622,6 +2622,33 @@ for_each_path (const struct path_prefix *paths, +@@ -2629,6 +2629,33 @@ for_each_path (const struct path_prefix *paths, /* Look first in MACHINE/VERSION subdirectory. */ if (!skip_multi_dir) { @@ -98,5 +98,5 @@ index db0e2934038..1c21d1b08eb 100644 ret = callback (path, callback_info); if (ret) -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch similarity index 94% rename from meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch index 5d89e8e..ae8acc7 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0027-Fix-various-_FOR_BUILD-and-related-variables.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0027-Fix-various-_FOR_BUILD-and-related-variables.patch @@ -1,7 +1,7 @@ -From 8e84bb09d2b7a60487a30e438bb109f31c2c254b Mon Sep 17 00:00:00 2001 +From 07db34b16b6c8e3d948b417f2fc052500ffb77d3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Dec 2015 23:42:45 +0000 -Subject: [PATCH 27/36] Fix various _FOR_BUILD and related variables +Subject: [PATCH 27/39] Fix various _FOR_BUILD and related variables When doing a FOR_BUILD thing, you have to override CFLAGS with CFLAGS_FOR_BUILD. And if you use C++, you also have to override @@ -94,7 +94,7 @@ index 41cae58a267..d3f6b79acdc 100644 CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 21472745c2c..8c93f03ffdc 100644 +index 7772342ad5e..02fec881b6d 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -805,7 +805,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@ @@ -107,10 +107,10 @@ index 21472745c2c..8c93f03ffdc 100644 # Actual name to use when installing a native compiler. GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') diff --git a/gcc/configure b/gcc/configure -index 911de2cf017..325ace34cdf 100755 +index a5f208af7cf..0788b7bf0b5 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -11965,7 +11965,7 @@ else +@@ -11966,7 +11966,7 @@ else CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \ LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \ @@ -120,7 +120,7 @@ index 911de2cf017..325ace34cdf 100755 --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias diff --git a/gcc/configure.ac b/gcc/configure.ac -index b413ae9bf25..72a6c95121b 100644 +index b7a7ead1c02..5ab50fae0f3 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1743,7 +1743,7 @@ else @@ -133,5 +133,5 @@ index b413ae9bf25..72a6c95121b 100644 --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch similarity index 84% rename from meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch index 84d92a3..52a5d97 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0028-nios2-Define-MUSL_DYNAMIC_LINKER.patch @@ -1,7 +1,7 @@ -From 5647f773e28b528a67800ef06ca44730f9f5dc7e Mon Sep 17 00:00:00 2001 +From 59543e897eb35194fb47288f7762e40a18fff611 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 2 Feb 2016 10:26:10 -0800 -Subject: [PATCH 28/36] nios2: Define MUSL_DYNAMIC_LINKER +Subject: [PATCH 28/39] nios2: Define MUSL_DYNAMIC_LINKER Upstream-Status: Pending @@ -24,5 +24,5 @@ index 698734add35..eeee60ecfea 100644 #undef LINK_SPEC #define LINK_SPEC LINK_SPEC_ENDIAN \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch index d19e5a0..bfa7e19 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0029-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch @@ -1,7 +1,7 @@ -From 474043ca7a064ca7b0a32308a0ed6f7c546f17b2 Mon Sep 17 00:00:00 2001 +From 8df99af0a65ef740bcf2b7dc9a109cc57f15c3aa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Jun 2017 18:10:54 -0700 -Subject: [PATCH 29/36] Add ssp_nonshared to link commandline for musl targets +Subject: [PATCH 29/39] Add ssp_nonshared to link commandline for musl targets when -fstack-protector options are enabled we need to link with ssp_shared on musl since it does not provide @@ -83,5 +83,5 @@ index 45a9a7cae59..d1e88a40e82 100644 %{!static-pie: \ %{rdynamic:-export-dynamic} \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch similarity index 84% rename from meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch index 38eab5a..f8e8c07 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0030-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0030-ldbl128-config.patch @@ -1,7 +1,7 @@ -From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001 +From 1bfae624b27ea4a1f5c5a92050d741b511e7b3d5 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 28 Feb 2018 00:54:05 +0000 -Subject: [PATCH 10/12] ldbl128 config +Subject: [PATCH 30/39] ldbl128 config Upstream-Status: Pending @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/gcc/configure b/gcc/configure -index 6121e163259..07ff8597d48 100755 +index 0788b7bf0b5..eb1a45bb263 100755 --- a/gcc/configure +++ b/gcc/configure -@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then : +@@ -29370,6 +29370,15 @@ if test "${with_long_double_128+set}" = set; then : withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128" else @@ -31,7 +31,7 @@ index 6121e163259..07ff8597d48 100755 if test $glibc_version_major -gt 2 \ || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then : gcc_cv_target_ldbl128=yes -@@ -29320,6 +29329,10 @@ else +@@ -29381,6 +29390,10 @@ else && gcc_cv_target_ldbl128=yes fi @@ -43,10 +43,10 @@ index 6121e163259..07ff8597d48 100755 ;; diff --git a/gcc/configure.ac b/gcc/configure.ac -index b066cc609e1..6c15ed898c0 100644 +index 5ab50fae0f3..7ffe35ee1c3 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -5971,13 +5971,25 @@ case "$target" in +@@ -6030,13 +6030,25 @@ case "$target" in AC_ARG_WITH(long-double-128, [AS_HELP_STRING([--with-long-double-128], [use 128-bit long double by default])], @@ -75,5 +75,5 @@ index b066cc609e1..6c15ed898c0 100644 esac if test x$gcc_cv_target_ldbl128 = xyes; then -- -2.17.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch similarity index 86% rename from meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch index dc2141d..60a29fc 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0031-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch @@ -1,7 +1,7 @@ -From 266dcc78e4d9d38de2809118977d97dc9270cf1f Mon Sep 17 00:00:00 2001 +From 31d008f5573627c6192ce9fcf729f0be464a7cf5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 May 2016 21:11:34 -0700 -Subject: [PATCH 31/36] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS +Subject: [PATCH 31/39] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS Upstream-Status: Pending @@ -25,5 +25,5 @@ index 099bf23e62f..436b277a79f 100644 $(SHLIB_OBJS) $(SHLIB_LC) && \ rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch similarity index 92% rename from meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch index 8dde016..6f048da 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0032-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch @@ -1,7 +1,7 @@ -From 9975b6ed3570bbf7c7d2d82f4d5f733d24ccacf5 Mon Sep 17 00:00:00 2001 +From 761fa6e3e37608cfd1b288e721a2ff89288cd6aa Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Sat, 24 Oct 2015 20:09:53 +0000 -Subject: [PATCH 32/36] libgcc_s: Use alias for __cpu_indicator_init instead of +Subject: [PATCH 32/39] libgcc_s: Use alias for __cpu_indicator_init instead of symver Adapter from @@ -39,10 +39,10 @@ Signed-off-by: Khem Raj 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c -index 2b37296e537..dd380ddba88 100644 +index 1bca5a7eea6..096c4bc8e25 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c -@@ -36658,10 +36658,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, +@@ -36685,10 +36685,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, { case IX86_BUILTIN_CPU_INIT: { @@ -82,5 +82,5 @@ index 8506a635790..564296f788e 100644 +HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS) CRTSTUFF_T_CFLAGS += $(CET_FLAGS) -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch b/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch similarity index 95% rename from meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch index b99ac42..f080b05 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0033-sync-gcc-stddef.h-with-musl.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0033-sync-gcc-stddef.h-with-musl.patch @@ -1,7 +1,7 @@ -From 39e2f61d262f9f6c7a91068998dea80791ef665e Mon Sep 17 00:00:00 2001 +From 126e342fb39d7af70c1e5a6df8ffafc8dfc3bf08 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Feb 2017 12:56:00 -0800 -Subject: [PATCH 33/36] sync gcc stddef.h with musl +Subject: [PATCH 33/39] sync gcc stddef.h with musl musl defines ptrdiff_t size_t and wchar_t so dont define them here if musl is definining them @@ -87,5 +87,5 @@ index da692e1c01a..9a00c261adb 100644 #endif /* _STDDEF_H or __need_wchar_t. */ -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch b/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch index 06a3c9f..3b7ccb3 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0034-fix-segmentation-fault-in-precompiled-header-generat.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0034-fix-segmentation-fault-in-precompiled-header-generat.patch @@ -1,7 +1,7 @@ -From aaa896a57b0004a74c1d474e74b21f41147a65cb Mon Sep 17 00:00:00 2001 +From d26fa9ededccc7e1ec47ead7f18afc80971483a3 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Mon, 19 Mar 2018 22:31:20 -0700 -Subject: [PATCH 34/36] fix segmentation fault in precompiled header generation +Subject: [PATCH 34/39] fix segmentation fault in precompiled header generation Prevent a segmentation fault which occurs when using incorrect structure trying to access name of some named operators, such as @@ -56,5 +56,5 @@ index eedfcbb3146..15040a1b1f0 100644 buffer = _cpp_spell_ident_ucns (buffer, token->val.node.node); break; -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch b/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch similarity index 98% rename from meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch index 7470cbf..5e199fb 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0035-Fix-for-testsuite-failure.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0035-Fix-for-testsuite-failure.patch @@ -1,7 +1,7 @@ -From 0f9d449c739df03782ce9d29f6b68d9af976a607 Mon Sep 17 00:00:00 2001 +From fb5bdf8f8527228d587e8af9fc700e5164b3c18c Mon Sep 17 00:00:00 2001 From: RAGHUNATH LOLUR Date: Wed, 6 Dec 2017 22:52:26 -0800 -Subject: [PATCH 35/36] Fix for testsuite failure +Subject: [PATCH 35/39] Fix for testsuite failure 2017-11-16 Raghunath Lolur @@ -254,5 +254,5 @@ index 6cda1534311..26e37f5b8ba 100644 __attribute__((vector_size((elcount)*sizeof(type)))) type -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch b/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch similarity index 88% rename from meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch index 4dbcd98..825e070 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/0036-Re-introduce-spe-commandline-options.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0036-Re-introduce-spe-commandline-options.patch @@ -1,7 +1,7 @@ -From 71e99c2b58a9eb00cdd65a04aeb6fb78227e3297 Mon Sep 17 00:00:00 2001 +From dc23cabac6a7b2ca85b02d2a58a8916c98f382e0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 6 Jun 2018 12:10:22 -0700 -Subject: [PATCH 36/36] Re-introduce spe commandline options +Subject: [PATCH 36/39] Re-introduce spe commandline options This should ensure that we keep accepting spe options @@ -37,5 +37,5 @@ index f4b5c91e11f..69869350fce 100644 Target RejectNegative Var(rs6000_altivec_abi) Save Use the AltiVec ABI extensions. -- -2.22.1 +2.25.1 diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch b/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch similarity index 59% rename from meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch index 65ea345..f268a4e 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-14250.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0037-CVE-2019-14250-Check-zero-value-in-simple_object_elf.patch @@ -1,7 +1,10 @@ -From 517b211a3d78366ca8d5929f580e8ca72fd2c004 Mon Sep 17 00:00:00 2001 +From ac4af583bd59f6631671ad4abf985799ce4a53d9 Mon Sep 17 00:00:00 2001 From: rguenth Date: Thu, 25 Jul 2019 10:46:54 +0000 -Subject: [PATCH] 2019-07-25 Richard Biener +Subject: [PATCH 37/39] CVE-2019-14250: Check zero value in + simple_object_elf_match + +2019-07-25 Richard Biener PR lto/90924 Backport from mainline @@ -10,7 +13,6 @@ Subject: [PATCH] 2019-07-25 Richard Biener * simple-object-elf.c (simple_object_elf_match): Check zero value shstrndx. - git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch at 273793 138bc75d-0d04-0410-961f-82ee72b054a4 Upstream-Status: Backport @@ -18,16 +20,15 @@ Affectes: < 9.2 CVE: CVE-2019-14250 Dropped changelog Signed-off-by: Armin Kuster - --- libiberty/simple-object-elf.c | 8 ++++++++ - 2 files changed, 17 insertions(+) + 1 file changed, 8 insertions(+) -Index: gcc-9.2.0/libiberty/simple-object-elf.c -=================================================================== ---- gcc-9.2.0.orig/libiberty/simple-object-elf.c -+++ gcc-9.2.0/libiberty/simple-object-elf.c -@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char h +diff --git a/libiberty/simple-object-elf.c b/libiberty/simple-object-elf.c +index 3d49f339631..c00cebdb6c7 100644 +--- a/libiberty/simple-object-elf.c ++++ b/libiberty/simple-object-elf.c +@@ -557,6 +557,14 @@ simple_object_elf_match (unsigned char header[SIMPLE_OBJECT_MATCH_HEADER_LEN], return NULL; } @@ -42,3 +43,6 @@ Index: gcc-9.2.0/libiberty/simple-object-elf.c return (void *) eor; } +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch b/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch similarity index 93% rename from meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch index 8e2c3f5..a79fc03 100644 --- a/meta/recipes-devtools/gcc/gcc-9.2/gen-no-line-numbers.patch +++ b/meta/recipes-devtools/gcc/gcc-9.3/0038-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch @@ -1,11 +1,23 @@ -Inserting line numbers into generated code means its not always reproducible wth +From 075e0929e04913538391052c32178b6a14ef0ae3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 12 Mar 2020 14:41:40 -0700 +Subject: [PATCH 38/39] gentypes/genmodes: Do not use __LINE__ for maintaining + reproducibility + +Inserting line numbers into generated code means its not always reproducible wth differing versions of host gcc. Void the issue by not adding these. Upstream-Status: Inappropriate [OE Reproducibility specific] + Signed-off-by: Richard Purdie +Signed-off-by: Khem Raj +--- + gcc/gengtype.c | 6 +++--- + gcc/genmodes.c | 32 ++++++++++++++++---------------- + 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gcc/gengtype.c b/gcc/gengtype.c -index 53317337c..bbb261516 100644 +index 53317337cf8..bbb26151671 100644 --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt, @@ -36,7 +48,7 @@ index 53317337c..bbb261516 100644 POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos)); POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos)); diff --git a/gcc/genmodes.c b/gcc/genmodes.c -index f33eefa24..07bef9eeb 100644 +index f33eefa2494..07bef9eebe2 100644 --- a/gcc/genmodes.c +++ b/gcc/genmodes.c @@ -429,7 +429,7 @@ complete_all_modes (void) @@ -168,3 +180,6 @@ index f33eefa24..07bef9eeb 100644 #define ADJUST_NUNITS(M, X) _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM) #define ADJUST_BYTESIZE(M, X) _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM) +-- +2.25.1 + 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.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch similarity index 88% rename from meta/recipes-devtools/gcc/gcc-9.2/re-PR-target-91102-aarch64-ICE-on-Linux-kernel-with-.patch rename to meta/recipes-devtools/gcc/gcc-9.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch index c37e0bb..b69114d 100644 --- 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.3/0039-process_alt_operands-Don-t-match-user-defined-regs-o.patch @@ -1,8 +1,10 @@ -From efb0ee06f5c0186c2d1442ecd4dbbd55dbd97b44 Mon Sep 17 00:00:00 2001 +From e75bcc2ec4f1e7e081ce18713f0a25913ba15340 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) +Subject: [PATCH 39/39] process_alt_operands: Don't match user defined regs + only if they are early clobbers + +PR target/91102 (aarch64 ICE on Linux kernel with -Os starting with r270266) 2019-07-10 Vladimir Makarov @@ -26,7 +28,7 @@ Signed-off-by: Taras Kondratiuk 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 +index cf33da8013e..6382dbf852b 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -2172,8 +2172,9 @@ process_alt_operands (int only_alternative) @@ -63,7 +65,7 @@ index cf33da8013e4..6382dbf852b6 100644 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 +index 00000000000..70b99045a48 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr91102.c @@ -0,0 +1,26 @@ @@ -93,3 +95,6 @@ index 000000000000..70b99045a48e + b.h = foo (b.h, c.h); + } +} +-- +2.25.1 + diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-cross-canadian_9.2.bb rename to meta/recipes-devtools/gcc/gcc-cross-canadian_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-cross_9.2.bb b/meta/recipes-devtools/gcc/gcc-cross_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-cross_9.2.bb rename to meta/recipes-devtools/gcc/gcc-cross_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-crosssdk_9.2.bb rename to meta/recipes-devtools/gcc/gcc-crosssdk_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-runtime_9.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-runtime_9.2.bb rename to meta/recipes-devtools/gcc/gcc-runtime_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-sanitizers_9.2.bb rename to meta/recipes-devtools/gcc/gcc-sanitizers_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc-source_9.2.bb b/meta/recipes-devtools/gcc/gcc-source_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc-source_9.2.bb rename to meta/recipes-devtools/gcc/gcc-source_9.3.bb diff --git a/meta/recipes-devtools/gcc/gcc_9.2.bb b/meta/recipes-devtools/gcc/gcc_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/gcc_9.2.bb rename to meta/recipes-devtools/gcc/gcc_9.3.bb diff --git a/meta/recipes-devtools/gcc/libgcc-initial_9.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc-initial_9.2.bb rename to meta/recipes-devtools/gcc/libgcc-initial_9.3.bb diff --git a/meta/recipes-devtools/gcc/libgcc_9.2.bb b/meta/recipes-devtools/gcc/libgcc_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgcc_9.2.bb rename to meta/recipes-devtools/gcc/libgcc_9.3.bb diff --git a/meta/recipes-devtools/gcc/libgfortran_9.2.bb b/meta/recipes-devtools/gcc/libgfortran_9.3.bb similarity index 100% rename from meta/recipes-devtools/gcc/libgfortran_9.2.bb rename to meta/recipes-devtools/gcc/libgfortran_9.3.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 13:36:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:36:33 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b065467 -> b1ae217) Message-ID: <158410659383.13056.5785372174095850314@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 b065467 gcc: Upgrade to 9.3 bugfix release add caf80e4 gcc: Upgrade to 9.3 bugfix release new d598f8e bluez: fix CVE-2020-0556 new 287123a binutils: fix CVE-2020-0551 new dd6ee0b initramfs-framework: fix boothang when console=null new 3513721 python: upgrade 3.8.1 -> 3.8.2 new b1ae217 babeltrace2: updated to 2.0.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 (b065467) \ N -- N -- N refs/heads/master-next (b1ae217) 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/recipes-connectivity/bluez5/bluez5.inc | 2 + .../bluez5/bluez5/CVE-2020-0556-1.patch | 35 ++ .../bluez5/bluez5/CVE-2020-0556-2.patch | 143 ++++++ .../initrdscripts/initramfs-framework/udev | 3 + meta/recipes-devtools/binutils/binutils-2.34.inc | 1 + .../binutils/binutils/CVE-2020-0551.patch | 549 +++++++++++++++++++++ ...-handle-sysroot-support-for-nativesdk-gcc.patch | 183 ++++++- .../python/{python3_3.8.1.bb => python3_3.8.2.bb} | 6 +- .../{babeltrace2_2.0.1.bb => babeltrace2_2.0.2.bb} | 2 +- 9 files changed, 895 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch rename meta/recipes-devtools/python/{python3_3.8.1.bb => python3_3.8.2.bb} (98%) rename meta/recipes-kernel/lttng/{babeltrace2_2.0.1.bb => babeltrace2_2.0.2.bb} (98%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 13:36:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:36:34 +0000 Subject: [oe-commits] [openembedded-core] 01/05: bluez: fix CVE-2020-0556 In-Reply-To: <158410659383.13056.5785372174095850314@git.openembedded.org> References: <158410659383.13056.5785372174095850314@git.openembedded.org> Message-ID: <20200313133634.4B673233631@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit d598f8eee0741148416e8660e10c716654205cb5 Author: Anuj Mittal AuthorDate: Fri Mar 13 09:09:38 2020 +0800 bluez: fix CVE-2020-0556 It was discovered that BlueZ's HID and HOGP profiles implementations don't specifically require bonding between the device and the host. This creates an opportunity for an malicious device to connect to a target host to either impersonate an existing HID device without security or to cause an SDP or GATT service discovery to take place which would allow HID reports to be injected to the input subsystem from a non-bonded source. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 + .../bluez5/bluez5/CVE-2020-0556-1.patch | 35 +++++ .../bluez5/bluez5/CVE-2020-0556-2.patch | 143 +++++++++++++++++++++ 3 files changed, 180 insertions(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 150d909..708fa1c 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -52,6 +52,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ + file://CVE-2020-0556-1.patch \ + file://CVE-2020-0556-2.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch new file mode 100644 index 0000000..a6bf31e --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch @@ -0,0 +1,35 @@ +From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:16 +0000 +Subject: [PATCH 1/2] HOGP must only accept data from bonded devices. + +HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1] +Signed-off-by: Anuj Mittal +CVE: CVE-2020-0556 +--- + profiles/input/hog.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/profiles/input/hog.c b/profiles/input/hog.c +index 83c017dcb..dfac68921 100644 +--- a/profiles/input/hog.c ++++ b/profiles/input/hog.c +@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) + return -EINVAL; + } + ++ /* HOGP 1.0 Section 6.1 requires bonding */ ++ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) ++ return -ECONNREFUSED; ++ + /* TODO: Replace GAttrib with bt_gatt_client */ + bt_hog_attach(dev->hog, attrib); + +-- +2.24.1 + diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch new file mode 100644 index 0000000..8acb2f1 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch @@ -0,0 +1,143 @@ +From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:18 +0000 +Subject: [PATCH 2/2] HID accepts bonded device connections only. + +This change adds a configuration for platforms to choose a more secure +posture for the HID profile. While some older mice are known to not +support pairing or encryption, some platform may choose a more secure +posture by requiring the device to be bonded and require the +connection to be encrypted when bonding is required. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787] +Signed-off-by: Anuj Mittal +CVE: CVE-2020-0556 + +--- + profiles/input/device.c | 23 ++++++++++++++++++++++- + profiles/input/device.h | 1 + + profiles/input/input.conf | 8 ++++++++ + profiles/input/manager.c | 13 ++++++++++++- + 4 files changed, 43 insertions(+), 2 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index 2cb3811c8..d89da2d7c 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -92,6 +92,7 @@ struct input_device { + + static int idle_timeout = 0; + static bool uhid_enabled = false; ++static bool classic_bonded_only = false; + + void input_set_idle_timeout(int timeout) + { +@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) + uhid_enabled = state; + } + ++void input_set_classic_bonded_only(bool state) ++{ ++ classic_bonded_only = state; ++} ++ + static void input_device_enter_reconnect_mode(struct input_device *idev); + static int connection_disconnect(struct input_device *idev, uint32_t flags); + +@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) + if (device_name_known(idev->device)) + device_get_name(idev->device, req->name, sizeof(req->name)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) { ++ error("Rejected connection from !bonded device %s", dst_addr); ++ goto cleanup; ++ } ++ + /* Encryption is mandatory for keyboards */ +- if (req->subclass & 0x40) { ++ /* Some platforms may choose to require encryption for all devices */ ++ /* Note that this only matters for pre 2.1 devices as otherwise the */ ++ /* device is encrypted by default by the lower layers */ ++ if (classic_bonded_only || req->subclass & 0x40) { + if (!bt_io_set(idev->intr_io, &gerr, + BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, + BT_IO_OPT_INVALID)) { +@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) + DBG("path=%s reconnect_mode=%s", idev->path, + reconnect_mode_to_string(idev->reconnect_mode)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) ++ return; ++ + /* Only attempt an auto-reconnect when the device is required to + * accept reconnections from the host. + */ +diff --git a/profiles/input/device.h b/profiles/input/device.h +index 51a9aee18..3044db673 100644 +--- a/profiles/input/device.h ++++ b/profiles/input/device.h +@@ -29,6 +29,7 @@ struct input_conn; + + void input_set_idle_timeout(int timeout); + void input_enable_userspace_hid(bool state); ++void input_set_classic_bonded_only(bool state); + + int input_device_register(struct btd_service *service); + void input_device_unregister(struct btd_service *service); +diff --git a/profiles/input/input.conf b/profiles/input/input.conf +index 3e1d65aae..166aff4a4 100644 +--- a/profiles/input/input.conf ++++ b/profiles/input/input.conf +@@ -11,3 +11,11 @@ + # Enable HID protocol handling in userspace input profile + # Defaults to false (HIDP handled in HIDP kernel module) + #UserspaceHID=true ++ ++# Limit HID connections to bonded devices ++# The HID Profile does not specify that devices must be bonded, however some ++# platforms may want to make sure that input connections only come from bonded ++# device connections. Several older mice have been known for not supporting ++# pairing/encryption. ++# Defaults to false to maximize device compatibility. ++#ClassicBondedOnly=true +diff --git a/profiles/input/manager.c b/profiles/input/manager.c +index 1d31b0652..5cd27b839 100644 +--- a/profiles/input/manager.c ++++ b/profiles/input/manager.c +@@ -96,7 +96,7 @@ static int input_init(void) + config = load_config_file(CONFIGDIR "/input.conf"); + if (config) { + int idle_timeout; +- gboolean uhid_enabled; ++ gboolean uhid_enabled, classic_bonded_only; + + idle_timeout = g_key_file_get_integer(config, "General", + "IdleTimeout", &err); +@@ -114,6 +114,17 @@ static int input_init(void) + input_enable_userspace_hid(uhid_enabled); + } else + g_clear_error(&err); ++ ++ classic_bonded_only = g_key_file_get_boolean(config, "General", ++ "ClassicBondedOnly", &err); ++ ++ if (!err) { ++ DBG("input.conf: ClassicBondedOnly=%s", ++ classic_bonded_only ? "true" : "false"); ++ input_set_classic_bonded_only(classic_bonded_only); ++ } else ++ g_clear_error(&err); ++ + } + + btd_profile_register(&input_profile); +-- +2.24.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 13:36:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:36:36 +0000 Subject: [oe-commits] [openembedded-core] 03/05: initramfs-framework: fix boothang when console=null In-Reply-To: <158410659383.13056.5785372174095850314@git.openembedded.org> References: <158410659383.13056.5785372174095850314@git.openembedded.org> Message-ID: <20200313133634.6132A233633@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dd6ee0b06cd8df6204cf600050516d15172302ea Author: Stefan Eichenberger AuthorDate: Fri Mar 13 12:09:07 2020 +0100 initramfs-framework: fix boothang when console=null If console=null systemd-udevd throws an assertion which prevents the system from booting. This patch redirects stdin, stdout and stderr to /dev/null in case that the console can't be opened so that udevd still boots. A systemd issue was reported here. However, they will not fix this specific use-case: https://github.com/systemd/systemd/issues/13332 Signed-off-by: Stefan Eichenberger Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/initramfs-framework/udev | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev b/meta/recipes-core/initrdscripts/initramfs-framework/udev index 87551ff..4898b89 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/udev +++ b/meta/recipes-core/initrdscripts/initramfs-framework/udev @@ -41,6 +41,9 @@ udev_run() { mkdir -p /run mkdir -p /var/run + # Workaround if console=null, systemd-udevd needs valid stdin, stdout and stderr to work + sh -c "exec 4< /dev/console" || { exec 0> /dev/null; exec 1> /dev/null; exec 2> /dev/null; } + $_UDEV_DAEMON --daemon udevadm trigger --action=add udevadm settle -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 13:36:35 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:36:35 +0000 Subject: [oe-commits] [openembedded-core] 02/05: binutils: fix CVE-2020-0551 In-Reply-To: <158410659383.13056.5785372174095850314@git.openembedded.org> References: <158410659383.13056.5785372174095850314@git.openembedded.org> Message-ID: <20200313133634.576F7233632@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 287123a9562e08cd97a4ebfd380508432654324b Author: Anuj Mittal AuthorDate: Fri Mar 13 09:09:39 2020 +0800 binutils: fix CVE-2020-0551 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils-2.34.inc | 1 + .../binutils/binutils/CVE-2020-0551.patch | 549 +++++++++++++++++++++ 2 files changed, 550 insertions(+) diff --git a/meta/recipes-devtools/binutils/binutils-2.34.inc b/meta/recipes-devtools/binutils/binutils-2.34.inc index eaaa5ed..ed9f902 100644 --- a/meta/recipes-devtools/binutils/binutils-2.34.inc +++ b/meta/recipes-devtools/binutils/binutils-2.34.inc @@ -40,6 +40,7 @@ SRC_URI = "\ 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 \ + file://CVE-2020-0551.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch b/meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch new file mode 100644 index 0000000..53e3caf --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch @@ -0,0 +1,549 @@ +From ae531041c7c5956672342f89c486a011c84f027f Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 11 Mar 2020 09:46:19 -0700 +Subject: [PATCH 1/1] i386: Generate lfence with load/indirect branch/ret + [CVE-2020-0551] + +Add 3 command-line options to generate lfence for load, indirect near +branch and ret to help mitigate: + +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00334.html +http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0551 + +1. -mlfence-after-load=[no|yes]: + -mlfence-after-load=yes generates lfence after load instructions. +2. -mlfence-before-indirect-branch=[none|all|memory|register]: + a. -mlfence-before-indirect-branch=all generates lfence before indirect + near branches via register and a warning before indirect near branches + via memory. + b. -mlfence-before-indirect-branch=memory issue a warning before + indirect near branches via memory. + c. -mlfence-before-indirect-branch=register generates lfence before + indirect near branches via register. +Note that lfence won't be generated before indirect near branches via +register with -mlfence-after-load=yes since lfence will be generated +after loading branch target register. +3. -mlfence-before-ret=[none|or|not] + a. -mlfence-before-ret=or generates or with lfence before ret. + b. -mlfence-before-ret=not generates not with lfence before ret. + +A warning will be issued and lfence won't be generated before indirect +near branch and ret if the previous item is a prefix or a constant +directive, which may be used to hardcode an instruction, since there +is no clear instruction boundary. + + * config/tc-i386.c (lfence_after_load): New. + (lfence_before_indirect_branch_kind): New. + (lfence_before_indirect_branch): New. + (lfence_before_ret_kind): New. + (lfence_before_ret): New. + (last_insn): New. + (load_insn_p): New. + (insert_lfence_after): New. + (insert_lfence_before): New. + (md_assemble): Call insert_lfence_before and insert_lfence_after. + Set last_insn. + (OPTION_MLFENCE_AFTER_LOAD): New. + (OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH): New. + (OPTION_MLFENCE_BEFORE_RET): New. + (md_longopts): Add -mlfence-after-load=, + -mlfence-before-indirect-branch= and -mlfence-before-ret=. + (md_parse_option): Handle -mlfence-after-load=, + -mlfence-before-indirect-branch= and -mlfence-before-ret=. + (md_show_usage): Display -mlfence-after-load=, + -mlfence-before-indirect-branch= and -mlfence-before-ret=. + (i386_cons_align): New. + * config/tc-i386.h (i386_cons_align): New. + (md_cons_align): New. + * doc/c-i386.texi: Document -mlfence-after-load=, + -mlfence-before-indirect-branch= and -mlfence-before-ret=. + +Signed-off-by: Anuj Mittal +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ae531041c7c5956672342f89c486a011c84f027f] +CVE: CVE-2020-0551 +--- +diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c +index b020f39c863..09063f784b7 100644 +--- a/gas/config/tc-i386.c ++++ b/gas/config/tc-i386.c +@@ -629,7 +629,29 @@ static int omit_lock_prefix = 0; + "lock addl $0, (%{re}sp)". */ + static int avoid_fence = 0; + +-/* Type of the previous instruction. */ ++/* 1 if lfence should be inserted after every load. */ ++static int lfence_after_load = 0; ++ ++/* Non-zero if lfence should be inserted before indirect branch. */ ++static enum lfence_before_indirect_branch_kind ++ { ++ lfence_branch_none = 0, ++ lfence_branch_register, ++ lfence_branch_memory, ++ lfence_branch_all ++ } ++lfence_before_indirect_branch; ++ ++/* Non-zero if lfence should be inserted before ret. */ ++static enum lfence_before_ret_kind ++ { ++ lfence_before_ret_none = 0, ++ lfence_before_ret_not, ++ lfence_before_ret_or ++ } ++lfence_before_ret; ++ ++/* Types of previous instruction is .byte or prefix. */ + static struct + { + segT seg; +@@ -4311,6 +4333,283 @@ optimize_encoding (void) + } + } + ++/* Return non-zero for load instruction. */ ++ ++static int ++load_insn_p (void) ++{ ++ unsigned int dest; ++ int any_vex_p = is_any_vex_encoding (&i.tm); ++ unsigned int base_opcode = i.tm.base_opcode | 1; ++ ++ if (!any_vex_p) ++ { ++ /* lea */ ++ if (i.tm.base_opcode == 0x8d) ++ return 0; ++ ++ /* pop */ ++ if ((i.tm.base_opcode & ~7) == 0x58 ++ || (i.tm.base_opcode == 0x8f && i.tm.extension_opcode == 0)) ++ return 1; ++ ++ /* movs, cmps, lods, scas. */ ++ if ((i.tm.base_opcode | 0xb) == 0xaf) ++ return 1; ++ ++ /* outs */ ++ if (base_opcode == 0x6f) ++ return 1; ++ } ++ ++ /* No memory operand. */ ++ if (!i.mem_operands) ++ return 0; ++ ++ if (any_vex_p) ++ { ++ /* vldmxcsr. */ ++ if (i.tm.base_opcode == 0xae ++ && i.tm.opcode_modifier.vex ++ && i.tm.opcode_modifier.vexopcode == VEX0F ++ && i.tm.extension_opcode == 2) ++ return 1; ++ } ++ else ++ { ++ /* test, not, neg, mul, imul, div, idiv. */ ++ if ((i.tm.base_opcode == 0xf6 || i.tm.base_opcode == 0xf7) ++ && i.tm.extension_opcode != 1) ++ return 1; ++ ++ /* inc, dec. */ ++ if (base_opcode == 0xff && i.tm.extension_opcode <= 1) ++ return 1; ++ ++ /* add, or, adc, sbb, and, sub, xor, cmp. */ ++ if (i.tm.base_opcode >= 0x80 && i.tm.base_opcode <= 0x83) ++ return 1; ++ ++ /* bt, bts, btr, btc. */ ++ if (i.tm.base_opcode == 0xfba ++ && (i.tm.extension_opcode >= 4 && i.tm.extension_opcode <= 7)) ++ return 1; ++ ++ /* rol, ror, rcl, rcr, shl/sal, shr, sar. */ ++ if ((base_opcode == 0xc1 ++ || (i.tm.base_opcode >= 0xd0 && i.tm.base_opcode <= 0xd3)) ++ && i.tm.extension_opcode != 6) ++ return 1; ++ ++ /* cmpxchg8b, cmpxchg16b, xrstors. */ ++ if (i.tm.base_opcode == 0xfc7 ++ && (i.tm.extension_opcode == 1 || i.tm.extension_opcode == 3)) ++ return 1; ++ ++ /* fxrstor, ldmxcsr, xrstor. */ ++ if (i.tm.base_opcode == 0xfae ++ && (i.tm.extension_opcode == 1 ++ || i.tm.extension_opcode == 2 ++ || i.tm.extension_opcode == 5)) ++ return 1; ++ ++ /* lgdt, lidt, lmsw. */ ++ if (i.tm.base_opcode == 0xf01 ++ && (i.tm.extension_opcode == 2 ++ || i.tm.extension_opcode == 3 ++ || i.tm.extension_opcode == 6)) ++ return 1; ++ ++ /* vmptrld */ ++ if (i.tm.base_opcode == 0xfc7 ++ && i.tm.extension_opcode == 6) ++ return 1; ++ ++ /* Check for x87 instructions. */ ++ if (i.tm.base_opcode >= 0xd8 && i.tm.base_opcode <= 0xdf) ++ { ++ /* Skip fst, fstp, fstenv, fstcw. */ ++ if (i.tm.base_opcode == 0xd9 ++ && (i.tm.extension_opcode == 2 ++ || i.tm.extension_opcode == 3 ++ || i.tm.extension_opcode == 6 ++ || i.tm.extension_opcode == 7)) ++ return 0; ++ ++ /* Skip fisttp, fist, fistp, fstp. */ ++ if (i.tm.base_opcode == 0xdb ++ && (i.tm.extension_opcode == 1 ++ || i.tm.extension_opcode == 2 ++ || i.tm.extension_opcode == 3 ++ || i.tm.extension_opcode == 7)) ++ return 0; ++ ++ /* Skip fisttp, fst, fstp, fsave, fstsw. */ ++ if (i.tm.base_opcode == 0xdd ++ && (i.tm.extension_opcode == 1 ++ || i.tm.extension_opcode == 2 ++ || i.tm.extension_opcode == 3 ++ || i.tm.extension_opcode == 6 ++ || i.tm.extension_opcode == 7)) ++ return 0; ++ ++ /* Skip fisttp, fist, fistp, fbstp, fistp. */ ++ if (i.tm.base_opcode == 0xdf ++ && (i.tm.extension_opcode == 1 ++ || i.tm.extension_opcode == 2 ++ || i.tm.extension_opcode == 3 ++ || i.tm.extension_opcode == 6 ++ || i.tm.extension_opcode == 7)) ++ return 0; ++ ++ return 1; ++ } ++ } ++ ++ dest = i.operands - 1; ++ ++ /* Check fake imm8 operand and 3 source operands. */ ++ if ((i.tm.opcode_modifier.immext ++ || i.tm.opcode_modifier.vexsources == VEX3SOURCES) ++ && i.types[dest].bitfield.imm8) ++ dest--; ++ ++ /* add, or, adc, sbb, and, sub, xor, cmp, test, xchg, xadd */ ++ if (!any_vex_p ++ && (base_opcode == 0x1 ++ || base_opcode == 0x9 ++ || base_opcode == 0x11 ++ || base_opcode == 0x19 ++ || base_opcode == 0x21 ++ || base_opcode == 0x29 ++ || base_opcode == 0x31 ++ || base_opcode == 0x39 ++ || (i.tm.base_opcode >= 0x84 && i.tm.base_opcode <= 0x87) ++ || base_opcode == 0xfc1)) ++ return 1; ++ ++ /* Check for load instruction. */ ++ return (i.types[dest].bitfield.class != ClassNone ++ || i.types[dest].bitfield.instance == Accum); ++} ++ ++/* Output lfence, 0xfaee8, after instruction. */ ++ ++static void ++insert_lfence_after (void) ++{ ++ if (lfence_after_load && load_insn_p ()) ++ { ++ char *p = frag_more (3); ++ *p++ = 0xf; ++ *p++ = 0xae; ++ *p = 0xe8; ++ } ++} ++ ++/* Output lfence, 0xfaee8, before instruction. */ ++ ++static void ++insert_lfence_before (void) ++{ ++ char *p; ++ ++ if (is_any_vex_encoding (&i.tm)) ++ return; ++ ++ if (i.tm.base_opcode == 0xff ++ && (i.tm.extension_opcode == 2 || i.tm.extension_opcode == 4)) ++ { ++ /* Insert lfence before indirect branch if needed. */ ++ ++ if (lfence_before_indirect_branch == lfence_branch_none) ++ return; ++ ++ if (i.operands != 1) ++ abort (); ++ ++ if (i.reg_operands == 1) ++ { ++ /* Indirect branch via register. Don't insert lfence with ++ -mlfence-after-load=yes. */ ++ if (lfence_after_load ++ || lfence_before_indirect_branch == lfence_branch_memory) ++ return; ++ } ++ else if (i.mem_operands == 1 ++ && lfence_before_indirect_branch != lfence_branch_register) ++ { ++ as_warn (_("indirect `%s` with memory operand should be avoided"), ++ i.tm.name); ++ return; ++ } ++ else ++ return; ++ ++ if (last_insn.kind != last_insn_other ++ && last_insn.seg == now_seg) ++ { ++ as_warn_where (last_insn.file, last_insn.line, ++ _("`%s` skips -mlfence-before-indirect-branch on `%s`"), ++ last_insn.name, i.tm.name); ++ return; ++ } ++ ++ p = frag_more (3); ++ *p++ = 0xf; ++ *p++ = 0xae; ++ *p = 0xe8; ++ return; ++ } ++ ++ /* Output or/not and lfence before ret. */ ++ if (lfence_before_ret != lfence_before_ret_none ++ && (i.tm.base_opcode == 0xc2 ++ || i.tm.base_opcode == 0xc3 ++ || i.tm.base_opcode == 0xca ++ || i.tm.base_opcode == 0xcb)) ++ { ++ if (last_insn.kind != last_insn_other ++ && last_insn.seg == now_seg) ++ { ++ as_warn_where (last_insn.file, last_insn.line, ++ _("`%s` skips -mlfence-before-ret on `%s`"), ++ last_insn.name, i.tm.name); ++ return; ++ } ++ if (lfence_before_ret == lfence_before_ret_or) ++ { ++ /* orl: 0x830c2400. */ ++ p = frag_more ((flag_code == CODE_64BIT ? 1 : 0) + 4 + 3); ++ if (flag_code == CODE_64BIT) ++ *p++ = 0x48; ++ *p++ = 0x83; ++ *p++ = 0xc; ++ *p++ = 0x24; ++ *p++ = 0x0; ++ } ++ else ++ { ++ p = frag_more ((flag_code == CODE_64BIT ? 2 : 0) + 6 + 3); ++ /* notl: 0xf71424. */ ++ if (flag_code == CODE_64BIT) ++ *p++ = 0x48; ++ *p++ = 0xf7; ++ *p++ = 0x14; ++ *p++ = 0x24; ++ /* notl: 0xf71424. */ ++ if (flag_code == CODE_64BIT) ++ *p++ = 0x48; ++ *p++ = 0xf7; ++ *p++ = 0x14; ++ *p++ = 0x24; ++ } ++ *p++ = 0xf; ++ *p++ = 0xae; ++ *p = 0xe8; ++ } ++} ++ + /* This is the guts of the machine-dependent assembler. LINE points to a + machine dependent instruction. This function is supposed to emit + the frags/bytes it assembles to. */ +@@ -4628,9 +4927,13 @@ md_assemble (char *line) + if (i.rex != 0) + add_prefix (REX_OPCODE | i.rex); + ++ insert_lfence_before (); ++ + /* We are ready to output the insn. */ + output_insn (); + ++ insert_lfence_after (); ++ + last_insn.seg = now_seg; + + if (i.tm.opcode_modifier.isprefix) +@@ -12250,6 +12553,9 @@ const char *md_shortopts = "qnO::"; + #define OPTION_MALIGN_BRANCH_PREFIX_SIZE (OPTION_MD_BASE + 28) + #define OPTION_MALIGN_BRANCH (OPTION_MD_BASE + 29) + #define OPTION_MBRANCHES_WITH_32B_BOUNDARIES (OPTION_MD_BASE + 30) ++#define OPTION_MLFENCE_AFTER_LOAD (OPTION_MD_BASE + 31) ++#define OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH (OPTION_MD_BASE + 32) ++#define OPTION_MLFENCE_BEFORE_RET (OPTION_MD_BASE + 33) + + struct option md_longopts[] = + { +@@ -12289,6 +12595,10 @@ struct option md_longopts[] = + {"malign-branch-prefix-size", required_argument, NULL, OPTION_MALIGN_BRANCH_PREFIX_SIZE}, + {"malign-branch", required_argument, NULL, OPTION_MALIGN_BRANCH}, + {"mbranches-within-32B-boundaries", no_argument, NULL, OPTION_MBRANCHES_WITH_32B_BOUNDARIES}, ++ {"mlfence-after-load", required_argument, NULL, OPTION_MLFENCE_AFTER_LOAD}, ++ {"mlfence-before-indirect-branch", required_argument, NULL, ++ OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH}, ++ {"mlfence-before-ret", required_argument, NULL, OPTION_MLFENCE_BEFORE_RET}, + {"mamd64", no_argument, NULL, OPTION_MAMD64}, + {"mintel64", no_argument, NULL, OPTION_MINTEL64}, + {NULL, no_argument, NULL, 0} +@@ -12668,6 +12978,41 @@ md_parse_option (int c, const char *arg) + as_fatal (_("invalid -mfence-as-lock-add= option: `%s'"), arg); + break; + ++ case OPTION_MLFENCE_AFTER_LOAD: ++ if (strcasecmp (arg, "yes") == 0) ++ lfence_after_load = 1; ++ else if (strcasecmp (arg, "no") == 0) ++ lfence_after_load = 0; ++ else ++ as_fatal (_("invalid -mlfence-after-load= option: `%s'"), arg); ++ break; ++ ++ case OPTION_MLFENCE_BEFORE_INDIRECT_BRANCH: ++ if (strcasecmp (arg, "all") == 0) ++ lfence_before_indirect_branch = lfence_branch_all; ++ else if (strcasecmp (arg, "memory") == 0) ++ lfence_before_indirect_branch = lfence_branch_memory; ++ else if (strcasecmp (arg, "register") == 0) ++ lfence_before_indirect_branch = lfence_branch_register; ++ else if (strcasecmp (arg, "none") == 0) ++ lfence_before_indirect_branch = lfence_branch_none; ++ else ++ as_fatal (_("invalid -mlfence-before-indirect-branch= option: `%s'"), ++ arg); ++ break; ++ ++ case OPTION_MLFENCE_BEFORE_RET: ++ if (strcasecmp (arg, "or") == 0) ++ lfence_before_ret = lfence_before_ret_or; ++ else if (strcasecmp (arg, "not") == 0) ++ lfence_before_ret = lfence_before_ret_not; ++ else if (strcasecmp (arg, "none") == 0) ++ lfence_before_ret = lfence_before_ret_none; ++ else ++ as_fatal (_("invalid -mlfence-before-ret= option: `%s'"), ++ arg); ++ break; ++ + case OPTION_MRELAX_RELOCATIONS: + if (strcasecmp (arg, "yes") == 0) + generate_relax_relocations = 1; +@@ -13025,6 +13370,15 @@ md_show_usage (FILE *stream) + -mbranches-within-32B-boundaries\n\ + align branches within 32 byte boundary\n")); + fprintf (stream, _("\ ++ -mlfence-after-load=[no|yes] (default: no)\n\ ++ generate lfence after load\n")); ++ fprintf (stream, _("\ ++ -mlfence-before-indirect-branch=[none|all|register|memory] (default: none)\n\ ++ generate lfence before indirect near branch\n")); ++ fprintf (stream, _("\ ++ -mlfence-before-ret=[none|or|not] (default: none)\n\ ++ generate lfence before ret\n")); ++ fprintf (stream, _("\ + -mamd64 accept only AMD64 ISA [default]\n")); + fprintf (stream, _("\ + -mintel64 accept only Intel64 ISA\n")); +@@ -13254,6 +13608,16 @@ i386_cons_align (int ignore ATTRIBUTE_UNUSED) + last_insn.kind = last_insn_directive; + last_insn.name = "constant directive"; + last_insn.file = as_where (&last_insn.line); ++ if (lfence_before_ret != lfence_before_ret_none) ++ { ++ if (lfence_before_indirect_branch != lfence_branch_none) ++ as_warn (_("constant directive skips -mlfence-before-ret " ++ "and -mlfence-before-indirect-branch")); ++ else ++ as_warn (_("constant directive skips -mlfence-before-ret")); ++ } ++ else if (lfence_before_indirect_branch != lfence_branch_none) ++ as_warn (_("constant directive skips -mlfence-before-indirect-branch")); + } + } + +diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi +index c536759cb38..1dd99f91bb0 100644 +--- a/gas/doc/c-i386.texi ++++ b/gas/doc/c-i386.texi +@@ -464,6 +464,49 @@ on an instruction. It is equivalent to + @option{-malign-branch-prefix-size=5}. + The default doesn't align branches. + ++ at cindex @samp{-mlfence-after-load=} option, i386 ++ at cindex @samp{-mlfence-after-load=} option, x86-64 ++ at item -mlfence-after-load=@var{no} ++ at itemx -mlfence-after-load=@var{yes} ++These options control whether the assembler should generate lfence ++after load instructions. @option{-mlfence-after-load=@var{yes}} will ++generate lfence. @option{-mlfence-after-load=@var{no}} will not generate ++lfence, which is the default. ++ ++ at cindex @samp{-mlfence-before-indirect-branch=} option, i386 ++ at cindex @samp{-mlfence-before-indirect-branch=} option, x86-64 ++ at item -mlfence-before-indirect-branch=@var{none} ++ at item -mlfence-before-indirect-branch=@var{all} ++ at item -mlfence-before-indirect-branch=@var{register} ++ at itemx -mlfence-before-indirect-branch=@var{memory} ++These options control whether the assembler should generate lfence ++after indirect near branch instructions. ++ at option{-mlfence-before-indirect-branch=@var{all}} will generate lfence ++after indirect near branch via register and issue a warning before ++indirect near branch via memory. ++ at option{-mlfence-before-indirect-branch=@var{register}} will generate ++lfence after indirect near branch via register. ++ at option{-mlfence-before-indirect-branch=@var{memory}} will issue a ++warning before indirect near branch via memory. ++ at option{-mlfence-before-indirect-branch=@var{none}} will not generate ++lfence nor issue warning, which is the default. Note that lfence won't ++be generated before indirect near branch via register with ++ at option{-mlfence-after-load=@var{yes}} since lfence will be generated ++after loading branch target register. ++ ++ at cindex @samp{-mlfence-before-ret=} option, i386 ++ at cindex @samp{-mlfence-before-ret=} option, x86-64 ++ at item -mlfence-before-ret=@var{none} ++ at item -mlfence-before-ret=@var{or} ++ at itemx -mlfence-before-ret=@var{not} ++These options control whether the assembler should generate lfence ++before ret. @option{-mlfence-before-ret=@var{or}} will generate ++generate or instruction with lfence. ++ at option{-mlfence-before-ret=@var{not}} will generate not instruction ++with lfence. ++ at option{-mlfence-before-ret=@var{none}} will not generate lfence, ++which is the default. ++ + @cindex @samp{-mx86-used-note=} option, i386 + @cindex @samp{-mx86-used-note=} option, x86-64 + @item -mx86-used-note=@var{no} +-- +2.18.2 -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 13:36:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:36:37 +0000 Subject: [oe-commits] [openembedded-core] 04/05: python: upgrade 3.8.1 -> 3.8.2 In-Reply-To: <158410659383.13056.5785372174095850314@git.openembedded.org> References: <158410659383.13056.5785372174095850314@git.openembedded.org> Message-ID: <20200313133634.6D386233634@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3513721b5dd660c7e6a8038b89ca17f1b76f7f9b Author: Trevor Gamblin AuthorDate: Fri Mar 13 04:27:20 2020 -0700 python: upgrade 3.8.1 -> 3.8.2 THE LICENSE checksum changed in this update due to copyright notice added for 2020. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/{python3_3.8.1.bb => python3_3.8.2.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3_3.8.1.bb b/meta/recipes-devtools/python/python3_3.8.2.bb similarity index 98% rename from meta/recipes-devtools/python/python3_3.8.1.bb rename to meta/recipes-devtools/python/python3_3.8.2.bb index 5e3c29c..fc01935 100644 --- a/meta/recipes-devtools/python/python3_3.8.1.bb +++ b/meta/recipes-devtools/python/python3_3.8.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.python.org" LICENSE = "PSFv2" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498" +LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://run-ptest \ @@ -40,8 +40,8 @@ SRC_URI_append_class-native = " \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[md5sum] = "b3fb85fd479c0bf950c626ef80cacb57" -SRC_URI[sha256sum] = "75894117f6db7051c1b34f37410168844bbb357c139a8a10a352e9bf8be594e8" +SRC_URI[md5sum] = "e9d6ebc92183a177b8e8a58cad5b8d67" +SRC_URI[sha256sum] = "2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 13:36:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:36:38 +0000 Subject: [oe-commits] [openembedded-core] 05/05: babeltrace2: updated to 2.0.2 In-Reply-To: <158410659383.13056.5785372174095850314@git.openembedded.org> References: <158410659383.13056.5785372174095850314@git.openembedded.org> Message-ID: <20200313133634.771A2233635@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b1ae2178fa188b2864280f2c3a9ba443e042cae0 Author: Anders Wallin AuthorDate: Fri Mar 13 13:14:58 2020 +0100 babeltrace2: updated to 2.0.2 Signed-off-by: Anders Wallin Signed-off-by: Richard Purdie --- .../recipes-kernel/lttng/{babeltrace2_2.0.1.bb => babeltrace2_2.0.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb similarity index 98% rename from meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb rename to meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb index e71ac1a..0791c65 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.2.bb @@ -13,7 +13,7 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 file://0001-Make-manpages-multilib-identical.patch \ file://0001-fs.c-initialize-other_entry.patch \ " -SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910" +SRCREV = "33003c352ed56aa49e0b3df272bbab6fac36cae8" UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\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 Fri Mar 13 13:50:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 13:50:00 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: musl: removes aliases for glibc provided libraries Message-ID: <158410740048.18534.17601456583991105749@git.openembedded.org> 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 3021d58 musl: removes aliases for glibc provided libraries 3021d58 is described below commit 3021d58a61c0a1269ad87b0c6401bca18ae3c7e2 Author: Jan Kaisrlik AuthorDate: Thu Mar 12 16:02:37 2020 -0700 musl: removes aliases for glibc provided libraries Based on the recommendation in musl mailing list[1] All symlinks have been removed from musl recipe. [1]: https://www.openwall.com/lists/musl/2020/03/10/11 Signed-off-by: Jan Kaisrlik Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index afc8446..f4fbb03 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -66,24 +66,11 @@ do_install() { rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} - for l in crypt dl m pthread resolv rt util xnet - do - ln -sf libc.so ${D}${libdir}/lib$l.so - done - for i in libc.so.6 libcrypt.so.1 libdl.so.2 libm.so.6 libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1; do - ln -sf libc.so ${D}${libdir}/$i - done } PACKAGES =+ "${PN}-glibc-compat" -FILES_${PN}-glibc-compat += "\ - ${libdir}/libc.so.6 ${libdir}/libcrypt.so.1 \ - ${libdir}/libdl.so.2 ${libdir}/libm.so.6 \ - ${libdir}/libpthread.so.0 ${libdir}/libresolv.so.2 \ - ${libdir}/librt.so.1 ${libdir}/libutil.so.1 \ - ${GLIBC_LDSO} \ - " +FILES_${PN}-glibc-compat += "${GLIBC_LDSO}" RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 16:15:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 16:15:04 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (3021d58 -> b1ae217) Message-ID: <158411610444.29371.7075116588445713746@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 3021d58 musl: removes aliases for glibc provided libraries 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 (b1ae217) \ O -- O -- O (3021d58) 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-core/musl/musl_git.bb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 18:01:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 18:01:42 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (a76744d -> f5fdeea) Message-ID: <158412250250.29344.9715989337367629539@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 a76744d cryptsetup: upgrade 2.3.0 -> 2.3.1 new d104def fio: disable compiler optimizations for x86 arch new f5fdeea sysdig: Use luajit and build fixes on aarch64 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-benchmark/fio/fio_3.17.bb | 1 + .../recipes-extended/sysdig/sysdig/aarch64.patch | 359 +++++++++++++++++++++ meta-oe/recipes-extended/sysdig/sysdig_git.bb | 3 +- 3 files changed, 361 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 18:01:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 18:01:43 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: fio: disable compiler optimizations for x86 arch In-Reply-To: <158412250250.29344.9715989337367629539@git.openembedded.org> References: <158412250250.29344.9715989337367629539@git.openembedded.org> Message-ID: <20200313180142.B9995233634@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit d104def001dba5c246abef6bc9f4e5f766b429d8 Author: Liwei Song AuthorDate: Fri Mar 13 18:16:29 2020 +0800 fio: disable compiler optimizations for x86 arch with compiler optimizations enabled, "fio --help" will failed with "Illegal instruction" on Intel Denverton board. Enable it on condition that MACHINE_FEATURES include x86. Related commits: https://git.openembedded.org/meta-openembedded/commit/?id=c58d9d500f90246d2d879e720fdfa5bbbc731c7f https://git.openembedded.org/meta-openembedded/commit/?id=739349da0826221f98648b64b693f9ae33e7d4ea Signed-off-by: Liwei Song 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 b65ab19..759d108 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -34,6 +34,7 @@ S = "${WORKDIR}/git" DISABLE_STATIC = "" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}" 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 Fri Mar 13 18:01:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 18:01:44 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: sysdig: Use luajit and build fixes on aarch64 In-Reply-To: <158412250250.29344.9715989337367629539@git.openembedded.org> References: <158412250250.29344.9715989337367629539@git.openembedded.org> Message-ID: <20200313180142.C5B45233635@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f5fdeea3564cdf0705d898350cf35d4612b672cc Author: Khem Raj AuthorDate: Fri Mar 13 06:35:38 2020 -0700 sysdig: Use luajit and build fixes on aarch64 latest luajit now supports aarch64 Signed-off-by: Khem Raj --- .../recipes-extended/sysdig/sysdig/aarch64.patch | 359 +++++++++++++++++++++ meta-oe/recipes-extended/sysdig/sysdig_git.bb | 3 +- 2 files changed, 360 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch b/meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch new file mode 100644 index 0000000..f16b0ec --- /dev/null +++ b/meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch @@ -0,0 +1,359 @@ +Check if legacy syscalls exist + +A lot of legacy syscalls are replaced with *at and are not implemented in newer +architectures like aarch64 + +Upstream-Status: Submitted [https://github.com/draios/sysdig/pull/1601] +Signed-off-by: Khem Raj +--- a/driver/syscall_table.c ++++ b/driver/syscall_table.c +@@ -42,26 +42,46 @@ or GPL2.txt for full copies of the licen + * SYSCALL TABLE + */ + const struct syscall_evt_pair g_syscall_table[SYSCALL_TABLE_SIZE] = { ++#ifdef __NR_open + [__NR_open - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_OPEN_E, PPME_SYSCALL_OPEN_X}, ++#endif ++#ifdef __NR_creat + [__NR_creat - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_CREAT_E, PPME_SYSCALL_CREAT_X}, ++#endif + [__NR_close - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_CLOSE_E, PPME_SYSCALL_CLOSE_X}, + [__NR_brk - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_BRK_4_E, PPME_SYSCALL_BRK_4_X}, + [__NR_read - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_READ_E, PPME_SYSCALL_READ_X}, + [__NR_write - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_WRITE_E, PPME_SYSCALL_WRITE_X}, + [__NR_execve - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_EXECVE_19_E, PPME_SYSCALL_EXECVE_19_X}, + [__NR_clone - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_CLONE_20_E, PPME_SYSCALL_CLONE_20_X}, ++#ifdef __NR_fork + [__NR_fork - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_FORK_20_E, PPME_SYSCALL_FORK_20_X}, ++#endif ++#ifdef __NR_vfork + [__NR_vfork - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_VFORK_20_E, PPME_SYSCALL_VFORK_20_X}, ++#endif ++#ifdef __NR_pipe + [__NR_pipe - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_PIPE_E, PPME_SYSCALL_PIPE_X}, ++#endif + [__NR_pipe2 - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_PIPE_E, PPME_SYSCALL_PIPE_X}, ++#ifdef __NR_eventfd + [__NR_eventfd - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_EVENTFD_E, PPME_SYSCALL_EVENTFD_X}, ++#endif + [__NR_eventfd2 - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_EVENTFD_E, PPME_SYSCALL_EVENTFD_X}, + [__NR_futex - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_FUTEX_E, PPME_SYSCALL_FUTEX_X}, ++#ifdef __NR_stat + [__NR_stat - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_STAT_E, PPME_SYSCALL_STAT_X}, ++#endif ++#ifdef __NR_lstat + [__NR_lstat - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_LSTAT_E, PPME_SYSCALL_LSTAT_X}, ++#endif + [__NR_fstat - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_FSTAT_E, PPME_SYSCALL_FSTAT_X}, ++#ifdef __NR_epoll_wait + [__NR_epoll_wait - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_EPOLLWAIT_E, PPME_SYSCALL_EPOLLWAIT_X}, ++#endif ++#ifdef __NR_poll + [__NR_poll - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_POLL_E, PPME_SYSCALL_POLL_X}, ++#endif + #ifdef __NR_select + [__NR_select - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_SELECT_E, PPME_SYSCALL_SELECT_X}, + #endif +@@ -70,13 +90,21 @@ const struct syscall_evt_pair g_syscall_ + [__NR_getcwd - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_GETCWD_E, PPME_SYSCALL_GETCWD_X}, + [__NR_chdir - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_CHDIR_E, PPME_SYSCALL_CHDIR_X}, + [__NR_fchdir - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_FCHDIR_E, PPME_SYSCALL_FCHDIR_X}, ++#ifdef __NR_mkdir + [__NR_mkdir - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_MKDIR_2_E, PPME_SYSCALL_MKDIR_2_X}, ++#endif ++#ifdef __NR_rmdir + [__NR_rmdir - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_RMDIR_2_E, PPME_SYSCALL_RMDIR_2_X}, ++#endif + [__NR_openat - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_OPENAT_2_E, PPME_SYSCALL_OPENAT_2_X}, + [__NR_mkdirat - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_MKDIRAT_E, PPME_SYSCALL_MKDIRAT_X}, ++#ifdef __NR_link + [__NR_link - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_LINK_2_E, PPME_SYSCALL_LINK_2_X}, ++#endif + [__NR_linkat - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_LINKAT_2_E, PPME_SYSCALL_LINKAT_2_X}, ++#ifdef __NR_unlink + [__NR_unlink - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_UNLINK_2_E, PPME_SYSCALL_UNLINK_2_X}, ++#endif + [__NR_unlinkat - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_UNLINKAT_2_E, PPME_SYSCALL_UNLINKAT_2_X}, + [__NR_pread64 - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_PREAD_E, PPME_SYSCALL_PREAD_X}, + [__NR_pwrite64 - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_PWRITE_E, PPME_SYSCALL_PWRITE_X}, +@@ -85,16 +113,22 @@ const struct syscall_evt_pair g_syscall_ + [__NR_preadv - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_PREADV_E, PPME_SYSCALL_PREADV_X}, + [__NR_pwritev - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_PWRITEV_E, PPME_SYSCALL_PWRITEV_X}, + [__NR_dup - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_DUP_E, PPME_SYSCALL_DUP_X}, ++#ifdef __NR_dup2 + [__NR_dup2 - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_DUP_E, PPME_SYSCALL_DUP_X}, ++#endif + [__NR_dup3 - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SYSCALL_DUP_E, PPME_SYSCALL_DUP_X}, ++#ifdef __NR_signalfd + [__NR_signalfd - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_SIGNALFD_E, PPME_SYSCALL_SIGNALFD_X}, ++#endif + [__NR_signalfd4 - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_SIGNALFD_E, PPME_SYSCALL_SIGNALFD_X}, + [__NR_kill - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_KILL_E, PPME_SYSCALL_KILL_X}, + [__NR_tkill - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_TKILL_E, PPME_SYSCALL_TKILL_X}, + [__NR_tgkill - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_TGKILL_E, PPME_SYSCALL_TGKILL_X}, + [__NR_nanosleep - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_NANOSLEEP_E, PPME_SYSCALL_NANOSLEEP_X}, + [__NR_timerfd_create - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_TIMERFD_CREATE_E, PPME_SYSCALL_TIMERFD_CREATE_X}, ++#ifdef __NR_inotify_init + [__NR_inotify_init - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_INOTIFY_INIT_E, PPME_SYSCALL_INOTIFY_INIT_X}, ++#endif + [__NR_inotify_init1 - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SYSCALL_INOTIFY_INIT_E, PPME_SYSCALL_INOTIFY_INIT_X}, + [__NR_fchmodat - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_FCHMODAT_E, PPME_SYSCALL_FCHMODAT_X}, + [__NR_fchmod - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_FCHMOD_E, PPME_SYSCALL_FCHMOD_X}, +@@ -114,14 +148,22 @@ const struct syscall_evt_pair g_syscall_ + #endif + /* [__NR_old_select - SYSCALL_TABLE_ID0] = {UF_USED, PPME_GENERIC_E, PPME_GENERIC_X}, */ + [__NR_pselect6 - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, ++#ifdef __NR_epoll_create + [__NR_epoll_create - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, ++#endif + [__NR_epoll_ctl - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, ++#ifdef __NR_uselib + [__NR_uselib - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, ++#endif + [__NR_sched_setparam - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, + [__NR_sched_getparam - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, + [__NR_syslog - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, ++#ifdef __NR_chmod + [__NR_chmod - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_CHMOD_E, PPME_SYSCALL_CHMOD_X}, ++#endif ++#ifdef __NR_lchown + [__NR_lchown - SYSCALL_TABLE_ID0] = {UF_USED, PPME_GENERIC_E, PPME_GENERIC_X}, ++#endif + #ifdef __NR_utime + [__NR_utime - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, + #endif +@@ -131,8 +173,9 @@ const struct syscall_evt_pair g_syscall_ + #ifdef __NR_alarm + [__NR_alarm - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, + #endif ++#ifdef __NR_pause + [__NR_pause - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_GENERIC_E, PPME_GENERIC_X}, +- ++#endif + #ifndef __NR_socketcall + [__NR_socket - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP | UF_SIMPLEDRIVER_KEEP, PPME_SOCKET_SOCKET_E, PPME_SOCKET_SOCKET_X}, + [__NR_bind - SYSCALL_TABLE_ID0] = {UF_USED | UF_NEVER_DROP, PPME_SOCKET_BIND_E, PPME_SOCKET_BIND_X}, +@@ -184,9 +227,13 @@ const struct syscall_evt_pair g_syscall_ + [__NR_process_vm_writev - SYSCALL_TABLE_ID0] = {UF_USED, PPME_GENERIC_E, PPME_GENERIC_X}, + #endif + ++#ifdef __NR_rename + [__NR_rename - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_RENAME_E, PPME_SYSCALL_RENAME_X}, ++#endif + [__NR_renameat - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_RENAMEAT_E, PPME_SYSCALL_RENAMEAT_X}, ++#ifdef __NR_symlink + [__NR_symlink - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_SYMLINK_E, PPME_SYSCALL_SYMLINK_X}, ++#endif + [__NR_symlinkat - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_SYMLINKAT_E, PPME_SYSCALL_SYMLINKAT_X}, + [__NR_sendfile - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_SENDFILE_E, PPME_SYSCALL_SENDFILE_X}, + #ifdef __NR_sendfile64 +@@ -255,7 +302,9 @@ const struct syscall_evt_pair g_syscall_ + #ifdef __NR_getresgid32 + [__NR_getresgid32 - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_GETRESGID_E, PPME_SYSCALL_GETRESGID_X }, + #endif ++#ifdef __NR_getdents + [__NR_getdents - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_GETDENTS_E, PPME_SYSCALL_GETDENTS_X}, ++#endif + [__NR_getdents64 - SYSCALL_TABLE_ID0] = {UF_USED | UF_ALWAYS_DROP, PPME_SYSCALL_GETDENTS64_E, PPME_SYSCALL_GETDENTS64_X}, + #ifdef __NR_setns + [__NR_setns - SYSCALL_TABLE_ID0] = {UF_USED, PPME_SYSCALL_SETNS_E, PPME_SYSCALL_SETNS_X}, +@@ -298,19 +347,33 @@ const enum ppm_syscall_code g_syscall_co + [__NR_exit - SYSCALL_TABLE_ID0] = PPM_SC_EXIT, + [__NR_read - SYSCALL_TABLE_ID0] = PPM_SC_READ, + [__NR_write - SYSCALL_TABLE_ID0] = PPM_SC_WRITE, ++#ifdef __NR_open + [__NR_open - SYSCALL_TABLE_ID0] = PPM_SC_OPEN, ++#endif + [__NR_close - SYSCALL_TABLE_ID0] = PPM_SC_CLOSE, ++#ifdef __NR_creat + [__NR_creat - SYSCALL_TABLE_ID0] = PPM_SC_CREAT, ++#endif ++#ifdef __NR_link + [__NR_link - SYSCALL_TABLE_ID0] = PPM_SC_LINK, ++#endif ++#ifdef __NR_unlink + [__NR_unlink - SYSCALL_TABLE_ID0] = PPM_SC_UNLINK, ++#endif + [__NR_chdir - SYSCALL_TABLE_ID0] = PPM_SC_CHDIR, + #ifdef __NR_time + [__NR_time - SYSCALL_TABLE_ID0] = PPM_SC_TIME, + #endif ++#ifdef __NR_mknod + [__NR_mknod - SYSCALL_TABLE_ID0] = PPM_SC_MKNOD, ++#endif ++#ifdef __NR_chmod + [__NR_chmod - SYSCALL_TABLE_ID0] = PPM_SC_CHMOD, ++#endif + /* [__NR_lchown16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_LCHOWN16, */ ++#ifdef __NR_stat + [__NR_stat - SYSCALL_TABLE_ID0] = PPM_SC_STAT, ++#endif + [__NR_lseek - SYSCALL_TABLE_ID0] = PPM_SC_LSEEK, + [__NR_getpid - SYSCALL_TABLE_ID0] = PPM_SC_GETPID, + [__NR_mount - SYSCALL_TABLE_ID0] = PPM_SC_MOUNT, +@@ -322,17 +385,27 @@ const enum ppm_syscall_code g_syscall_co + [__NR_alarm - SYSCALL_TABLE_ID0] = PPM_SC_ALARM, + #endif + [__NR_fstat - SYSCALL_TABLE_ID0] = PPM_SC_FSTAT, ++#ifdef __NR_pause + [__NR_pause - SYSCALL_TABLE_ID0] = PPM_SC_PAUSE, ++#endif + #ifdef __NR_utime + [__NR_utime - SYSCALL_TABLE_ID0] = PPM_SC_UTIME, + #endif + [__NR_sync - SYSCALL_TABLE_ID0] = PPM_SC_SYNC, + [__NR_kill - SYSCALL_TABLE_ID0] = PPM_SC_KILL, ++#ifdef __NR_rename + [__NR_rename - SYSCALL_TABLE_ID0] = PPM_SC_RENAME, ++#endif ++#ifdef __NR_mkdir + [__NR_mkdir - SYSCALL_TABLE_ID0] = PPM_SC_MKDIR, ++#endif ++#ifdef __NR_rmdir + [__NR_rmdir - SYSCALL_TABLE_ID0] = PPM_SC_RMDIR, ++#endif + [__NR_dup - SYSCALL_TABLE_ID0] = PPM_SC_DUP, ++#ifdef __NR_pipe + [__NR_pipe - SYSCALL_TABLE_ID0] = PPM_SC_PIPE, ++#endif + [__NR_times - SYSCALL_TABLE_ID0] = PPM_SC_TIMES, + [__NR_brk - SYSCALL_TABLE_ID0] = PPM_SC_BRK, + /* [__NR_setgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETGID16, */ +@@ -345,10 +418,16 @@ const enum ppm_syscall_code g_syscall_co + [__NR_setpgid - SYSCALL_TABLE_ID0] = PPM_SC_SETPGID, + [__NR_umask - SYSCALL_TABLE_ID0] = PPM_SC_UMASK, + [__NR_chroot - SYSCALL_TABLE_ID0] = PPM_SC_CHROOT, ++#ifdef __NR_ustat + [__NR_ustat - SYSCALL_TABLE_ID0] = PPM_SC_USTAT, ++#endif ++#ifdef __NR_dup2 + [__NR_dup2 - SYSCALL_TABLE_ID0] = PPM_SC_DUP2, ++#endif + [__NR_getppid - SYSCALL_TABLE_ID0] = PPM_SC_GETPPID, ++#ifdef __NR_getpgrp + [__NR_getpgrp - SYSCALL_TABLE_ID0] = PPM_SC_GETPGRP, ++#endif + [__NR_setsid - SYSCALL_TABLE_ID0] = PPM_SC_SETSID, + [__NR_sethostname - SYSCALL_TABLE_ID0] = PPM_SC_SETHOSTNAME, + [__NR_setrlimit - SYSCALL_TABLE_ID0] = PPM_SC_SETRLIMIT, +@@ -359,10 +438,18 @@ const enum ppm_syscall_code g_syscall_co + /* [__NR_getgroups16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_GETGROUPS16, */ + /* [__NR_setgroups16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETGROUPS16, */ + /* [__NR_old_select - SYSCALL_TABLE_ID0] = PPM_SC_NR_OLD_SELECT, */ ++#ifdef __NR_symlink + [__NR_symlink - SYSCALL_TABLE_ID0] = PPM_SC_SYMLINK, ++#endif ++#ifdef __NR_lstat + [__NR_lstat - SYSCALL_TABLE_ID0] = PPM_SC_LSTAT, ++#endif ++#ifdef __NR_readlink + [__NR_readlink - SYSCALL_TABLE_ID0] = PPM_SC_READLINK, ++#endif ++#ifdef __NR_uselib + [__NR_uselib - SYSCALL_TABLE_ID0] = PPM_SC_USELIB, ++#endif + [__NR_swapon - SYSCALL_TABLE_ID0] = PPM_SC_SWAPON, + [__NR_reboot - SYSCALL_TABLE_ID0] = PPM_SC_REBOOT, + /* [__NR_old_readdir - SYSCALL_TABLE_ID0] = PPM_SC_NR_OLD_READDIR, */ +@@ -399,12 +486,16 @@ const enum ppm_syscall_code g_syscall_co + [__NR_delete_module - SYSCALL_TABLE_ID0] = PPM_SC_DELETE_MODULE, + [__NR_getpgid - SYSCALL_TABLE_ID0] = PPM_SC_GETPGID, + [__NR_fchdir - SYSCALL_TABLE_ID0] = PPM_SC_FCHDIR, ++#ifdef __NR_sysfs + [__NR_sysfs - SYSCALL_TABLE_ID0] = PPM_SC_SYSFS, ++#endif + [__NR_personality - SYSCALL_TABLE_ID0] = PPM_SC_PERSONALITY, + /* [__NR_setfsuid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETFSUID16, */ + /* [__NR_setfsgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETFSGID16, */ + /* [__NR_llseek - SYSCALL_TABLE_ID0] = PPM_SC_NR_LLSEEK, */ ++#ifdef __NR_getdents + [__NR_getdents - SYSCALL_TABLE_ID0] = PPM_SC_GETDENTS, ++#endif + #ifdef __NR_select + [__NR_select - SYSCALL_TABLE_ID0] = PPM_SC_SELECT, + #endif +@@ -431,7 +522,9 @@ const enum ppm_syscall_code g_syscall_co + [__NR_mremap - SYSCALL_TABLE_ID0] = PPM_SC_MREMAP, + /* [__NR_setresuid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETRESUID16, */ + /* [__NR_getresuid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_GETRESUID16, */ ++#ifdef __NR_poll + [__NR_poll - SYSCALL_TABLE_ID0] = PPM_SC_POLL, ++#endif + /* [__NR_setresgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_SETRESGID16, */ + /* [__NR_getresgid16 - SYSCALL_TABLE_ID0] = PPM_SC_NR_GETRESGID16, */ + [__NR_prctl - SYSCALL_TABLE_ID0] = PPM_SC_PRCTL, +@@ -453,13 +546,17 @@ const enum ppm_syscall_code g_syscall_co + [__NR_getrlimit - SYSCALL_TABLE_ID0] = PPM_SC_GETRLIMIT, + #endif + /* [__NR_mmap_pgoff - SYSCALL_TABLE_ID0] = PPM_SC_NR_MMAP_PGOFF, */ ++#ifdef __NR_lchown + [__NR_lchown - SYSCALL_TABLE_ID0] = PPM_SC_LCHOWN, ++#endif + [__NR_setreuid - SYSCALL_TABLE_ID0] = PPM_SC_SETREUID, + [__NR_setregid - SYSCALL_TABLE_ID0] = PPM_SC_SETREGID, + [__NR_getgroups - SYSCALL_TABLE_ID0] = PPM_SC_GETGROUPS, + [__NR_setgroups - SYSCALL_TABLE_ID0] = PPM_SC_SETGROUPS, + [__NR_fchown - SYSCALL_TABLE_ID0] = PPM_SC_FCHOWN, ++#ifdef __NR_chown + [__NR_chown - SYSCALL_TABLE_ID0] = PPM_SC_CHOWN, ++#endif + [__NR_setfsuid - SYSCALL_TABLE_ID0] = PPM_SC_SETFSUID, + [__NR_setfsgid - SYSCALL_TABLE_ID0] = PPM_SC_SETFSGID, + [__NR_pivot_root - SYSCALL_TABLE_ID0] = PPM_SC_PIVOT_ROOT, +@@ -494,9 +591,13 @@ const enum ppm_syscall_code g_syscall_co + [__NR_io_submit - SYSCALL_TABLE_ID0] = PPM_SC_IO_SUBMIT, + [__NR_io_cancel - SYSCALL_TABLE_ID0] = PPM_SC_IO_CANCEL, + [__NR_exit_group - SYSCALL_TABLE_ID0] = PPM_SC_EXIT_GROUP, ++#ifdef __NR_epoll_create + [__NR_epoll_create - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_CREATE, ++#endif + [__NR_epoll_ctl - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_CTL, ++#ifdef __NR_epoll_wait + [__NR_epoll_wait - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_WAIT, ++#endif + [__NR_remap_file_pages - SYSCALL_TABLE_ID0] = PPM_SC_REMAP_FILE_PAGES, + [__NR_set_tid_address - SYSCALL_TABLE_ID0] = PPM_SC_SET_TID_ADDRESS, + [__NR_timer_create - SYSCALL_TABLE_ID0] = PPM_SC_TIMER_CREATE, +@@ -509,7 +610,9 @@ const enum ppm_syscall_code g_syscall_co + [__NR_clock_getres - SYSCALL_TABLE_ID0] = PPM_SC_CLOCK_GETRES, + [__NR_clock_nanosleep - SYSCALL_TABLE_ID0] = PPM_SC_CLOCK_NANOSLEEP, + [__NR_tgkill - SYSCALL_TABLE_ID0] = PPM_SC_TGKILL, ++#ifdef __NR_utimes + [__NR_utimes - SYSCALL_TABLE_ID0] = PPM_SC_UTIMES, ++#endif + [__NR_mq_open - SYSCALL_TABLE_ID0] = PPM_SC_MQ_OPEN, + [__NR_mq_unlink - SYSCALL_TABLE_ID0] = PPM_SC_MQ_UNLINK, + [__NR_mq_timedsend - SYSCALL_TABLE_ID0] = PPM_SC_MQ_TIMEDSEND, +@@ -523,14 +626,18 @@ const enum ppm_syscall_code g_syscall_co + [__NR_keyctl - SYSCALL_TABLE_ID0] = PPM_SC_KEYCTL, + [__NR_ioprio_set - SYSCALL_TABLE_ID0] = PPM_SC_IOPRIO_SET, + [__NR_ioprio_get - SYSCALL_TABLE_ID0] = PPM_SC_IOPRIO_GET, ++#ifdef __NR_inotify_init + [__NR_inotify_init - SYSCALL_TABLE_ID0] = PPM_SC_INOTIFY_INIT, ++#endif + [__NR_inotify_add_watch - SYSCALL_TABLE_ID0] = PPM_SC_INOTIFY_ADD_WATCH, + [__NR_inotify_rm_watch - SYSCALL_TABLE_ID0] = PPM_SC_INOTIFY_RM_WATCH, + [__NR_openat - SYSCALL_TABLE_ID0] = PPM_SC_OPENAT, + [__NR_mkdirat - SYSCALL_TABLE_ID0] = PPM_SC_MKDIRAT, + [__NR_mknodat - SYSCALL_TABLE_ID0] = PPM_SC_MKNODAT, + [__NR_fchownat - SYSCALL_TABLE_ID0] = PPM_SC_FCHOWNAT, ++#ifdef __NR_futimesat + [__NR_futimesat - SYSCALL_TABLE_ID0] = PPM_SC_FUTIMESAT, ++#endif + [__NR_unlinkat - SYSCALL_TABLE_ID0] = PPM_SC_UNLINKAT, + [__NR_renameat - SYSCALL_TABLE_ID0] = PPM_SC_RENAMEAT, + [__NR_linkat - SYSCALL_TABLE_ID0] = PPM_SC_LINKAT, +@@ -551,9 +658,13 @@ const enum ppm_syscall_code g_syscall_co + #endif + [__NR_epoll_pwait - SYSCALL_TABLE_ID0] = PPM_SC_EPOLL_PWAIT, + [__NR_utimensat - SYSCALL_TABLE_ID0] = PPM_SC_UTIMENSAT, ++#ifdef __NR_signalfd + [__NR_signalfd - SYSCALL_TABLE_ID0] = PPM_SC_SIGNALFD, ++#endif + [__NR_timerfd_create - SYSCALL_TABLE_ID0] = PPM_SC_TIMERFD_CREATE, ++#ifdef __NR_eventfd + [__NR_eventfd - SYSCALL_TABLE_ID0] = PPM_SC_EVENTFD, ++#endif + [__NR_timerfd_settime - SYSCALL_TABLE_ID0] = PPM_SC_TIMERFD_SETTIME, + [__NR_timerfd_gettime - SYSCALL_TABLE_ID0] = PPM_SC_TIMERFD_GETTIME, + [__NR_signalfd4 - SYSCALL_TABLE_ID0] = PPM_SC_SIGNALFD4, diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index ce1a424..11eb5db 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -12,7 +12,6 @@ inherit cmake pkgconfig JIT ?= "jit" JIT_mipsarchn32 = "" JIT_mipsarchn64 = "" -JIT_aarch64 = "" DEPENDS += "lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS_${PN} = "bash" @@ -21,8 +20,8 @@ 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 \ + file://aarch64.patch \ " -# v0.26.4 SRCREV = "9fa0d129668fdabf256446be4be35838888052d9" PV = "0.26.5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 19:50:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 19:50:02 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (f5fdeea -> 887ad76) Message-ID: <158412900223.21364.13271922015633320663@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 f5fdeea sysdig: Use luajit and build fixes on aarch64 new 93d67b3 iwd: upgrade 1.4 -> 1.5 new be88786 libqmi: upgrade 1.24.4 -> 1.24.6 new 96d703b python3-kconfiglib: upgrade 13.7.0 -> 14.1.0 new 887ad76 python-requests: upgrade 2.22 -> 2.23 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: .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ---------------------- .../iwd/{iwd_1.4.bb => iwd_1.5.bb} | 10 ++-- .../libqmi/{libqmi_1.24.4.bb => libqmi_1.24.6.bb} | 4 +- .../recipes-devtools/python/python-kconfiglib.inc | 4 +- .../recipes-devtools/python/python-requests.inc | 6 +-- ...glib_13.7.0.bb => python3-kconfiglib_14.1.0.bb} | 0 ...quests_2.22.0.bb => python3-requests_2.23.0.bb} | 0 7 files changed, 11 insertions(+), 75 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch rename meta-oe/recipes-connectivity/iwd/{iwd_1.4.bb => iwd_1.5.bb} (85%) rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.4.bb => libqmi_1.24.6.bb} (85%) rename meta-python/recipes-devtools/python/{python3-kconfiglib_13.7.0.bb => python3-kconfiglib_14.1.0.bb} (100%) rename meta-python/recipes-devtools/python/{python3-requests_2.22.0.bb => python3-requests_2.23.0.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 19:50:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 19:50:04 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: libqmi: upgrade 1.24.4 -> 1.24.6 In-Reply-To: <158412900223.21364.13271922015633320663@git.openembedded.org> References: <158412900223.21364.13271922015633320663@git.openembedded.org> Message-ID: <20200313195002.9CA8F233643@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit be8878665b1b3c9c81df83abbe80f3ea587a3858 Author: Pierre-Jean Texier AuthorDate: Fri Mar 13 19:57:51 2020 +0100 libqmi: upgrade 1.24.4 -> 1.24.6 Overview of changes in libqmi 1.24.6 ---------------------------------------- * libqmi-glib: ** Fixed the close operation logic to make sure that a reopen done right away doesn't close the wrong endpoint. ** Updated string reading logic to make sure that all strings are valid UTF-8. ** Updated string reading logic to attempt parsing as GSM7 or UCS2 if the initial UTF-8 validation fails. *+ Renamed TLV 0x15 in the "WDA Get Data Format" message, and added new compat methods for the old name. ** Fixed the format of the NITZ information TLV, and added new compat methods for the old name. ** Fixed the format of the Home Network 3GPP2 TLV, and added new compat methods for the old name. * Several other minor improvements and fixes. Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../libqmi/{libqmi_1.24.4.bb => libqmi_1.24.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb similarity index 85% rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb index 5512828..a86215a 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.4.bb +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.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] = "be6539fde54fec1fc9d852db201c8560" -SRC_URI[sha256sum] = "0316badec92ff32f51fe6278e6046968d2272a26608995deedd8e4afb563918a" +SRC_URI[md5sum] = "5d50233394a33e43dee3e70e197323e5" +SRC_URI[sha256sum] = "1325257bc16de7b2b443fa689826c993474bdbd6e78c7a1e60e527269b44d8c9" 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 Fri Mar 13 19:50:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 19:50:05 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: python3-kconfiglib: upgrade 13.7.0 -> 14.1.0 In-Reply-To: <158412900223.21364.13271922015633320663@git.openembedded.org> References: <158412900223.21364.13271922015633320663@git.openembedded.org> Message-ID: <20200313195002.A9787233645@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 96d703ba9d992f466c1640e90007a6cb1bcb285b Author: Pierre-Jean Texier AuthorDate: Fri Mar 13 19:57:49 2020 +0100 python3-kconfiglib: upgrade 13.7.0 -> 14.1.0 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-kconfiglib.inc | 4 ++-- .../{python3-kconfiglib_13.7.0.bb => python3-kconfiglib_14.1.0.bb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-kconfiglib.inc b/meta-python/recipes-devtools/python/python-kconfiglib.inc index c82b26b..3dc4961 100644 --- a/meta-python/recipes-devtools/python/python-kconfiglib.inc +++ b/meta-python/recipes-devtools/python/python-kconfiglib.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Kconfiglib is a Kconfig implementation in Python" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=712177a72a3937909543eda3ad1bfb7c" -SRC_URI[md5sum] = "7879aa13d306263e95146439d3959f23" -SRC_URI[sha256sum] = "8dbb946d41a33cec2b63432393a4920479c8c9fa8d5bbca468c4e8a673be6e36" +SRC_URI[md5sum] = "4ad68618824d4bad1d1de1d7eb838bba" +SRC_URI[sha256sum] = "bed2cc2216f538eca4255a83a4588d8823563cdd50114f86cf1a2674e602c93c" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-kconfiglib_13.7.0.bb b/meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-kconfiglib_13.7.0.bb rename to meta-python/recipes-devtools/python/python3-kconfiglib_14.1.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 19:50:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 19:50:06 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: python-requests: upgrade 2.22 -> 2.23 In-Reply-To: <158412900223.21364.13271922015633320663@git.openembedded.org> References: <158412900223.21364.13271922015633320663@git.openembedded.org> Message-ID: <20200313195002.B38ED233647@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 887ad76f3eb1504a7db64afc94961b60910d45c2 Author: Pierre-Jean Texier AuthorDate: Fri Mar 13 19:57:48 2020 +0100 python-requests: upgrade 2.22 -> 2.23 License-Update: copyright years updated -Copyright 2018 Kenneth Reitz +Copyright 2019 Kenneth Reitz Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-requests.inc | 6 +++--- .../{python3-requests_2.22.0.bb => python3-requests_2.23.0.bb} | 0 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-python/recipes-devtools/python/python-requests.inc b/meta-python/recipes-devtools/python/python-requests.inc index 5fe5dc2..ddca4bc 100644 --- a/meta-python/recipes-devtools/python/python-requests.inc +++ b/meta-python/recipes-devtools/python/python-requests.inc @@ -1,12 +1,12 @@ DESCRIPTION = "Python HTTP for Humans." HOMEPAGE = "http://python-requests.org" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a8d5a1d1c2d53025e2282c511033f6f7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=19b6be66ed463d93fa88c29f7860bcd7" FILESEXTRAPATHS_prepend := "${THISDIR}/python-requests:" -SRC_URI[md5sum] = "ee28bee2de76e9198fc41e48f3a7dd47" -SRC_URI[sha256sum] = "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4" +SRC_URI[md5sum] = "abfdc28db1065bbd0bc32592ac9d27a6" +SRC_URI[sha256sum] = "b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6" inherit pypi diff --git a/meta-python/recipes-devtools/python/python3-requests_2.22.0.bb b/meta-python/recipes-devtools/python/python3-requests_2.23.0.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-requests_2.22.0.bb rename to meta-python/recipes-devtools/python/python3-requests_2.23.0.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 19:50:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 19:50:03 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: iwd: upgrade 1.4 -> 1.5 In-Reply-To: <158412900223.21364.13271922015633320663@git.openembedded.org> References: <158412900223.21364.13271922015633320663@git.openembedded.org> Message-ID: <20200313195002.91FC9233642@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 93d67b30793ef5d22647d9f80656ba3449083ea5 Author: Pierre-Jean Texier AuthorDate: Fri Mar 13 19:57:50 2020 +0100 iwd: upgrade 1.4 -> 1.5 Remove patch already in version Fixes: ver 1.5: Fix issue with handling missing NEW_WIPHY events. Fix issue with interface creation and NEW_WIPHY events. Fix issue with handling LastConnectedTime property change. Fix issue with PEAPv0 interoperability with Windows. Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ---------------------- .../iwd/{iwd_1.4.bb => iwd_1.5.bb} | 10 ++-- 2 files changed, 4 insertions(+), 68 deletions(-) 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 deleted file mode 100644 index 733f5fe..0000000 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch +++ /dev/null @@ -1,62 +0,0 @@ -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.4.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb similarity index 85% rename from meta-oe/recipes-connectivity/iwd/iwd_1.4.bb rename to meta-oe/recipes-connectivity/iwd/iwd_1.5.bb index f758781..4d4c699 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb @@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" 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 \ -" -SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261" +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + " +SRCREV = "1ee7b985aaa294447d073bfe1242744784278a8e" S = "${WORKDIR}/git" inherit autotools manpages pkgconfig python3native systemd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 23:01:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 23:01:03 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (caf80e4 -> b1ae217) Message-ID: <158414046380.32540.17174863445509151064@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 caf80e4 gcc: Upgrade to 9.3 bugfix release add d598f8e bluez: fix CVE-2020-0556 add 287123a binutils: fix CVE-2020-0551 add dd6ee0b initramfs-framework: fix boothang when console=null add 3513721 python: upgrade 3.8.1 -> 3.8.2 add b1ae217 babeltrace2: updated to 2.0.2 No new revisions were added by this update. Summary of changes: meta/recipes-connectivity/bluez5/bluez5.inc | 2 + .../bluez5/bluez5/CVE-2020-0556-1.patch | 35 ++ .../bluez5/bluez5/CVE-2020-0556-2.patch | 143 ++++++ .../initrdscripts/initramfs-framework/udev | 3 + meta/recipes-devtools/binutils/binutils-2.34.inc | 1 + .../binutils/binutils/CVE-2020-0551.patch | 549 +++++++++++++++++++++ .../python/{python3_3.8.1.bb => python3_3.8.2.bb} | 6 +- .../{babeltrace2_2.0.1.bb => babeltrace2_2.0.2.bb} | 2 +- 8 files changed, 737 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch create mode 100644 meta/recipes-devtools/binutils/binutils/CVE-2020-0551.patch rename meta/recipes-devtools/python/{python3_3.8.1.bb => python3_3.8.2.bb} (98%) rename meta/recipes-kernel/lttng/{babeltrace2_2.0.1.bb => babeltrace2_2.0.2.bb} (98%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 23:01:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 23:01:15 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b1ae217 -> 66809f9) Message-ID: <158414047590.408.15536056038922734107@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 b1ae217 babeltrace2: updated to 2.0.2 new 8d068bd musl: removes aliases for glibc provided libraries new 66809f9 ltp: make multilib installable. 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/musl/musl_git.bb | 21 +++++++-------------- meta/recipes-extended/ltp/ltp_20200120.bb | 16 ++++++++-------- 2 files changed, 15 insertions(+), 22 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 23:01:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 23:01:16 +0000 Subject: [oe-commits] [openembedded-core] 01/02: musl: removes aliases for glibc provided libraries In-Reply-To: <158414047590.408.15536056038922734107@git.openembedded.org> References: <158414047590.408.15536056038922734107@git.openembedded.org> Message-ID: <20200313230116.1356A233642@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8d068bd3adec64d451cf9cd4ae6b0803a7152463 Author: Jan Kaisrlik AuthorDate: Fri Mar 13 12:44:51 2020 -0700 musl: removes aliases for glibc provided libraries Based on the recommendation in musl mailing list[1] All symlinks have been removed from musl recipe. Move stub libraries into -dev package having them treated as normal .a which they are not, is not correct and packages shoves them into static archives, which are not installed on target usually unless asked for this should help in linking with -lm, -lpthread etc. on target [1]: https://www.openwall.com/lists/musl/2020/03/10/11 Signed-off-by: Jan Kaisrlik Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index afc8446..2a15a78 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -66,27 +66,20 @@ do_install() { rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} - for l in crypt dl m pthread resolv rt util xnet - do - ln -sf libc.so ${D}${libdir}/lib$l.so - done - for i in libc.so.6 libcrypt.so.1 libdl.so.2 libm.so.6 libpthread.so.0 libresolv.so.2 librt.so.1 libutil.so.1; do - ln -sf libc.so ${D}${libdir}/$i - done } PACKAGES =+ "${PN}-glibc-compat" -FILES_${PN}-glibc-compat += "\ - ${libdir}/libc.so.6 ${libdir}/libcrypt.so.1 \ - ${libdir}/libdl.so.2 ${libdir}/libm.so.6 \ - ${libdir}/libpthread.so.0 ${libdir}/libresolv.so.2 \ - ${libdir}/librt.so.1 ${libdir}/libutil.so.1 \ - ${GLIBC_LDSO} \ - " +FILES_${PN}-glibc-compat += "${GLIBC_LDSO}" +FILES_${PN}-staticdev = "${libdir}/libc.a" +FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ + ${libdir}/libpthread.a ${libdir}/libresolv.a \ + ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ + " RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" LEAD_SONAME = "libc.so" +INSANE_SKIP_${PN}-dev = "staticdev" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 13 23:01:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 13 Mar 2020 23:01:17 +0000 Subject: [oe-commits] [openembedded-core] 02/02: ltp: make multilib installable. In-Reply-To: <158414047590.408.15536056038922734107@git.openembedded.org> References: <158414047590.408.15536056038922734107@git.openembedded.org> Message-ID: <20200313230116.1DD4D233643@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 66809f9257d667a0a0814f5c6d804f93cd4ad6e1 Author: Jeremy Puhlman AuthorDate: Fri Mar 13 15:55:22 2020 -0700 ltp: make multilib installable. Many of ltp's tests are of syscalls and libc content. Enable installing mulitpule abi's. Use prefix consistently rather then hardcoded /opt/ltp everywhere. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/recipes-extended/ltp/ltp_20200120.bb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb b/meta/recipes-extended/ltp/ltp_20200120.bb index 3e6cbc6..deac391 100644 --- a/meta/recipes-extended/ltp/ltp_20200120.bb +++ b/meta/recipes-extended/ltp/ltp_20200120.bb @@ -45,8 +45,8 @@ inherit autotools-brokensep TARGET_CC_ARCH += "${LDFLAGS}" -export prefix = "/opt/ltp" -export exec_prefix = "/opt/ltp" +export prefix = "/opt/${PN}" +export exec_prefix = "/opt/${PN}" PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" @@ -55,7 +55,7 @@ EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite --w EXTRA_OECONF += " --without-tirpc " do_install(){ - install -d ${D}/opt/ltp/ + install -d ${D}${prefix}/ oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install # fixup not deploy STPfailure_report.pl to avoid confusing about it fails to run @@ -64,10 +64,10 @@ do_install(){ # runs on the OSDL's Scaleable Test Platform (STP) and it mainly accesses # http://khack.osdl.org to retrieve ltp test results run on # OSDL's Scaleable Test Platform, but now http://khack.osdl.org unaccessible - rm -rf ${D}/opt/ltp/bin/STPfailure_report.pl + rm -rf ${D}${prefix}/bin/STPfailure_report.pl - # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual - cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases + # Copy POSIX test suite into ${D}${prefix}/testcases by manual + cp -r testcases/open_posix_testsuite ${D}${prefix}/testcases # Makefile were configured in the build system find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \ @@ -101,10 +101,10 @@ RDEPENDS_${PN} = "\ tar \ " -FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_tests [...] +FILES_${PN} += "${prefix}/* ${prefix}/runtest/* ${prefix}/scenario_groups/* ${prefix}/testcases/bin/* ${prefix}/testcases/bin/*/bin/* ${prefix}/testscripts/* ${prefix}/testcases/open_posix_testsuite/* ${prefix}/testcases/open_posix_testsuite/conformance/* ${prefix}/testcases/open_posix_testsuite/Documentation/* ${prefix}/testcases/open_posix_testsuite/functional/* ${prefix}/testcases/open_posix_testsuite/include/* ${prefix}/testcases/open_posix_testsuite/scripts/* ${prefix}/testcases/ope [...] # Avoid stripping some generated binaries otherwise some of the ltp tests such as ldd01 & nm01 fail -INHIBIT_PACKAGE_STRIP_FILES = "/opt/ltp/testcases/bin/nm01 /opt/ltp/testcases/bin/ldd01" +INHIBIT_PACKAGE_STRIP_FILES = "${prefix}/testcases/bin/nm01 ${prefix}/testcases/bin/ldd01" INSANE_SKIP_${PN} += "already-stripped staticdev" # Avoid file dependency scans, as LTP checks for things that may or may not -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 14 04:27:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 14 Mar 2020 04:27:50 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (887ad76 -> 3e047ed) Message-ID: <158416007094.13258.13962731500139198546@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 887ad76 python-requests: upgrade 2.22 -> 2.23 new 99793be postgresql: 12.1 -> 12.2 new 3e047ed sg3-utils: upgrade 1.44 -> 1.45 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-dbs/postgresql/postgresql_12.1.bb | 12 ------------ meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb | 12 ++++++++++++ .../sg3-utils/{sg3-utils_1.44.bb => sg3-utils_1.45.bb} | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb create mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb rename meta-oe/recipes-support/sg3-utils/{sg3-utils_1.44.bb => sg3-utils_1.45.bb} (81%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 14 04:27:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 14 Mar 2020 04:27:52 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: sg3-utils: upgrade 1.44 -> 1.45 In-Reply-To: <158416007094.13258.13962731500139198546@git.openembedded.org> References: <158416007094.13258.13962731500139198546@git.openembedded.org> Message-ID: <20200314042751.52B20233645@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3e047edcff30b29804edb1c06d6a7dfb2af825a8 Author: Wang Mingyu AuthorDate: Sat Mar 14 02:15:19 2020 -0700 sg3-utils: upgrade 1.44 -> 1.45 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../sg3-utils/{sg3-utils_1.44.bb => sg3-utils_1.45.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb similarity index 81% rename from meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb rename to meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb index 4909035..22995b7 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.44.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb @@ -14,8 +14,8 @@ MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sg3_utils-(?P\d+(\.\d+)+)\.tgz" -SRC_URI[md5sum] = "c11d2b3ca4cc2fd01796473e5330afed" -SRC_URI[sha256sum] = "8dae684d22e71b11353a48b16c95597af90f0cbe9bbd57f98d7f5544da5cae7b" +SRC_URI[md5sum] = "2e71d7cd925dcc48acb24afaaaac7990" +SRC_URI[sha256sum] = "0b87c971af52af7cebebcce343eac6bd3d73febb3c72af9ce41a4552f1605a61" inherit autotools-brokensep -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sat Mar 14 04:27:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sat, 14 Mar 2020 04:27:51 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: postgresql: 12.1 -> 12.2 In-Reply-To: <158416007094.13258.13962731500139198546@git.openembedded.org> References: <158416007094.13258.13962731500139198546@git.openembedded.org> Message-ID: <20200314042751.47B43233643@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 99793bee6bddd5d01e67b14217078a4bbef87a54 Author: Wang Mingyu AuthorDate: Sat Mar 14 02:15:18 2020 -0700 postgresql: 12.1 -> 12.2 -License-Update: Copyright year updated to 2020. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb | 12 ------------ meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb b/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb deleted file mode 100644 index 4868519..0000000 --- a/meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ -" - -SRC_URI[md5sum] = "2ee1bd4ec5f49363a3f456f07e599b41" -SRC_URI[sha256sum] = "a09bf3abbaf6763980d0f8acbb943b7629a8b20073de18d867aecdb7988483ed" diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb new file mode 100644 index 0000000..0613e50 --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc4ce21960f0c561460d750bc270d11f" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ +" + +SRC_URI[md5sum] = "a88ceea8ecf2741307f663e4539b58b7" +SRC_URI[sha256sum] = "ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 04:32:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 04:32:15 +0000 Subject: [oe-commits] [meta-openembedded] 02/02: mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] In-Reply-To: <158424673389.17295.8551374743773292373@git.openembedded.org> References: <158424673389.17295.8551374743773292373@git.openembedded.org> Message-ID: <20200315043214.195D723364D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 07f818ec5071dbc4bbd9e95e5b0c5a50a86c8482 Author: Andreas M?ller AuthorDate: Sat Mar 14 23:04:40 2020 +0100 mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb index 7979802..c90559c 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb @@ -52,7 +52,7 @@ PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_bac PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" -PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" +PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire-0.2" PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 04:32:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 04:32:13 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (3e047ed -> 07f818e) Message-ID: <158424673389.17295.8551374743773292373@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 3e047ed sg3-utils: upgrade 1.44 -> 1.45 new dbcafa6 pipewire: upgrade 0.2.7 -> 0.3.1 new 07f818e mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] 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-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- .../{pipewire_git.bb => pipewire-0.2_git.bb} | 0 .../recipes-multimedia/pipewire/pipewire_git.bb | 32 ++++++++++++++-------- 3 files changed, 22 insertions(+), 12 deletions(-) copy meta-oe/recipes-multimedia/pipewire/{pipewire_git.bb => pipewire-0.2_git.bb} (100%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 04:32:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 04:32:14 +0000 Subject: [oe-commits] [meta-openembedded] 01/02: pipewire: upgrade 0.2.7 -> 0.3.1 In-Reply-To: <158424673389.17295.8551374743773292373@git.openembedded.org> References: <158424673389.17295.8551374743773292373@git.openembedded.org> Message-ID: <20200315043214.0EE1F23364B@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dbcafa6ebe1ba05660ec35bf8165cd3fc5036cba Author: Andreas M?ller AuthorDate: Sat Mar 14 23:04:39 2020 +0100 pipewire: upgrade 0.2.7 -> 0.3.1 * as long as we have not upgradeed mutter to 3.36 we have to keep pipewire 0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2 * license was changed to MIT * additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES or if not available by pipewire's defaults * vulkan was disabled for now Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../{pipewire_git.bb => pipewire-0.2_git.bb} | 0 .../recipes-multimedia/pipewire/pipewire_git.bb | 32 ++++++++++++++-------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb similarity index 100% copy from meta-oe/recipes-multimedia/pipewire/pipewire_git.bb copy to meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb index bcb3015..95da2df 100644 --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb @@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans " HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "MIT" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" +PV = "0.3.1" SRC_URI = "git://github.com/PipeWire/pipewire" @@ -18,13 +18,20 @@ S = "${WORKDIR}/git" inherit meson pkgconfig systemd manpages PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \ + jack gstreamer \ " -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +# disable vulkan fo now +EXTRA_OEMESON = "-Dvulkan=false" + +PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" +PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" PACKAGES =+ "\ ${PN}-spa-plugins \ @@ -33,28 +40,31 @@ PACKAGES =+ "\ gstreamer1.0-${PN} \ lib${PN} \ lib${PN}-modules \ + lib${PN}-jack \ " RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" FILES_${PN} = "\ ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pw-* \ ${bindir}/pipewire* \ ${systemd_user_unitdir}/* \ " FILES_lib${PN} = "\ ${libdir}/libpipewire-*.so.* \ + ${libdir}/libjack-*.so.* \ + ${libdir}/libpulse-*.so.* \ " FILES_lib${PN}-modules = "\ ${libdir}/pipewire-*/* \ " FILES_${PN}-spa-plugins = "\ ${bindir}/spa-* \ - ${libdir}/spa/* \ + ${libdir}/spa-*/* \ " FILES_${PN}-alsa = "\ ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ " FILES_gstreamer1.0-${PN} = "\ ${libdir}/gstreamer-1.0/* \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 12:04:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 12:04:27 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated: scripts/pybootchartgui: Fix to work with python 3.8 Message-ID: <158427386770.9284.16941463552061796917@git.openembedded.org> 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 f1d4ecc scripts/pybootchartgui: Fix to work with python 3.8 f1d4ecc is described below commit f1d4ecce7d3968c5e08c268e3329041d4b647cf6 Author: Richard Purdie AuthorDate: Sun Mar 15 12:03:20 2020 +0000 scripts/pybootchartgui: Fix to work with python 3.8 time.clock() was removed in python 3.8, use one of its recommended replacements to fix failures on python 3.8 systems. Signed-off-by: Richard Purdie --- scripts/pybootchartgui/pybootchartgui/parsing.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pybootchartgui/pybootchartgui/parsing.py b/scripts/pybootchartgui/pybootchartgui/parsing.py index ef2d3d3..b42dac6 100644 --- a/scripts/pybootchartgui/pybootchartgui/parsing.py +++ b/scripts/pybootchartgui/pybootchartgui/parsing.py @@ -18,7 +18,7 @@ import string import re import sys import tarfile -from time import clock +import time from collections import defaultdict from functools import reduce @@ -723,7 +723,7 @@ def get_num_cpus(headers): def _do_parse(writer, state, filename, file): writer.info("parsing '%s'" % filename) - t1 = clock() + t1 = time.process_time() name = os.path.basename(filename) if name == "proc_diskstats.log": state.disk_stats = _parse_proc_disk_stat_log(file) @@ -743,7 +743,7 @@ def _do_parse(writer, state, filename, file): state.monitor_disk = _parse_monitor_disk_log(file) elif not filename.endswith('.log'): _parse_bitbake_buildstats(writer, state, filename, file) - t2 = clock() + t2 = time.process_time() writer.info(" %s seconds" % str(t2-t1)) return state -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:23 +0000 Subject: [oe-commits] [meta-openembedded] 02/13: wireshark: Upgrade 3.0.6 -> 3.0.8 In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203521.E0D1B2336BF@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 af706c5d83c2807d1fec321602c63aee210f0db6 Author: Adrian Bunk AuthorDate: Fri Feb 21 22:39:26 2020 +0200 wireshark: Upgrade 3.0.6 -> 3.0.8 Upgrade on the 3.0 stable branch, including fixes for CVE-2019-19553 and CVE-2020-7045. Signed-off-by: Adrian Bunk Signed-off-by: Armin Kuster --- .../wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.8.bb similarity index 95% rename from meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb rename to meta-networking/recipes-support/wireshark/wireshark_3.0.8.bb index ccaa0c9..226e16e 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_3.0.6.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.8.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] = "c6f8d12a3efe21cc7885f7cb0c4bd938" -SRC_URI[sha256sum] = "a87f4022a0c15ddbf1730bf1acafce9e75a4e657ce9fa494ceda0324c0c3e33e" +SRC_URI[md5sum] = "034f09e639fb4efebbc08af7b2a85333" +SRC_URI[sha256sum] = "b4bd8189934d82330a053c5b10398f2b625b1e1c8818831ab61739b2d7aa7561" PE = "1" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:24 +0000 Subject: [oe-commits] [meta-openembedded] 03/13: lvm2, libdevmapper: Do not patch configure In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203521.EC3592336C0@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 28fef8eb25c6791607da75f8e6273b645e542919 Author: Peter Kjellerstedt AuthorDate: Thu Feb 27 01:48:50 2020 +0100 lvm2, libdevmapper: Do not patch configure Since the do_configure task regenerates the configure script, there is no need to patch it. Actually doing so will cause problems, which can be seen by doing: bitbake lvm2 -c configure bitbake lvm2 -c patch -f Reported-by: Andrey Zhizhikin Signed-off-by: Peter Kjellerstedt Signed-off-by: Armin Kuster --- ...configure-Fix-setting-of-CLDFLAGS-default.patch | 34 +--------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch index 07cb88f..91ab239 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch @@ -4,44 +4,12 @@ Date: Mon, 19 Aug 2019 14:54:43 +0200 Subject: [PATCH] configure: Fix setting of CLDFLAGS default --- - configure | 6 +++--- configure.ac | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] Signed-off-by: Peter Kjellerstedt -diff --git a/configure b/configure -index ff3a59b6b..4c8476502 100755 ---- a/configure -+++ b/configure -@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : - fi - case "$host_os" in - linux*) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" - # equivalent to -rdynamic - ELDFLAGS="-Wl,--export-dynamic" - # FIXME Generate list and use --dynamic-list=.dlopen.sym -@@ -3098,7 +3098,7 @@ case "$host_os" in - ;; - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ELDFLAGS= - CLDWHOLEARCHIVE="-all_load" - CLDNOWHOLEARCHIVE= -@@ -3111,7 +3111,7 @@ case "$host_os" in - BLKDEACTIVATE=no - ;; - *) -- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" -+ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" - ;; - esac - diff --git a/configure.ac b/configure.ac index 5da694631..830edb8da 100644 --- a/configure.ac -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:22 +0000 Subject: [oe-commits] [meta-openembedded] 01/13: mosquitto: Use mosquitto.init for daemon init In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203521.D33AA233678@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 878e450a9448c8bfd09266ca9051e45dfe9701b3 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 (cherry picked from commit 257ea010b716073acbe6866f4c3968b4962fdc37) Signed-off-by: Armin Kuster --- 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 Sun Mar 15 20:35:25 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:25 +0000 Subject: [oe-commits] [meta-openembedded] 04/13: lmsensors: Fix sensord dependencies In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.05C5A2336C1@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 a61b6c3f54343c54c923ee23b89cf797e4cf504a Author: Paul Barker AuthorDate: Mon Mar 2 17:18:34 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 Backport of 5674b0a9e8778f7538419451e629ef0c13711123 from master branch. Signed-off-by: Armin Kuster --- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb index ffafd17..316d066 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ DEPENDS = " \ bison-native \ flex-native \ - rrdtool \ virtual/libiconv \ " @@ -93,7 +92,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 Sun Mar 15 20:35:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:21 +0000 Subject: [oe-commits] [meta-openembedded] branch zeus-next updated (bb65c27 -> 9e60d30) Message-ID: <158430452136.10155.11440558556589669186@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 bb65c27 fluentbit: Fix packaging in multilib env new 878e450 mosquitto: Use mosquitto.init for daemon init new af706c5 wireshark: Upgrade 3.0.6 -> 3.0.8 new 28fef8e lvm2, libdevmapper: Do not patch configure new a61b6c3 lmsensors: Fix sensord dependencies new 94cc8b8 libldb: Do not require the "pam" distro feature to be enabled new 7932e83 ade: Fix install paths in multilib builds new a90c217 opencv: Enable pkg-config .pc file generation new 18933cb opencv: don't download during configure new cb24464 opencv: also download face alignment data in do_fetch() new 112aea3 opencv: PACKAGECONFIG for G-API, use system ADE new 861e854 opencv: abort configure if we need to download new 60d8193 s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher new 9e60d30 sanlock: Replace cp -a with cp -R --no-dereference 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: .../mosquitto/files/mosquitto.init | 2 +- .../recipes-support/libldb/libldb_1.5.6.bb | 3 +- .../{wireshark_3.0.6.bb => wireshark_3.0.8.bb} | 4 +- meta-oe/recipes-bsp/lm_sensors/lmsensors_3.5.0.bb | 3 +- ...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51 ++++++++++++++++++++++ meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +- ...configure-Fix-setting-of-CLDFLAGS-default.patch | 34 +-------------- ...NUInstallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + .../recipes-support/opencv/opencv/download.patch | 32 ++++++++++++++ meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 32 ++++++++++++-- .../{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} | 7 ++- .../{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} | 6 +-- ...x-native_svn.bb => sjf2410-linux-native_git.bb} | 11 +++-- .../usbpath/{usbpath_svn.bb => usbpath_git.bb} | 10 ++--- .../{wmiconfig_svn.bb => wmiconfig_git.bb} | 13 +++--- 16 files changed, 183 insertions(+), 69 deletions(-) rename meta-networking/recipes-support/wireshark/{wireshark_3.0.6.bb => wireshark_3.0.8.bb} (95%) create mode 100644 meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch create mode 100644 meta-oe/recipes-support/opencv/opencv/download.patch rename meta-oe/recipes-support/samsung-soc-utils/{s3c24xx-gpio_svn.bb => s3c24xx-gpio_git.bb} (73%) rename meta-oe/recipes-support/samsung-soc-utils/{s3c64xx-gpio_svn.bb => s3c64xx-gpio_git.bb} (74%) rename meta-oe/recipes-support/samsung-soc-utils/{sjf2410-linux-native_svn.bb => sjf2410-linux-native_git.bb} (72%) rename meta-oe/recipes-support/usbpath/{usbpath_svn.bb => usbpath_git.bb} (68%) rename meta-oe/recipes-support/wmiconfig/{wmiconfig_svn.bb => wmiconfig_git.bb} (58%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:26 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:26 +0000 Subject: [oe-commits] [meta-openembedded] 05/13: libldb: Do not require the "pam" distro feature to be enabled In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.1115B2336C3@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 94cc8b862ac4df7c7f66933dea42846c80f707df Author: Peter Kjellerstedt AuthorDate: Mon Nov 18 14:31:39 2019 +0100 libldb: Do not require the "pam" distro feature to be enabled It was only added because samba was a dependency, but was not removed again when the dependency on samba was removed in commit 6207331f. This effectively reverts commit a190c2e3. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj (cherry picked from commit 0d2b80bd783fb2190c28caa2ebf3a13d4491d7c7) Signed-off-by: Armin Kuster --- meta-networking/recipes-support/libldb/libldb_1.5.6.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/libldb/libldb_1.5.6.bb b/meta-networking/recipes-support/libldb/libldb_1.5.6.bb index 99eb6f9..cc24863 100644 --- a/meta-networking/recipes-support/libldb/libldb_1.5.6.bb +++ b/meta-networking/recipes-support/libldb/libldb_1.5.6.bb @@ -36,8 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada SRC_URI[md5sum] = "fc58ef432c1fcb03fc3bb6cccce08977" SRC_URI[sha256sum] = "ff82474d0bf109e415a2d50334bde5715f486a53ff4bb8c7f74459dd229e975b" -inherit waf-samba distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" +inherit waf-samba S = "${WORKDIR}/ldb-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:30 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:30 +0000 Subject: [oe-commits] [meta-openembedded] 09/13: opencv: also download face alignment data in do_fetch() In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.3E81E234137@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 cb24464d4547601bd3a844bf1f2610a2e1018149 Author: Ross Burton AuthorDate: Sun Mar 1 08:33:00 2020 +0800 opencv: also download face alignment data in do_fetch() The face alignment data is downloaded in do_configure, so download it in do_fetch and add it to the cache. Signed-off-by: Ross Burton Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Armin Kuster --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index cfc7854..487393f 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" def ipp_filename(d): import re @@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ file://0003-To-fix-errors-as-following.patch \ @@ -73,6 +75,7 @@ do_unpack_extra() { } cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i + cache data ${WORKDIR}/face/*.dat } addtask unpack_extra after do_unpack before do_patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:28 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:28 +0000 Subject: [oe-commits] [meta-openembedded] 07/13: opencv: Enable pkg-config .pc file generation In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.2704323410B@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 a90c217a793682a73c5670fa7d95f8179253d3ef Author: Carlos Rafael Giani AuthorDate: Mon Mar 2 09:27:31 2020 +0800 opencv: Enable pkg-config .pc file generation In OpenCV 4, .pc file generation is disabled by default. Yet, other software such as GStreamer and FFmpeg rely on the .pc files during build time configuration. Explicitely enable .pc file generation to make sure pkg-config can be used for getting information about OpenCV. Signed-off-by: Carlos Rafael Giani Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Ross Burton Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Ross Burton Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Armin Kuster --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 77b5dd6..5e89db0 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -64,6 +64,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DCMAKE_SKIP_RPATH=ON \ -DOPENCV_ICV_HASH=${IPP_MD5} \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:31 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:31 +0000 Subject: [oe-commits] [meta-openembedded] 10/13: opencv: PACKAGECONFIG for G-API, use system ADE In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.4D06D234138@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 112aea3cedf827c82357241a6a1edfb32a9570a2 Author: Ross Burton AuthorDate: Sun Mar 1 08:33:01 2020 +0800 opencv: PACKAGECONFIG for G-API, use system ADE The Graph API is enabled by default, and if ADE isn't present it will download a copy of the source during do_configure. Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we package. Signed-off-by: Ross Burton Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Armin Kuster --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 487393f..03e4f58 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -93,10 +93,11 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ " EXTRA_OECMAKE_append_x86 = " -DX86=ON" -PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:27 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:27 +0000 Subject: [oe-commits] [meta-openembedded] 06/13: ade: Fix install paths in multilib builds In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.1BE8823410A@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 7932e835f1fb218a28a7f32ddc2edff630614830 Author: Khem Raj AuthorDate: Thu Mar 5 08:20:05 2020 +0800 ade: Fix install paths in multilib builds Fixes ERROR: ade-0.1.1f-r0 do_package: QA Issue: ade: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/libade.a Signed-off-by: Khem Raj Signed-off-by: Sanjeev Nahulanthran Signed-off-by: Armin Kuster --- ...NUInstallDirs-for-detecting-install-paths.patch | 39 ++++++++++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + 2 files changed, 40 insertions(+) diff --git a/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch new file mode 100644 index 0000000..f038b0a --- /dev/null +++ b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch @@ -0,0 +1,39 @@ +From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 19 Dec 2019 21:33:46 -0800 +Subject: [PATCH] use GNUInstallDirs for detecting install paths + +This helps with multilib builds + +Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19] +Signed-off-by: Khem Raj +--- + sources/ade/CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt +index 2d1dd20..46415d1 100644 +--- a/sources/ade/CMakeLists.txt ++++ b/sources/ade/CMakeLists.txt +@@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION) + VERBATIM) + endif() + ++include(GNUInstallDirs) ++ + install(TARGETS ade COMPONENT dev + EXPORT adeTargets +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib +- INCLUDES DESTINATION include) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev) + +-- +2.24.1 + diff --git a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb index 332820d..3861802 100644 --- a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb +++ b/meta-oe/recipes-support/opencv/ade_0.1.1f.bb @@ -5,6 +5,7 @@ organizing data flow processing and execution." HOMEPAGE = "https://github.com/opencv/ade" SRC_URI = "git://github.com/opencv/ade.git \ + file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \ " SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:29 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:29 +0000 Subject: [oe-commits] [meta-openembedded] 08/13: opencv: don't download during configure In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.322FB234136@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 18933cb8d81950adc04e3839f541dbef22bd0a5f Author: Ross Burton AuthorDate: Sun Mar 1 08:32:59 2020 +0800 opencv: don't download during configure OpenCV downloads data files during the CMake configure phase, which is bad because fetching should only happen in do_fetch (and if proxies are needed, won't be set in do_configure). The recipe attempts to solve this already by having the repositories in SRC_URI and moving the files to the correct place before do_configure(). However they are written to ${B} which is then wiped in do_configure so they're not used. The OpenCV download logic has a download cache with specially formatted filenames, so take the downloaded files and populate the cache. Signed-off-by: Ross Burton Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Armin Kuster --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 5e89db0..cfc7854 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -51,10 +51,28 @@ PV = "4.1.0" S = "${WORKDIR}/git" +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + do_unpack_extra() { tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} - cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src - cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i + cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i } addtask unpack_extra after do_unpack before do_patch @@ -65,6 +83,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DOPENCV_ICV_HASH=${IPP_MD5} \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:33 +0000 Subject: [oe-commits] [meta-openembedded] 12/13: s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.680C82336BF@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 60d819329833d5efaabf131bf4b15c2f1316b484 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 (cherry picked from commit 6902dcd2edc3a08f6929e19e9a9c18493883f9d2) [ak: fixes build issue WARNING: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: Could not copy license file /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c to /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/license-destdir/s3c24xx-gpio/gpio.c: [Errno 2] No such file or directory: '/home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c' ERROR: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: QA Issue: s3c24xx-gpio: LIC_FILES_CHKSUM points to an invalid file: /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c [license-checksum] ] Signed-off-by: Armin Kuster --- .../{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 72% 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 9e609c4..7d468ba 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 Sun Mar 15 20:35:32 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:32 +0000 Subject: [oe-commits] [meta-openembedded] 11/13: opencv: abort configure if we need to download In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.596FB23415D@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 861e85453dc8b8249c0318bc9b4f48018abe0f3e Author: Ross Burton AuthorDate: Sun Mar 1 08:33:02 2020 +0800 opencv: abort configure if we need to download OpenCV's habit of downloading files during do_configure is bad form (as it becomes impossible to do offline builds), so add an option to error out if a download would be needed. Signed-off-by: Ross Burton Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Armin Kuster --- .../recipes-support/opencv/opencv/download.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 2 ++ 2 files changed, 34 insertions(+) diff --git a/meta-oe/recipes-support/opencv/opencv/download.patch b/meta-oe/recipes-support/opencv/opencv/download.patch new file mode 100644 index 0000000..fa8db88 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/download.patch @@ -0,0 +1,32 @@ +This CMake module will download files during do_configure. This is bad as it +means we can't do offline builds. + +Add an option to disallow downloads by emitting a fatal error. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake +index cdc47ad2cb..74573f45a2 100644 +--- a/cmake/OpenCVDownload.cmake ++++ b/cmake/OpenCVDownload.cmake +@@ -14,6 +14,7 @@ + # RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it + # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is /.cache + ++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads") + set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files") + if(DEFINED ENV{OPENCV_DOWNLOAD_PATH}) + set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}") +@@ -153,6 +154,11 @@ function(ocv_download) + + # Download + if(NOT EXISTS "${CACHE_CANDIDATE}") ++ if(NOT OPENCV_ALLOW_DOWNLOADS) ++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}") ++ return() ++ endif() ++ + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") + file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}" + INACTIVITY_TIMEOUT 60 diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 03e4f58..f679ccb 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -48,6 +48,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ + file://download.patch \ " PV = "4.1.0" @@ -87,6 +88,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 20:35:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 20:35:34 +0000 Subject: [oe-commits] [meta-openembedded] 13/13: sanlock: Replace cp -a with cp -R --no-dereference In-Reply-To: <158430452136.10155.11440558556589669186@git.openembedded.org> References: <158430452136.10155.11440558556589669186@git.openembedded.org> Message-ID: <20200315203522.77EDE233678@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 9e60d30669a2ad0598e9abf0cd15ee06b523986b Author: Khem Raj AuthorDate: Thu Nov 21 13:50:44 2019 -0800 sanlock: Replace cp -a with cp -R --no-dereference helps to stop leaking builder's UID into sstate cache Fixes Exception: KeyError: 'getpwuid(): uid not found: 6000' Signed-off-by: Khem Raj (cherry picked from commit 80d4d7538a85123603eea3d87542c1c0433febb7) [ak: fixes build issue Exception: KeyError: 'getpwuid(): uid not found: 1000'] Signed-off-by: Armin Kuster --- ...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51 ++++++++++++++++++++++ meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb | 4 +- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch b/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch new file mode 100644 index 0000000..a0b721c --- /dev/null +++ b/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch @@ -0,0 +1,51 @@ +From 78a9cffb1c760466933bbbcbae7ecb9b30a3e6a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Nov 2019 13:47:42 -0800 +Subject: [PATCH] sanlock: Replace "cp -a" with "cp -R --no-dereference + --preserve=mode, links" + +Using "cp -a" leaks UID of user running the builds + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/Makefile | 8 ++++---- + wdmd/Makefile | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 533dd79..2fc9ba5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -127,9 +127,9 @@ install: all + $(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig + $(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig +- cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/wdmd/Makefile b/wdmd/Makefile +index 5849efc..4894517 100644 +--- a/wdmd/Makefile ++++ b/wdmd/Makefile +@@ -68,7 +68,7 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 + $(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -c -m 755 $(SHLIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8 +-- +2.24.0 + diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index 9f7ce9c..850690f 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -11,7 +11,9 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + " SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" 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 Mar 15 22:24:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:24:58 +0000 Subject: [oe-commits] [openembedded-core] 01/01: layer.conf: Update to LAYERSERIES_CORENAME to dunfell In-Reply-To: <158431109739.7865.6142359522354817862@git.openembedded.org> References: <158431109739.7865.6142359522354817862@git.openembedded.org> Message-ID: <20200315222457.85465233678@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 090bb3b44ba0cc01c29942c00d43e910d1ff735e Author: Richard Purdie AuthorDate: Sun Mar 15 22:21:55 2020 +0000 layer.conf: Update to LAYERSERIES_CORENAME to dunfell Update the layer core name to the new release name. Signed-off-by: Richard Purdie --- meta-selftest/conf/layer.conf | 2 +- meta-skeleton/conf/layer.conf | 2 +- meta/conf/layer.conf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-selftest/conf/layer.conf b/meta-selftest/conf/layer.conf index 08181a8..a4bd461 100644 --- a/meta-selftest/conf/layer.conf +++ b/meta-selftest/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "selftest" BBFILE_PATTERN_selftest = "^${LAYERDIR}/" BBFILE_PRIORITY_selftest = "5" -LAYERSERIES_COMPAT_selftest = "zeus" +LAYERSERIES_COMPAT_selftest = "dunfell" diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf index 7d7381a..5e449a4 100644 --- a/meta-skeleton/conf/layer.conf +++ b/meta-skeleton/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1" LAYERDEPENDS_skeleton = "core" -LAYERSERIES_COMPAT_skeleton = "zeus" +LAYERSERIES_COMPAT_skeleton = "dunfell" diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 60f8e26..29ddb29 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core" BBFILE_PATTERN_core = "^${LAYERDIR}/" BBFILE_PRIORITY_core = "5" -LAYERSERIES_CORENAMES = "zeus" +LAYERSERIES_CORENAMES = "dunfell" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_core = "11" -LAYERSERIES_COMPAT_core = "warrior zeus" +LAYERSERIES_COMPAT_core = "zeus dunfell" BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 22:24:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:24:57 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (b1ae217 -> 090bb3b) Message-ID: <158431109739.7865.6142359522354817862@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 b1ae217 babeltrace2: updated to 2.0.2 add 8d068bd musl: removes aliases for glibc provided libraries add 66809f9 ltp: make multilib installable. add f1d4ecc scripts/pybootchartgui: Fix to work with python 3.8 new 090bb3b layer.conf: Update to LAYERSERIES_CORENAME to dunfell 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-selftest/conf/layer.conf | 2 +- meta-skeleton/conf/layer.conf | 2 +- meta/conf/layer.conf | 4 ++-- meta/recipes-core/musl/musl_git.bb | 21 +++++++-------------- meta/recipes-extended/ltp/ltp_20200120.bb | 16 ++++++++-------- scripts/pybootchartgui/pybootchartgui/parsing.py | 6 +++--- 6 files changed, 22 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 22:27:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:27:44 +0000 Subject: [oe-commits] [openembedded-core] branch master updated: build-appliance-image: Update to master head revision Message-ID: <158431126483.8770.7636210045991534703@git.openembedded.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 ebe7767 build-appliance-image: Update to master head revision ebe7767 is described below commit ebe7767d8a1f2d41bad126e7bafe3a33a6165333 Author: Richard Purdie AuthorDate: Sun Mar 15 22:27:16 2020 +0000 build-appliance-image: Update to master 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 91329a7..f22bc18 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 ?= "39d45ef825694705daf6d7ab4ab3066b1b8e3aa2" +SRCREV ?= "4cf541859dca74669a4b7ddf4c1b2ada75f0379b" SRC_URI = "git://git.yoctoproject.org/poky \ 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 Sun Mar 15 22:27:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:27:49 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f1d4ecc -> ebe7767) Message-ID: <158431126972.8980.17401146441741860573@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 f1d4ecc scripts/pybootchartgui: Fix to work with python 3.8 add 090bb3b layer.conf: Update to LAYERSERIES_CORENAME to dunfell add ebe7767 build-appliance-image: Update to master head revision No new revisions were added by this update. Summary of changes: meta-selftest/conf/layer.conf | 2 +- meta-skeleton/conf/layer.conf | 2 +- meta/conf/layer.conf | 4 ++-- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 22:49:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:49:13 +0000 Subject: [oe-commits] [openembedded-core] 01/02: layer.conf: Allow compatibility with zeus for now In-Reply-To: <158431255248.14248.4032467753427235668@git.openembedded.org> References: <158431255248.14248.4032467753427235668@git.openembedded.org> Message-ID: <20200315224912.9F0672336BF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 1970c5f7838ff10cd6243e1624553bdc46e89fad Author: Richard Purdie AuthorDate: Sun Mar 15 22:48:36 2020 +0000 layer.conf: Allow compatibility with zeus for now Signed-off-by: Richard Purdie --- meta/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 29ddb29..b3cd100 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -7,7 +7,7 @@ BBFILE_COLLECTIONS += "core" BBFILE_PATTERN_core = "^${LAYERDIR}/" BBFILE_PRIORITY_core = "5" -LAYERSERIES_CORENAMES = "dunfell" +LAYERSERIES_CORENAMES = "dunfell zeus" # This should only be incremented on significant changes that will # cause compatibility issues with other layers -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 22:49:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:49:12 +0000 Subject: [oe-commits] [openembedded-core] branch master updated (ebe7767 -> 61d80b0) Message-ID: <158431255248.14248.4032467753427235668@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 ebe7767 build-appliance-image: Update to master head revision new 1970c5f layer.conf: Allow compatibility with zeus for now new 61d80b0 build-appliance-image: Update to master head revision 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/layer.conf | 2 +- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 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 Sun Mar 15 22:49:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:49:14 +0000 Subject: [oe-commits] [openembedded-core] 02/02: build-appliance-image: Update to master head revision In-Reply-To: <158431255248.14248.4032467753427235668@git.openembedded.org> References: <158431255248.14248.4032467753427235668@git.openembedded.org> Message-ID: <20200315224912.A96E82336C0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master in repository openembedded-core. commit 61d80b07bcfa4adf5f1feb2904fec0a8d09c89f6 Author: Richard Purdie AuthorDate: Sun Mar 15 22:48:51 2020 +0000 build-appliance-image: Update to master 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 f22bc18..8c9fe92 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 ?= "4cf541859dca74669a4b7ddf4c1b2ada75f0379b" +SRCREV ?= "1adc7478a0548e1ebd75d96d2b938c5852c78365" SRC_URI = "git://git.yoctoproject.org/poky \ 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 Sun Mar 15 22:49:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 22:49:18 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (ebe7767 -> 61d80b0) Message-ID: <158431255875.14513.14321755137743692469@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 ebe7767 build-appliance-image: Update to master head revision add 1970c5f layer.conf: Allow compatibility with zeus for now add 61d80b0 build-appliance-image: Update to master head revision No new revisions were added by this update. Summary of changes: meta/conf/layer.conf | 2 +- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 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 Sun Mar 15 23:25:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:25:57 +0000 Subject: [oe-commits] [meta-openembedded] 01/06: pipewire: Link with libatomic on mips/i*86 In-Reply-To: <158431475656.22965.18036406638817004541@git.openembedded.org> References: <158431475656.22965.18036406638817004541@git.openembedded.org> Message-ID: <20200315232557.07616234136@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 0ea5b0d3721d04111310ef6c331cbb3c2d68bd5c Author: Khem Raj AuthorDate: Sun Mar 15 11:03:46 2020 -0700 pipewire: Link with libatomic on mips/i*86 Fixes src/pipewire-jack.c:4218: undefined reference to `__atomic_store_8' Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/pipewire/pipewire_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb index 95da2df..3252f2e 100644 --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb @@ -26,6 +26,9 @@ PACKAGECONFIG ??= "\ # disable vulkan fo now EXTRA_OEMESON = "-Dvulkan=false" +LDFLAGS_append_mipsarch = " -latomic" +LDFLAGS_append_x86 = " -latomic" + PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 23:25:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:25:58 +0000 Subject: [oe-commits] [meta-openembedded] 02/06: mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] In-Reply-To: <158431475656.22965.18036406638817004541@git.openembedded.org> References: <158431475656.22965.18036406638817004541@git.openembedded.org> Message-ID: <20200315232557.1710F234137@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 8e0af1dcaabb9384e648303f60bedc3db82968a8 Author: Andreas M?ller AuthorDate: Sat Mar 14 23:04:40 2020 +0100 mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb index 7979802..c90559c 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb @@ -52,7 +52,7 @@ PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_bac PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" -PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" +PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire-0.2" PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 23:25:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:25:56 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (07f818e -> 2f8ad44) Message-ID: <158431475656.22965.18036406638817004541@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 07f818e mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] new 0ea5b0d pipewire: Link with libatomic on mips/i*86 new 8e0af1d mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] new 7c93eb3 xxhash: upgrade 0.7.2 -> 0.7.3 new 2d2d54a ddrescue: upgrade 1.24 -> 1.25 new 623efed flashrom: upgrade 1.1 -> 1.2 new 2f8ad44 ostree: upgrade 2020.2 -> 2020.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 (07f818e) \ N -- N -- N refs/heads/master-next (2f8ad44) 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-oe/recipes-bsp/flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} | 4 ++-- .../recipes-extended/ddrescue/{ddrescue_1.24.bb => ddrescue_1.25.bb} | 4 ++-- .../recipes-extended/ostree/{ostree_2020.2.bb => ostree_2020.3.bb} | 2 +- meta-oe/recipes-multimedia/pipewire/pipewire_git.bb | 3 +++ meta-oe/recipes-support/xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) rename meta-oe/recipes-bsp/flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} (77%) rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.24.bb => ddrescue_1.25.bb} (90%) rename meta-oe/recipes-extended/ostree/{ostree_2020.2.bb => ostree_2020.3.bb} (99%) rename meta-oe/recipes-support/xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} (78%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 23:25:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:25:59 +0000 Subject: [oe-commits] [meta-openembedded] 03/06: xxhash: upgrade 0.7.2 -> 0.7.3 In-Reply-To: <158431475656.22965.18036406638817004541@git.openembedded.org> References: <158431475656.22965.18036406638817004541@git.openembedded.org> Message-ID: <20200315232557.23B8A234138@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7c93eb3d029ba8956f1aa6ac7a6bcb0a98ac6b13 Author: Pierre-Jean Texier AuthorDate: Sun Mar 15 14:11:24 2020 +0100 xxhash: upgrade 0.7.2 -> 0.7.3 License-Update: change link to https -BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) +BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php) See full changelog https://github.com/Cyan4973/xxHash/releases/tag/v0.7.3 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-support/xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb b/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb similarity index 78% rename from meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb rename to meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb index df106e4..865adc5 100644 --- a/meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb +++ b/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb @@ -3,12 +3,12 @@ DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ working at speeds close to RAM limits." HOMEPAGE = "http://www.xxhash.com/" LICENSE = "BSD-2-Clause & GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3511a67991a5923907dff2ed268026" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01a7eba4212ef1e882777a38585e7a9b" SRC_URI = "git://github.com/Cyan4973/xxHash.git" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" -SRCREV = "e2f4695899e831171ecd2e780078474712ea61d3" +SRCREV = "d408e9b0606d07b1ddc5452ffc0ec8512211b174" 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 Mar 15 23:26:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:26:00 +0000 Subject: [oe-commits] [meta-openembedded] 04/06: ddrescue: upgrade 1.24 -> 1.25 In-Reply-To: <158431475656.22965.18036406638817004541@git.openembedded.org> References: <158431475656.22965.18036406638817004541@git.openembedded.org> Message-ID: <20200315232557.3469B23415D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2d2d54ab9b5ad42a4e3af8d8f7216fdb4ca0ad11 Author: Pierre-Jean Texier AuthorDate: Sun Mar 15 14:11:25 2020 +0100 ddrescue: upgrade 1.24 -> 1.25 See changelog https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../recipes-extended/ddrescue/{ddrescue_1.24.bb => ddrescue_1.25.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb similarity index 90% rename from meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb rename to meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb index 52bd11b..cf24354 100644 --- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb +++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz" -SRC_URI[md5sum] = "8ac89f833c0df221723e33b447e230fe" -SRC_URI[sha256sum] = "4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087" +SRC_URI[md5sum] = "99fd7a28bf9953d88534c7ee9ab5bd2a" +SRC_URI[sha256sum] = "ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063" # This isn't already added by base.bbclass do_unpack[depends] += "lzip-native:do_populate_sysroot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 23:26:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:26:02 +0000 Subject: [oe-commits] [meta-openembedded] 06/06: ostree: upgrade 2020.2 -> 2020.3 In-Reply-To: <158431475656.22965.18036406638817004541@git.openembedded.org> References: <158431475656.22965.18036406638817004541@git.openembedded.org> Message-ID: <20200315232557.4C8C7234160@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2f8ad447a47c0a548144a0e527612522fda3ea1f Author: Alex Kiernan AuthorDate: Sun Mar 15 16:47:06 2020 +0000 ostree: upgrade 2020.2 -> 2020.3 Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- meta-oe/recipes-extended/ostree/{ostree_2020.2.bb => ostree_2020.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2020.2.bb b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb similarity index 99% rename from meta-oe/recipes-extended/ostree/ostree_2020.2.bb rename to meta-oe/recipes-extended/ostree/ostree_2020.3.bb index 78f4cf5..43021c5 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2020.2.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://run-ptest \ " -SRCREV = "c6085ebd5e27da35f43165eb614190665468f13a" +SRCREV = "6ed48234ba579ff73eb128af237212b0a00f2057" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 23:26:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:26:01 +0000 Subject: [oe-commits] [meta-openembedded] 05/06: flashrom: upgrade 1.1 -> 1.2 In-Reply-To: <158431475656.22965.18036406638817004541@git.openembedded.org> References: <158431475656.22965.18036406638817004541@git.openembedded.org> Message-ID: <20200315232557.413B223415F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 623efedc70c8f2ced0e61c2f2ca7426acefecfea Author: Pierre-Jean Texier AuthorDate: Sun Mar 15 14:11:26 2020 +0100 flashrom: upgrade 1.1 -> 1.2 Signed-off-by: Pierre-Jean Texier 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 Sun Mar 15 23:37:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:37:08 +0000 Subject: [oe-commits] [meta-openembedded] 01/04: xxhash: upgrade 0.7.2 -> 0.7.3 In-Reply-To: <158431542758.25368.10328591821860448702@git.openembedded.org> References: <158431542758.25368.10328591821860448702@git.openembedded.org> Message-ID: <20200315233707.C7B51234136@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ade451ca96bf8b51fda65c68d4f701519ceef13c Author: Pierre-Jean Texier AuthorDate: Sun Mar 15 14:11:24 2020 +0100 xxhash: upgrade 0.7.2 -> 0.7.3 License-Update: change link to https -BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) +BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php) See full changelog https://github.com/Cyan4973/xxHash/releases/tag/v0.7.3 Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-support/xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb b/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb similarity index 78% rename from meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb rename to meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb index df106e4..865adc5 100644 --- a/meta-oe/recipes-support/xxhash/xxhash_0.7.2.bb +++ b/meta-oe/recipes-support/xxhash/xxhash_0.7.3.bb @@ -3,12 +3,12 @@ DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ working at speeds close to RAM limits." HOMEPAGE = "http://www.xxhash.com/" LICENSE = "BSD-2-Clause & GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3511a67991a5923907dff2ed268026" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01a7eba4212ef1e882777a38585e7a9b" SRC_URI = "git://github.com/Cyan4973/xxHash.git" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" -SRCREV = "e2f4695899e831171ecd2e780078474712ea61d3" +SRCREV = "d408e9b0606d07b1ddc5452ffc0ec8512211b174" 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 Mar 15 23:37:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:37:07 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (2f8ad44 -> 7f673e2) Message-ID: <158431542758.25368.10328591821860448702@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 2f8ad44 ostree: upgrade 2020.2 -> 2020.3 discard 623efed flashrom: upgrade 1.1 -> 1.2 discard 2d2d54a ddrescue: upgrade 1.24 -> 1.25 discard 7c93eb3 xxhash: upgrade 0.7.2 -> 0.7.3 discard 8e0af1d mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] discard 0ea5b0d pipewire: Link with libatomic on mips/i*86 discard dbcafa6 pipewire: upgrade 0.2.7 -> 0.3.1 new ade451c xxhash: upgrade 0.7.2 -> 0.7.3 new 2d3c7ff ddrescue: upgrade 1.24 -> 1.25 new c8a84d2 flashrom: upgrade 1.1 -> 1.2 new 7f673e2 ostree: upgrade 2020.2 -> 2020.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 (2f8ad44) \ N -- N -- N refs/heads/master-next (7f673e2) 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-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- .../pipewire/pipewire-0.2_git.bb | 65 ---------------------- .../recipes-multimedia/pipewire/pipewire_git.bb | 35 ++++-------- 3 files changed, 12 insertions(+), 90 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 23:37:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:37:09 +0000 Subject: [oe-commits] [meta-openembedded] 02/04: ddrescue: upgrade 1.24 -> 1.25 In-Reply-To: <158431542758.25368.10328591821860448702@git.openembedded.org> References: <158431542758.25368.10328591821860448702@git.openembedded.org> Message-ID: <20200315233707.D5CBF234137@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2d3c7ffae7af08ee186126428d731102bb554de9 Author: Pierre-Jean Texier AuthorDate: Sun Mar 15 14:11:25 2020 +0100 ddrescue: upgrade 1.24 -> 1.25 See changelog https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../recipes-extended/ddrescue/{ddrescue_1.24.bb => ddrescue_1.25.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb similarity index 90% rename from meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb rename to meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb index 52bd11b..cf24354 100644 --- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.24.bb +++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.25.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ file://main_common.cc;beginline=5;endline=16;md5=3ec288b2676528cd2b069364e313016f" SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz" -SRC_URI[md5sum] = "8ac89f833c0df221723e33b447e230fe" -SRC_URI[sha256sum] = "4b5d3feede70e3657ca6b3c7844f23131851cbb6af0cecc9721500f7d7021087" +SRC_URI[md5sum] = "99fd7a28bf9953d88534c7ee9ab5bd2a" +SRC_URI[sha256sum] = "ce538ebd26a09f45da67d3ad3f7431932428231ceec7a2d255f716fa231a1063" # This isn't already added by base.bbclass do_unpack[depends] += "lzip-native:do_populate_sysroot" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Sun Mar 15 23:37:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:37:10 +0000 Subject: [oe-commits] [meta-openembedded] 03/04: flashrom: upgrade 1.1 -> 1.2 In-Reply-To: <158431542758.25368.10328591821860448702@git.openembedded.org> References: <158431542758.25368.10328591821860448702@git.openembedded.org> Message-ID: <20200315233707.E627D234138@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c8a84d27ccfa6a4f549a24d3f3db743cd596504d Author: Pierre-Jean Texier AuthorDate: Sun Mar 15 14:11:26 2020 +0100 flashrom: upgrade 1.1 -> 1.2 Signed-off-by: Pierre-Jean Texier 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 Sun Mar 15 23:37:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Sun, 15 Mar 2020 23:37:11 +0000 Subject: [oe-commits] [meta-openembedded] 04/04: ostree: upgrade 2020.2 -> 2020.3 In-Reply-To: <158431542758.25368.10328591821860448702@git.openembedded.org> References: <158431542758.25368.10328591821860448702@git.openembedded.org> Message-ID: <20200315233707.F3C8623415D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7f673e2133623a43f307c70444a2de74b40ce53c Author: Alex Kiernan AuthorDate: Sun Mar 15 16:47:06 2020 +0000 ostree: upgrade 2020.2 -> 2020.3 Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- meta-oe/recipes-extended/ostree/{ostree_2020.2.bb => ostree_2020.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/ostree/ostree_2020.2.bb b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb similarity index 99% rename from meta-oe/recipes-extended/ostree/ostree_2020.2.bb rename to meta-oe/recipes-extended/ostree/ostree_2020.3.bb index 78f4cf5..43021c5 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2020.2.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2020.3.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://run-ptest \ " -SRCREV = "c6085ebd5e27da35f43165eb614190665468f13a" +SRCREV = "6ed48234ba579ff73eb128af237212b0a00f2057" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 01:06:33 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 01:06:33 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (f5d2bf5 -> 802f912) Message-ID: <158432079353.16258.1685989198380244473@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 f5d2bf5 python3-packaging: upgrade 20.0 -> 20.3 add d178745 conf/layer.conf: add BBFILES_DYNAMIC and dynamic layers add f83f29a python3-cycler: add recipe for 0.10.0 add 9047a1d python3-kiwisolver: add recipe for version 1.1.0 add 721f234 libcamera: Added the meta multimedia packagegroup in libcamera image add 6ce0a9c openjpeg: Fix CVE-2020-6851 add ebcd510 python3-pycryptodomex: add 3.9.4 recipe add dc426d1 xfce4-clipman-plugin: upgrade 1.4.3 -> 1.4.4 add 2145fad xfce4-whiskermenu-plugin: upgrade 2.4.2 -> 2.4.3 add a12959c xfce4-power-manager: upgrade 1.6.5 -> 1.6.6 add e331ce0 nodejs: install gen-regexp-special-case only when icu is enabled add a76744d cryptsetup: upgrade 2.3.0 -> 2.3.1 add d104def fio: disable compiler optimizations for x86 arch add f5fdeea sysdig: Use luajit and build fixes on aarch64 add 93d67b3 iwd: upgrade 1.4 -> 1.5 add be88786 libqmi: upgrade 1.24.4 -> 1.24.6 add 96d703b python3-kconfiglib: upgrade 13.7.0 -> 14.1.0 add 887ad76 python-requests: upgrade 2.22 -> 2.23 add 99793be postgresql: 12.1 -> 12.2 add 3e047ed sg3-utils: upgrade 1.44 -> 1.45 add ade451c xxhash: upgrade 0.7.2 -> 0.7.3 add 2d3c7ff ddrescue: upgrade 1.24 -> 1.25 add c8a84d2 flashrom: upgrade 1.1 -> 1.2 add 7f673e2 ostree: upgrade 2020.2 -> 2020.3 new 802f912 flashrom: Fix build with clang 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: .../images/multimedia-libcamera-image.bb | 2 +- meta-oe/conf/layer.conf | 5 + .../speedtest-cli/speedtest-cli_2.1.2.bb | 0 .../meta-python}/recipes-bsp/rwmem/rwmem_1.2.bb | 0 ...x-build-on-32bit-arches-with-64bit-time_t.patch | 0 .../recipes-connectivity/lirc/lirc/lirc.tmpfiles | 0 .../lirc/lirc/lirc_options.conf | 0 .../recipes-connectivity/lirc/lirc/lircd.conf | 0 .../recipes-connectivity/lirc/lirc/lircd.init | 0 .../recipes-connectivity/lirc/lirc/lircd.service | 0 .../recipes-connectivity/lirc/lirc/lircexec.init | 0 .../recipes-connectivity/lirc/lirc/pollfd.patch | 0 .../recipes-connectivity/lirc/lirc_0.9.4d.bb | 0 .../packagegroups/packagegroup-meta-oe.bb | 0 ...FPMathLib20U1-Check-for-__DEFINED_wchar_t.patch | 0 ...-strerror_r-implementation-glibc-specific.patch | 0 ...001-Support-deprecated-resolver-functions.patch | 0 ...to-use-build-settings-from-environment-va.patch | 0 ...__-to-control-use-of-gnu_get_libc_version.patch | 0 .../0001-Use-long-long-instead-of-int64_t.patch | 0 ...001-asio-Dont-use-experimental-with-clang.patch | 0 ...finition-for-the-macro-__ELF_NATIVE_CLASS.patch | 0 .../0002-Fix-default-stack-size-to-256K.patch | 0 .../mongodb/0003-Fix-unknown-prefix-env.patch | 0 .../0004-wiredtiger-Disable-strtouq-on-musl.patch | 0 .../mongodb/mongodb/arm64-support.patch | 0 .../recipes-dbs/mongodb/mongodb_git.bb | 0 ...l-build-fix-port-internal-make-dependenci.patch | 0 ...-Include-limits.h-for-PATH_MAX-definition.patch | 0 .../0003-Fix-non-x86-platforms-on-musl.patch | 0 .../recipes-extended/lcdproc/lcdproc_git.bb | 0 .../mozjs/mozjs/0001-Port-build-to-python3.patch | 0 ...-not-include-RequiredDefines.h-for-depend.patch | 0 ...003-fix-cross-compilation-on-i586-targets.patch | 0 .../0004-do-not-create-python-environment.patch | 0 .../mozjs/mozjs/0005-fix-cannot-find-link.patch | 0 ...workaround-autoconf-2.13-detection-failed.patch | 0 .../mozjs/0007-fix-do_compile-failed-on-mips.patch | 0 .../mozjs/mozjs/0008-add-riscv-support.patch | 0 .../0009-mozjs-fix-coredump-caused-by-getenv.patch | 0 .../mozjs/mozjs/0010-format-overflow.patch | 0 .../mozjs/0011-To-fix-build-error-on-arm32BE.patch | 0 .../mozjs/mozjs/0012-JS_PUBLIC_API.patch | 0 .../0013-riscv-Disable-atomic-operations.patch | 0 .../mozjs/0014-fallback-to-2011-C++-standard.patch | 0 ...1-fix-compiling-failure-on-mips64-n32-bsp.patch | 0 .../mozjs/mozjs/musl/0001-support-musl.patch | 0 .../mozjs/musl/0002-js-Fix-build-with-musl.patch | 0 .../recipes-extended/mozjs/mozjs_60.9.0.bb | 0 ...mem-fix-support-for-source-option-python3.patch | 0 .../meta-python}/recipes-support/smem/smem_1.5.bb | 0 meta-oe/recipes-benchmark/fio/fio_3.17.bb | 1 + ...0001-typecast-enum-conversions-explicitly.patch | 69 ++++ .../flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} | 5 +- .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ---- .../iwd/{iwd_1.4.bb => iwd_1.5.bb} | 10 +- .../libqmi/{libqmi_1.24.4.bb => libqmi_1.24.6.bb} | 4 +- .../{cryptsetup_2.3.0.bb => cryptsetup_2.3.1.bb} | 4 +- meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb | 12 - meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb | 12 + meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 4 +- .../{ddrescue_1.24.bb => ddrescue_1.25.bb} | 4 +- .../ostree/{ostree_2020.2.bb => ostree_2020.3.bb} | 2 +- .../recipes-extended/sysdig/sysdig/aarch64.patch | 359 +++++++++++++++++++++ meta-oe/recipes-extended/sysdig/sysdig_git.bb | 3 +- .../openjpeg/openjpeg/CVE-2020-6851.patch | 32 ++ .../recipes-graphics/openjpeg/openjpeg_2.3.1.bb | 1 + .../{sg3-utils_1.44.bb => sg3-utils_1.45.bb} | 4 +- .../xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} | 4 +- .../recipes-devtools/python/python-kconfiglib.inc | 4 +- .../recipes-devtools/python/python-requests.inc | 6 +- .../python/python3-cycler_0.10.0.bb | 16 + ...glib_13.7.0.bb => python3-kconfiglib_14.1.0.bb} | 0 .../python/python3-kiwisolver_1.1.0.bb | 16 + ...yptodome.inc => python3-pycryptodomex_3.9.4.bb} | 9 +- ...quests_2.22.0.bb => python3-requests_2.23.0.bb} | 0 ...ugin_1.4.3.bb => xfce4-clipman-plugin_1.4.4.bb} | 4 +- ..._2.4.2.bb => xfce4-whiskermenu-plugin_2.4.3.bb} | 4 +- ...nager_1.6.5.bb => xfce4-power-manager_1.6.6.bb} | 4 +- 79 files changed, 550 insertions(+), 112 deletions(-) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-bsp/rwmem/rwmem_1.2.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lirc.tmpfiles (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lirc_options.conf (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.conf (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.init (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircd.service (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/lircexec.init (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc/pollfd.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-connectivity/lirc/lirc_0.9.4d.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-core/packagegroups/packagegroup-meta-oe.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb/arm64-support.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-dbs/mongodb/mongodb_git.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/lcdproc/lcdproc_git.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0001-Port-build-to-python3.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0002-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0003-fix-cross-compilation-on-i586-targets.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0004-do-not-create-python-environment.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0005-fix-cannot-find-link.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0006-workaround-autoconf-2.13-detection-failed.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0007-fix-do_compile-failed-on-mips.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0008-add-riscv-support.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0009-mozjs-fix-coredump-caused-by-getenv.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0010-format-overflow.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0011-To-fix-build-error-on-arm32BE.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0012-JS_PUBLIC_API.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0013-riscv-Disable-atomic-operations.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/0014-fallback-to-2011-C++-standard.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/musl/0001-support-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs/musl/0002-js-Fix-build-with-musl.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-extended/mozjs/mozjs_60.9.0.bb (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-support/smem/smem/0001-smem-fix-support-for-source-option-python3.patch (100%) rename meta-oe/{ => dynamic-layers/meta-python}/recipes-support/smem/smem_1.5.bb (100%) create mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch rename meta-oe/recipes-bsp/flashrom/{flashrom_1.1.bb => flashrom_1.2.bb} (70%) delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch rename meta-oe/recipes-connectivity/iwd/{iwd_1.4.bb => iwd_1.5.bb} (85%) rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.4.bb => libqmi_1.24.6.bb} (85%) rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.3.0.bb => cryptsetup_2.3.1.bb} (96%) delete mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_12.1.bb create mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_12.2.bb rename meta-oe/recipes-extended/ddrescue/{ddrescue_1.24.bb => ddrescue_1.25.bb} (90%) rename meta-oe/recipes-extended/ostree/{ostree_2020.2.bb => ostree_2020.3.bb} (99%) create mode 100644 meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch rename meta-oe/recipes-support/sg3-utils/{sg3-utils_1.44.bb => sg3-utils_1.45.bb} (81%) rename meta-oe/recipes-support/xxhash/{xxhash_0.7.2.bb => xxhash_0.7.3.bb} (78%) create mode 100644 meta-python/recipes-devtools/python/python3-cycler_0.10.0.bb rename meta-python/recipes-devtools/python/{python3-kconfiglib_13.7.0.bb => python3-kconfiglib_14.1.0.bb} (100%) create mode 100644 meta-python/recipes-devtools/python/python3-kiwisolver_1.1.0.bb copy meta-python/recipes-devtools/python/{python-pycryptodome.inc => python3-pycryptodomex_3.9.4.bb} (65%) rename meta-python/recipes-devtools/python/{python3-requests_2.22.0.bb => python3-requests_2.23.0.bb} (100%) rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.4.3.bb => xfce4-clipman-plugin_1.4.4.bb} (76%) rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_2.4.2.bb => xfce4-whiskermenu-plugin_2.4.3.bb} (66%) rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.6.5.bb => xfce4-power-manager_1.6.6.bb} (89%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 01:06:34 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 01:06:34 +0000 Subject: [oe-commits] [meta-openembedded] 01/01: flashrom: Fix build with clang In-Reply-To: <158432079353.16258.1685989198380244473@git.openembedded.org> References: <158432079353.16258.1685989198380244473@git.openembedded.org> Message-ID: <20200316010634.1B809234136@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 802f9127b17e730032803adefdc2237426adbd8b Author: Khem Raj AuthorDate: Sun Mar 15 17:05:07 2020 -0700 flashrom: Fix build with clang Signed-off-by: Khem Raj --- ...0001-typecast-enum-conversions-explicitly.patch | 69 ++++++++++++++++++++++ meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb | 1 + 2 files changed, 70 insertions(+) diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch new file mode 100644 index 0000000..7ac5365 --- /dev/null +++ b/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch @@ -0,0 +1,69 @@ +From 8a236330f2af56bde21e9f69208ea3e59f529f0c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 15 Mar 2020 17:02:30 -0700 +Subject: [PATCH] typecast enum conversions explicitly + +clang complains like below + +libflashrom.c:191:43: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] + supported_boards[i].working = binfo[i].working; + ~ ~~~~~~~~~^~~~~~~ +libflashrom.c:229:46: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] + supported_chipsets[i].status = chipset[i].status; + ~ ~~~~~~~~~~~^~~~~~ + +However these enums are exactly same so they can be typecasted + +libflashrom.h + +/** @ingroup flashrom-query */ +enum flashrom_test_state { + FLASHROM_TESTED_OK = 0, + FLASHROM_TESTED_NT = 1, + FLASHROM_TESTED_BAD = 2, + FLASHROM_TESTED_DEP = 3, + FLASHROM_TESTED_NA = 4, +}; + +flash.h + +enum test_state { + OK = 0, + NT = 1, /* Not tested */ + BAD, /* Known to not work */ + DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ + NA, /* Not applicable (e.g. write support on ROM chips) */ + }; + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + libflashrom.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libflashrom.c b/libflashrom.c +index 0dec22e..7956685 100644 +--- a/libflashrom.c ++++ b/libflashrom.c +@@ -188,7 +188,7 @@ struct flashrom_board_info *flashrom_supported_boards(void) + for (; i < boards_known_size; ++i) { + supported_boards[i].vendor = binfo[i].vendor; + supported_boards[i].name = binfo[i].name; +- supported_boards[i].working = binfo[i].working; ++ supported_boards[i].working = (enum flashrom_test_state)binfo[i].working; + } + } else { + msg_gerr("Memory allocation error!\n"); +@@ -226,7 +226,7 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) + supported_chipsets[i].chipset = chipset[i].device_name; + supported_chipsets[i].vendor_id = chipset[i].vendor_id; + supported_chipsets[i].chipset_id = chipset[i].device_id; +- supported_chipsets[i].status = chipset[i].status; ++ supported_chipsets[i].status = (enum flashrom_test_state)chipset[i].status; + } + } else { + msg_gerr("Memory allocation error!\n"); +-- +2.25.1 + diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb index 17445ac..642cec1 100644 --- a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb +++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pciutils libusb libusb-compat" SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ + file://0001-typecast-enum-conversions-explicitly.patch \ " SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 02:09:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 02:09:55 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (7f673e2 -> 802f912) Message-ID: <158432459537.5625.9467788941865821077@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 7f673e2 ostree: upgrade 2020.2 -> 2020.3 add 802f912 flashrom: Fix build with clang No new revisions were added by this update. Summary of changes: ...0001-typecast-enum-conversions-explicitly.patch | 69 ++++++++++++++++++++++ meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb | 1 + 2 files changed, 70 insertions(+) create mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:10 +0000 Subject: [oe-commits] [openembedded-core] 01/15: yocto-uninative.inc: version 2.8 updates glibc to 2.31 In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.31AA8234138@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 2da4ee30335d0b127b79a6eedad68c8559606c57 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 (cherry picked from commit ccb374c279b260b1fd3460f6bfd1567240816055) Signed-off-by: Armin Kuster --- 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 Mon Mar 16 16:45:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:12 +0000 Subject: [oe-commits] [openembedded-core] 03/15: cve-check: fail gracefully when file not found In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.48EA923415F@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 d313a5912d2ecbf7796e75ee7e7cd1d442b4fa40 Author: Armin Kuster AuthorDate: Wed Dec 11 08:16:04 2019 -0800 cve-check: fail gracefully when file not found With out these changes, a traceback displayed when a file is listed in the SRC_URI but the file does not exist. raise FileNotFoundError and print the patch then mark the task as failed. Signed-off-by: Armin Kuster Signed-off-by: Ross Burton (cherry picked from commit d4926c11a4ab9148bdb640a9367c9e1891491a5b) Signed-off-by: Armin Kuster --- meta/classes/cve-check.bbclass | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 01b3637..7412436 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -52,7 +52,10 @@ python do_cve_check () { """ if os.path.exists(d.getVar("CVE_CHECK_DB_FILE")): - patched_cves = get_patches_cves(d) + try: + patched_cves = get_patches_cves(d) + except FileNotFoundError: + bb.fatal("Failure in searching patches") patched, unpatched = check_cves(d, patched_cves) if patched or unpatched: cve_data = get_cve_info(d, patched + unpatched) @@ -129,6 +132,10 @@ def get_patches_cves(d): for url in src_patches(d): patch_file = bb.fetch.decodeurl(url)[2] + if not os.path.isfile(patch_file): + bb.error("File Not found: %s" % patch_file) + raise FileNotFoundError + # Check patch file name for CVE ID fname_match = cve_file_name_match.search(patch_file) if fname_match: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:11 +0000 Subject: [oe-commits] [openembedded-core] 02/15: linux-yocto/5.2: backport perf build fix for latest binutils In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.3B37023415D@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 fb3a4c0ef61ca9b6313d4fdc6e2b28d415780dc7 Author: Bruce Ashfield AuthorDate: Wed Mar 4 09:55:21 2020 -0500 linux-yocto/5.2: backport perf build fix for latest binutils [ Author: Changbin Du Date: Tue Jan 28 23:29:38 2020 +0800 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 Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 14a338dbbe2da5a022a916081b3aab9c7472c3ce) Signed-off-by: Armin Kuster --- meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 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 441545f..a23a5e6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b18bde6f0d8d1a5710cec9792372c03543cf0be9" +SRCREV_machine ?= "78e147f949b5b18524aa7bd72f1cc8f7ae8039f8" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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 6d49e00..ac9904f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "ed1c3b7ad8221ba4e20ce7e4e4f6a73afd5015d4" -SRCREV_machine ?= "c926964d00caf714f42878535af8c7374452072d" +SRCREV_machine_qemuarm ?= "e0a3a01b24070b15121e938ea19755091bf0d662" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" 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 44516dc..eab142e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -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_machine_qemuarm ?= "fdb7cd1bb5e4238e5b3d120ce9db31119ec2b5ee" +SRCREV_machine_qemuarm64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips ?= "eb7faee13cfce200e9add4ba1852a3fe5d8b92e6" +SRCREV_machine_qemuppc ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemuriscv64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemux86-64 ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" +SRCREV_machine_qemumips64 ?= "8e3bfeb7e9b5aa92c5bea941d361ff5b081a2aaa" +SRCREV_machine ?= "73b12de4c879e4569bef3b2d0ee9c783a9788b27" SRCREV_meta ?= "bb2776d6beaae64b1a0fc902b64376f082085498" # remap qemuarm to qemuarma15 for the 5.2 kernel -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:09 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated (c781409 -> d8cfc30) Message-ID: <158437710972.23816.2547680517804315942@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 c781409 linux-yocto/5.2: update to v5.2.32 new 2da4ee3 yocto-uninative.inc: version 2.8 updates glibc to 2.31 new fb3a4c0 linux-yocto/5.2: backport perf build fix for latest binutils new d313a59 cve-check: fail gracefully when file not found new a01bf79 dummy-sdk-package: Add DUMMYPROVIDES_PACKAGES new 29a1d9b wic/engine: lets display an error not a traceback new fdd3d65 gcc-cross-canadian: A missing space in an append caused an invalid option new 9bb270b gcc-cross.inc: Prevent native sysroot from leaking into configargs.h new 0f418fc gcc-target.inc: Prevent sysroot from leaking into configargs.h new b8e6eb4 ruby: fix CVE-2019-16254 new 7235c62 dhcp: Fix REQUIRE(ctx->running) assertion triggered on SIGTERM/SIGINT new 74a1ec4 virglrenderer: fix multiple CVEs new 4281342 maintainers: Add entry for buildtools-extended-tarball new 229bc59 glibc: CVE-2020-10029 new 707b3a4 cve-check: show whitelisted status new d8cfc30 cve-check: fix ValueError 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/cve-check.bbclass | 25 +++- meta/conf/distro/include/maintainers.inc | 1 + meta/conf/distro/include/yocto-uninative.inc | 10 +- ...ext-is-running-prior-to-calling-isc_app_c.patch | 165 +++++++++++++++++++++ ...2-Added-shutdown-log-statment-to-dhcrelay.patch | 29 ++++ .../dhcp/dhcp/0003-Addressed-review-comment.patch | 31 ++++ meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb | 3 + meta/recipes-core/glibc/glibc/CVE-2020-10029.patch | 128 ++++++++++++++++ meta/recipes-core/glibc/glibc_2.30.bb | 1 + meta/recipes-core/meta/dummy-sdk-package.inc | 3 + .../meta/nativesdk-buildtools-perl-dummy.bb | 5 +- .../meta/nativesdk-sdk-provides-dummy.bb | 5 +- .../recipes-core/meta/target-sdk-provides-dummy.bb | 1 - meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 +- meta/recipes-devtools/gcc/gcc-cross.inc | 7 + meta/recipes-devtools/gcc/gcc-runtime.inc | 4 - meta/recipes-devtools/gcc/gcc-target.inc | 8 + .../ruby/ruby/fix-CVE-2019-16254.patch | 106 +++++++++++++ meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + .../virglrenderer/CVE-2019-18390.patch | 66 +++++++++ .../virglrenderer/CVE-2019-18391.patch | 51 +++++++ .../virglrenderer/CVE-2020-8002.patch | 39 +++++ .../virglrenderer/virglrenderer_0.8.0.bb | 3 + meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb | 4 +- meta/recipes-kernel/linux/linux-yocto_5.2.bb | 18 +-- scripts/lib/wic/engine.py | 5 +- 27 files changed, 690 insertions(+), 35 deletions(-) create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch create mode 100644 meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch create mode 100644 meta/recipes-core/glibc/glibc/CVE-2020-10029.patch create mode 100644 meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18390.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:13 +0000 Subject: [oe-commits] [openembedded-core] 04/15: dummy-sdk-package: Add DUMMYPROVIDES_PACKAGES In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.585EF234160@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 a01bf79a35c908d6b072b984608114860b5c1e8f Author: Richard Purdie AuthorDate: Sat Nov 23 14:34:35 2019 +0000 dummy-sdk-package: Add DUMMYPROVIDES_PACKAGES We're about to need to use this variable in the main include file so restructure the users of it to all set it appropriately. Signed-off-by: Richard Purdie (cherry picked from commit 4a247e7c961286cbed73b6dc0f4074ecf856402a) Signed-off-by: Armin Kuster --- meta/recipes-core/meta/dummy-sdk-package.inc | 3 +++ meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb | 5 ++++- meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | 5 ++++- meta/recipes-core/meta/target-sdk-provides-dummy.bb | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc index 4d65370..0d15a37 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc @@ -17,6 +17,9 @@ ALLOW_EMPTY_${PN} = "1" PR[vardeps] += "DUMMYPROVIDES" +DUMMYPROVIDES_PACKAGES ??= "" +DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" + python populate_packages_prepend() { p = d.getVar("PN") d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb index 6a8748a..5bc11b9 100644 --- a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb @@ -1,6 +1,6 @@ DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}" -DUMMYPROVIDES = "\ +DUMMYPROVIDES_PACKAGES = "\ nativesdk-perl \ nativesdk-libxml-parser-perl \ nativesdk-perl-module-bytes \ @@ -21,6 +21,9 @@ DUMMYPROVIDES = "\ nativesdk-perl-module-posix \ nativesdk-perl-module-thread-queue \ nativesdk-perl-module-threads \ +" + +DUMMYPROVIDES = "\ /usr/bin/perl \ " diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index b891efa..29f4dd3 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -1,10 +1,13 @@ DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}" +DUMMYPROVIDES_PACKAGES = "\ + pkgconfig \ +" + # Add /bin/sh? DUMMYPROVIDES = "\ /bin/bash \ /usr/bin/env \ - pkgconfig \ libGL.so()(64bit) \ libGL.so \ " diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb index 87b8bfa..e3beeb7 100644 --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb @@ -48,7 +48,6 @@ DUMMYPROVIDES_PACKAGES = "\ " DUMMYPROVIDES = "\ - ${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])} \ /bin/sh \ /bin/bash \ /usr/bin/env \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:14 +0000 Subject: [oe-commits] [openembedded-core] 05/15: wic/engine: lets display an error not a traceback In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.649BD234161@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 29a1d9bed5bf7ed024870a0323f9afdf88346e4d Author: Armin Kuster AuthorDate: Sun Mar 1 21:39:56 2020 -0800 wic/engine: lets display an error not a traceback If the requested partition does not exist in this request "wic ls {path}:pnum" display a nice message not a trackback Also fix displaying the pnum and not "%s" Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit 15d1722950a22649905cf8a5789d3cfe48a2a892) Signed-off-by: Armin Kuster --- scripts/lib/wic/engine.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 18776fa..4ccca48 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -290,7 +290,7 @@ class Disk: def _get_part_image(self, pnum): if pnum not in self.partitions: - raise WicError("Partition %s is not in the image") + raise WicError("Partition %s is not in the image" % pnum) part = self.partitions[pnum] # check if fstype is supported for fstype in self.fstypes: @@ -313,6 +313,9 @@ class Disk: seek=self.partitions[pnum].start) def dir(self, pnum, path): + if pnum not in self.partitions: + raise WicError("Partition %s is not in the image" % pnum) + if self.partitions[pnum].fstype.startswith('ext'): return exec_cmd("{} {} -R 'ls -l {}'".format(self.debugfs, self._get_part_image(pnum), -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:15 +0000 Subject: [oe-commits] [openembedded-core] 06/15: gcc-cross-canadian: A missing space in an append caused an invalid option In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.70587234172@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 fdd3d65b690c9d460a5758cf1b83e7b2edfc9559 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 (cherry picked from commit 7b52893632dae7bc9ac75dddc7ad625e19f41050) Signed-off-by: Armin Kuster --- 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 Mon Mar 16 16:45:17 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:17 +0000 Subject: [oe-commits] [openembedded-core] 08/15: gcc-target.inc: Prevent sysroot from leaking into configargs.h In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.8790E234174@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 0f418fccab3f67a2afaa28195263d6f24831dd56 Author: Nathan Rossi AuthorDate: Sat Nov 30 10:47:24 2019 +0000 gcc-target.inc: Prevent sysroot from leaking into configargs.h Prevent the full recipe-sysroot path from leaking into configargs.h. The configargs.h header is intended to be static and unchanged as the content is used as a means of determining that a gcc plugin is built for the same gcc. This also effects the output of 'gcc -v'. Due to per recipe sysroots and staging, the sysroot path would be replaced with the sysroot local to the recipe thus changing the content of configargs.h. This change also improves gcc binary reproducibility. The sysroot path is replaced with the base target root "/". Signed-off-by: Nathan Rossi Signed-off-by: Richard Purdie (cherry picked from commit b8d6e2ab68ee5e341fe970b191bfd334e6d2c40b) Signed-off-by: Armin Kuster --- meta/recipes-devtools/gcc/gcc-target.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index bdc6ff6..987e88d 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -137,6 +137,14 @@ FILES_${PN}-doc = "\ " do_compile () { + # Prevent full target sysroot path from being used in configargs.h header, + # as it will be rewritten when used by other sysroots preventing support + # for gcc plugins. Additionally the path is embeddeded into the output + # binary, this prevents building a reproducible binary. + oe_runmake configure-gcc + sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/configargs.h + sed -i 's@${STAGING_DIR_HOST}@/@g' ${B}/gcc/configargs.h + oe_runmake all-host } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:21 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:21 +0000 Subject: [oe-commits] [openembedded-core] 12/15: maintainers: Add entry for buildtools-extended-tarball In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.BAF6C23418C@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 4281342a04078990bb0a110760ff2dc053eccc93 Author: Richard Purdie AuthorDate: Tue Dec 31 11:26:50 2019 +0000 maintainers: Add entry for buildtools-extended-tarball Signed-off-by: Richard Purdie (cherry picked from commit 61d4d3d5a9f27e0fbf1d7ed6db818a779643b8f3) Signed-off-by: Armin Kuster --- meta/conf/distro/include/maintainers.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index ab0c6c5..7494873 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -82,6 +82,7 @@ RECIPE_MAINTAINER_pn-build-appliance-image = "Richard Purdie running) assertion triggered on SIGTERM/SIGINT In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.A3B7B234176@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 7235c62727e48415c4e81f852607311ec31b6e41 Author: Ovidiu Panait AuthorDate: Thu Feb 27 13:45:49 2020 +0200 dhcp: Fix REQUIRE(ctx->running) assertion triggered on SIGTERM/SIGINT Closed a small window of time between the installation of graceful shutdown signal handlers and application context startup, during which the receipt of shutdown signal would cause a REQUIRE() assertion to occur. Note this issue is only visible when compiling with ENABLE_GENTLE_SHUTDOWN defined. Reference: https://gitlab.isc.org/isc-projects/dhcp/issues/53 Upstream patches: https://gitlab.isc.org/isc-projects/dhcp/commit/ce117de7a1ed3c4911b4009c1cc23fba85370a26 https://gitlab.isc.org/isc-projects/dhcp/commit/dbd36dfa82956b53683462afadfabb1b33fa3dd1 https://gitlab.isc.org/isc-projects/dhcp/commit/95944cab6035d20be270eec01254c7bb867ec705 Signed-off-by: Ovidiu Panait Signed-off-by: Anuj Mittal --- ...ext-is-running-prior-to-calling-isc_app_c.patch | 165 +++++++++++++++++++++ ...2-Added-shutdown-log-statment-to-dhcrelay.patch | 29 ++++ .../dhcp/dhcp/0003-Addressed-review-comment.patch | 31 ++++ meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb | 3 + 4 files changed, 228 insertions(+) diff --git a/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch b/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch new file mode 100644 index 0000000..34b2ae1 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0001-Ensure-context-is-running-prior-to-calling-isc_app_c.patch @@ -0,0 +1,165 @@ +From f369dbb9e67eb5ef336944af63039b6d8f838384 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Thu, 12 Sep 2019 10:35:46 -0400 +Subject: [PATCH 1/3] Ensure context is running prior to calling + isc_app_ctxsuspend + +Add a release note. + +includes/omapip/isclib.h + Added actx_running flag to global context, dhcp_gbl_ctx + +omapip/isclib.c + set_ctx_running() - new function used as the ctxonrun callback + + dhcp_context_create() - installs set_ctx_running callback + + dhcp_signal_handler() - modified to use act_running flag to + determine is context is running and should be suspended + +Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] + +Signed-off-by: Ovidiu Panait +--- + RELNOTES | 7 +++++ + includes/omapip/isclib.h | 3 ++- + omapip/isclib.c | 57 +++++++++++++++++++++++++++++++++------- + 3 files changed, 57 insertions(+), 10 deletions(-) + +diff --git a/RELNOTES b/RELNOTES +index f10305d..1730473 100644 +--- a/RELNOTES ++++ b/RELNOTES +@@ -6,6 +6,13 @@ + + NEW FEATURES + ++- Closed a small window of time between the installation of graceful ++ shutdown signal handlers and application context startup, during which ++ the receipt of shutdown signal would cause a REQUIRE() assertion to ++ occur. Note this issue is only visible when compiling with ++ ENABLE_GENTLE_SHUTDOWN defined. ++ [Gitlab #53,!18 git TBD] ++ + Please note that that ISC DHCP is now licensed under the Mozilla Public License, + MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0 + license terms. +diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h +index 6c20584..af6a6fc 100644 +--- a/includes/omapip/isclib.h ++++ b/includes/omapip/isclib.h +@@ -94,7 +94,8 @@ + typedef struct dhcp_context { + isc_mem_t *mctx; + isc_appctx_t *actx; +- int actx_started; ++ int actx_started; // ISC_TRUE if ctxstart has been called ++ int actx_running; // ISC_TRUE if ctxrun has been called + isc_taskmgr_t *taskmgr; + isc_task_t *task; + isc_socketmgr_t *socketmgr; +diff --git a/omapip/isclib.c b/omapip/isclib.c +index ce4b4a1..73e017c 100644 +--- a/omapip/isclib.c ++++ b/omapip/isclib.c +@@ -134,6 +134,35 @@ handle_signal(int sig, void (*handler)(int)) { + } + } + ++/* Callback passed to isc_app_ctxonrun ++ * ++ * BIND9 context code will invoke this handler once the context has ++ * entered the running state. We use it to set a global marker so that ++ * we can tell if the context is running. Several of the isc_app_ ++ * calls REQUIRE that the context is running and we need a way to ++ * know that. ++ * ++ * We also check to see if we received a shutdown signal prior to ++ * the context entering the run state. If we did, then we can just ++ * simply shut the context down now. This closes the relatively ++ * small window between start up and entering run via the call ++ * to dispatch(). ++ * ++ */ ++static void ++set_ctx_running(isc_task_t *task, isc_event_t *event) { ++ task = task; // unused; ++ dhcp_gbl_ctx.actx_running = ISC_TRUE; ++ ++ if (shutdown_signal) { ++ // We got signaled shutdown before we entered running state. ++ // Now that we've reached running state, shut'er down. ++ isc_app_ctxsuspend(dhcp_gbl_ctx.actx); ++ } ++ ++ isc_event_free(&event); ++} ++ + isc_result_t + dhcp_context_create(int flags, + struct in_addr *local4, +@@ -141,6 +170,9 @@ dhcp_context_create(int flags, + isc_result_t result; + + if ((flags & DHCP_CONTEXT_PRE_DB) != 0) { ++ dhcp_gbl_ctx.actx_started = ISC_FALSE; ++ dhcp_gbl_ctx.actx_running = ISC_FALSE; ++ + /* + * Set up the error messages, this isn't the right place + * for this call but it is convienent for now. +@@ -204,15 +236,24 @@ dhcp_context_create(int flags, + if (result != ISC_R_SUCCESS) + goto cleanup; + +- result = isc_task_create(dhcp_gbl_ctx.taskmgr, 0, &dhcp_gbl_ctx.task); ++ result = isc_task_create(dhcp_gbl_ctx.taskmgr, 0, ++ &dhcp_gbl_ctx.task); + if (result != ISC_R_SUCCESS) + goto cleanup; + + result = isc_app_ctxstart(dhcp_gbl_ctx.actx); + if (result != ISC_R_SUCCESS) +- return (result); ++ goto cleanup; ++ + dhcp_gbl_ctx.actx_started = ISC_TRUE; + ++ // Install the onrun callback. ++ result = isc_app_ctxonrun(dhcp_gbl_ctx.actx, dhcp_gbl_ctx.mctx, ++ dhcp_gbl_ctx.task, set_ctx_running, ++ dhcp_gbl_ctx.actx); ++ if (result != ISC_R_SUCCESS) ++ goto cleanup; ++ + /* Not all OSs support suppressing SIGPIPE through socket + * options, so set the sigal action to be ignore. This allows + * broken connections to fail gracefully with EPIPE on writes */ +@@ -335,19 +376,17 @@ isclib_make_dst_key(char *inname, + * @param signal signal code that we received + */ + void dhcp_signal_handler(int signal) { +- isc_appctx_t *ctx = dhcp_gbl_ctx.actx; +- int prev = shutdown_signal; +- +- if (prev != 0) { ++ if (shutdown_signal != 0) { + /* Already in shutdown. */ + return; + } ++ + /* Possible race but does it matter? */ + shutdown_signal = signal; + +- /* Use reload (aka suspend) for easier dispatch() reenter. */ +- if (ctx && ctx->methods && ctx->methods->ctxsuspend) { +- (void) isc_app_ctxsuspend(ctx); ++ /* If the application context is running tell it to shut down */ ++ if (dhcp_gbl_ctx.actx_running == ISC_TRUE) { ++ (void) isc_app_ctxsuspend(dhcp_gbl_ctx.actx); + } + } + +-- +2.23.0 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch b/meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch new file mode 100644 index 0000000..78b2b74 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0002-Added-shutdown-log-statment-to-dhcrelay.patch @@ -0,0 +1,29 @@ +From adcd34ae1f56b16d7e9696d980332b4cf6c7ce91 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Fri, 13 Sep 2019 15:03:31 -0400 +Subject: [PATCH 2/3] Added shutdown log statment to dhcrelay + +Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] + +Signed-off-by: Ovidiu Panait +--- + relay/dhcrelay.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c +index d8caaaf..4bd1d47 100644 +--- a/relay/dhcrelay.c ++++ b/relay/dhcrelay.c +@@ -2076,6 +2076,9 @@ dhcp_set_control_state(control_object_state_t oldstate, + if (newstate != server_shutdown) + return ISC_R_SUCCESS; + ++ /* Log shutdown on signal. */ ++ log_info("Received signal %d, initiating shutdown.", shutdown_signal); ++ + if (no_pid_file == ISC_FALSE) + (void) unlink(path_dhcrelay_pid); + +-- +2.23.0 + diff --git a/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch new file mode 100644 index 0000000..a51b6cf --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch @@ -0,0 +1,31 @@ +From e4b54b4d676783152d487103714cba2913661ef8 Mon Sep 17 00:00:00 2001 +From: Thomas Markwalder +Date: Wed, 6 Nov 2019 15:53:50 -0500 +Subject: [PATCH 3/3] Addressed review comment. + +omapip/isclib.c + Added use of IGNORE_UNUSED() + +Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] + +Signed-off-by: Ovidiu Panait +--- + omapip/isclib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/omapip/isclib.c b/omapip/isclib.c +index 73e017c..1d52463 100644 +--- a/omapip/isclib.c ++++ b/omapip/isclib.c +@@ -151,7 +151,7 @@ handle_signal(int sig, void (*handler)(int)) { + */ + static void + set_ctx_running(isc_task_t *task, isc_event_t *event) { +- task = task; // unused; ++ IGNORE_UNUSED(task); + dhcp_gbl_ctx.actx_running = ISC_TRUE; + + if (shutdown_signal) { +-- +2.23.0 + diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb index 275961a..ddc8b60 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.4.1.bb @@ -11,6 +11,9 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat 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-Ensure-context-is-running-prior-to-calling-isc_app_c.patch \ + file://0002-Added-shutdown-log-statment-to-dhcrelay.patch \ + file://0003-Addressed-review-comment.patch \ " SRC_URI[md5sum] = "18c7f4dcbb0a63df25098216d47b1ede" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:16 +0000 Subject: [oe-commits] [openembedded-core] 07/15: gcc-cross.inc: Prevent native sysroot from leaking into configargs.h In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.7C202234173@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 9bb270b3f12ff94b1541649078741e683020ffe9 Author: Nathan Rossi AuthorDate: Mon Nov 25 06:58:00 2019 +0000 gcc-cross.inc: Prevent native sysroot from leaking into configargs.h Prevent the native(sdk) sysroot path from leaking into configargs.h. The configargs.h header is intended to be static and unchanged as the content is used as a means of determining that a gcc plugin is built for the same gcc. This also effects the output of 'gcc --version'. Due to per recipe sysroots and staging, the sysroot path would be replaced with the sysroot local to the recipe thus changing the content of configargs.h. The sysroot path is replaced with a generic "/host" prefix which represents the host sysroot (e.g. native or nativesdk). Signed-off-by: Nathan Rossi Signed-off-by: Ross Burton (cherry picked from commit 84a78f46d59447eeec3d69532a7506148f64c979) Signed-off-by: Armin Kuster --- meta/recipes-devtools/gcc/gcc-cross.inc | 7 +++++++ meta/recipes-devtools/gcc/gcc-runtime.inc | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 8855bb1..06ba3cc 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -61,6 +61,13 @@ do_compile () { export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" + # Prevent native/host sysroot path from being used in configargs.h header, + # as it will be rewritten when used by other sysroots preventing support + # for gcc plugins + oe_runmake configure-gcc + sed -i 's@${STAGING_DIR_TARGET}@/host at g' ${B}/gcc/configargs.h + sed -i 's@${STAGING_DIR_HOST}@/host at g' ${B}/gcc/configargs.h + oe_runmake all-host configure-target-libgcc (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h) # now generate script to drive testing diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 2da3c02..536b18d 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc @@ -302,10 +302,6 @@ do_check() { # HACK: this works around the configure setting CXX with -nostd* args sed -i 's/-nostdinc++ -nostdlib++//g' $(find ${B} -name testsuite_flags | head -1) - # HACK: this works around the de-stashing changes to configargs.h, as well as recipe-sysroot changing the content - sed -i '/static const char configuration_arguments/d' ${B}/gcc/configargs.h - ${CC} -v 2>&1 | grep "^Configured with:" | \ - sed 's/Configured with: \(.*\)/static const char configuration_arguments[] = "\1";/g' >> ${B}/gcc/configargs.h if [ "${TOOLCHAIN_TEST_TARGET}" = "user" ]; then # qemu user has issues allocating large amounts of memory -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:18 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:18 +0000 Subject: [oe-commits] [openembedded-core] 09/15: ruby: fix CVE-2019-16254 In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.95AAA234175@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 b8e6eb473f3697ab76f30ca8a0abe584d3d10fa6 Author: Rahul Chauhan AuthorDate: Tue Feb 11 19:13:08 2020 +0530 ruby: fix CVE-2019-16254 Signed-off-by: Rahul Chauhan Signed-off-by: Anuj Mittal --- .../ruby/ruby/fix-CVE-2019-16254.patch | 106 +++++++++++++++++++++ meta/recipes-devtools/ruby/ruby_2.5.5.bb | 1 + 2 files changed, 107 insertions(+) diff --git a/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch new file mode 100644 index 0000000..704c850 --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/fix-CVE-2019-16254.patch @@ -0,0 +1,106 @@ +From 18d5289b4579822e391b3f5c16541e6552e9f06c Mon Sep 17 00:00:00 2001 +From: Yusuke Endoh +Date: Tue, 1 Oct 2019 12:29:18 +0900 +Subject: [PATCH] WEBrick: prevent response splitting and header injection + +This is a follow up to d9d4a28f1cdd05a0e8dabb36d747d40bbcc30f16. +The commit prevented CRLR, but did not address an isolated CR or an +isolated LF. + +Upstream-Status: Backport https://github.com/ruby/ruby/commit/3ce238b5f9795581eb84114dcfbdf4aa086bfecc +CVE: CVE-2019-16254 + +Co-Authored-By: NARUSE, Yui +Signed-off-by: Rahul Chauhan +--- + lib/webrick/httpresponse.rb | 3 ++- + test/webrick/test_httpresponse.rb | 46 +++++++++++++++++++++++++++++++++++++-- + 2 files changed, 46 insertions(+), 3 deletions(-) + +diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb +index 6d77692..d26324c 100644 +--- a/lib/webrick/httpresponse.rb ++++ b/lib/webrick/httpresponse.rb +@@ -367,7 +367,8 @@ def set_error(ex, backtrace=false) + private + + def check_header(header_value) +- if header_value =~ /\r\n/ ++ header_value = header_value.to_s ++ if /[\r\n]/ =~ header_value + raise InvalidHeader + else + header_value +diff --git a/test/webrick/test_httpresponse.rb b/test/webrick/test_httpresponse.rb +index 6263e0a..24a6968 100644 +--- a/test/webrick/test_httpresponse.rb ++++ b/test/webrick/test_httpresponse.rb +@@ -29,7 +29,7 @@ def setup + @res.keep_alive = true + end + +- def test_prevent_response_splitting_headers ++ def test_prevent_response_splitting_headers_crlf + res['X-header'] = "malicious\r\nCookie: hack" + io = StringIO.new + res.send_response io +@@ -39,7 +39,7 @@ def test_prevent_response_splitting_headers + refute_match 'hack', io.string + end + +- def test_prevent_response_splitting_cookie_headers ++ def test_prevent_response_splitting_cookie_headers_crlf + user_input = "malicious\r\nCookie: hack" + res.cookies << WEBrick::Cookie.new('author', user_input) + io = StringIO.new +@@ -50,6 +50,48 @@ def test_prevent_response_splitting_cookie_headers + refute_match 'hack', io.string + end + ++ def test_prevent_response_splitting_headers_cr ++ res['X-header'] = "malicious\rCookie: hack" ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_cookie_headers_cr ++ user_input = "malicious\rCookie: hack" ++ res.cookies << WEBrick::Cookie.new('author', user_input) ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_headers_lf ++ res['X-header'] = "malicious\nCookie: hack" ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ ++ def test_prevent_response_splitting_cookie_headers_lf ++ user_input = "malicious\nCookie: hack" ++ res.cookies << WEBrick::Cookie.new('author', user_input) ++ io = StringIO.new ++ res.send_response io ++ io.rewind ++ res = Net::HTTPResponse.read_new(Net::BufferedIO.new(io)) ++ assert_equal '500', res.code ++ refute_match 'hack', io.string ++ end ++ + def test_304_does_not_log_warning + res.status = 304 + res.setup_header +-- +2.7.4 diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb b/meta/recipes-devtools/ruby/ruby_2.5.5.bb index 223b037..58bb97f 100644 --- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb @@ -3,6 +3,7 @@ require ruby.inc SRC_URI += " \ file://0001-configure.ac-check-finite-isinf-isnan-as-macros-firs.patch \ file://run-ptest \ + file://fix-CVE-2019-16254.patch \ " SRC_URI[md5sum] = "7e156fb526b8f4bb1b30a3dd8a7ce400" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:23 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:23 +0000 Subject: [oe-commits] [openembedded-core] 14/15: cve-check: show whitelisted status In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.D642B23415D@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 707b3a41b3cacfb7f1d1ed75f9a298ff4721735e Author: Chee Yang Lee AuthorDate: Fri Mar 6 10:27:26 2020 +0800 cve-check: show whitelisted status change whitelisted CVE status from "Patched" to "Whitelisted". [Yocto #13687] Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie (cherry picked from commit 181bdd670492525f9488d52c3ebb9a1b142e35ea) Signed-off-by: Armin Kuster --- meta/classes/cve-check.bbclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 7412436..7f98da6 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -56,10 +56,10 @@ python do_cve_check () { patched_cves = get_patches_cves(d) except FileNotFoundError: bb.fatal("Failure in searching patches") - patched, unpatched = check_cves(d, patched_cves) + whitelisted, patched, unpatched = check_cves(d, patched_cves) if patched or unpatched: cve_data = get_cve_info(d, patched + unpatched) - cve_write_data(d, patched, unpatched, cve_data) + cve_write_data(d, patched, unpatched, whitelisted, cve_data) else: bb.note("No CVE database found, skipping CVE check") @@ -263,7 +263,7 @@ def check_cves(d, patched_cves): conn.close() - return (list(patched_cves), cves_unpatched) + return (list(cve_whitelist), list(patched_cves), cves_unpatched) def get_cve_info(d, cves): """ @@ -287,7 +287,7 @@ def get_cve_info(d, cves): conn.close() return cve_data -def cve_write_data(d, patched, unpatched, cve_data): +def cve_write_data(d, patched, unpatched, whitelisted, cve_data): """ Write CVE information in WORKDIR; and to CVE_CHECK_DIR, and CVE manifest if enabled. @@ -303,7 +303,9 @@ def cve_write_data(d, patched, unpatched, cve_data): write_string += "PACKAGE NAME: %s\n" % d.getVar("PN") write_string += "PACKAGE VERSION: %s\n" % d.getVar("PV") write_string += "CVE: %s\n" % cve - if cve in patched: + if cve in whitelisted: + write_string += "CVE STATUS: Whitelisted\n" + elif cve in patched: write_string += "CVE STATUS: Patched\n" else: unpatched_cves.append(cve) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:20 +0000 Subject: [oe-commits] [openembedded-core] 11/15: virglrenderer: fix multiple CVEs In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.AF909234187@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 74a1ec4a39fe3b05045c1d60a89393cd25eccb1f Author: Lee Chee Yang AuthorDate: Mon Mar 2 14:32:59 2020 +0800 virglrenderer: fix multiple CVEs fix these CVE: CVE-2019-18390 CVE-2019-18391 CVE-2020-8002 Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- .../virglrenderer/CVE-2019-18390.patch | 66 ++++++++++++++++++++++ .../virglrenderer/CVE-2019-18391.patch | 51 +++++++++++++++++ .../virglrenderer/CVE-2020-8002.patch | 39 +++++++++++++ .../virglrenderer/virglrenderer_0.8.0.bb | 3 + 4 files changed, 159 insertions(+) diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18390.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18390.patch new file mode 100644 index 0000000..ad61c95 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18390.patch @@ -0,0 +1,66 @@ +From 24f67de7a9088a873844a39be03cee6882260ac9 Mon Sep 17 00:00:00 2001 +From: Gert Wollny +Date: Mon, 7 Oct 2019 10:59:56 +0200 +Subject: [PATCH] vrend: check info formats in blits + +Closes #141 +Closes #142 + +v2 : drop colon in error description (Emil) + +Signed-off-by: Gert Wollny +Reviewed-by: Emil Velikov + +Upstream-Status: Backport +[https://gitlab.freedesktop.org/virgl/virglrenderer/commit/24f67de7a9088a873844a39be03cee6882260ac9] +CVE: CVE-2019-18390 +Signed-off-by: Lee Chee Yang +--- + src/virgl_hw.h | 1 + + src/vrend_renderer.c | 11 +++++++++++ + 2 files changed, 12 insertions(+) + +diff --git a/src/virgl_hw.h b/src/virgl_hw.h +index 145780bf..5ccf3073 100644 +--- a/src/virgl_hw.h ++++ b/src/virgl_hw.h +@@ -426,6 +426,7 @@ enum virgl_ctx_errors { + VIRGL_ERROR_CTX_ILLEGAL_CMD_BUFFER, + VIRGL_ERROR_CTX_GLES_HAVE_TES_BUT_MISS_TCS, + VIRGL_ERROR_GL_ANY_SAMPLES_PASSED, ++ VIRGL_ERROR_CTX_ILLEGAL_FORMAT, + }; + + #define VIRGL_RESOURCE_Y_0_TOP (1 << 0) +diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c +index 14fefb38..aa6a89c1 100644 +--- a/src/vrend_renderer.c ++++ b/src/vrend_renderer.c +@@ -758,6 +758,7 @@ static const char *vrend_ctx_error_strings[] = { + [VIRGL_ERROR_CTX_ILLEGAL_CMD_BUFFER] = "Illegal command buffer", + [VIRGL_ERROR_CTX_GLES_HAVE_TES_BUT_MISS_TCS] = "On GLES context and shader program has tesselation evaluation shader but no tesselation control shader", + [VIRGL_ERROR_GL_ANY_SAMPLES_PASSED] = "Query for ANY_SAMPLES_PASSED not supported", ++ [VIRGL_ERROR_CTX_ILLEGAL_FORMAT] = "Illegal format ID", + }; + + static void __report_context_error(const char *fname, struct vrend_context *ctx, +@@ -8492,6 +8493,16 @@ void vrend_renderer_blit(struct vrend_context *ctx, + if (ctx->in_error) + return; + ++ if (!info->src.format || (enum virgl_formats)info->src.format >= VIRGL_FORMAT_MAX) { ++ report_context_error(ctx, VIRGL_ERROR_CTX_ILLEGAL_FORMAT, info->src.format); ++ return; ++ } ++ ++ if (!info->dst.format || (enum virgl_formats)info->dst.format >= VIRGL_FORMAT_MAX) { ++ report_context_error(ctx, VIRGL_ERROR_CTX_ILLEGAL_FORMAT, info->dst.format); ++ return; ++ } ++ + if (info->render_condition_enable == false) + vrend_pause_render_condition(ctx, true); + +-- +2.24.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch new file mode 100644 index 0000000..cc641d8 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2019-18391.patch @@ -0,0 +1,51 @@ +From 2abeb1802e3c005b17a7123e382171b3fb665971 Mon Sep 17 00:00:00 2001 +From: Gert Wollny +Date: Tue, 8 Oct 2019 17:27:01 +0200 +Subject: [PATCH] vrend: check that the transfer iov holds enough data for the + data upload + +Closes #140 + +Signed-off-by: Gert Wollny +Reviewed-by: Emil Velikov + +Upstream-Status: Backport +[https://gitlab.freedesktop.org/virgl/virglrenderer/commit/2abeb1802e3c005b17a7123e382171b3fb665971] +CVE: CVE-2019-18391 +Signed-off-by: Lee Chee Yang +--- + src/vrend_renderer.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c +index 694e1d0e..fe23846b 100644 +--- a/src/vrend_renderer.c ++++ b/src/vrend_renderer.c +@@ -7005,15 +7005,22 @@ static int vrend_renderer_transfer_write_iov(struct vrend_context *ctx, + invert = true; + } + ++ send_size = util_format_get_nblocks(res->base.format, info->box->width, ++ info->box->height) * elsize; ++ if (res->target == GL_TEXTURE_3D || ++ res->target == GL_TEXTURE_2D_ARRAY || ++ res->target == GL_TEXTURE_CUBE_MAP_ARRAY) ++ send_size *= info->box->depth; ++ + if (need_temp) { +- send_size = util_format_get_nblocks(res->base.format, info->box->width, +- info->box->height) * elsize * info->box->depth; + data = malloc(send_size); + if (!data) + return ENOMEM; + read_transfer_data(iov, num_iovs, data, res->base.format, info->offset, + stride, layer_stride, info->box, invert); + } else { ++ if (send_size > iov[0].iov_len - info->offset) ++ return EINVAL; + data = (char*)iov[0].iov_base + info->offset; + } + +-- +2.24.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch new file mode 100644 index 0000000..925f2c8 --- /dev/null +++ b/meta/recipes-graphics/virglrenderer/virglrenderer/CVE-2020-8002.patch @@ -0,0 +1,39 @@ +From 63bcca251f093d83da7e290ab4bbd38ae69089b5 Mon Sep 17 00:00:00 2001 +From: Gert Wollny +Date: Wed, 15 Jan 2020 13:43:58 +0100 +Subject: [PATCH] vrend: Don't try launching a grid if no CS is available + +Closes #155 + +Signed-off-by: Gert Wollny +Reviewed-by: Gurchetan Singh + +Upstream-Status: Backport +[https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/63bcca251f093d83da7e290ab4bbd38ae69089b5.patch] +CVE: CVE-2020-8002 +Signed-off-by: Lee Chee Yang +--- + src/vrend_renderer.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c +index a054bad8..2280fc43 100644 +--- a/src/vrend_renderer.c ++++ b/src/vrend_renderer.c +@@ -4604,6 +4604,13 @@ void vrend_launch_grid(struct vrend_context *ctx, + } + ctx->sub->shader_dirty = true; + } ++ ++ if (!ctx->sub->prog) { ++ vrend_printf("%s: Skipping compute shader execution due to missing shaders: %s\n", ++ __func__, ctx->debug_name); ++ return; ++ } ++ + vrend_use_program(ctx, ctx->sub->prog->id); + + vrend_draw_bind_ubo_shader(ctx, PIPE_SHADER_COMPUTE, 0); +-- +2.24.1 + diff --git a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb index d2b11c1..e91ccc6 100644 --- a/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb +++ b/meta/recipes-graphics/virglrenderer/virglrenderer_0.8.0.bb @@ -8,6 +8,9 @@ DEPENDS = "libdrm mesa libepoxy" SRCREV = "48cc96c9aebb9d0164830a157efc8916f08f00c0" SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ file://0001-gallium-Expand-libc-check-to-be-platform-OS-check.patch \ + file://CVE-2019-18390.patch \ + file://CVE-2019-18391.patch \ + file://CVE-2020-8002.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 Mar 16 16:45:24 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:24 +0000 Subject: [oe-commits] [openembedded-core] 15/15: cve-check: fix ValueError In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.E1C94234137@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 d8cfc309f9dd0dc8904ab18e5898770502ee2540 Author: Chee Yang Lee AuthorDate: Mon Mar 9 12:57:03 2020 +0800 cve-check: fix ValueError fix below error for whitelisted recipe and recipe skip cve check. Error: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: 0001: *** 0002:do_cve_check(d) 0003: File: '/poky-master/meta/classes/cve-check.bbclass', lineno: 59, function: do_cve_check 0055: try: 0056: patched_cves = get_patches_cves(d) 0057: except FileNotFoundError: 0058: bb.fatal("Failure in searching patches") *** 0059: whitelisted, patched, unpatched = check_cves(d, patched_cves) 0060: if patched or unpatched: 0061: cve_data = get_cve_info(d, patched + unpatched) 0062: cve_write_data(d, patched, unpatched, whitelisted, cve_data) 0063: else: Exception: ValueError: not enough values to unpack (expected 3, got 2) Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie (cherry picked from commit 64a362bd2dd0b4f3165d5162adbc600826af66f8) Signed-off-by: Armin Kuster --- meta/classes/cve-check.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 7f98da6..5d84b93 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -179,13 +179,13 @@ def check_cves(d, patched_cves): products = d.getVar("CVE_PRODUCT").split() # If this has been unset then we're not scanning for CVEs here (for example, image recipes) if not products: - return ([], []) + return ([], [], []) pv = d.getVar("CVE_VERSION").split("+git")[0] # If the recipe has been whitlisted we return empty lists if d.getVar("PN") in d.getVar("CVE_CHECK_PN_WHITELIST").split(): bb.note("Recipe has been whitelisted, skipping check") - return ([], []) + return ([], [], []) old_cve_whitelist = d.getVar("CVE_CHECK_CVE_WHITELIST") if old_cve_whitelist: -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Mon Mar 16 16:45:22 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Mon, 16 Mar 2020 16:45:22 +0000 Subject: [oe-commits] [openembedded-core] 13/15: glibc: CVE-2020-10029 In-Reply-To: <158437710972.23816.2547680517804315942@git.openembedded.org> References: <158437710972.23816.2547680517804315942@git.openembedded.org> Message-ID: <20200316164510.C958B234138@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 229bc59863265433121656b57320d90808f6569e Author: Zhixiong Chi AuthorDate: Mon Mar 9 00:43:44 2020 -0700 glibc: CVE-2020-10029 Backport the CVE patch from upstream: [https://sourceware.org/git/gitweb.cgi?p=glibc.git; a=patch;h=9333498794cde1d5cca518badf79533a24114b6f] Signed-off-by: Zhixiong Chi Signed-off-by: Armin Kuster --- meta/recipes-core/glibc/glibc/CVE-2020-10029.patch | 128 +++++++++++++++++++++ meta/recipes-core/glibc/glibc_2.30.bb | 1 + 2 files changed, 129 insertions(+) diff --git a/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch b/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch new file mode 100644 index 0000000..606b691 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2020-10029.patch @@ -0,0 +1,128 @@ +From ce265ec5bc25ec35fba53807abac1b0c8469895e Mon Sep 17 00:00:00 2001 +From: Joseph Myers +Date: Wed, 12 Feb 2020 23:31:56 +0000 +Subject: [PATCH] Avoid ldbl-96 stack corruption from range reduction of + + pseudo-zero (bug 25487). + +Bug 25487 reports stack corruption in ldbl-96 sinl on a pseudo-zero +argument (an representation where all the significand bits, including +the explicit high bit, are zero, but the exponent is not zero, which +is not a valid representation for the long double type). + +Although this is not a valid long double representation, existing +practice in this area (see bug 4586, originally marked invalid but +subsequently fixed) is that we still seek to avoid invalid memory +accesses as a result, in case of programs that treat arbitrary binary +data as long double representations, although the invalid +representations of the ldbl-96 format do not need to be consistently +handled the same as any particular valid representation. + +This patch makes the range reduction detect pseudo-zero and unnormal +representations that would otherwise go to __kernel_rem_pio2, and +returns a NaN for them instead of continuing with the range reduction +process. (Pseudo-zero and unnormal representations whose unbiased +exponent is less than -1 have already been safely returned from the +function before this point without going through the rest of range +reduction.) Pseudo-zero representations would previously result in +the value passed to __kernel_rem_pio2 being all-zero, which is +definitely unsafe; unnormal representations would previously result in +a value passed whose high bit is zero, which might well be unsafe +since that is not a form of input expected by __kernel_rem_pio2. + +Tested for x86_64. + +CVE: CVE-2020-10029 +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git; +a=patch;h=9333498794cde1d5cca518badf79533a24114b6f] +Signed-off-by: Zhixiong Chi + +--- + sysdeps/ieee754/ldbl-96/Makefile | 3 ++- + sysdeps/ieee754/ldbl-96/e_rem_pio2l.c | 12 +++++++++ + sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c | 41 ++++++++++++++++++++++++++++++ + 3 files changed, 55 insertions(+), 1 deletion(-) + create mode 100644 sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c + +diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile +index b103254..052c1c7 100644 +--- a/sysdeps/ieee754/ldbl-96/Makefile ++++ b/sysdeps/ieee754/ldbl-96/Makefile +@@ -17,5 +17,6 @@ + # . + + ifeq ($(subdir),math) +-tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 ++tests += test-canonical-ldbl-96 test-totalorderl-ldbl-96 test-sinl-pseudo ++CFLAGS-test-sinl-pseudo.c += -fstack-protector-all + endif +diff --git a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +index 805de22..1aeccb4 100644 +--- a/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c ++++ b/sysdeps/ieee754/ldbl-96/e_rem_pio2l.c +@@ -210,6 +210,18 @@ __ieee754_rem_pio2l (long double x, long double *y) + return 0; + } + ++ if ((i0 & 0x80000000) == 0) ++ { ++ /* Pseudo-zero and unnormal representations are not valid ++ representations of long double. We need to avoid stack ++ corruption in __kernel_rem_pio2, which expects input in a ++ particular normal form, but those representations do not need ++ to be consistently handled like any particular floating-point ++ value. */ ++ y[1] = y[0] = __builtin_nanl (""); ++ return 0; ++ } ++ + /* Split the 64 bits of the mantissa into three 24-bit integers + stored in a double array. */ + exp = j0 - 23; +diff --git a/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +new file mode 100644 +index 0000000..f59b977 +--- /dev/null ++++ b/sysdeps/ieee754/ldbl-96/test-sinl-pseudo.c +@@ -0,0 +1,41 @@ ++/* Test sinl for pseudo-zeros and unnormals for ldbl-96 (bug 25487). ++ Copyright (C) 2020 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++static int ++do_test (void) ++{ ++ for (int i = 0; i < 64; i++) ++ { ++ uint64_t sig = i == 63 ? 0 : 1ULL << i; ++ long double ld; ++ SET_LDOUBLE_WORDS (ld, 0x4141, ++ sig >> 32, sig & 0xffffffffULL); ++ /* The requirement is that no stack overflow occurs when the ++ pseudo-zero or unnormal goes through range reduction. */ ++ volatile long double ldr; ++ ldr = sinl (ld); ++ (void) ldr; ++ } ++ return 0; ++} ++ ++#include diff --git a/meta/recipes-core/glibc/glibc_2.30.bb b/meta/recipes-core/glibc/glibc_2.30.bb index 7913bc2..c9e44a3 100644 --- a/meta/recipes-core/glibc/glibc_2.30.bb +++ b/meta/recipes-core/glibc/glibc_2.30.bb @@ -42,6 +42,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0027-inject-file-assembly-directives.patch \ file://0028-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ file://CVE-2019-19126.patch \ + file://CVE-2020-10029.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 Wed Mar 18 02:46:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:40 +0000 Subject: [oe-commits] [meta-openembedded] 03/19: libgphoto2: upgrade 2.5.23 -> 2.5.24 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024637.CC231234160@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit b836d02c37b35c9c8813298a6c50c00c22fb70dc Author: Zang Ruochen AuthorDate: Tue Mar 17 10:40:49 2020 +0800 libgphoto2: upgrade 2.5.23 -> 2.5.24 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../gphoto2/{libgphoto2_2.5.23.bb => libgphoto2_2.5.24.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb similarity index 91% rename from meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb rename to meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb index a012c49..9d9b0c7 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.23.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.24.bb @@ -14,8 +14,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ " -SRC_URI[libgphoto2.md5sum] = "bf052ce815e607dc781c5b0f3c5ca5c0" -SRC_URI[libgphoto2.sha256sum] = "d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d" +SRC_URI[libgphoto2.md5sum] = "063632d839b71698e99da0ccd19bc9f6" +SRC_URI[libgphoto2.sha256sum] = "fd3c578769f0fa389c1e68120f224bd98477aa3d82d16b82746c1266c0d4fb31" inherit autotools pkgconfig gettext lib_package -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:39 +0000 Subject: [oe-commits] [meta-openembedded] 02/19: glade: upgrade 3.22.1 -> 3.22.2 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024637.C1AF323415F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 866c0c40d5f2d4052e5e60e7c26027f1d7e4f0ae Author: Zang Ruochen AuthorDate: Tue Mar 17 10:36:42 2020 +0800 glade: upgrade 3.22.1 -> 3.22.2 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/glade/{glade_3.22.1.bb => glade_3.22.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/glade/glade_3.22.1.bb b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb similarity index 87% rename from meta-oe/recipes-devtools/glade/glade_3.22.1.bb rename to meta-oe/recipes-devtools/glade/glade_3.22.2.bb index 01decab..3d539b2 100644 --- a/meta-oe/recipes-devtools/glade/glade_3.22.1.bb +++ b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb @@ -16,8 +16,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade/3.22/glade-${PV}.tar.xz \ file://remove-yelp-help-rules-var.patch \ " -SRC_URI[md5sum] = "226802cf3b06861240524805aa6fe6ff" -SRC_URI[sha256sum] = "dff89a2ef2eaf000ff2a46979978d03cb9202cb04668e01d0ea5c5bb5547e39a" +SRC_URI[md5sum] = "c074fa378c8f1ad80d20133c4ae6f42d" +SRC_URI[sha256sum] = "edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3f26a21" EXTRA_OECONF += "--disable-man-pages" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:37 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (802f912 -> c9f6eb2) Message-ID: <158449959725.20126.18195875210658424459@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 802f912 flashrom: Fix build with clang new 81386fc redis: upgrade 5.0.7 -> 5.0.8 new 866c0c4 glade: upgrade 3.22.1 -> 3.22.2 new b836d02 libgphoto2: upgrade 2.5.23 -> 2.5.24 new 883c00b sdparm: upgrade 1.10 -> 1.11 new 7f8f1ac gsoap: upgrade 2.8.95 -> 2.8.99 new 7124587 arptables: upgrade 0.0.4 -> 0.0.5 new 36d5ae1 libtdb: upgrade 1.4.2 -> 1.4.3 new 04984e6 spice-protocol: upgrade 0.14.0 -> 0.14.1 new c64b204 botan: Define --libdir to fix multilib build issues new 464c317 ipmitool: fixes for CVE-2020-5208 new f7e11c4 openjpeg: Fix CVE-2020-8112 new 5200e02 pipewire: upgrade 0.2.7 -> 0.3.1 new 92f9c0f mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] new a0b1694 pipewire: Link with libatomic on mips/i*86 new 81a32ac c-ares: upgrade 1.15.0 -> 1.16.0 new 28dd862 flatbuffers: upgrade 1.11.0 -> 1.12.0 new 3758a2d irssi: upgrade 1.1.2 -> 1.2.2 new 6adacfc rocksdb: upgrade 6.5.2 -> 6.6.4 new c9f6eb2 ser2net: upgrade 4.1.2 -> 4.1.5 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-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- ...FLAGS-for-package-specific-compiler-flags.patch | 42 ++---- .../arptables/arptables-init-busybox.patch | 77 ----------- .../arptables/arptables-remove-bashism.patch | 37 ------ .../recipes-support/arptables/arptables_git.bb | 6 +- .../0001-waf-add-support-of-cross_compile.patch | 63 --------- .../tdb-Add-configure-options-for-packages.patch | 2 +- .../libtdb/{libtdb_1.4.2.bb => libtdb_1.4.3.bb} | 5 +- .../recipes-support/spice/spice-protocol_git.bb | 4 +- .../irssi/{irssi_1.1.2.bb => irssi_1.2.2.bb} | 4 +- .../ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb} | 4 +- meta-oe/recipes-crypto/botan/botan_2.13.0.bb | 5 +- ...build-breakage-from-lock_guard-error-6161.patch | 36 ------ meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 7 +- ...0001-Add-detection-of-strtoull_l-function.patch | 38 ------ ...flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} | 8 +- .../glade/{glade_3.22.1.bb => glade_3.22.2.bb} | 4 +- .../redis/0001-src-Do-not-reset-FINAL_LIBS.patch | 4 +- ...-extern-definition-of-SDS_NOINIT-in-sds.h.patch | 27 ---- .../redis/{redis_5.0.7.bb => redis_5.0.8.bb} | 5 +- .../{libgphoto2_2.5.23.bb => libgphoto2_2.5.24.bb} | 4 +- .../openjpeg/openjpeg/CVE-2020-8112.patch | 46 +++++++ .../recipes-graphics/openjpeg/openjpeg_2.3.1.bb | 1 + ...Fix-buffer-overflow-in-ipmi_spd_print_fru.patch | 53 ++++++++ ...-buffer-overflow-in-ipmi_get_session_info.patch | 53 ++++++++ .../0003-channel-Fix-buffer-overflow.patch | 69 ++++++++++ ...-buffer-overflows-in-get_lan_param_select.patch | 94 ++++++++++++++ ...05-fru-sdr-Fix-id_string-buffer-overflows.patch | 142 +++++++++++++++++++++ meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 5 + .../{pipewire_git.bb => pipewire-0.2_git.bb} | 0 .../recipes-multimedia/pipewire/pipewire_git.bb | 33 +++-- ...re-error-mv-libcares.pc.cmakein-to-libcar.patch | 27 ++++ .../c-ares/c-ares/cmake-install-libcares.pc.patch | 54 ++------ .../c-ares/{c-ares_1.15.0.bb => c-ares_1.16.0.bb} | 5 +- .../gsoap/{gsoap_2.8.95.bb => gsoap_2.8.99.bb} | 4 +- .../sdparm/files/make-sysroot-work.patch | 4 +- .../sdparm/{sdparm_1.10.bb => sdparm_1.11.bb} | 6 +- 37 files changed, 576 insertions(+), 404 deletions(-) delete mode 100644 meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch delete mode 100644 meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch delete mode 100644 meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch rename meta-networking/recipes-support/libtdb/{libtdb_1.4.2.bb => libtdb_1.4.3.bb} (90%) rename meta-oe/recipes-connectivity/irssi/{irssi_1.1.2.bb => irssi_1.2.2.bb} (79%) rename meta-oe/recipes-connectivity/ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb} (73%) delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch delete mode 100644 meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} (72%) rename meta-oe/recipes-devtools/glade/{glade_3.22.1.bb => glade_3.22.2.bb} (87%) delete mode 100644 meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch rename meta-oe/recipes-extended/redis/{redis_5.0.7.bb => redis_5.0.8.bb} (90%) rename meta-oe/recipes-graphics/gphoto2/{libgphoto2_2.5.23.bb => libgphoto2_2.5.24.bb} (91%) create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch copy meta-oe/recipes-multimedia/pipewire/{pipewire_git.bb => pipewire-0.2_git.bb} (100%) create mode 100644 meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch rename meta-oe/recipes-support/c-ares/{c-ares_1.15.0.bb => c-ares_1.16.0.bb} (78%) rename meta-oe/recipes-support/gsoap/{gsoap_2.8.95.bb => gsoap_2.8.99.bb} (89%) rename meta-oe/recipes-support/sdparm/{sdparm_1.10.bb => sdparm_1.11.bb} (78%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:38 +0000 Subject: [oe-commits] [meta-openembedded] 01/19: redis: upgrade 5.0.7 -> 5.0.8 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024637.B74A723415D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 81386fc82cd6c3364cf689aa1b2459f58c636598 Author: Zang Ruochen AuthorDate: Tue Mar 17 10:35:50 2020 +0800 redis: upgrade 5.0.7 -> 5.0.8 -Refresh the following patch: 0001-src-Do-not-reset-FINAL_LIBS.patch -0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch Removed since this is included in 5.0.8 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../redis/0001-src-Do-not-reset-FINAL_LIBS.patch | 4 ++-- ...-extern-definition-of-SDS_NOINIT-in-sds.h.patch | 27 ---------------------- .../redis/{redis_5.0.7.bb => redis_5.0.8.bb} | 5 ++-- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch index 04af15d..b5c4133 100644 --- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -18,7 +18,7 @@ diff --git a/src/Makefile b/src/Makefile index 7f7c625..c71dd3b 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -66,7 +66,7 @@ endif +@@ -75,7 +75,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) @@ -26,7 +26,7 @@ index 7f7c625..c71dd3b 100644 +FINAL_LIBS+=-lm DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) + # Linux ARM needs -latomic at linking time -- 2.23.0 diff --git a/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch b/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch deleted file mode 100644 index 4675687..0000000 --- a/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7f7f710c8821b7254baeaf945ca3ca263b9845e2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 21 Dec 2019 11:17:50 -0800 -Subject: [PATCH] Mark extern definition of SDS_NOINIT in sds.h - -This helps avoiding multiple definition of this variable, its also -defined globally in sds.c - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/sds.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sds.h b/src/sds.h -index 1bdb60d..adcc12c 100644 ---- a/src/sds.h -+++ b/src/sds.h -@@ -34,7 +34,7 @@ - #define __SDS_H - - #define SDS_MAX_PREALLOC (1024*1024) --const char *SDS_NOINIT; -+extern const char *SDS_NOINIT; - - #include - #include diff --git a/meta-oe/recipes-extended/redis/redis_5.0.7.bb b/meta-oe/recipes-extended/redis/redis_5.0.8.bb similarity index 90% rename from meta-oe/recipes-extended/redis/redis_5.0.7.bb rename to meta-oe/recipes-extended/redis/redis_5.0.8.bb index b915755..2aec1b4 100644 --- a/meta-oe/recipes-extended/redis/redis_5.0.7.bb +++ b/meta-oe/recipes-extended/redis/redis_5.0.8.bb @@ -14,12 +14,11 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://oe-use-libc-malloc.patch \ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch \ file://GNU_SOURCE.patch \ " -SRC_URI[md5sum] = "612ec43075a888bc8b8a7dd8ccb2e0f7" -SRC_URI[sha256sum] = "61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b" +SRC_URI[md5sum] = "1885f1c67281d566a1fd126e19cfb25d" +SRC_URI[sha256sum] = "f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7" inherit autotools-brokensep update-rc.d systemd useradd -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:41 +0000 Subject: [oe-commits] [meta-openembedded] 04/19: sdparm: upgrade 1.10 -> 1.11 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024637.D7178234161@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 883c00b3b59bc90ba0806de406c0a5da3f13d5fd Author: Zang Ruochen AuthorDate: Tue Mar 17 10:41:31 2020 +0800 sdparm: upgrade 1.10 -> 1.11 -Refresh the following patch: files/make-sysroot-work.patch -License-Update: Copyright year updated to 2019 and removed the following description? * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch | 4 ++-- meta-oe/recipes-support/sdparm/{sdparm_1.10.bb => sdparm_1.11.bb} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch index 3fd85d9..f58091a 100644 --- a/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch +++ b/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch @@ -17,13 +17,13 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 61dd9f8..42c911f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -41,7 +41,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ +@@ -53,7 +53,7 @@ sglib_SOURCES = ../lib/sg_lib.c \ ../lib/sg_pt_common.c if HAVE_SGUTILS -INCLUDES = -I/scsi +INCLUDES = -I=@includedir@/scsi - sdparm_LDADD = @GETOPT_O_FILES@ @os_libs@ @SGUTILS_LIBS@ + sdparm_LDADD = @GETOPT_O_FILES@ @SGUTILS_LIBS@ sdparm_DEPENDENCIES = @GETOPT_O_FILES@ else -- diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-oe/recipes-support/sdparm/sdparm_1.11.bb similarity index 78% rename from meta-oe/recipes-support/sdparm/sdparm_1.10.bb rename to meta-oe/recipes-support/sdparm/sdparm_1.11.bb index c09b495..7fc87db 100644 --- a/meta-oe/recipes-support/sdparm/sdparm_1.10.bb +++ b/meta-oe/recipes-support/sdparm/sdparm_1.11.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://sg.danny.cz/sg/sdparm.html" SECTION = "console/utils" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ - file://lib/BSD_LICENSE;md5=1d52f4a66f1e0ed96776bf354ab7a2ed" + file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64" DEPENDS="sg3-utils" SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \ file://make-sysroot-work.patch \ @@ -17,8 +17,8 @@ UPSTREAM_CHECK_REGEX = "sdparm-(?P\d+(\.\d+)+)\.tgz" PACKAGES =+ "${PN}-scripts" RDEPENDS_${PN}-scripts += "bash ${PN}" -SRC_URI[md5sum] = "bdae64375376ce8fe4bf9521c1db858f" -SRC_URI[sha256sum] = "1ea1ed1bb1ee2aef62392618fa42da9ed027d5e655f174525c39235778292ab3" +SRC_URI[md5sum] = "cd998d1c12a4ec11652d0af580f06b4d" +SRC_URI[sha256sum] = "432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:45 +0000 Subject: [oe-commits] [meta-openembedded] 08/19: spice-protocol: upgrade 0.14.0 -> 0.14.1 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.13838234175@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 04984e696a01c77f1a168942ea09532906a6a6c5 Author: Wang Mingyu AuthorDate: Tue Mar 17 05:11:58 2020 -0700 spice-protocol: upgrade 0.14.0 -> 0.14.1 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-support/spice/spice-protocol_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-support/spice/spice-protocol_git.bb b/meta-networking/recipes-support/spice/spice-protocol_git.bb index 966ca41..1d56bea 100644 --- a/meta-networking/recipes-support/spice/spice-protocol_git.bb +++ b/meta-networking/recipes-support/spice/spice-protocol_git.bb @@ -13,9 +13,9 @@ architectures." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b37311cb5604f3e5cc2fb0fd23527e95" -PV = "0.14.0+git${SRCPV}" +PV = "0.14.1+git${SRCPV}" -SRCREV = "f72ece993aeaf23f77e2845562b20e5563e52ba0" +SRCREV = "e0ec178a72aa33e307ee5ac02b63bf336da921a5" SRC_URI = " \ git://anongit.freedesktop.org/spice/spice-protocol \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:42 +0000 Subject: [oe-commits] [meta-openembedded] 05/19: gsoap: upgrade 2.8.95 -> 2.8.99 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024637.E3D7B234172@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 7f8f1ac31c34d23a03cc1b29b0bbcf309a767491 Author: Zang Ruochen AuthorDate: Tue Mar 17 10:43:31 2020 +0800 gsoap: upgrade 2.8.95 -> 2.8.99 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-oe/recipes-support/gsoap/{gsoap_2.8.95.bb => gsoap_2.8.99.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.99.bb similarity index 89% rename from meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb rename to meta-oe/recipes-support/gsoap/gsoap_2.8.99.bb index 22a0498..a5535ee 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.95.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.99.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ " -SRC_URI[md5sum] = "88031646018d60857f21246962d10011" -SRC_URI[sha256sum] = "fe07aa152cd946ef8ebd3f87653f14c1d38efe7c6e6fce8c6f773c4814f79baf" +SRC_URI[md5sum] = "9bba04cf88211762ee4cf35e03c65662" +SRC_URI[sha256sum] = "c1c99a64eecf96cfd781a611171b58a39326f5811eb98c619aa7c54ec7bcc84b" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:46 +0000 Subject: [oe-commits] [meta-openembedded] 09/19: botan: Define --libdir to fix multilib build issues In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.1D3BE234176@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c64b204a3a1c732d9b006118bff2820e6881dff8 Author: Khem Raj AuthorDate: Tue Mar 17 12:48:32 2020 -0700 botan: Define --libdir to fix multilib build issues Signed-off-by: Khem Raj --- meta-oe/recipes-crypto/botan/botan_2.13.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-crypto/botan/botan_2.13.0.bb b/meta-oe/recipes-crypto/botan/botan_2.13.0.bb index 0854bd6..4143264 100644 --- a/meta-oe/recipes-crypto/botan/botan_2.13.0.bb +++ b/meta-oe/recipes-crypto/botan/botan_2.13.0.bb @@ -19,14 +19,15 @@ CPU_armv7ve = "armv7" do_configure() { python3 ${S}/configure.py \ - --prefix="${D}${prefix}" \ + --prefix="${D}${exec_prefix}" \ + --libdir="${D}${libdir}" \ --cpu="${CPU}" \ --cc-bin="${CXX}" \ --cxxflags="${CXXFLAGS}" \ --ldflags="${LDFLAGS}" \ --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ ${@bb.utils.contains("TUNE_FEATURES","neon","","--disable-neon",d)} \ - --with-sysroot-dir=${STAGING_DIR_TARGET} \ + --with-sysroot-dir=${STAGING_DIR_HOST} \ --with-build-dir="${B}" \ --optimize-for-size \ --with-stack-protector \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:44 +0000 Subject: [oe-commits] [meta-openembedded] 07/19: libtdb: upgrade 1.4.2 -> 1.4.3 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.08F19234174@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 36d5ae1580a52630fdcf372c6f55a51b4da6535c Author: Wang Mingyu AuthorDate: Tue Mar 17 00:19:56 2020 -0700 libtdb: upgrade 1.4.2 -> 1.4.3 0001-waf-add-support-of-cross_compile.patch removed since it's not available for 1.4.3 refresh tdb-Add-configure-options-for-packages.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-waf-add-support-of-cross_compile.patch | 63 ---------------------- .../tdb-Add-configure-options-for-packages.patch | 2 +- .../libtdb/{libtdb_1.4.2.bb => libtdb_1.4.3.bb} | 5 +- 3 files changed, 3 insertions(+), 67 deletions(-) diff --git a/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch deleted file mode 100644 index e20c9a2..0000000 --- a/meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Fri, 25 Jan 2019 15:00:59 +0800 -Subject: [PATCH] waf: add support of cross_compile - -After upgrade libtdb from 1.3.16 to 1.3.17, waf build system -which used by libtdb upgrade from 1.5.19 to 2.0.8 - -on 1.5.19, for cross_compile, subprocess.Popen is set to be -samba_cross.cross_Popen, which will not execute testprog on -host, but only read result from cross-answers.txt which is -passed by option --cross-answer - -part of old code: - args = Utils.to_list(kw.get('exec_args', [])) - proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) - -but on 2.0.8, exec_args is not used and cause do_configure -failed with Exec format error - -fixed by append cross anser related args to cmd - -Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211] - -Signed-off-by: Changqing Li ---- - third_party/waf/waflib/Tools/c_config.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py -index 7608215..767cf33 100644 ---- a/third_party/waf/waflib/Tools/c_config.py -+++ b/third_party/waf/waflib/Tools/c_config.py -@@ -660,20 +660,21 @@ class test_exec(Task.Task): - """ - color = 'PINK' - def run(self): -+ args = self.generator.bld.kw.get('exec_args', []) - if getattr(self.generator, 'rpath', None): - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) -- else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args) -+ else: -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args) - else: - env = self.env.env or {} - env.update(dict(os.environ)) - for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): - env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) - else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env) - - @feature('test_exec') - @after_method('apply_link') --- -2.7.4 - diff --git a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch index 481fd68..c35cab7 100644 --- a/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch @@ -78,7 +78,7 @@ index 1d01e1e..2336dc3 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('attr/xattr.h compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') +- conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb similarity index 90% rename from meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb rename to meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb index 4973e80..c131014 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.2.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://tdb-Add-configure-options-for-packages.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ " -SRC_URI[md5sum] = "b2c05ad68334368d3258a63db709f254" -SRC_URI[sha256sum] = "9040b2cce4028e392f063f91bbe76b8b28fecc2b7c0c6071c67b5eb3168e004a" +SRC_URI[md5sum] = "e638e8890f743624a754304b3f994f4d" +SRC_URI[sha256sum] = "c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:43 +0000 Subject: [oe-commits] [meta-openembedded] 06/19: arptables: upgrade 0.0.4 -> 0.0.5 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024637.F0DB1234173@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 71245876085477834f0dc7ba9c993e7a5961fb25 Author: Wang Mingyu AuthorDate: Tue Mar 17 00:19:55 2020 -0700 arptables: upgrade 0.0.4 -> 0.0.5 arptables-init-busybox.patch arptables-remove-bashism.patch removed since they are not available in 0.0.5 refresh 0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...FLAGS-for-package-specific-compiler-flags.patch | 42 ++++-------- .../arptables/arptables-init-busybox.patch | 77 ---------------------- .../arptables/arptables-remove-bashism.patch | 37 ----------- .../recipes-support/arptables/arptables_git.bb | 6 +- 4 files changed, 14 insertions(+), 148 deletions(-) diff --git a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch index e8be45e..eb58389 100644 --- a/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch +++ b/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch @@ -8,24 +8,17 @@ which OE uses to pass tweaks Signed-off-by: Khem Raj --- - Makefile | 15 +++++++-------- - extensions/Makefile | 5 ++++- - 2 files changed, 11 insertions(+), 9 deletions(-) + Makefile | 10 ++++------ + extensions/Makefile | 4 ++++ + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 7bead0d..336db6b 100644 +index 62ebdf2..cd06813 100644 --- a/Makefile +++ b/Makefile -@@ -7,15 +7,13 @@ LIBDIR:=$(PREFIX)/lib - BINDIR:=$(PREFIX)/sbin - MANDIR:=$(PREFIX)/man - man8dir=$(MANDIR)/man8 --INITDIR:=/etc/rc.d/init.d -+INITDIR:=/etc/init.d - SYSCONFIGDIR:=/etc/sysconfig - DESTDIR:= +@@ -12,9 +12,7 @@ DESTDIR:= - MANS = arptables.8 arptables-save.8 arptables-restore.8 + MANS = arptables-legacy.8 arptables-save.8 arptables-restore.8 -COPT_FLAGS:=-O2 -CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG @@ -34,8 +27,8 @@ index 7bead0d..336db6b 100644 ifndef ARPT_LIBDIR ARPT_LIBDIR:=$(LIBDIR)/arptables endif -@@ -25,13 +23,13 @@ include extensions/Makefile - all: arptables libarptc/libarptc.a +@@ -24,13 +22,13 @@ include extensions/Makefile + all: arptables-legacy libarptc/libarptc.a arptables.o: arptables.c - $(CC) $(CFLAGS) -c -o $@ $< @@ -51,29 +44,18 @@ index 7bead0d..336db6b 100644 libarptc/libarptc.a: libarptc/libarptc.o $(AR) rcs $@ $< -@@ -53,7 +51,8 @@ scripts: arptables-save arptables-restore arptables.sysv - install -m 0755 arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore - cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_ - if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi -- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi -+ install -d $(DESTDIR)$(INITDIR) -+ install -m 0755 arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables - rm -f arptables-save_ arptables-restore_ arptables.sysv_ - - .PHONY: install-man diff --git a/extensions/Makefile b/extensions/Makefile -index 0189cc9..b046425 100644 +index 0189cc9..e8af782 100644 --- a/extensions/Makefile +++ b/extensions/Makefile -@@ -4,4 +4,7 @@ EXT_FUNC+=standard mangle CLASSIFY MARK - EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) +@@ -5,3 +5,7 @@ EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o) extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h -- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< + $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $< + $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< + +extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h + $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $< -- -2.12.1 +2.17.1 diff --git a/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch b/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch deleted file mode 100644 index 24956c4..0000000 --- a/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: arptables-v0.0.3-4/arptables.sysv -=================================================================== ---- arptables-v0.0.3-4.orig/arptables.sysv 2010-03-22 16:28:03.000000000 +0300 -+++ arptables-v0.0.3-4/arptables.sysv 2010-03-22 16:27:51.000000000 +0300 -@@ -12,10 +12,10 @@ - # config: __SYSCONFIG__/arptables - - source /etc/init.d/functions --source /etc/sysconfig/network -+# source /etc/sysconfig/network - - # Check that networking is up. --[ ${NETWORKING} = "no" ] && exit 0 -+# [ ${NETWORKING} = "no" ] && exit 0 - - [ -x __EXEC_PATH__/arptables ] || exit 1 - [ -x __EXEC_PATH__/arptables-save ] || exit 1 -@@ -28,32 +28,30 @@ - desc="Arp filtering" - - start() { -- echo -n $"Starting $desc ($prog): " -+ echo -n "Starting $desc ($prog): " - __EXEC_PATH__/arptables-restore < __SYSCONFIG__/arptables || RETVAL=1 - - if [ $RETVAL -eq 0 ]; then -- success "$prog startup" -- rm -f /var/lock/subsys/$prog -+ echo "$prog ok" -+ touch /var/lock/subsys/$prog - else -- failure "$prog startup" -+ echo "$prog failed" - fi - -- echo - return $RETVAL - } - - stop() { -- echo -n $"Stopping $desc ($prog): " -+ echo -n "Stopping $desc ($prog): " - __EXEC_PATH__/arptables-restore < /dev/null || RETVAL=1 - - if [ $RETVAL -eq 0 ]; then -- success "$prog shutdown" -- rm -f %{_localstatedir}/lock/subsys/$prog -+ echo "$prog stopped" -+ rm -f /var/lock/subsys/$prog - else -- failure "$prog shutdown" -+ echo "$prog failed to stop" - fi - -- echo - return $RETVAL - } - -@@ -63,15 +61,14 @@ - } - - save() { -- echo -n $"Saving $desc ($prog): " -+ echo -n "Saving $desc ($prog): " - __EXEC_PATH__/arptables-save > __SYSCONFIG__/arptables || RETVAL=1 - - if [ $RETVAL -eq 0 ]; then -- success "$prog saved" -+ echo "$prog saved" - else -- failure "$prog saved" -+ echo "$prog is not saved" - fi -- echo - } - - case "$1" in diff --git a/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch b/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch deleted file mode 100644 index f332658..0000000 --- a/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cd312bc0e3686404428878d23b8888cba09a20e1 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Thu, 18 Sep 2014 19:46:58 -0700 -Subject: [PATCH] arptables.sysv: remove bashism - -Use "." to replace of "source", and change /bin/bash to /bin/sh, the -echo $"foo" works well in busybox. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang ---- - arptables.sysv | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arptables.sysv b/arptables.sysv -index 7a90bd2..7710376 100644 ---- a/arptables.sysv -+++ b/arptables.sysv -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # - # init script for arptables - # -@@ -11,7 +11,7 @@ - # - # config: __SYSCONFIG__/arptables - --source /etc/init.d/functions -+. /etc/init.d/functions - # source /etc/sysconfig/network - - # Check that networking is up. --- -1.7.9.5 - diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index cec1d1f..c02a199 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -2,15 +2,13 @@ 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" -SRCREV = "f4ab8f63f11a72f14687a6646d04ae1bae3fa45f" -PV = "0.0.4+git${SRCPV}" +SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" +PV = "0.0.5+git${SRCPV}" SRC_URI = " \ git://git.netfilter.org/arptables \ file://0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch \ - file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ - file://arptables-remove-bashism.patch \ file://arptables.service \ " SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:50 +0000 Subject: [oe-commits] [meta-openembedded] 13/19: mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.4F35B23415F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 92f9c0f8329026185b4bf11faa69a5cf76c1bac6 Author: Andreas M?ller AuthorDate: Wed Mar 18 00:34:28 2020 +0100 mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb index 7979802..c90559c 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb @@ -52,7 +52,7 @@ PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_bac PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" -PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" +PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire-0.2" PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:47 +0000 Subject: [oe-commits] [meta-openembedded] 10/19: ipmitool: fixes for CVE-2020-5208 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.2A2F9234187@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 464c317c850155caaead4eb77465560e4060c276 Author: Wenlin Kang AuthorDate: Tue Mar 17 09:44:32 2020 -0700 ipmitool: fixes for CVE-2020-5208 This patch is the other part of the fixes for CVE-2020-5208. Signed-off-by: Wenlin Kang Signed-off-by: Khem Raj --- ...Fix-buffer-overflow-in-ipmi_spd_print_fru.patch | 53 ++++++++ ...-buffer-overflow-in-ipmi_get_session_info.patch | 53 ++++++++ .../0003-channel-Fix-buffer-overflow.patch | 69 ++++++++++ ...-buffer-overflows-in-get_lan_param_select.patch | 94 ++++++++++++++ ...05-fru-sdr-Fix-id_string-buffer-overflows.patch | 142 +++++++++++++++++++++ meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 5 + 6 files changed, 416 insertions(+) diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch new file mode 100644 index 0000000..eadfb7e --- /dev/null +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch @@ -0,0 +1,53 @@ +From 24aed93efb30a8f557aedc2f03b6ccec758ccbf4 Mon Sep 17 00:00:00 2001 +From: Chrostoper Ertl +Date: Thu, 28 Nov 2019 16:44:18 +0000 +Subject: [PATCH 1/5] fru: Fix buffer overflow in ipmi_spd_print_fru + +Partial fix for CVE-2020-5208, see +https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp + +The `ipmi_spd_print_fru` function has a similar issue as the one fixed +by the previous commit in `read_fru_area_section`. An initial request is +made to get the `fru.size`, which is used as the size for the allocation +of `spd_data`. Inside a loop, further requests are performed to get the +copy sizes which are not checked before being used as the size for a +copy into the buffer. + +Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/840fb1cbb4fb365cb9797300e3374d4faefcdb10] +CVE: CVE-2020-5208 + +Signed-off-by: Wenlin Kang +--- + lib/dimm_spd.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c +index 91ae117..4c9c21d 100644 +--- a/lib/dimm_spd.c ++++ b/lib/dimm_spd.c +@@ -1014,7 +1014,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) + struct ipmi_rq req; + struct fru_info fru; + uint8_t *spd_data, msg_data[4]; +- int len, offset; ++ uint32_t len, offset; + + msg_data[0] = id; + +@@ -1091,6 +1091,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) + } + + len = rsp->data[0]; ++ if(rsp->data_len < 1 ++ || len > rsp->data_len - 1 ++ || len > fru.size - offset) ++ { ++ printf(" Not enough buffer size"); ++ return -1; ++ } + memcpy(&spd_data[offset], rsp->data + 1, len); + offset += len; + } while (offset < fru.size); +-- +1.9.1 + diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch new file mode 100644 index 0000000..b8742b1 --- /dev/null +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch @@ -0,0 +1,53 @@ +From 81144cfba131b4ddbfcf9c530274b23bfc7e0ea8 Mon Sep 17 00:00:00 2001 +From: Chrostoper Ertl +Date: Thu, 28 Nov 2019 16:51:49 +0000 +Subject: [PATCH 2/5] session: Fix buffer overflow in ipmi_get_session_info + +Partial fix for CVE-2020-5208, see +https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp + +The `ipmi_get_session_info` function does not properly check the +response `data_len`, which is used as a copy size, allowing stack buffer +overflow. + +Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/41d7026946fafbd4d1ec0bcaca3ea30a6e8eed22] +CVE: CVE-2020-5208 + +Signed-off-by: Wenlin Kang +--- + lib/ipmi_session.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c +index 4855bc4..71bef4c 100644 +--- a/lib/ipmi_session.c ++++ b/lib/ipmi_session.c +@@ -319,8 +319,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, + } + else + { +- memcpy(&session_info, rsp->data, rsp->data_len); +- print_session_info(&session_info, rsp->data_len); ++ memcpy(&session_info, rsp->data, ++ __min(rsp->data_len, sizeof(session_info))); ++ print_session_info(&session_info, ++ __min(rsp->data_len, sizeof(session_info))); + } + break; + +@@ -351,8 +353,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, + break; + } + +- memcpy(&session_info, rsp->data, rsp->data_len); +- print_session_info(&session_info, rsp->data_len); ++ memcpy(&session_info, rsp->data, ++ __min(rsp->data_len, sizeof(session_info))); ++ print_session_info(&session_info, ++ __min(rsp->data_len, sizeof(session_info))); + + } while (i <= session_info.session_slot_count); + break; +-- +1.9.1 + diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch new file mode 100644 index 0000000..deebd35 --- /dev/null +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch @@ -0,0 +1,69 @@ +From 5057761e30e3a7682edab60f98f631616392ddc6 Mon Sep 17 00:00:00 2001 +From: Chrostoper Ertl +Date: Thu, 28 Nov 2019 16:56:38 +0000 +Subject: [PATCH 3/3] channel: Fix buffer overflow +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Partial fix for CVE-2020-5208, see +https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp + +The `ipmi_get_channel_cipher_suites` function does not properly check +the final response?s `data_len`, which can lead to stack buffer overflow +on the final copy. + +Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/9452be87181a6e83cfcc768b3ed8321763db50e4] +CVE: CVE-2020-5208 + +[Make some changes to apply it] +Signed-off-by: Wenlin Kang +--- + include/ipmitool/ipmi_channel.h | 2 ++ + lib/ipmi_channel.c | 10 ++++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/include/ipmitool/ipmi_channel.h b/include/ipmitool/ipmi_channel.h +index b138c26..d7cce5e 100644 +--- a/include/ipmitool/ipmi_channel.h ++++ b/include/ipmitool/ipmi_channel.h +@@ -77,6 +77,8 @@ struct channel_access_t { + uint8_t user_level_auth; + }; + ++#define MAX_CIPHER_SUITE_DATA_LEN 0x10 ++ + /* + * The Get Authentication Capabilities response structure + * From table 22-15 of the IPMI v2.0 spec +diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c +index fab2e54..76ecdcd 100644 +--- a/lib/ipmi_channel.c ++++ b/lib/ipmi_channel.c +@@ -378,7 +378,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, + lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites"); + return -1; + } +- if (rsp->ccode > 0) { ++ if (rsp->ccode ++ || rsp->data_len < 1 ++ || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN) ++ { + lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s", + val2str(rsp->ccode, completion_code_vals)); + return -1; +@@ -413,7 +416,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, + lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites"); + return -1; + } +- if (rsp->ccode > 0) { ++ if (rsp->ccode ++ || rsp->data_len < 1 ++ || rsp->data_len > sizeof(uint8_t) + MAX_CIPHER_SUITE_DATA_LEN) ++ { + lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s", + val2str(rsp->ccode, completion_code_vals)); + return -1; +-- +2.18.1 + diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch new file mode 100644 index 0000000..b5ce9e9 --- /dev/null +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch @@ -0,0 +1,94 @@ +From e6aa6076f65e71544bd6450d20d943d7baaccb9f Mon Sep 17 00:00:00 2001 +From: Chrostoper Ertl +Date: Thu, 28 Nov 2019 17:06:39 +0000 +Subject: [PATCH 4/5] lanp: Fix buffer overflows in get_lan_param_select +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Partial fix for CVE-2020-5208, see +https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp + +The `get_lan_param_select` function is missing a validation check on the +response?s `data_len`, which it then returns to caller functions, where +stack buffer overflow can occur. + +Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/d45572d71e70840e0d4c50bf48218492b79c1a10] +CVE: CVE-2020-5208 + +[Make some changes to apply it] +Signed-off-by: Wenlin Kang +--- + lib/ipmi_lanp.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c +index 060e753..dee21ee 100644 +--- a/lib/ipmi_lanp.c ++++ b/lib/ipmi_lanp.c +@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, + if (p == NULL) { + return (-1); + } +- memcpy(data, p->data, p->data_len); ++ memcpy(data, p->data, __min(p->data_len, sizeof(data))); + /* set new ipaddr */ + memcpy(data+3, temp, 4); + printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert, +@@ -1932,7 +1932,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, + if (p == NULL) { + return (-1); + } +- memcpy(data, p->data, p->data_len); ++ memcpy(data, p->data, __min(p->data_len, sizeof(data))); + /* set new macaddr */ + memcpy(data+7, temp, 6); + printf("Setting LAN Alert %d MAC Address to " +@@ -1947,7 +1947,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, + if (p == NULL) { + return (-1); + } +- memcpy(data, p->data, p->data_len); ++ memcpy(data, p->data, __min(p->data_len, sizeof(data))); + + if (strncasecmp(argv[1], "def", 3) == 0 || + strncasecmp(argv[1], "default", 7) == 0) { +@@ -1973,7 +1973,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, + if (p == NULL) { + return (-1); + } +- memcpy(data, p->data, p->data_len); ++ memcpy(data, p->data, __min(p->data_len, sizeof(data))); + + if (strncasecmp(argv[1], "on", 2) == 0 || + strncasecmp(argv[1], "yes", 3) == 0) { +@@ -1998,7 +1998,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, + if (p == NULL) { + return (-1); + } +- memcpy(data, p->data, p->data_len); ++ memcpy(data, p->data, __min(p->data_len, sizeof(data))); + + if (strncasecmp(argv[1], "pet", 3) == 0) { + printf("Setting LAN Alert %d destination to PET Trap\n", alert); +@@ -2026,7 +2026,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, + if (p == NULL) { + return (-1); + } +- memcpy(data, p->data, p->data_len); ++ memcpy(data, p->data, __min(p->data_len, sizeof(data))); + + if (str2uchar(argv[1], &data[2]) != 0) { + lprintf(LOG_ERR, "Invalid time: %s", argv[1]); +@@ -2042,7 +2042,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, + if (p == NULL) { + return (-1); + } +- memcpy(data, p->data, p->data_len); ++ memcpy(data, p->data, __min(p->data_len, sizeof(data))); + + if (str2uchar(argv[1], &data[3]) != 0) { + lprintf(LOG_ERR, "Invalid retry: %s", argv[1]); +-- +1.9.1 + diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch b/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch new file mode 100644 index 0000000..cf8b925 --- /dev/null +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch @@ -0,0 +1,142 @@ +From 26e64ca78ae844c5ceedde89531e2924d7d4594c Mon Sep 17 00:00:00 2001 +From: Chrostoper Ertl +Date: Thu, 28 Nov 2019 17:13:45 +0000 +Subject: [PATCH 5/5] fru, sdr: Fix id_string buffer overflows + +Final part of the fixes for CVE-2020-5208, see +https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp + +9 variants of stack buffer overflow when parsing `id_string` field of +SDR records returned from `CMD_GET_SDR` command. + +SDR record structs have an `id_code` field, and an `id_string` `char` +array. + +The length of `id_string` is calculated as `(id_code & 0x1f) + 1`, +which can be larger than expected 16 characters (if `id_code = 0xff`, +then length will be `(0xff & 0x1f) + 1 = 32`). + +In numerous places, this can cause stack buffer overflow when copying +into fixed buffer of size `17` bytes from this calculated length. + +Upstream-Status: Backport[https://github.com/ipmitool/ipmitool/commit/7ccea283dd62a05a320c1921e3d8d71a87772637] +CVE: CVE-2020-5208 + +Signed-off-by: Wenlin Kang +--- + lib/ipmi_fru.c | 2 +- + lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++---------------- + 2 files changed, 25 insertions(+), 17 deletions(-) + +diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c +index b71ea23..1decea2 100644 +--- a/lib/ipmi_fru.c ++++ b/lib/ipmi_fru.c +@@ -3038,7 +3038,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru) + return 0; + + memset(desc, 0, sizeof(desc)); +- memcpy(desc, fru->id_string, fru->id_code & 0x01f); ++ memcpy(desc, fru->id_string, __min(fru->id_code & 0x01f, sizeof(desc))); + desc[fru->id_code & 0x01f] = 0; + printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id); + +diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c +index fa7b082..175a86f 100644 +--- a/lib/ipmi_sdr.c ++++ b/lib/ipmi_sdr.c +@@ -2113,7 +2113,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf, + return -1; + + memset(desc, 0, sizeof (desc)); +- snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string); ++ snprintf(desc, sizeof(desc), "%.*s", (sensor->id_code & 0x1f) + 1, sensor->id_string); + + if (verbose) { + printf("Sensor ID : %s (0x%x)\n", +@@ -2164,7 +2164,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf, + return -1; + + memset(desc, 0, sizeof (desc)); +- snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string); ++ snprintf(desc, sizeof(desc), "%.*s", (mc->id_code & 0x1f) + 1, mc->id_string); + + if (verbose == 0) { + if (csv_output) +@@ -2257,7 +2257,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf, + char desc[17]; + + memset(desc, 0, sizeof (desc)); +- snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string); ++ snprintf(desc, sizeof(desc), "%.*s", (dev->id_code & 0x1f) + 1, dev->id_string); + + if (!verbose) { + if (csv_output) +@@ -2314,7 +2314,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf, + char desc[17]; + + memset(desc, 0, sizeof (desc)); +- snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string); ++ snprintf(desc, sizeof(desc), "%.*s", (fru->id_code & 0x1f) + 1, fru->id_string); + + if (!verbose) { + if (csv_output) +@@ -2518,35 +2518,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf,uint16_t id, + + int rc =0; + char desc[17]; ++ const char *id_string; ++ uint8_t id_code; + memset(desc, ' ', sizeof (desc)); + + switch ( type) { + case SDR_RECORD_TYPE_FULL_SENSOR: + record.full = (struct sdr_record_full_sensor *) raw; +- snprintf(desc, (record.full->id_code & 0x1f) +1, "%s", +- (const char *)record.full->id_string); ++ id_code = record.full->id_code; ++ id_string = record.full->id_string; + break; ++ + case SDR_RECORD_TYPE_COMPACT_SENSOR: + record.compact = (struct sdr_record_compact_sensor *) raw ; +- snprintf(desc, (record.compact->id_code & 0x1f) +1, "%s", +- (const char *)record.compact->id_string); ++ id_code = record.compact->id_code; ++ id_string = record.compact->id_string; + break; ++ + case SDR_RECORD_TYPE_EVENTONLY_SENSOR: + record.eventonly = (struct sdr_record_eventonly_sensor *) raw ; +- snprintf(desc, (record.eventonly->id_code & 0x1f) +1, "%s", +- (const char *)record.eventonly->id_string); +- break; ++ id_code = record.eventonly->id_code; ++ id_string = record.eventonly->id_string; ++ break; ++ + case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: + record.mcloc = (struct sdr_record_mc_locator *) raw ; +- snprintf(desc, (record.mcloc->id_code & 0x1f) +1, "%s", +- (const char *)record.mcloc->id_string); ++ id_code = record.mcloc->id_code; ++ id_string = record.mcloc->id_string; + break; ++ + default: + rc = -1; +- break; +- } ++ } ++ if (!rc) { ++ snprintf(desc, sizeof(desc), "%.*s", (id_code & 0x1f) + 1, id_string); ++ } + +- lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc); ++ lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc); + return rc; + } + +-- +1.9.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 500d5bd..3de9a92 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb @@ -25,6 +25,11 @@ 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 \ + file://0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch \ + file://0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch \ + file://0003-channel-Fix-buffer-overflow.patch \ + file://0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch \ + file://0005-fru-sdr-Fix-id_string-buffer-overflows.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 Wed Mar 18 02:46:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:51 +0000 Subject: [oe-commits] [meta-openembedded] 14/19: pipewire: Link with libatomic on mips/i*86 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.5C1ED234160@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a0b1694970cd6e5b0b807f30417a2b9150d32a02 Author: Khem Raj AuthorDate: Sun Mar 15 11:03:46 2020 -0700 pipewire: Link with libatomic on mips/i*86 Fixes src/pipewire-jack.c:4218: undefined reference to `__atomic_store_8' Signed-off-by: Khem Raj --- meta-oe/recipes-multimedia/pipewire/pipewire_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb index 64ef8e3..1a415c1 100644 --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb @@ -31,6 +31,9 @@ PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=fa PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" PACKAGECONFIG[vulkan] = "-Dvulkan=true,-Dvulkan=false,vulkan-loader" +LDFLAGS_append_mipsarch = " -latomic" +LDFLAGS_append_x86 = " -latomic" + PACKAGES =+ "\ ${PN}-spa-plugins \ ${PN}-alsa \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:49 +0000 Subject: [oe-commits] [meta-openembedded] 12/19: pipewire: upgrade 0.2.7 -> 0.3.1 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.43A9123418D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5200e029ea4f853f83b0c0884af5f6d9626b78ea Author: Andreas M?ller AuthorDate: Wed Mar 18 00:34:27 2020 +0100 pipewire: upgrade 0.2.7 -> 0.3.1 * as long as we have not upgradeed mutter to 3.36 we have to keep pipewire 0.2.7 as pipewire-0.2 - mutter 3.34 asks for pipewire 0.2 * license was changed to MIT * additional PACKAGECONFIGs added. The defaults were chosen by DISTRO_FEATURES or if not available by pipewire's defaults * vulkan was disabled for now Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../{pipewire_git.bb => pipewire-0.2_git.bb} | 0 .../recipes-multimedia/pipewire/pipewire_git.bb | 30 ++++++++++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb similarity index 100% copy from meta-oe/recipes-multimedia/pipewire/pipewire_git.bb copy to meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb diff --git a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb index bcb3015..64ef8e3 100644 --- a/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +++ b/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb @@ -2,14 +2,14 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans " HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "MIT" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" +SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" +PV = "0.3.1" SRC_URI = "git://github.com/PipeWire/pipewire" @@ -18,13 +18,18 @@ S = "${WORKDIR}/git" inherit meson pkgconfig systemd manpages PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \ + jack gstreamer \ " -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" +PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" +PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[vulkan] = "-Dvulkan=true,-Dvulkan=false,vulkan-loader" PACKAGES =+ "\ ${PN}-spa-plugins \ @@ -33,28 +38,31 @@ PACKAGES =+ "\ gstreamer1.0-${PN} \ lib${PN} \ lib${PN}-modules \ + lib${PN}-jack \ " RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" FILES_${PN} = "\ ${sysconfdir}/pipewire/pipewire.conf \ + ${bindir}/pw-* \ ${bindir}/pipewire* \ ${systemd_user_unitdir}/* \ " FILES_lib${PN} = "\ ${libdir}/libpipewire-*.so.* \ + ${libdir}/libjack-*.so.* \ + ${libdir}/libpulse-*.so.* \ " FILES_lib${PN}-modules = "\ ${libdir}/pipewire-*/* \ " FILES_${PN}-spa-plugins = "\ ${bindir}/spa-* \ - ${libdir}/spa/* \ + ${libdir}/spa-*/* \ " FILES_${PN}-alsa = "\ ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ " FILES_gstreamer1.0-${PN} = "\ ${libdir}/gstreamer-1.0/* \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:56 +0000 Subject: [oe-commits] [meta-openembedded] 19/19: ser2net: upgrade 4.1.2 -> 4.1.5 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.A77A2234195@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit c9f6eb27c9b2bcfdcdfc5a74a1ffadca62e6ce6f Author: Wang Mingyu AuthorDate: Wed Mar 18 00:19:52 2020 -0700 ser2net: upgrade 4.1.2 -> 4.1.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb similarity index 73% rename from meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb index 66985af..0df134e 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb @@ -9,8 +9,8 @@ DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a" -SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7" +SRC_URI[md5sum] = "52c5e56d2d54ced0cdeb764a7e8fec92" +SRC_URI[sha256sum] = "df904d271eb161c265c956f0cb938dd0a375dda4a919a344f73b08bc50b9f308" 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 Mar 18 02:46:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:54 +0000 Subject: [oe-commits] [meta-openembedded] 17/19: irssi: upgrade 1.1.2 -> 1.2.2 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.8A795234161@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 3758a2d9c5aa75ad1b928a9bfbf1be94b0cbd9f5 Author: Wang Mingyu AuthorDate: Wed Mar 18 00:19:50 2020 -0700 irssi: upgrade 1.1.2 -> 1.2.2 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/irssi/{irssi_1.1.2.bb => irssi_1.2.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb similarity index 79% rename from meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb rename to meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb index cd797e0..da5403e 100644 --- a/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb +++ b/meta-oe/recipes-connectivity/irssi/irssi_1.2.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" DEPENDS = "glib-2.0 ncurses openssl" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[md5sum] = "271d2fd875cddd34526234d8a766d82c" -SRC_URI[sha256sum] = "5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf9732" +SRC_URI[md5sum] = "8547f89e014e23e1bbbb665bcf7e2f70" +SRC_URI[sha256sum] = "6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:48 +0000 Subject: [oe-commits] [meta-openembedded] 11/19: openjpeg: Fix CVE-2020-8112 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.36BC523418C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f7e11c4c7504568cdbc1a9cfb8cbde0247cb1c92 Author: Sakib Sajal AuthorDate: Tue Mar 17 13:05:33 2020 -0700 openjpeg: Fix CVE-2020-8112 Backport from upstream to fix heap-based buffer overflow. Upstream-Status: Backport CVE: CVE-2020-8112 Signed-off-by: Sakib Sajal Signed-off-by: Khem Raj --- .../openjpeg/openjpeg/CVE-2020-8112.patch | 46 ++++++++++++++++++++++ .../recipes-graphics/openjpeg/openjpeg_2.3.1.bb | 1 + 2 files changed, 47 insertions(+) diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch new file mode 100644 index 0000000..cb25053 --- /dev/null +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch @@ -0,0 +1,46 @@ +From 05f9b91e60debda0e83977e5e63b2e66486f7074 Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Thu, 30 Jan 2020 00:59:57 +0100 +Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow + +That could lead to later assertion failures. + +Fixes #1231 / CVE-2020-8112 +--- + src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c +index deecc4df..aa419030 100644 +--- a/src/lib/openjp2/tcd.c ++++ b/src/lib/openjp2/tcd.c +@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, + /* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ + l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx; + l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy; +- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx; +- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy; ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1, ++ (OPJ_INT32)l_pdx)) << l_pdx; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_x_end = (OPJ_INT32)tmp; ++ } ++ { ++ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1, ++ (OPJ_INT32)l_pdy)) << l_pdy; ++ if (tmp > (OPJ_UINT32)INT_MAX) { ++ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n"); ++ return OPJ_FALSE; ++ } ++ l_br_prc_y_end = (OPJ_INT32)tmp; ++ } + /*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/ + + l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)(( +-- +2.20.1 + diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb index 4045148..42011ef 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.3.1.bb @@ -9,6 +9,7 @@ SRC_URI = " \ git://github.com/uclouvain/openjpeg.git \ file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ file://CVE-2020-6851.patch \ + file://CVE-2020-8112.patch \ " SRCREV = "57096325457f96d8cd07bd3af04fe81d7a2ba788" 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 Mar 18 02:46:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:52 +0000 Subject: [oe-commits] [meta-openembedded] 15/19: c-ares: upgrade 1.15.0 -> 1.16.0 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.6B2D4234138@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 81a32ac4808646d44929f33929b41e8b1524fff7 Author: Wang Mingyu AuthorDate: Wed Mar 18 00:19:48 2020 -0700 c-ares: upgrade 1.15.0 -> 1.16.0 add 0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch to fix error of do_configure refresh cmake-install-libcares.pc.patch Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...re-error-mv-libcares.pc.cmakein-to-libcar.patch | 27 +++++++++++ .../c-ares/c-ares/cmake-install-libcares.pc.patch | 54 ++++++---------------- .../c-ares/{c-ares_1.15.0.bb => c-ares_1.16.0.bb} | 5 +- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch new file mode 100644 index 0000000..8f15f84 --- /dev/null +++ b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch @@ -0,0 +1,27 @@ +From f2f1e134bf5d9d0789942848e03006af8d926cf8 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Tue, 17 Mar 2020 12:53:35 +0800 +Subject: [PATCH] fix configure error : mv libcares.pc.cmakein to + libcares.pc.cmake + +Signed-off-by: Wang Mingyu +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a5878d..c2e5740 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -563,7 +563,7 @@ IF (CARES_STATIC) + ENDIF() + + # Write ares_config.h configuration file. This is used only for the build. +-CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) ++CONFIGURE_FILE (libcares.pc.cmake ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) + + + +-- +2.17.1 + diff --git a/meta-oe/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 index 8cadb2b..0eb7e4b 100644 --- a/meta-oe/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 @@ -12,39 +12,37 @@ update to 1.14.0, fix patch warning Signed-off-by: Changqing Li --- - CMakeLists.txt | 23 +++++++++++++++++++++++ - libcares.pc.cmakein | 20 ++++++++++++++++++++ - 2 files changed, 43 insertions(+) - create mode 100644 libcares.pc.cmakein + CMakeLists.txt | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 60a880c..71eaa53 100644 +index fd123e1..3a5878d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -193,22 +193,30 @@ ADD_DEFINITIONS(${SYSFLAGS}) +@@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) # Tell C-Ares about libraries to depend on +# Also pass these libraries to pkg-config file +SET(CARES_PRIVATE_LIBS_LIST) IF (HAVE_LIBRESOLV) - LIST (APPEND CARES_DEPENDENT_LIBS resolv) +- LIST (APPEND CARES_DEPENDENT_LIBS resolv) + LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lresolv") ENDIF () IF (HAVE_LIBNSL) - LIST (APPEND CARES_DEPENDENT_LIBS nsl) +- LIST (APPEND CARES_DEPENDENT_LIBS nsl) + LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lnsl") ENDIF () IF (HAVE_LIBSOCKET) - LIST (APPEND CARES_DEPENDENT_LIBS socket) +- LIST (APPEND CARES_DEPENDENT_LIBS socket) + LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lsocket") ENDIF () IF (HAVE_LIBRT) - LIST (APPEND CARES_DEPENDENT_LIBS rt) +- LIST (APPEND CARES_DEPENDENT_LIBS rt) + LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lrt") ENDIF () IF (WIN32) - LIST (APPEND CARES_DEPENDENT_LIBS ws2_32) +- LIST (APPEND CARES_DEPENDENT_LIBS ws2_32 Advapi32) + LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lws2_32") ENDIF () @@ -52,7 +50,7 @@ index 60a880c..71eaa53 100644 # When checking for symbols, we need to make sure we set the proper # headers, libraries, and definitions for the detection to work properly -@@ -514,6 +522,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) +@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) # Write ares_config.h configuration file. This is used only for the build. CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) @@ -68,8 +66,8 @@ index 60a880c..71eaa53 100644 # TRANSFORM_MAKEFILE_INC # -@@ -664,6 +681,12 @@ IF (CARES_INSTALL) - INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +@@ -728,6 +740,12 @@ IF (CARES_INSTALL) + INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ENDIF () +# pkg-config file @@ -81,32 +79,6 @@ index 60a880c..71eaa53 100644 # Legacy chain-building variables (provided for compatibility with old code). # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") -diff --git a/libcares.pc.cmakein b/libcares.pc.cmakein -new file mode 100644 -index 0000000..3579256 ---- /dev/null -+++ b/libcares.pc.cmakein -@@ -0,0 +1,20 @@ -+#*************************************************************************** -+# Project ___ __ _ _ __ ___ ___ -+# / __|____ / _` | '__/ _ \/ __| -+# | (_|_____| (_| | | | __/\__ \ -+# \___| \__,_|_| \___||___/ -+# -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+ -+Name: c-ares -+URL: http://daniel.haxx.se/projects/c-ares/ -+Description: asynchronous DNS lookup library -+Version: @VERSION@ -+Requires: -+Requires.private: -+Cflags: -I${includedir} @CPPFLAG_CARES_STATICLIB@ -+Libs: -L${libdir} -lcares -+Libs.private: @CARES_PRIVATE_LIBS@ -- -2.7.4 +2.17.1 diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb similarity index 78% rename from meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb index d437529..e235b9b 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.15.0.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb @@ -5,13 +5,14 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -PV = "1.15.0+gitr${SRCPV}" +PV = "1.16.0+gitr${SRCPV}" SRC_URI = "\ git://github.com/c-ares/c-ares.git \ file://cmake-install-libcares.pc.patch \ + file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ " -SRCREV = "e982924acee7f7313b4baa4ee5ec000c5e373c30" +SRCREV = "077a587dccbe2f0d8a1987fbd3525333705c2249" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:53 +0000 Subject: [oe-commits] [meta-openembedded] 16/19: flatbuffers: upgrade 1.11.0 -> 1.12.0 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.7E80023415D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 28dd862c927f3791b6e7e8409b6c3d02a28eb6ee Author: Wang Mingyu AuthorDate: Wed Mar 18 00:19:49 2020 -0700 flatbuffers: upgrade 1.11.0 -> 1.12.0 0001-Add-detection-of-strtoull_l-function.patch removed since it is included in 1.12.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...0001-Add-detection-of-strtoull_l-function.patch | 38 ---------------------- ...flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} | 8 ++--- 2 files changed, 3 insertions(+), 43 deletions(-) diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch b/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch deleted file mode 100644 index f3e8210..0000000 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bff7ffbc5130cd46caf33b76b4bb0593fcd15066 Mon Sep 17 00:00:00 2001 -From: Vladimir Glavnyy <31897320+vglavnyy at users.noreply.github.com> -Date: Fri, 10 May 2019 00:15:29 +0700 -Subject: [PATCH] Add detection of strtoull_l function (#5333) (#5337) - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/google/flatbuffers/commit/bff7ffbc5130cd46caf33b76b4bb0593fcd15066] ---- - CMakeLists.txt | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0640c37b5..30be238fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,12 +42,18 @@ if(DEFINED FLATBUFFERS_MAX_PARSING_DEPTH) - message(STATUS "FLATBUFFERS_MAX_PARSING_DEPTH: ${FLATBUFFERS_MAX_PARSING_DEPTH}") - endif() - --# Auto-detect locale-narrow 'strtod_l' function. -+# Auto-detect locale-narrow 'strtod_l' and 'strtoull_l' functions. - if(NOT DEFINED FLATBUFFERS_LOCALE_INDEPENDENT) -+ set(FLATBUFFERS_LOCALE_INDEPENDENT 0) - if(MSVC) -- check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) -+ check_cxx_symbol_exists(_strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) -+ check_cxx_symbol_exists(_strtoui64_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) - else() -- check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_LOCALE_INDEPENDENT) -+ check_cxx_symbol_exists(strtof_l stdlib.h FLATBUFFERS_HAS_STRTOF_L) -+ check_cxx_symbol_exists(strtoull_l stdlib.h FLATBUFFERS_HAS_STRTOULL_L) -+ endif() -+ if(FLATBUFFERS_HAS_STRTOF_L AND FLATBUFFERS_HAS_STRTOULL_L) -+ set(FLATBUFFERS_LOCALE_INDEPENDENT 1) - endif() - endif() - add_definitions(-DFLATBUFFERS_LOCALE_INDEPENDENT=$) diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb similarity index 72% rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb index 529441d..c31cef6 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.11.0.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb @@ -8,13 +8,11 @@ PACKAGE_BEFORE_PN = "${PN}-compiler" RDEPENDS_${PN}-compiler = "${PN}" RDEPENDS_${PN}-dev += "${PN}-compiler" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a873c5645c184d51e0f9b34e1d7cf559" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "9e7e8cbe9f675123dd41b7c62868acad39188cae" +SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7" -SRC_URI = "git://github.com/google/flatbuffers.git \ - file://0001-Add-detection-of-strtoull_l-function.patch \ - " +SRC_URI = "git://github.com/google/flatbuffers.git" # Make sure C++11 is used, required for example for GCC 4.9 CXXFLAGS += "-std=c++11 -fPIC" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 02:46:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 02:46:55 +0000 Subject: [oe-commits] [meta-openembedded] 18/19: rocksdb: upgrade 6.5.2 -> 6.6.4 In-Reply-To: <158449959725.20126.18195875210658424459@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> Message-ID: <20200318024638.97E5D23418E@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6adacfcdbb29f3ed003307d1584167b7d2e92910 Author: Wang Mingyu AuthorDate: Wed Mar 18 00:19:51 2020 -0700 rocksdb: upgrade 6.5.2 -> 6.6.4 0001-Fix-build-breakage-from-lock_guard-error-6161.patch removed since it is included in 6.6.4 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...build-breakage-from-lock_guard-error-6161.patch | 36 ---------------------- meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 7 ++--- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch deleted file mode 100644 index ac87d0c..0000000 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b626703de7ece507f360507e49d3ecb448b12e07 Mon Sep 17 00:00:00 2001 -From: Maysam Yabandeh -Date: Thu, 12 Dec 2019 13:48:50 -0800 -Subject: [PATCH] Fix build breakage from lock_guard error (#6161) - -Summary: -This change fixes a source issue that caused compile time error which breaks build for many fbcode services in that setup. The size() member function of channel is a const member, so member variables accessed within it are implicitly const as well. This caused error when clang fails to resolve to a constructor that takes std::mutex because the suitable constructor got rejected due to loss of constness for its argument. The fix is to add mutable modifier to the lock_ member of channel. -Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161 - -Differential Revision: D18967685 - -Pulled By: maysamyabandeh - -Upstream-Status: Backport - -fbshipit-source-id: 698b6a5153c3c92eeacb842c467aa28cc350d432 ---- - util/channel.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/channel.h b/util/channel.h -index 0225482c0..a8a47680a 100644 ---- a/util/channel.h -+++ b/util/channel.h -@@ -60,7 +60,7 @@ class channel { - - private: - std::condition_variable cv_; -- std::mutex lock_; -+ mutable std::mutex lock_; - std::queue buffer_; - bool eof_; - }; --- -2.24.1 - diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 713d5bb..e82b77e 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "4cfbd87afd08a16df28436fb990ef6b154ee6114" -SRCBRANCH = "6.5.fb" -PV = "6.5.2" +SRCREV = "551a110918493a19d11243f53408b97485de1411" +SRCBRANCH = "6.6.fb" +PV = "6.6.4" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ - file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \ file://0001-db-write_thread.cc-Initialize-state.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From schnitzeltony at gmail.com Wed Mar 18 11:52:49 2020 From: schnitzeltony at gmail.com (=?UTF-8?Q?Andreas_M=C3=BCller?=) Date: Wed, 18 Mar 2020 12:52:49 +0100 Subject: [oe-commits] [meta-openembedded] 14/19: pipewire: Link with libatomic on mips/i*86 In-Reply-To: <20200318024638.5C1ED234160@git.openembedded.org> References: <158449959725.20126.18195875210658424459@git.openembedded.org> <20200318024638.5C1ED234160@git.openembedded.org> Message-ID: On Wed, Mar 18, 2020 at 3:46 AM wrote: > > This is an automated email from the git hooks/post-receive script. > > khem pushed a commit to branch master-next > in repository meta-openembedded. > > commit a0b1694970cd6e5b0b807f30417a2b9150d32a02 > Author: Khem Raj > AuthorDate: Sun Mar 15 11:03:46 2020 -0700 > > pipewire: Link with libatomic on mips/i*86 > > Fixes > > src/pipewire-jack.c:4218: undefined reference to `__atomic_store_8' > > Signed-off-by: Khem Raj Slipped through - thanks! Andreas From git at git.openembedded.org Wed Mar 18 22:35:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:35:59 +0000 Subject: [oe-commits] [meta-openembedded] 02/16: ser2net: upgrade 4.1.2 -> 4.1.5 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.92FDB23415F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 141307ea5196dc779da7700851db54b5094adcf7 Author: Wang Mingyu AuthorDate: Wed Mar 18 00:19:52 2020 -0700 ser2net: upgrade 4.1.2 -> 4.1.5 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb similarity index 73% rename from meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb rename to meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb index 66985af..0df134e 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.2.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.5.bb @@ -9,8 +9,8 @@ DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[md5sum] = "1a42e9605342fd3d6fa41b48be7f564a" -SRC_URI[sha256sum] = "9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7" +SRC_URI[md5sum] = "52c5e56d2d54ced0cdeb764a7e8fec92" +SRC_URI[sha256sum] = "df904d271eb161c265c956f0cb938dd0a375dda4a919a344f73b08bc50b9f308" 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 Mar 18 22:35:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:35:58 +0000 Subject: [oe-commits] [meta-openembedded] 01/16: rocksdb: Fix build on platforms not having all atomic intrinsics In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.8005823415D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 42676e95014928a1c4a9a03866ddfbd84b73220f Author: Khem Raj AuthorDate: Wed Mar 18 15:23:21 2020 -0700 rocksdb: Fix build on platforms not having all atomic intrinsics Signed-off-by: Khem Raj --- .../0001-cmake-Add-check-for-atomic-support.patch | 115 +++++++++++++++++++++ meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 1 + 2 files changed, 116 insertions(+) diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch new file mode 100644 index 0000000..9bfb1f3 --- /dev/null +++ b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch @@ -0,0 +1,115 @@ +From ba0a0e54d9544babbd3963891f4e3200dd5583f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Mar 2020 15:10:37 -0700 +Subject: [PATCH] cmake: Add check for atomic support + +Detect if libatomic should be linked in or compiler and platform can +provide the needed atomic instrinsics, this helps build on certain +platforms like mips or clang/i386 + +Fixes + +| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_exchange_8' +| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_fetch_or_8' +| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_compare_exchange_8' +| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_fetch_sub_8' +| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_load_8' +| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_store_8' +| /mnt/b/yoe/build/tmp/work/mips32r2-yoe-linux/rocksdb/6.6.4-r0/recipe-sysroot-native/usr/bin/mips-yoe-linux/mips-yoe-linux-ld: librocksdb.so.6.6.4: undefined reference to `__atomic_fetch_add_8' + +Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/6555] +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 6 +++ + cmake/modules/CheckAtomic.cmake | 69 +++++++++++++++++++++++++++++++++ + 2 files changed, 75 insertions(+) + create mode 100644 cmake/modules/CheckAtomic.cmake + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -780,7 +780,13 @@ if(WIN32) + set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) + set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) + else() ++ # check if linking against libatomic is necessary ++ include(CheckAtomic) ++ + set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT}) ++ if(HAVE_CXX_ATOMIC_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) ++ set(SYSTEM_LIBS ${SYSTEM_LIBS} atomic) ++ endif() + set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) + + add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES}) +--- /dev/null ++++ b/cmake/modules/CheckAtomic.cmake +@@ -0,0 +1,69 @@ ++# Checks if atomic operations are supported natively or if linking against ++# libatomic is needed. ++ ++# Check inspired by LLVMs cmake/modules/CheckAtomic.cmake ++ ++INCLUDE(CheckCXXSourceCompiles) ++INCLUDE(CheckLibraryExists) ++ ++function(check_working_cxx_atomics varname) ++ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) ++ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11") ++ CHECK_CXX_SOURCE_COMPILES(" ++#include ++std::atomic x; ++int main() { ++ return x; ++} ++" ${varname}) ++ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) ++endfunction(check_working_cxx_atomics) ++ ++function(check_working_cxx_atomics64 varname) ++ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) ++ set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}") ++ CHECK_CXX_SOURCE_COMPILES(" ++#include ++#include ++std::atomic x (0); ++std::atomic y (0); ++int main() { ++ uint64_t i = x.load(std::memory_order_relaxed); ++ return int(y); ++} ++" ${varname}) ++ set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) ++endfunction(check_working_cxx_atomics64) ++ ++# Check if atomics work without libatomic ++check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB) ++ ++if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) ++ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) ++ if( HAVE_LIBATOMIC ) ++ list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") ++ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB) ++ if (NOT HAVE_CXX_ATOMICS_WITH_LIB) ++ message(FATAL_ERROR "Host compiler must support std::atomic!") ++ endif() ++ else() ++ message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.") ++ endif() ++endif() ++ ++# Check if 64bit atomics work without libatomic ++check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB) ++ ++if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) ++ check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64) ++ if(HAVE_CXX_LIBATOMICS64) ++ list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") ++ check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB) ++ if (NOT HAVE_CXX_ATOMICS64_WITH_LIB) ++ message(FATAL_ERROR "Host compiler must support std::atomic!") ++ endif() ++ else() ++ message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.") ++ endif() ++endif() ++ diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index e82b77e..addf955 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -12,6 +12,7 @@ PV = "6.6.4" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ file://0001-db-write_thread.cc-Initialize-state.patch \ + file://0001-cmake-Add-check-for-atomic-support.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 Mar 18 22:36:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:00 +0000 Subject: [oe-commits] [meta-openembedded] 03/16: libyui-ncurses: Fix multilib build In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.A27B2234160@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 43f1485e21ebde03502f12500f66933b15fee50c Author: Khem Raj AuthorDate: Tue Mar 17 19:59:03 2020 -0700 libyui-ncurses: Fix multilib build Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb index dae5c34..1a376a4 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb @@ -25,8 +25,10 @@ do_configure_prepend () { git checkout bootstrap.sh sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh ./bootstrap.sh - mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ - cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then + mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + fi cd - sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:35:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:35:57 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (c9f6eb2 -> 68710f2) Message-ID: <158457095792.28207.10859725033940276289@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 c9f6eb2 ser2net: upgrade 4.1.2 -> 4.1.5 new 42676e9 rocksdb: Fix build on platforms not having all atomic intrinsics new 141307e ser2net: upgrade 4.1.2 -> 4.1.5 new 43f1485 libyui-ncurses: Fix multilib build new a12ce6d doxygen-native: fix compile error new 530a791 vboxguestdrivers: upgrade 6.1.2 -> 6.1.4 new 5b37163 corosync: update corosync.conf to 3.x new f869eaa indent: delete meaningless line referring to "/usr/doc" new 94faa7c libqmi: Upgrade 1.24.6 -> 1.24.8 new ca61f11 modemmanager: Upgrade 1.12.6 -> 1.12.8 new 568684f networkmanager: Upgrade 1.22.8 -> 1.22.10 new e6b805c gd: Fix CVE-2018-14553 new 6411f48 libnma: initial add 1.8.28 new 72f0b48 network-manager-applet: upgrade 1.8.24 -> 1.16.0 new dbcdc25 networkmanager-openvpn: upgrade 1.8.10 -> 1.8.12 new dcc32fb networkmanager-openvpn: Make PACKAGECONFIG gnome work new 68710f2 gnome-control-center: replace network-manager-applet by libnma in DEPENDS 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 (c9f6eb2) \ N -- N -- N refs/heads/master-next (68710f2) 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: .../recipes-connectivity/libnma/libnma_1.8.28.bb | 18 + .../network-manager-applet_1.16.0.bb | 25 ++ .../network-manager-applet_1.8.24.bb | 29 -- .../gnome-control-center_3.34.4.bb | 2 +- ..._1.8.10.bb => networkmanager-openvpn_1.8.12.bb} | 18 +- ...manager_1.22.8.bb => networkmanager_1.22.10.bb} | 3 +- .../corosync/corosync/corosync.conf | 85 ++-- .../libqmi/{libqmi_1.24.6.bb => libqmi_1.24.8.bb} | 3 +- ...demmanager_1.12.6.bb => modemmanager_1.12.8.bb} | 3 +- .../0001-cmake-Add-check-for-atomic-support.patch | 115 ++++++ meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 1 + .../doxygen-native-only-check-python3.patch | 433 +++++++++++++++++++++ meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb | 1 + meta-oe/recipes-extended/indent/indent_2.2.12.bb | 2 - .../libyui/libyui-ncurses_2.52.0.bb | 6 +- meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch | 110 ++++++ meta-oe/recipes-support/gd/gd_2.2.5.bb | 1 + ...tdrivers_6.1.2.bb => vboxguestdrivers_6.1.4.bb} | 4 +- 18 files changed, 773 insertions(+), 86 deletions(-) create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb rename meta-networking/recipes-connectivity/networkmanager/{networkmanager-openvpn_1.8.10.bb => networkmanager-openvpn_1.8.12.bb} (56%) rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.22.8.bb => networkmanager_1.22.10.bb} (97%) rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.6.bb => libqmi_1.24.8.bb} (85%) rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.12.6.bb => modemmanager_1.12.8.bb} (93%) create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch create mode 100644 meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.2.bb => vboxguestdrivers_6.1.4.bb} (95%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:01 +0000 Subject: [oe-commits] [meta-openembedded] 04/16: doxygen-native: fix compile error In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.B7B6F234161@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit a12ce6d446f0dbf1367227e8606394248a136f87 Author: Kai Kang AuthorDate: Wed Mar 18 11:22:14 2020 +0800 doxygen-native: fix compile error It fails to compile doxygen-native when /usr/bin/python is a link to python3 on build host: | Failed to import the site module | Traceback (most recent call last): | File "/usr/lib64/python3.6/site.py", line 564, in | main() | File "/usr/lib64/python3.6/site.py", line 550, in main | known_paths = addusersitepackages(known_paths) | File "/usr/lib64/python3.6/site.py", line 282, in addusersitepackages | user_site = getusersitepackages() | File "/usr/lib64/python3.6/site.py", line 258, in getusersitepackages | user_base = getuserbase() # this will also set USER_BASE | File "/usr/lib64/python3.6/site.py", line 248, in getuserbase | USER_BASE = get_config_var('userbase') | File "/usr/lib64/python3.6/sysconfig.py", line 604, in get_config_var | return get_config_vars().get(name) | File "/usr/lib64/python3.6/sysconfig.py", line 553, in get_config_vars | _init_posix(_CONFIG_VARS) | File "/usr/lib64/python3.6/sysconfig.py", line 424, in _init_posix | _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) | ModuleNotFoundError: No module named '_sysconfigdata' Replace find_package PythonInterp with Python3 to fix this issue that it uses python3 from python3-native. And it also replaces the result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE. This patch is only needded by doxygen-native. Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../doxygen-native-only-check-python3.patch | 433 +++++++++++++++++++++ meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb | 1 + 2 files changed, 434 insertions(+) diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch new file mode 100644 index 0000000..a9650c2 --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch @@ -0,0 +1,433 @@ +It fails to compile doxygen-native when /usr/bin/python is a link to python3 on +build host: + +| Failed to import the site module +| Traceback (most recent call last): +| File "/usr/lib64/python3.6/site.py", line 564, in +| main() +| File "/usr/lib64/python3.6/site.py", line 550, in main +| known_paths = addusersitepackages(known_paths) +| File "/usr/lib64/python3.6/site.py", line 282, in addusersitepackages +| user_site = getusersitepackages() +| File "/usr/lib64/python3.6/site.py", line 258, in getusersitepackages +| user_base = getuserbase() # this will also set USER_BASE +| File "/usr/lib64/python3.6/site.py", line 248, in getuserbase +| USER_BASE = get_config_var('userbase') +| File "/usr/lib64/python3.6/sysconfig.py", line 604, in get_config_var +| return get_config_vars().get(name) +| File "/usr/lib64/python3.6/sysconfig.py", line 553, in get_config_vars +| _init_posix(_CONFIG_VARS) +| File "/usr/lib64/python3.6/sysconfig.py", line 424, in _init_posix +| _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) +| ModuleNotFoundError: No module named '_sysconfigdata' + +Replace find_package PythonInterp with Python3 to fix this issue that +it uses python3 from python3-native. And it also replaces the result +variable PYTHON_EXECUTABLE with Python3_EXECUTABLE. + +This patch is only needded by doxygen-native. + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Kai Kang +--- +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 969ae58..604400f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,7 +93,7 @@ else () + endif () + + find_program(DOT NAMES dot) +-find_package(PythonInterp REQUIRED) ++find_package(Python3 REQUIRED) + find_package(FLEX REQUIRED) + find_package(BISON REQUIRED) + if (BISON_VERSION VERSION_LESS 2.7) +diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt +index 6aacd8b..fa197e9 100644 +--- a/addon/doxywizard/CMakeLists.txt ++++ b/addon/doxywizard/CMakeLists.txt +@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA + + # generate version.cpp + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp + DEPENDS ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_SOURCE_DIR}/src/version.py + OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp + ) +@@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER + + # generate configdoc.cpp + add_custom_command( +-COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp ++COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp + OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp + ) + set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) +@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN + set(LEX_FILES config_doxyw) + foreach(lex_file ${LEX_FILES}) + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l + OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h + ) +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 032c16a..332f1b2 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -132,7 +132,7 @@ configure_file(${CMAKE_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR}/ + + # doc/language.doc (see tag Doxyfile:INPUT) + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} ++ COMMAND ${Python3_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} + DEPENDS ${PROJECT_BINARY_DIR}/doc/maintainers.txt ${PROJECT_BINARY_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py + OUTPUT language.doc + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc +@@ -141,7 +141,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) + + # doc/config.doc (see tag Doxyfile:INPUT) + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/src/configgen.py -doc ${TOP}/src/config.xml > config.doc + DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py + OUTPUT config.doc + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/ +@@ -192,7 +192,7 @@ add_custom_target(docs_chm + COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py + COMMAND ${CMAKE_COMMAND} -E echo " if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py + COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py +- COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm ${PYTHON_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp ++ COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm ${Python3_EXECUTABLE} ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual.hhp + COMMAND ${CMAKE_COMMAND} -E chdir ${PROJECT_BINARY_DIR}/chm "${HTML_HELP_COMPILER}" doxygen_manual.hhp || echo > nul + COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm + DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 967f3d4..a8d1aad 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -52,196 +52,196 @@ add_custom_target(examples + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen class.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex + DEPENDS doxygen class.h class.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen define.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex + DEPENDS doxygen define.h define.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen enum.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex + DEPENDS doxygen enum.h enum.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen file.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex + DEPENDS doxygen file.h file.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/file/html/index.html ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen func.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex + DEPENDS doxygen func.h func.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/func/html/index.html ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen javadoc-banner.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex + DEPENDS doxygen javadoc-banner.h javadoc-banner.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/html/index.html ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen page.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex + DEPENDS doxygen page.doc page.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/page/html/index.html ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen relates.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex + DEPENDS doxygen relates.cpp relates.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/relates/html/index.html ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen author.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex + DEPENDS doxygen author.cpp author.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/author/html/index.html ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen par.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex + DEPENDS doxygen par.cpp par.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/par/html/index.html ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen overload.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex + DEPENDS doxygen overload.cpp overload.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/overload/html/index.html ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen example.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex + DEPENDS doxygen example.cpp example_test.cpp example.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen include.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex + DEPENDS doxygen include.cpp include_test.cpp include.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/include/html/index.html ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen qtstyle.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex + DEPENDS doxygen qtstyle.cpp qtstyle.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/qtstyle/html/index.html ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen jdstyle.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex + DEPENDS doxygen jdstyle.cpp jdstyle.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/jdstyle/html/index.html ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen structcmd.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex + DEPENDS doxygen structcmd.h structcmd.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/structcmd/html/index.html ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen autolink.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex + DEPENDS doxygen autolink.cpp autolink.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/autolink/html/index.html ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tag.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex + DEPENDS doxygen tag.cpp tag.cfg ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen restypedef.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex + DEPENDS doxygen restypedef.cpp restypedef.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/restypedef/html/index.html ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen afterdoc.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex + DEPENDS doxygen afterdoc.h afterdoc.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/afterdoc/html/index.html ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen templ.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex + DEPENDS doxygen templ.cpp templ.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen group.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex + DEPENDS doxygen group.cpp group.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/group/html/index.html ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen memgrp.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex + DEPENDS doxygen memgrp.cpp memgrp.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/memgrp/html/index.html ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen pyexample.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex + DEPENDS doxygen pyexample.py pyexample.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/pyexample/html/index.html ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tclexample.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex + DEPENDS doxygen tclexample.tcl tclexample.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tclexample/html/index.html ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen mux.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex + DEPENDS doxygen mux.vhdl mux.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/mux/html/index.html ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen manual.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex + DEPENDS doxygen manual.c manual.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/manual/html/index.html ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex + ) + + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen docstring.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex + DEPENDS doxygen docstring.py docstring.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/docstring/html/index.html ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex + ) +@@ -249,7 +249,7 @@ add_custom_command( + if (DOT) + add_custom_command( + COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg +- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex ++ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex + DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex + ) +diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt +index 079fcfc..e6d86f6 100644 +--- a/libmscgen/CMakeLists.txt ++++ b/libmscgen/CMakeLists.txt +@@ -7,7 +7,7 @@ include_directories( + set(LEX_FILES mscgen_lexer) + foreach(lex_file ${LEX_FILES}) + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l + OUTPUT ${GENERATED_SRC}/${lex_file}.l.h + ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 23460d0..58f679a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -35,7 +35,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) + + # configvalues.h + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configvalues.h + ) +@@ -47,7 +47,7 @@ add_custom_target( + + # configvalues.cpp + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maps ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.cpp ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maps ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.cpp + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configvalues.cpp + ) +@@ -55,7 +55,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT + + # configoptions.cpp + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configoptions.cpp + ) +@@ -86,7 +86,7 @@ file(GLOB RESOURCES ${CMAKE_SOURCE_DIR}/templates/*/*) + # resources.cpp + add_custom_command( + COMMENT "Generating ${GENERATED_SRC}/resources.cpp" +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp + DEPENDS ${RESOURCES} + OUTPUT ${GENERATED_SRC}/resources.cpp + ) +@@ -94,7 +94,7 @@ set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED + + # layout_default.xml + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/layout_default.xml + OUTPUT ${GENERATED_SRC}/layout_default.xml.h + ) +@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES}) + set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files") + set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files") + add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l + OUTPUT ${GENERATED_SRC}/${lex_file}.l.h + ) +diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt +index 40cb40b..a301acd 100644 +--- a/testing/CMakeLists.txt ++++ b/testing/CMakeLists.txt +@@ -1,9 +1,9 @@ + add_custom_target(tests + COMMENT "Running doxygen tests..." +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + DEPENDS doxygen + ) + add_test(NAME suite +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $ --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing ++ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $ --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing + ) + diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb index 7a4eee3..45de718 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb @@ -9,6 +9,7 @@ DEPENDS = "flex-native bison-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ file://0001-build-don-t-look-for-Iconv.patch \ " +SRC_URI_append_class-native = " file://doxygen-native-only-check-python3.patch" SRC_URI[md5sum] = "7997a15c73a8bd6d003eaba5c2ee2b47" SRC_URI[sha256sum] = "2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:02 +0000 Subject: [oe-commits] [meta-openembedded] 05/16: vboxguestdrivers: upgrade 6.1.2 -> 6.1.4 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.C628A234172@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 530a791fee324b86e7c52410ebb15f1de6b6a431 Author: Zang Ruochen AuthorDate: Wed Mar 18 13:19:39 2020 +0800 vboxguestdrivers: upgrade 6.1.2 -> 6.1.4 Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../{vboxguestdrivers_6.1.2.bb => vboxguestdrivers_6.1.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.4.bb similarity index 95% rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.4.bb index 62c2b50..1227e42 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.2.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.4.bb @@ -14,8 +14,8 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ " -SRC_URI[md5sum] = "f4f42fd09857556b04b803fb99cc6905" -SRC_URI[sha256sum] = "4326576e8428ea3626194fc82646347576e94c61f11d412a669fc8a10c2a1e67" +SRC_URI[md5sum] = "b3ffc51c1f082743f22bfcb71b75a396" +SRC_URI[sha256sum] = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99" S = "${WORKDIR}/vbox_module" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:04 +0000 Subject: [oe-commits] [meta-openembedded] 07/16: indent: delete meaningless line referring to "/usr/doc" In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.E10A7234174@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit f869eaaef3a4aa6d248246b90c01b184dd61dbac Author: Robert P. J. Day AuthorDate: Wed Mar 18 08:16:58 2020 -0400 indent: delete meaningless line referring to "/usr/doc" Remove what appears to be historical line referencing HTML docs under /usr/doc -- building indent generates no such file. Signed-off-by: Robert P. J. Day Signed-off-by: Khem Raj --- meta-oe/recipes-extended/indent/indent_2.2.12.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb index 0f4f4c2..90ba8a2 100644 --- a/meta-oe/recipes-extended/indent/indent_2.2.12.bb +++ b/meta-oe/recipes-extended/indent/indent_2.2.12.bb @@ -24,6 +24,4 @@ inherit autotools gettext texinfo CFLAGS_append_class-native = " -Wno-error=unused-value" -FILES_${PN}-doc += "/usr/doc/indent/indent.html" - BBCLASSEXTEND = "native" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:05 +0000 Subject: [oe-commits] [meta-openembedded] 08/16: libqmi: Upgrade 1.24.6 -> 1.24.8 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.F1DEA234175@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 94faa7c0e34040f6045309c57b3090ceb357f6f7 Author: Adrian Bunk AuthorDate: Wed Mar 18 20:51:59 2020 +0200 libqmi: Upgrade 1.24.6 -> 1.24.8 Bugfix release on the 1.24 stable branch. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../recipes-connectivity/libqmi/{libqmi_1.24.6.bb => libqmi_1.24.8.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb similarity index 85% rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb index a86215a..124b0f1 100644 --- a/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.6.bb +++ b/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.8.bb @@ -14,8 +14,7 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "5d50233394a33e43dee3e70e197323e5" -SRC_URI[sha256sum] = "1325257bc16de7b2b443fa689826c993474bdbd6e78c7a1e60e527269b44d8c9" +SRC_URI[sha256sum] = "c793db2c91d7928160341b357b26315d9c879ecb36699cb7a6b36054cba60893" 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 Wed Mar 18 22:36:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:06 +0000 Subject: [oe-commits] [meta-openembedded] 09/16: modemmanager: Upgrade 1.12.6 -> 1.12.8 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.0A10C234176@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ca61f118d40cedcb3ef86831de2537515334da70 Author: Adrian Bunk AuthorDate: Wed Mar 18 20:52:00 2020 +0200 modemmanager: Upgrade 1.12.6 -> 1.12.8 Bugfix release on the 1.12 stable branch. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../modemmanager/{modemmanager_1.12.6.bb => modemmanager_1.12.8.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb similarity index 93% rename from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb rename to meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb index ef6ba6b..47a86b9 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.6.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.8.bb @@ -14,8 +14,7 @@ DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ " -SRC_URI[md5sum] = "796bf7bfc156c4229cef1a9cb8c79f37" -SRC_URI[sha256sum] = "2eb3353ee5518005c51d429308695c69d8c38cf2fd9102b04f785c03a0cc624c" +SRC_URI[sha256sum] = "68b53d0615ba0d3e2bbf386ed029dfe644a6a30a79ab8d85523527bb4e713aff" 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 Wed Mar 18 22:36:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:07 +0000 Subject: [oe-commits] [meta-openembedded] 10/16: networkmanager: Upgrade 1.22.8 -> 1.22.10 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.1960623415F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 568684f14d6b1e8658293dddfc4491883becd96d Author: Adrian Bunk AuthorDate: Wed Mar 18 21:18:25 2020 +0200 networkmanager: Upgrade 1.22.8 -> 1.22.10 Upgrade on the 1.22 stable branch. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../{networkmanager_1.22.8.bb => networkmanager_1.22.10.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb similarity index 97% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb index 297f056..33a2b7c 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.8.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb @@ -33,8 +33,7 @@ SRC_URI_append_libc-musl = " \ file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \ file://musl/0004-Fix-build-with-musl-systemd-specific.patch \ " -SRC_URI[md5sum] = "b512b4985fe3b7e0b37fdac7ab5b8284" -SRC_URI[sha256sum] = "9511b92c72c6b5b4f063de9590ef6560696657bb6ba7d360676151742c7dab4f" +SRC_URI[sha256sum] = "2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77" S = "${WORKDIR}/NetworkManager-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:09 +0000 Subject: [oe-commits] [meta-openembedded] 12/16: libnma: initial add 1.8.28 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.369A423415D@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 6411f4872607fc10bb18a1785fc8259d890ee5ed Author: Andreas M?ller AuthorDate: Wed Mar 18 21:44:07 2020 +0100 libnma: initial add 1.8.28 With upcoming network-manager-applet 1.16 this library gets mandatory: GNOME splitted out common code from network-manager-applet to libnma. Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../recipes-connectivity/libnma/libnma_1.8.28.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb new file mode 100644 index 0000000..de5ad08 --- /dev/null +++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb @@ -0,0 +1,18 @@ +SUMMARY = "NetworkManager GUI library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0 networkmanager" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gobject-introspection gtk-doc gettext vala + +SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5" +SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726" + +PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" +PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" +PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" +PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" + +GTKDOC_MESON_OPTION = "gtk_doc" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:03 +0000 Subject: [oe-commits] [meta-openembedded] 06/16: corosync: update corosync.conf to 3.x In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223558.D3ED1234173@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5b37163201bb4b51856ddf67c66839b4fa8581df Author: Mingli Yu AuthorDate: Wed Mar 18 17:28:57 2020 +0800 corosync: update corosync.conf to 3.x Update corosync.conf to make it valid after corosync upgrades to 3.x. Reference: https://sources.debian.org/data/main/c/corosync/3.0.3-2/debian/patches/Make-the-example-config-valid.patch Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../corosync/corosync/corosync.conf | 85 +++++++++++----------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/meta-networking/recipes-extended/corosync/corosync/corosync.conf index 6aef9de..744a30f 100644 --- a/meta-networking/recipes-extended/corosync/corosync/corosync.conf +++ b/meta-networking/recipes-extended/corosync/corosync/corosync.conf @@ -1,58 +1,61 @@ -# Starting point for cluster with pacemaker/openais -compatibility: none - -corosync { - user: root - group: root -} - -aisexec { - with Pacemaker - user: root - group: root -} - -service { - name: pacemaker - ver: 1 -} - +# Please read the corosync.conf.5 manual page totem { version: 2 - secauth: off - threads: 0 - interface { - ringnumber: 0 - # Cluster network address - bindnetaddr: 192.168.10.0 - # Should be fine in most cases, don't forget to allow - # packets for this address/port in netfilter if there - # is restrictive policy set for cluster network - mcastaddr: 226.94.1.1 - mcastport: 5405 - } + + # Set name of the cluster + cluster_name: testCluster + + # crypto_cipher and crypto_hash: Used for mutual node authentication. + # If you choose to enable this, then do remember to create a shared + # secret with "corosync-keygen". + # enabling crypto_cipher, requires also enabling of crypto_hash. + # crypto works only with knet transport + crypto_cipher: none + crypto_hash: none } logging { + # Log the source file and line where messages are being + # generated. When in doubt, leave off. Potentially useful for + # debugging. fileline: off - to_stderr: no + # Log to standard error. When in doubt, set to yes. Useful when + # running in the foreground (when invoking "corosync -f") + to_stderr: yes + # Log to a log file. When set to "no", the "logfile" option + # must not be set. to_logfile: yes - to_syslog: yes logfile: /var/log/cluster/corosync.log + # Log to the system log daemon. When in doubt, set to yes. + to_syslog: yes + # Log debug messages (very verbose). When in doubt, leave off. debug: off - timestamp: on + # Log messages with time stamps. When in doubt, set to hires (or on) + #timestamp: hires logger_subsys { - subsys: AMF + subsys: QUORUM debug: off } } -amf { - mode: disabled -} - quorum { - # Quorum for the Pacemaker Cluster Resource Manager + # Enable and configure quorum subsystem (default: off) + # see also corosync.conf.5 and votequorum.5 provider: corosync_votequorum - expected_votes: 1 +} + +nodelist { + # Change/uncomment/add node sections to match cluster configuration + + node { + # Hostname of the node + name: node1 + # Cluster membership node identifier + nodeid: 1 + # Address of first link + ring0_addr: 127.0.0.1 + # When knet transport is used it's possible to define up to 8 links + #ring1_addr: 192.168.1.1 + } + # ... } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:08 +0000 Subject: [oe-commits] [meta-openembedded] 11/16: gd: Fix CVE-2018-14553 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.29667234138@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e6b805c3b2ab8ceb153d87caa7d8187252c94cdd Author: Sakib Sajal AuthorDate: Wed Mar 18 12:54:36 2020 -0700 gd: Fix CVE-2018-14553 Backport fix from upstream to fix NULL pointer dereference. Upstream-Status: Backport CVE: CVE-2018-14553 Signed-off-by: Sakib Sajal Signed-off-by: Khem Raj --- meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch | 110 +++++++++++++++++++++ meta-oe/recipes-support/gd/gd_2.2.5.bb | 1 + 2 files changed, 111 insertions(+) diff --git a/meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch b/meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch new file mode 100644 index 0000000..344f34f --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch @@ -0,0 +1,110 @@ +From a93eac0e843148dc2d631c3ba80af17e9c8c860f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?F=C3=A1bio=20Cabral=20Pacheco?= +Date: Fri, 20 Dec 2019 12:03:33 -0300 +Subject: [PATCH] Fix potential NULL pointer dereference in gdImageClone() + +--- + src/gd.c | 9 +-------- + tests/gdimageclone/.gitignore | 1 + + tests/gdimageclone/CMakeLists.txt | 1 + + tests/gdimageclone/Makemodule.am | 3 ++- + tests/gdimageclone/style.c | 30 ++++++++++++++++++++++++++++++ + 5 files changed, 35 insertions(+), 9 deletions(-) + create mode 100644 tests/gdimageclone/style.c + +diff --git a/src/gd.c b/src/gd.c +index 592a028..d564d1f 100644 +--- a/src/gd.c ++++ b/src/gd.c +@@ -2865,14 +2865,6 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { + } + } + +- if (src->styleLength > 0) { +- dst->styleLength = src->styleLength; +- dst->stylePos = src->stylePos; +- for (i = 0; i < src->styleLength; i++) { +- dst->style[i] = src->style[i]; +- } +- } +- + dst->interlace = src->interlace; + + dst->alphaBlendingFlag = src->alphaBlendingFlag; +@@ -2907,6 +2899,7 @@ BGD_DECLARE(gdImagePtr) gdImageClone (gdImagePtr src) { + + if (src->style) { + gdImageSetStyle(dst, src->style, src->styleLength); ++ dst->stylePos = src->stylePos; + } + + for (i = 0; i < gdMaxColors; i++) { +diff --git a/tests/gdimageclone/.gitignore b/tests/gdimageclone/.gitignore +index a70782d..f4129cc 100644 +--- a/tests/gdimageclone/.gitignore ++++ b/tests/gdimageclone/.gitignore +@@ -1 +1,2 @@ + /bug00300 ++/style +diff --git a/tests/gdimageclone/CMakeLists.txt b/tests/gdimageclone/CMakeLists.txt +index e6ccc31..662f4e9 100644 +--- a/tests/gdimageclone/CMakeLists.txt ++++ b/tests/gdimageclone/CMakeLists.txt +@@ -1,5 +1,6 @@ + LIST(APPEND TESTS_FILES + bug00300 ++ style + ) + + ADD_GD_TESTS() +diff --git a/tests/gdimageclone/Makemodule.am b/tests/gdimageclone/Makemodule.am +index 4b1b54c..51abf5c 100644 +--- a/tests/gdimageclone/Makemodule.am ++++ b/tests/gdimageclone/Makemodule.am +@@ -1,5 +1,6 @@ + libgd_test_programs += \ +- gdimageclone/bug00300 ++ gdimageclone/bug00300 \ ++ gdimageclone/style + + EXTRA_DIST += \ + gdimageclone/CMakeLists.txt +diff --git a/tests/gdimageclone/style.c b/tests/gdimageclone/style.c +new file mode 100644 +index 0000000..c2b246e +--- /dev/null ++++ b/tests/gdimageclone/style.c +@@ -0,0 +1,30 @@ ++/** ++ * Cloning an image should exactly reproduce all style related data ++ */ ++ ++ ++#include ++#include "gd.h" ++#include "gdtest.h" ++ ++ ++int main() ++{ ++ gdImagePtr im, clone; ++ int style[] = {0, 0, 0}; ++ ++ im = gdImageCreate(8, 8); ++ gdImageSetStyle(im, style, sizeof(style)/sizeof(style[0])); ++ ++ clone = gdImageClone(im); ++ gdTestAssert(clone != NULL); ++ ++ gdTestAssert(clone->styleLength == im->styleLength); ++ gdTestAssert(clone->stylePos == im->stylePos); ++ gdTestAssert(!memcmp(clone->style, im->style, sizeof(style)/sizeof(style[0]))); ++ ++ gdImageDestroy(clone); ++ gdImageDestroy(im); ++ ++ return gdNumFailures(); ++} +-- +2.20.1 + diff --git a/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-oe/recipes-support/gd/gd_2.2.5.bb index dda2e67..a665de4 100644 --- a/meta-oe/recipes-support/gd/gd_2.2.5.bb +++ b/meta-oe/recipes-support/gd/gd_2.2.5.bb @@ -18,6 +18,7 @@ SRC_URI = "git://github.com/libgd/libgd.git;branch=GD-2.2 \ file://CVE-2018-1000222.patch \ file://CVE-2019-6978.patch \ file://CVE-2017-6363.patch \ + file://CVE-2018-14553.patch \ " SRCREV = "8255231b68889597d04d451a72438ab92a405aba" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:12 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:12 +0000 Subject: [oe-commits] [meta-openembedded] 15/16: networkmanager-openvpn: Make PACKAGECONFIG gnome work In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.65530234187@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dcc32fb1c420abe178385a708b8b6d3c5c80fd90 Author: Andreas M?ller AuthorDate: Wed Mar 18 21:44:10 2020 +0100 networkmanager-openvpn: Make PACKAGECONFIG gnome work Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../networkmanager/networkmanager-openvpn_1.8.12.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb index 5e246a8..d455a0f 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb @@ -15,7 +15,18 @@ SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f S = "${WORKDIR}/NetworkManager-openvpn-${PV}" -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome" +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret" + +do_configure_append() { + # network-manager-openvpn.metainfo.xml is created in source folder but + # compile expects it in build folder. As long as nobody comes up with a + # better solution just support build: + if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then + mkdir -p ${B}/appdata + cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/ + fi +} do_install_append () { rm -rf ${D}${libdir}/NetworkManager/*.la -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:13 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:13 +0000 Subject: [oe-commits] [meta-openembedded] 16/16: gnome-control-center: replace network-manager-applet by libnma in DEPENDS In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.7650123418C@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 68710f24671a1485aca983367e6b692cc9ec1208 Author: Andreas M?ller AuthorDate: Wed Mar 18 21:44:11 2020 +0100 gnome-control-center: replace network-manager-applet by libnma in DEPENDS Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb index c4ba833..2533220 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.4.bb @@ -20,7 +20,7 @@ DEPENDS = " \ gnome-settings-daemon \ gnome-desktop3 \ gnome-online-accounts \ - network-manager-applet \ + libnma \ gnome-bluetooth \ grilo \ libgtop \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:10 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:10 +0000 Subject: [oe-commits] [meta-openembedded] 13/16: network-manager-applet: upgrade 1.8.24 -> 1.16.0 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.43DE6234160@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 72f0b489ce8c3788d54ff89c58abfcf79fb21bb8 Author: Andreas M?ller AuthorDate: Wed Mar 18 21:44:08 2020 +0100 network-manager-applet: upgrade 1.8.24 -> 1.16.0 * License changed in [1] - it is still GPLv2 ======================================================= network-manager-applet-1.16.0 Overview of changes since network-manager-applet-1.8.24 ======================================================= * Turned libnma into an external dependency and move to "https://gitlab.gnome.org/GNOME/libnma". To build, libnma-1.8.28 or newer is required. * The libnm-gtk, the deprecated libnm-glib compatibility library was removed. Everybody should be using libnma by now. * Improve applet icons for hidpi. * Fix transparent dialog borders. [1] https://gitlab.gnome.org/GNOME/network-manager-applet/-/commit/1ab20e8d49d10a7e673efc3c15983f2fac7a41fe Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- .../network-manager-applet_1.16.0.bb | 25 +++++++++++++++++++ .../network-manager-applet_1.8.24.bb | 29 ---------------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb new file mode 100644 index 0000000..0cac52c --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss" + +GNOMEBASEBUILDCLASS = "meson" +inherit features_check gnomebase gsettings gtk-icon-cache gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "9652c2757e85d6caba657405cf794fbd" +SRC_URI[archive.sha256sum] = "d6f98a455a271e7e169b5d35d290f4880f503cdf7593251572c9330941b5c3e5" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" + +RDEPENDS_${PN} =+ "networkmanager" + +FILES_${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb deleted file mode 100644 index 0853407..0000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+3 libnotify libsecret networkmanager iso-codes nss" - -GNOMEBASEBUILDCLASS = "meson" -inherit features_check gnomebase gsettings gtk-doc gtk-icon-cache gobject-introspection gettext - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "5c1bf351fde5adc12200345550516050" -SRC_URI[archive.sha256sum] = "118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" -PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" -PACKAGECONFIG[mobile-provider-info] = "-Dmobile_broadband_provider_info=true, -Dmobile_broadband_provider_info=false, mobile-broadband-provider-info,mobile-broadband-provider-info" -PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/nm-applet/ \ - ${datadir}/libnma/wifi.ui \ - ${datadir}/metainfo \ -" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Wed Mar 18 22:36:11 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Wed, 18 Mar 2020 22:36:11 +0000 Subject: [oe-commits] [meta-openembedded] 14/16: networkmanager-openvpn: upgrade 1.8.10 -> 1.8.12 In-Reply-To: <158457095792.28207.10859725033940276289@git.openembedded.org> References: <158457095792.28207.10859725033940276289@git.openembedded.org> Message-ID: <20200318223559.5443B234161@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit dbcdc254ddeeb979a840c92cfb57ae47f89d334f Author: Andreas M?ller AuthorDate: Wed Mar 18 21:44:09 2020 +0100 networkmanager-openvpn: upgrade 1.8.10 -> 1.8.12 >From [1]: ======================================================= NetworkManager-openvpn-1.8.12 Overview of changes since NetworkManager-openvpn-1.8.10 ======================================================= * The auth helper in external UI mode can now be run without a display server. Future nmcli version will utilize this for handling the secrets without a graphical desktop. * libnm-glib compatibility (NetworkManager < 1.0) is disabled by default. It can be enabled by passing --with-libnm-glib to configure script. Nobody should need it by now. Users that still use this are encouraged to let us know before the libnm-glib support is removed for good. * Add support for the following OpenVPN options: tls-version-min, tls-version-max, compress. * Support inline CRL blobs during import. * Allow option mssfix to be set to zero. * Update Catalan, Czech, Danish, Dutch, Friulian, Hungarian, Indonesian, Italian, Polish, Serbian, Spanish, Swedish and Ukrainian translations. [1] http://ftp.gnome.org/pub/gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.12.news Signed-off-by: Andreas M?ller Signed-off-by: Khem Raj --- ...orkmanager-openvpn_1.8.10.bb => networkmanager-openvpn_1.8.12.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb similarity index 85% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb index 56db770..5e246a8 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.10.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.12.bb @@ -10,8 +10,8 @@ inherit gnomebase useradd gettext systemd SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" -SRC_URI[md5sum] = "4dbbc103761facc7a61a1c00dfd55231" -SRC_URI[sha256sum] = "af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef" +SRC_URI[md5sum] = "e8b1210011ece18d0278310fbff45af5" +SRC_URI[sha256sum] = "0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318" S = "${WORKDIR}/NetworkManager-openvpn-${PV}" @@ -26,6 +26,7 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system nm-openvpn" FILES_${PN} += " \ + ${datadir}/dbus-1 \ ${libdir}/NetworkManager/*.so \ ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 02:28:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 02:28:58 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (68710f2 -> 2ede6ac) Message-ID: <158458493817.9156.5766403008058553659@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 68710f2 gnome-control-center: replace network-manager-applet by libnma in DEPENDS new 539119d php: CVE-2019-11045.patch CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch new fae5af0 hwdata: upgrade 0.332 -> 0.333 new 2ede6ac nss: upgrade 3.50 -> 3.51 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-devtools/php/php/CVE-2019-11045.patch | 78 ++++++++++++++++++++++ .../recipes-devtools/php/php/CVE-2019-11046.patch | 59 ++++++++++++++++ .../recipes-devtools/php/php/CVE-2019-11047.patch | 57 ++++++++++++++++ .../recipes-devtools/php/php/CVE-2019-11050.patch | 53 +++++++++++++++ meta-oe/recipes-devtools/php/php_7.3.11.bb | 4 ++ meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- .../nss/{nss_3.50.bb => nss_3.51.bb} | 4 +- 7 files changed, 255 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch rename meta-oe/recipes-support/nss/{nss_3.50.bb => nss_3.51.bb} (98%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 02:29:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 02:29:00 +0000 Subject: [oe-commits] [meta-openembedded] 02/03: hwdata: upgrade 0.332 -> 0.333 In-Reply-To: <158458493817.9156.5766403008058553659@git.openembedded.org> References: <158458493817.9156.5766403008058553659@git.openembedded.org> Message-ID: <20200319022858.85174234160@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fae5af02dd435eef3240351ba3f004081ad80e3e Author: Wang Mingyu AuthorDate: Thu Mar 19 00:39:16 2020 -0700 hwdata: upgrade 0.332 -> 0.333 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 77bb60a..5f3e3f6 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.332" -SRCREV = "17cc5d636a559ae1073865846980e4db35f7989a" +PV = "0.333" +SRCREV = "2de52be0d00015fa6cde70bb845fa9b86cf6f420" 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 Thu Mar 19 02:29:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 02:29:01 +0000 Subject: [oe-commits] [meta-openembedded] 03/03: nss: upgrade 3.50 -> 3.51 In-Reply-To: <158458493817.9156.5766403008058553659@git.openembedded.org> References: <158458493817.9156.5766403008058553659@git.openembedded.org> Message-ID: <20200319022858.8E797234161@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 2ede6ac4485cd02274595b12288a22cf7deaa163 Author: Wang Mingyu AuthorDate: Thu Mar 19 00:39:17 2020 -0700 nss: upgrade 3.50 -> 3.51 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/nss/{nss_3.50.bb => nss_3.51.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/nss/nss_3.50.bb b/meta-oe/recipes-support/nss/nss_3.51.bb similarity index 98% rename from meta-oe/recipes-support/nss/nss_3.50.bb rename to meta-oe/recipes-support/nss/nss_3.51.bb index e9855d7..889967c 100644 --- a/meta-oe/recipes-support/nss/nss_3.50.bb +++ b/meta-oe/recipes-support/nss/nss_3.51.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] = "e0366615e12b147cebc136c915baea37" -SRC_URI[sha256sum] = "185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7" +SRC_URI[md5sum] = "e59dc16965ef7713669c628d2640ebd1" +SRC_URI[sha256sum] = "75348b3b3229362486c57a880db917da1f96ef4eb639dc9cc2ff17d72268459c" 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 Thu Mar 19 02:28:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 02:28:59 +0000 Subject: [oe-commits] [meta-openembedded] 01/03: php: CVE-2019-11045.patch CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch In-Reply-To: <158458493817.9156.5766403008058553659@git.openembedded.org> References: <158458493817.9156.5766403008058553659@git.openembedded.org> Message-ID: <20200319022858.7C5F923415F@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 539119d170270bc1fee0a2510f635d6e8fabff04 Author: Wang Mingyu AuthorDate: Thu Mar 19 00:39:15 2020 -0700 php: CVE-2019-11045.patch CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch Security Advisory References: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11045 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11046 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11047 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11050 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../recipes-devtools/php/php/CVE-2019-11045.patch | 78 ++++++++++++++++++++++ .../recipes-devtools/php/php/CVE-2019-11046.patch | 59 ++++++++++++++++ .../recipes-devtools/php/php/CVE-2019-11047.patch | 57 ++++++++++++++++ .../recipes-devtools/php/php/CVE-2019-11050.patch | 53 +++++++++++++++ meta-oe/recipes-devtools/php/php_7.3.11.bb | 4 ++ 5 files changed, 251 insertions(+) diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch new file mode 100644 index 0000000..3b3c187 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch @@ -0,0 +1,78 @@ +From a5a15965da23c8e97657278fc8dfbf1dfb20c016 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" +Date: Mon, 25 Nov 2019 16:56:34 +0100 +Subject: [PATCH] Fix #78863: DirectoryIterator class silently truncates after + a null byte + +Since the constructor of DirectoryIterator and friends is supposed to +accepts paths (i.e. strings without NUL bytes), we must not accept +arbitrary strings. + +Upstream-Status: Accepted +CVE: CVE-2019-11045 + +Reference to upstream patch: +http://git.php.net/?p=php-src.git;a=commit;h=a5a15965da23c8e97657278fc8dfbf1dfb20c016 +http://git.php.net/?p=php-src.git;a=commit;h=d74907b8575e6edb83b728c2a94df434c23e1f79 +--- + ext/spl/spl_directory.c | 4 ++-- + ext/spl/tests/bug78863.phpt | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 2 deletions(-) + create mode 100644 ext/spl/tests/bug78863.phpt + +diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c +index 91ea2e0265..56e809b1c7 100644 +--- a/ext/spl/spl_directory.c ++++ b/ext/spl/spl_directory.c +@@ -708,10 +708,10 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto + + if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_FLAGS)) { + flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_FILEINFO; +- parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &path, &len, &flags); ++ parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p|l", &path, &len, &flags); + } else { + flags = SPL_FILE_DIR_KEY_AS_PATHNAME|SPL_FILE_DIR_CURRENT_AS_SELF; +- parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &len); ++ parsed = zend_parse_parameters(ZEND_NUM_ARGS(), "p", &path, &len); + } + if (SPL_HAS_FLAG(ctor_flags, SPL_FILE_DIR_SKIPDOTS)) { + flags |= SPL_FILE_DIR_SKIPDOTS; +diff --git a/ext/spl/tests/bug78863.phpt b/ext/spl/tests/bug78863.phpt +new file mode 100644 +index 0000000000..dc88d98dee +--- /dev/null ++++ b/ext/spl/tests/bug78863.phpt +@@ -0,0 +1,31 @@ ++--TEST-- ++Bug #78863 (DirectoryIterator class silently truncates after a null byte) ++--FILE-- ++isDot()) { ++ var_dump($fileinfo->getFilename()); ++ } ++} ++?> ++--EXPECTF-- ++Fatal error: Uncaught UnexpectedValueException: DirectoryIterator::__construct() expects parameter 1 to be a valid path, string given in %s:%d ++Stack trace: ++#0 %s(%d): DirectoryIterator->__construct('%s') ++#1 {main} ++ thrown in %s on line %d ++--CLEAN-- ++ +-- +2.11.0 diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch new file mode 100644 index 0000000..711b852 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch @@ -0,0 +1,59 @@ +From 2d07f00b73d8f94099850e0f5983e1cc5817c196 Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" +Date: Sat, 30 Nov 2019 12:26:37 +0100 +Subject: [PATCH] Fix #78878: Buffer underflow in bc_shift_addsub + +We must not rely on `isdigit()` to detect digits, since we only support +decimal ASCII digits in the following processing. + +(cherry picked from commit eb23c6008753b1cdc5359dead3a096dce46c9018) + +Upstream-Status: Accepted +CVE: CVE-2019-11046 + +Reference to upstream patch: +http://git.php.net/?p=php-src.git;a=commit;h=eb23c6008753b1cdc5359dead3a096dce46c9018 +http://git.php.net/?p=php-src.git;a=commit;h=2d07f00b73d8f94099850e0f5983e1cc5817c196 +--- + ext/bcmath/libbcmath/src/str2num.c | 4 ++-- + ext/bcmath/tests/bug78878.phpt | 13 +++++++++++++ + 2 files changed, 15 insertions(+), 2 deletions(-) + create mode 100644 ext/bcmath/tests/bug78878.phpt + +diff --git a/ext/bcmath/libbcmath/src/str2num.c b/ext/bcmath/libbcmath/src/str2num.c +index f38d341570..03aec15930 100644 +--- a/ext/bcmath/libbcmath/src/str2num.c ++++ b/ext/bcmath/libbcmath/src/str2num.c +@@ -57,9 +57,9 @@ bc_str2num (bc_num *num, char *str, int scale) + zero_int = FALSE; + if ( (*ptr == '+') || (*ptr == '-')) ptr++; /* Sign */ + while (*ptr == '0') ptr++; /* Skip leading zeros. */ +- while (isdigit((int)*ptr)) ptr++, digits++; /* digits */ ++ while (*ptr >= '0' && *ptr <= '9') ptr++, digits++; /* digits */ + if (*ptr == '.') ptr++; /* decimal point */ +- while (isdigit((int)*ptr)) ptr++, strscale++; /* digits */ ++ while (*ptr >= '0' && *ptr <= '9') ptr++, strscale++; /* digits */ + if ((*ptr != '\0') || (digits+strscale == 0)) + { + *num = bc_copy_num (BCG(_zero_)); +diff --git a/ext/bcmath/tests/bug78878.phpt b/ext/bcmath/tests/bug78878.phpt +new file mode 100644 +index 0000000000..2c9d72b946 +--- /dev/null ++++ b/ext/bcmath/tests/bug78878.phpt +@@ -0,0 +1,13 @@ ++--TEST-- ++Bug #78878 (Buffer underflow in bc_shift_addsub) ++--SKIPIF-- ++ ++--FILE-- ++ ++--EXPECT-- ++bc math warning: non-zero scale in modulus ++0 +-- +2.11.0 diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch new file mode 100644 index 0000000..e2922bf --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch @@ -0,0 +1,57 @@ +From d348cfb96f2543565691010ade5e0346338be5a7 Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev +Date: Mon, 16 Dec 2019 00:10:39 -0800 +Subject: [PATCH] Fixed bug #78910 + +Upstream-Status: Accepted +CVE-2019-11047 + +Reference to upstream patch: +http://git.php.net/?p=php-src.git;a=commit;h=d348cfb96f2543565691010ade5e0346338be5a7 +http://git.php.net/?p=php-src.git;a=commit;h=57325460d2bdee01a13d8e6cf03345c90543ff4f +--- + ext/exif/exif.c | 3 ++- + ext/exif/tests/bug78910.phpt | 17 +++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + create mode 100644 ext/exif/tests/bug78910.phpt + +diff --git a/ext/exif/exif.c b/ext/exif/exif.c +index 2804807e..a5780113 100644 +--- a/ext/exif/exif.c ++++ b/ext/exif/exif.c +@@ -3138,7 +3138,8 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu + /*exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "check (%s)", maker_note->make?maker_note->make:"");*/ + if (maker_note->make && (!ImageInfo->make || strcmp(maker_note->make, ImageInfo->make))) + continue; +- if (maker_note->id_string && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len)) ++ if (maker_note->id_string && value_len >= maker_note->id_string_len ++ && strncmp(maker_note->id_string, value_ptr, maker_note->id_string_len)) + continue; + break; + } +diff --git a/ext/exif/tests/bug78910.phpt b/ext/exif/tests/bug78910.phpt +new file mode 100644 +index 00000000..f5b1c32c +--- /dev/null ++++ b/ext/exif/tests/bug78910.phpt +@@ -0,0 +1,17 @@ ++--TEST-- ++Bug #78910: Heap-buffer-overflow READ in exif (OSS-Fuzz #19044) ++--FILE-- ++ ++--EXPECTF-- ++Notice: exif_read_data(): Read from TIFF: tag(0x927C, MakerNote ): Illegal format code 0x2020, switching to BYTE in %s on line %d ++ ++Warning: exif_read_data(): Process tag(x927C=MakerNote ): Illegal format code 0x2020, suppose BYTE in %s on line %d ++ ++Warning: exif_read_data(): IFD data too short: 0x0000 offset 0x000C in %s on line %d ++ ++Warning: exif_read_data(): Invalid TIFF file in %s on line %d ++bool(false) +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch new file mode 100644 index 0000000..700b99b --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch @@ -0,0 +1,53 @@ +From c14eb8de974fc8a4d74f3515424c293bc7a40fba Mon Sep 17 00:00:00 2001 +From: Stanislav Malyshev +Date: Mon, 16 Dec 2019 01:14:38 -0800 +Subject: [PATCH] Fix bug #78793 + +Upstream-Status: Accepted +CVE-2019-11050 + +Reference to upstream patch: +http://git.php.net/?p=php-src.git;a=commit;h=c14eb8de974fc8a4d74f3515424c293bc7a40fba +http://git.php.net/?p=php-src.git;a=commit;h=1b3b4a0d367b6f0b67e9f73d82f53db6c6b722b2 +--- + ext/exif/exif.c | 5 +++-- + ext/exif/tests/bug78793.phpt | 12 ++++++++++++ + 2 files changed, 15 insertions(+), 2 deletions(-) + create mode 100644 ext/exif/tests/bug78793.phpt + +diff --git a/ext/exif/exif.c b/ext/exif/exif.c +index c0be05922f..7fe055f381 100644 +--- a/ext/exif/exif.c ++++ b/ext/exif/exif.c +@@ -3240,8 +3240,9 @@ static int exif_process_IFD_in_MAKERNOTE(image_info_type *ImageInfo, char * valu + } + + for (de=0;detag_table)) { ++ size_t offset = 2 + 12 * de; ++ if (!exif_process_IFD_TAG(ImageInfo, dir_start + offset, ++ offset_base, data_len - offset, displacement, section_index, 0, maker_note->tag_table)) { + return FALSE; + } + } +diff --git a/ext/exif/tests/bug78793.phpt b/ext/exif/tests/bug78793.phpt +new file mode 100644 +index 0000000000..033f255ace +--- /dev/null ++++ b/ext/exif/tests/bug78793.phpt +@@ -0,0 +1,12 @@ ++--TEST-- ++Bug #78793: Use-after-free in exif parsing under memory sanitizer ++--FILE-- ++ ++===DONE=== ++--EXPECT-- ++===DONE=== +-- +2.11.0 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 8dbaf89..880ac83 100644 --- a/meta-oe/recipes-devtools/php/php_7.3.11.bb +++ b/meta-oe/recipes-devtools/php/php_7.3.11.bb @@ -19,6 +19,10 @@ SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ file://debian-php-fixheader.patch \ file://CVE-2019-6978.patch \ file://CVE-2020-7059.patch \ + file://CVE-2019-11045.patch \ + file://CVE-2019-11046.patch \ + file://CVE-2019-11047.patch \ + file://CVE-2019-11050.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 Thu Mar 19 08:36:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 08:36:02 +0000 Subject: [oe-commits] [meta-openembedded] branch master updated (802f912 -> 2ede6ac) Message-ID: <158460696200.19631.10593628924736452613@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 802f912 flashrom: Fix build with clang add 81386fc redis: upgrade 5.0.7 -> 5.0.8 add 866c0c4 glade: upgrade 3.22.1 -> 3.22.2 add b836d02 libgphoto2: upgrade 2.5.23 -> 2.5.24 add 883c00b sdparm: upgrade 1.10 -> 1.11 add 7f8f1ac gsoap: upgrade 2.8.95 -> 2.8.99 add 7124587 arptables: upgrade 0.0.4 -> 0.0.5 add 36d5ae1 libtdb: upgrade 1.4.2 -> 1.4.3 add 04984e6 spice-protocol: upgrade 0.14.0 -> 0.14.1 add c64b204 botan: Define --libdir to fix multilib build issues add 464c317 ipmitool: fixes for CVE-2020-5208 add f7e11c4 openjpeg: Fix CVE-2020-8112 add 5200e02 pipewire: upgrade 0.2.7 -> 0.3.1 add 92f9c0f mutter: depend on pipewire-0.2 in PACKAGECONFIG[remote-desktop] add a0b1694 pipewire: Link with libatomic on mips/i*86 add 81a32ac c-ares: upgrade 1.15.0 -> 1.16.0 add 28dd862 flatbuffers: upgrade 1.11.0 -> 1.12.0 add 3758a2d irssi: upgrade 1.1.2 -> 1.2.2 add 6adacfc rocksdb: upgrade 6.5.2 -> 6.6.4 add 42676e9 rocksdb: Fix build on platforms not having all atomic intrinsics add 141307e ser2net: upgrade 4.1.2 -> 4.1.5 add 43f1485 libyui-ncurses: Fix multilib build add a12ce6d doxygen-native: fix compile error add 530a791 vboxguestdrivers: upgrade 6.1.2 -> 6.1.4 add 5b37163 corosync: update corosync.conf to 3.x add f869eaa indent: delete meaningless line referring to "/usr/doc" add 94faa7c libqmi: Upgrade 1.24.6 -> 1.24.8 add ca61f11 modemmanager: Upgrade 1.12.6 -> 1.12.8 add 568684f networkmanager: Upgrade 1.22.8 -> 1.22.10 add e6b805c gd: Fix CVE-2018-14553 add 6411f48 libnma: initial add 1.8.28 add 72f0b48 network-manager-applet: upgrade 1.8.24 -> 1.16.0 add dbcdc25 networkmanager-openvpn: upgrade 1.8.10 -> 1.8.12 add dcc32fb networkmanager-openvpn: Make PACKAGECONFIG gnome work add 68710f2 gnome-control-center: replace network-manager-applet by libnma in DEPENDS add 539119d php: CVE-2019-11045.patch CVE-2019-11046.patch CVE-2019-11047.patch CVE-2019-11050.patch add fae5af0 hwdata: upgrade 0.332 -> 0.333 add 2ede6ac nss: upgrade 3.50 -> 3.51 No new revisions were added by this update. Summary of changes: .../recipes-connectivity/libnma/libnma_1.8.28.bb | 18 + .../network-manager-applet_1.16.0.bb | 25 ++ .../network-manager-applet_1.8.24.bb | 29 -- .../gnome-control-center_3.34.4.bb | 2 +- meta-gnome/recipes-gnome/mutter/mutter_3.34.4.bb | 2 +- ..._1.8.10.bb => networkmanager-openvpn_1.8.12.bb} | 18 +- ...manager_1.22.8.bb => networkmanager_1.22.10.bb} | 3 +- .../corosync/corosync/corosync.conf | 85 ++-- ...FLAGS-for-package-specific-compiler-flags.patch | 42 +- .../arptables/arptables-init-busybox.patch | 77 ---- .../arptables/arptables-remove-bashism.patch | 37 -- .../recipes-support/arptables/arptables_git.bb | 6 +- .../0001-waf-add-support-of-cross_compile.patch | 63 --- .../tdb-Add-configure-options-for-packages.patch | 2 +- .../libtdb/{libtdb_1.4.2.bb => libtdb_1.4.3.bb} | 5 +- .../recipes-support/spice/spice-protocol_git.bb | 4 +- .../irssi/{irssi_1.1.2.bb => irssi_1.2.2.bb} | 4 +- .../libqmi/{libqmi_1.24.6.bb => libqmi_1.24.8.bb} | 3 +- ...demmanager_1.12.6.bb => modemmanager_1.12.8.bb} | 3 +- .../ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb} | 4 +- meta-oe/recipes-crypto/botan/botan_2.13.0.bb | 5 +- ...build-breakage-from-lock_guard-error-6161.patch | 36 -- .../0001-cmake-Add-check-for-atomic-support.patch | 115 ++++++ meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 8 +- .../doxygen-native-only-check-python3.patch | 433 +++++++++++++++++++++ meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb | 1 + ...0001-Add-detection-of-strtoull_l-function.patch | 38 -- ...flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} | 8 +- .../glade/{glade_3.22.1.bb => glade_3.22.2.bb} | 4 +- .../recipes-devtools/php/php/CVE-2019-11045.patch | 78 ++++ .../recipes-devtools/php/php/CVE-2019-11046.patch | 59 +++ .../recipes-devtools/php/php/CVE-2019-11047.patch | 57 +++ .../recipes-devtools/php/php/CVE-2019-11050.patch | 53 +++ meta-oe/recipes-devtools/php/php_7.3.11.bb | 4 + meta-oe/recipes-extended/indent/indent_2.2.12.bb | 2 - .../redis/0001-src-Do-not-reset-FINAL_LIBS.patch | 4 +- ...-extern-definition-of-SDS_NOINIT-in-sds.h.patch | 27 -- .../redis/{redis_5.0.7.bb => redis_5.0.8.bb} | 5 +- .../{libgphoto2_2.5.23.bb => libgphoto2_2.5.24.bb} | 4 +- .../libyui/libyui-ncurses_2.52.0.bb | 6 +- .../openjpeg/openjpeg/CVE-2020-8112.patch | 46 +++ .../recipes-graphics/openjpeg/openjpeg_2.3.1.bb | 1 + ...Fix-buffer-overflow-in-ipmi_spd_print_fru.patch | 53 +++ ...-buffer-overflow-in-ipmi_get_session_info.patch | 53 +++ .../0003-channel-Fix-buffer-overflow.patch | 69 ++++ ...-buffer-overflows-in-get_lan_param_select.patch | 94 +++++ ...05-fru-sdr-Fix-id_string-buffer-overflows.patch | 142 +++++++ meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 5 + .../{pipewire_git.bb => pipewire-0.2_git.bb} | 0 .../recipes-multimedia/pipewire/pipewire_git.bb | 33 +- ...re-error-mv-libcares.pc.cmakein-to-libcar.patch | 27 ++ .../c-ares/c-ares/cmake-install-libcares.pc.patch | 54 +-- .../c-ares/{c-ares_1.15.0.bb => c-ares_1.16.0.bb} | 5 +- meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch | 110 ++++++ meta-oe/recipes-support/gd/gd_2.2.5.bb | 1 + .../gsoap/{gsoap_2.8.95.bb => gsoap_2.8.99.bb} | 4 +- meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- .../nss/{nss_3.50.bb => nss_3.51.bb} | 4 +- .../sdparm/files/make-sysroot-work.patch | 4 +- .../sdparm/{sdparm_1.10.bb => sdparm_1.11.bb} | 6 +- ...tdrivers_6.1.2.bb => vboxguestdrivers_6.1.4.bb} | 4 +- 61 files changed, 1604 insertions(+), 494 deletions(-) create mode 100644 meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.16.0.bb delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.24.bb rename meta-networking/recipes-connectivity/networkmanager/{networkmanager-openvpn_1.8.10.bb => networkmanager-openvpn_1.8.12.bb} (56%) rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.22.8.bb => networkmanager_1.22.10.bb} (97%) delete mode 100644 meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch delete mode 100644 meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch delete mode 100644 meta-networking/recipes-support/libtdb/libtdb/0001-waf-add-support-of-cross_compile.patch rename meta-networking/recipes-support/libtdb/{libtdb_1.4.2.bb => libtdb_1.4.3.bb} (90%) rename meta-oe/recipes-connectivity/irssi/{irssi_1.1.2.bb => irssi_1.2.2.bb} (79%) rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.24.6.bb => libqmi_1.24.8.bb} (85%) rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.12.6.bb => modemmanager_1.12.8.bb} (93%) rename meta-oe/recipes-connectivity/ser2net/{ser2net_4.1.2.bb => ser2net_4.1.5.bb} (73%) delete mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Fix-build-breakage-from-lock_guard-error-6161.patch create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch create mode 100644 meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch delete mode 100644 meta-oe/recipes-devtools/flatbuffers/flatbuffers/0001-Add-detection-of-strtoull_l-function.patch rename meta-oe/recipes-devtools/flatbuffers/{flatbuffers_1.11.0.bb => flatbuffers_1.12.0.bb} (72%) rename meta-oe/recipes-devtools/glade/{glade_3.22.1.bb => glade_3.22.2.bb} (87%) create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11045.patch create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11046.patch create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11047.patch create mode 100644 meta-oe/recipes-devtools/php/php/CVE-2019-11050.patch delete mode 100644 meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch rename meta-oe/recipes-extended/redis/{redis_5.0.7.bb => redis_5.0.8.bb} (90%) rename meta-oe/recipes-graphics/gphoto2/{libgphoto2_2.5.23.bb => libgphoto2_2.5.24.bb} (91%) create mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0001-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0002-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0003-channel-Fix-buffer-overflow.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch create mode 100644 meta-oe/recipes-kernel/ipmitool/ipmitool/0005-fru-sdr-Fix-id_string-buffer-overflows.patch copy meta-oe/recipes-multimedia/pipewire/{pipewire_git.bb => pipewire-0.2_git.bb} (100%) create mode 100644 meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch rename meta-oe/recipes-support/c-ares/{c-ares_1.15.0.bb => c-ares_1.16.0.bb} (78%) create mode 100644 meta-oe/recipes-support/gd/gd/CVE-2018-14553.patch rename meta-oe/recipes-support/gsoap/{gsoap_2.8.95.bb => gsoap_2.8.99.bb} (89%) rename meta-oe/recipes-support/nss/{nss_3.50.bb => nss_3.51.bb} (98%) rename meta-oe/recipes-support/sdparm/{sdparm_1.10.bb => sdparm_1.11.bb} (78%) rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_6.1.2.bb => vboxguestdrivers_6.1.4.bb} (95%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:47 +0000 Subject: [oe-commits] [openembedded-core] 02/07: libpcre2: fix CVE-2019-20454 In-Reply-To: <158461234560.28224.759514127728700692@git.openembedded.org> References: <158461234560.28224.759514127728700692@git.openembedded.org> Message-ID: <20200319100546.4739F2362A7@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 8ec7a51da26f07fd43b5e6787b15c8636009b183 Author: Lee Chee Yang AuthorDate: Wed Mar 11 14:47:36 2020 +0800 libpcre2: fix CVE-2019-20454 Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- .../libpcre/libpcre2/CVE-2019-20454.patch | 19 +++++++++++++++++++ meta/recipes-support/libpcre/libpcre2_10.33.bb | 1 + 2 files changed, 20 insertions(+) diff --git a/meta/recipes-support/libpcre/libpcre2/CVE-2019-20454.patch b/meta/recipes-support/libpcre/libpcre2/CVE-2019-20454.patch new file mode 100644 index 0000000..51f95a7 --- /dev/null +++ b/meta/recipes-support/libpcre/libpcre2/CVE-2019-20454.patch @@ -0,0 +1,19 @@ +Upstream-Status: Backport [https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_jit_compile.c?r1=1092&r2=1091&pathrev=1092] +CVE: CVE-2020-8002 +Signed-off-by: Lee Chee Yang + +--- pcre2-10.30/src/pcre2_jit_compile.c 2019/05/13 16:26:17 1091 ++++ pcre2-10.30/src/pcre2_jit_compile.c 2019/05/13 16:38:18 1092 +@@ -8571,7 +8571,10 @@ + PCRE2_SPTR bptr; + uint32_t c; + +-GETCHARINC(c, cc); ++/* Patch by PH */ ++/* GETCHARINC(c, cc); */ ++ ++c = *cc++; + #if PCRE2_CODE_UNIT_WIDTH == 32 + if (c >= 0x110000) + return NULL; + diff --git a/meta/recipes-support/libpcre/libpcre2_10.33.bb b/meta/recipes-support/libpcre/libpcre2_10.33.bb index 50b2675..1020df9 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.33.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.33.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=b1588d3bb4cb0e1f5a597d908f8c5b37" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \ file://pcre-cross.patch \ + file://CVE-2019-20454.patch \ " SRC_URI[md5sum] = "80b355f2dce909a2e2424f5c79eddb44" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:45 +0000 Subject: [oe-commits] [openembedded-core] branch zeus updated (d8cfc30 -> c940e4b) Message-ID: <158461234560.28224.759514127728700692@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 d8cfc30 cve-check: fix ValueError new dac4545 qemu: fix CVE-2019-20382 new 8ec7a51 libpcre2: fix CVE-2019-20454 new feb8982 sqlite: fix numerous CVEs new 07dc856 aspell: CVE-2019-20433 new 3c40cfe python3: Upgrade 3.7.6 -> 3.7.7 new 8788173 libarchive: Fix CVE-2020-9308 new c940e4b bluez: fix CVE-2020-0556 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-connectivity/bluez5/bluez5.inc | 2 + .../bluez5/bluez5/CVE-2020-0556-1.patch | 35 + .../bluez5/bluez5/CVE-2020-0556-2.patch | 143 +++ .../python/{python3_3.7.6.bb => python3_3.7.7.bb} | 6 +- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2019-20382.patch | 1018 ++++++++++++++++++++ ...-reject-files-that-declare-invalid-header.patch | 124 +++ .../libarchive/libarchive_3.4.0.bb | 1 + .../aspell/aspell/CVE-2019-20433-0001.patch | 999 +++++++++++++++++++ .../aspell/aspell/CVE-2019-20433-0002.patch | 68 ++ meta/recipes-support/aspell/aspell_0.60.7.bb | 2 + .../libpcre/libpcre2/CVE-2019-20454.patch | 19 + meta/recipes-support/libpcre/libpcre2_10.33.bb | 1 + .../sqlite/sqlite3/CVE-2019-19244.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.29.0.bb | 10 +- 21 files changed, 2714 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch create mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch rename meta/recipes-devtools/python/{python3_3.7.6.bb => python3_3.7.7.bb} (98%) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2019-20382.patch create mode 100644 meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch create mode 100644 meta/recipes-support/aspell/aspell/CVE-2019-20433-0001.patch create mode 100644 meta/recipes-support/aspell/aspell/CVE-2019-20433-0002.patch create mode 100644 meta/recipes-support/libpcre/libpcre2/CVE-2019-20454.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch create mode 100644 meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:48 +0000 Subject: [oe-commits] [openembedded-core] 03/07: sqlite: fix numerous CVEs In-Reply-To: <158461234560.28224.759514127728700692@git.openembedded.org> References: <158461234560.28224.759514127728700692@git.openembedded.org> Message-ID: <20200319100546.545452362A8@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 feb8982ac6670af3bcb1243b51054bba9b027c83 Author: Ross Burton AuthorDate: Wed Mar 11 11:49:19 2020 +0200 sqlite: fix numerous CVEs Fix the following CVEs: - CVE-2019-19244 - CVE-2019-19923 - CVE-2019-19924 - CVE-2019-19925 - CVE-2019-19926 - CVE-2019-19959 - CVE-2019-20218 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie [ removed the CVE-2019-19880 fix that did not apply cleanly ] Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- .../sqlite/sqlite3/CVE-2019-19244.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.29.0.bb | 10 +++- 8 files changed, 298 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch new file mode 100644 index 0000000..3f70979 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19244.patch @@ -0,0 +1,33 @@ +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-19923.patch b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch new file mode 100644 index 0000000..b1b866b --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19923.patch @@ -0,0 +1,50 @@ +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 new file mode 100644 index 0000000..80d5edb --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19924.patch @@ -0,0 +1,65 @@ +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 new file mode 100644 index 0000000..ffc2c6a --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19925.patch @@ -0,0 +1,33 @@ +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 new file mode 100644 index 0000000..92bc790 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19926.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000..cba8ec9 --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-19959.patch @@ -0,0 +1,46 @@ +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 new file mode 100644 index 0000000..fb6cd6d --- /dev/null +++ b/meta/recipes-support/sqlite/sqlite3/CVE-2019-20218.patch @@ -0,0 +1,31 @@ +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.29.0.bb b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb index 34066fb..cf3b179 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.29.0.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.29.0.bb @@ -4,6 +4,14 @@ 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://0001-Fix-CVE-2019-16168.patch" + file://0001-Fix-CVE-2019-16168.patch \ + file://CVE-2019-19244.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] = "8f3dfe83387e62ecb91c7c5c09c688dc" SRC_URI[sha256sum] = "8e7c1e2950b5b04c5944a981cb31fffbf9d2ddda939d536838ebc854481afd5b" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:46 +0000 Subject: [oe-commits] [openembedded-core] 01/07: qemu: fix CVE-2019-20382 In-Reply-To: <158461234560.28224.759514127728700692@git.openembedded.org> References: <158461234560.28224.759514127728700692@git.openembedded.org> Message-ID: <20200319100546.381322362A6@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 dac4545cdf0ab848086da96eac123d0c640cd8b2 Author: Lee Chee Yang AuthorDate: Wed Mar 11 14:47:35 2020 +0800 qemu: fix CVE-2019-20382 Signed-off-by: Lee Chee Yang Signed-off-by: Anuj Mittal --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2019-20382.patch | 1018 ++++++++++++++++++++ 2 files changed, 1019 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index d394db8..f451017 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -30,6 +30,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2019-15890.patch \ file://CVE-2019-12068.patch \ file://CVE-2020-1711.patch \ + file://CVE-2019-20382.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2019-20382.patch b/meta/recipes-devtools/qemu/qemu/CVE-2019-20382.patch new file mode 100644 index 0000000..183d100 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2019-20382.patch @@ -0,0 +1,1018 @@ +From 6bf21f3d83e95bcc4ba35a7a07cc6655e8b010b0 Mon Sep 17 00:00:00 2001 +From: Li Qiang +Date: Sat, 31 Aug 2019 08:39:22 -0700 +Subject: [PATCH] vnc: fix memory leak when vnc disconnect + +Currently when qemu receives a vnc connect, it creates a 'VncState' to +represent this connection. In 'vnc_worker_thread_loop' it creates a +local 'VncState'. The connection 'VcnState' and local 'VncState' exchange +data in 'vnc_async_encoding_start' and 'vnc_async_encoding_end'. +In 'zrle_compress_data' it calls 'deflateInit2' to allocate the libz library +opaque data. The 'VncState' used in 'zrle_compress_data' is the local +'VncState'. In 'vnc_zrle_clear' it calls 'deflateEnd' to free the libz +library opaque data. The 'VncState' used in 'vnc_zrle_clear' is the connection +'VncState'. In currently implementation there will be a memory leak when the +vnc disconnect. Following is the asan output backtrack: + +Direct leak of 29760 byte(s) in 5 object(s) allocated from: + 0 0xffffa67ef3c3 in __interceptor_calloc (/lib64/libasan.so.4+0xd33c3) + 1 0xffffa65071cb in g_malloc0 (/lib64/libglib-2.0.so.0+0x571cb) + 2 0xffffa5e968f7 in deflateInit2_ (/lib64/libz.so.1+0x78f7) + 3 0xaaaacec58613 in zrle_compress_data ui/vnc-enc-zrle.c:87 + 4 0xaaaacec58613 in zrle_send_framebuffer_update ui/vnc-enc-zrle.c:344 + 5 0xaaaacec34e77 in vnc_send_framebuffer_update ui/vnc.c:919 + 6 0xaaaacec5e023 in vnc_worker_thread_loop ui/vnc-jobs.c:271 + 7 0xaaaacec5e5e7 in vnc_worker_thread ui/vnc-jobs.c:340 + 8 0xaaaacee4d3c3 in qemu_thread_start util/qemu-thread-posix.c:502 + 9 0xffffa544e8bb in start_thread (/lib64/libpthread.so.0+0x78bb) + 10 0xffffa53965cb in thread_start (/lib64/libc.so.6+0xd55cb) + +This is because the opaque allocated in 'deflateInit2' is not freed in +'deflateEnd'. The reason is that the 'deflateEnd' calls 'deflateStateCheck' +and in the latter will check whether 's->strm != strm'(libz's data structure). +This check will be true so in 'deflateEnd' it just return 'Z_STREAM_ERROR' and +not free the data allocated in 'deflateInit2'. + +The reason this happens is that the 'VncState' contains the whole 'VncZrle', +so when calling 'deflateInit2', the 's->strm' will be the local address. +So 's->strm != strm' will be true. + +To fix this issue, we need to make 'zrle' of 'VncState' to be a pointer. +Then the connection 'VncState' and local 'VncState' exchange mechanism will +work as expection. The 'tight' of 'VncState' has the same issue, let's also turn +it to a pointer. + +Reported-by: Ying Fang +Signed-off-by: Li Qiang +Message-id: 20190831153922.121308-1-liq3ea at 163.com +Signed-off-by: Gerd Hoffmann + +Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=6bf21f3d83e95bcc4ba35a7a07cc6655e8b010b0] +CVE: CVE-2019-20382 +Signed-off-by: Lee Chee Yang + +--- + ui/vnc-enc-tight.c | 219 +++++++++++++++++++++++++------------------------- + ui/vnc-enc-zlib.c | 11 +-- + ui/vnc-enc-zrle.c | 68 ++++++++-------- + ui/vnc-enc-zrle.inc.c | 2 +- + ui/vnc.c | 28 ++++--- + ui/vnc.h | 4 +- + 6 files changed, 170 insertions(+), 162 deletions(-) + +diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c +index 9084c22..1e08518 100644 +--- a/ui/vnc-enc-tight.c ++++ b/ui/vnc-enc-tight.c +@@ -116,7 +116,7 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, + + static bool tight_can_send_png_rect(VncState *vs, int w, int h) + { +- if (vs->tight.type != VNC_ENCODING_TIGHT_PNG) { ++ if (vs->tight->type != VNC_ENCODING_TIGHT_PNG) { + return false; + } + +@@ -144,7 +144,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h) + int pixels = 0; + int pix, left[3]; + unsigned int errors; +- unsigned char *buf = vs->tight.tight.buffer; ++ unsigned char *buf = vs->tight->tight.buffer; + + /* + * If client is big-endian, color samples begin from the second +@@ -215,7 +215,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h) + int pixels = 0; \ + int sample, sum, left[3]; \ + unsigned int errors; \ +- unsigned char *buf = vs->tight.tight.buffer; \ ++ unsigned char *buf = vs->tight->tight.buffer; \ + \ + endian = 0; /* FIXME */ \ + \ +@@ -296,8 +296,8 @@ static int + tight_detect_smooth_image(VncState *vs, int w, int h) + { + unsigned int errors; +- int compression = vs->tight.compression; +- int quality = vs->tight.quality; ++ int compression = vs->tight->compression; ++ int quality = vs->tight->quality; + + if (!vs->vd->lossy) { + return 0; +@@ -309,7 +309,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h) + return 0; + } + +- if (vs->tight.quality != (uint8_t)-1) { ++ if (vs->tight->quality != (uint8_t)-1) { + if (w * h < VNC_TIGHT_JPEG_MIN_RECT_SIZE) { + return 0; + } +@@ -320,9 +320,9 @@ tight_detect_smooth_image(VncState *vs, int w, int h) + } + + if (vs->client_pf.bytes_per_pixel == 4) { +- if (vs->tight.pixel24) { ++ if (vs->tight->pixel24) { + errors = tight_detect_smooth_image24(vs, w, h); +- if (vs->tight.quality != (uint8_t)-1) { ++ if (vs->tight->quality != (uint8_t)-1) { + return (errors < tight_conf[quality].jpeg_threshold24); + } + return (errors < tight_conf[compression].gradient_threshold24); +@@ -352,7 +352,7 @@ tight_detect_smooth_image(VncState *vs, int w, int h) + uint##bpp##_t c0, c1, ci; \ + int i, n0, n1; \ + \ +- data = (uint##bpp##_t *)vs->tight.tight.buffer; \ ++ data = (uint##bpp##_t *)vs->tight->tight.buffer; \ + \ + c0 = data[0]; \ + i = 1; \ +@@ -423,9 +423,9 @@ static int tight_fill_palette(VncState *vs, int x, int y, + { + int max; + +- max = count / tight_conf[vs->tight.compression].idx_max_colors_divisor; ++ max = count / tight_conf[vs->tight->compression].idx_max_colors_divisor; + if (max < 2 && +- count >= tight_conf[vs->tight.compression].mono_min_rect_size) { ++ count >= tight_conf[vs->tight->compression].mono_min_rect_size) { + max = 2; + } + if (max >= 256) { +@@ -558,7 +558,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) + int x, y, c; + + buf32 = (uint32_t *)buf; +- memset(vs->tight.gradient.buffer, 0, w * 3 * sizeof(int)); ++ memset(vs->tight->gradient.buffer, 0, w * 3 * sizeof(int)); + + if (1 /* FIXME */) { + shift[0] = vs->client_pf.rshift; +@@ -575,7 +575,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) + upper[c] = 0; + here[c] = 0; + } +- prev = (int *)vs->tight.gradient.buffer; ++ prev = (int *)vs->tight->gradient.buffer; + for (x = 0; x < w; x++) { + pix32 = *buf32++; + for (c = 0; c < 3; c++) { +@@ -615,7 +615,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) + int prediction; \ + int x, y, c; \ + \ +- memset (vs->tight.gradient.buffer, 0, w * 3 * sizeof(int)); \ ++ memset(vs->tight->gradient.buffer, 0, w * 3 * sizeof(int)); \ + \ + endian = 0; /* FIXME */ \ + \ +@@ -631,7 +631,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) + upper[c] = 0; \ + here[c] = 0; \ + } \ +- prev = (int *)vs->tight.gradient.buffer; \ ++ prev = (int *)vs->tight->gradient.buffer; \ + for (x = 0; x < w; x++) { \ + pix = *buf; \ + if (endian) { \ +@@ -785,7 +785,7 @@ static void extend_solid_area(VncState *vs, int x, int y, int w, int h, + static int tight_init_stream(VncState *vs, int stream_id, + int level, int strategy) + { +- z_streamp zstream = &vs->tight.stream[stream_id]; ++ z_streamp zstream = &vs->tight->stream[stream_id]; + + if (zstream->opaque == NULL) { + int err; +@@ -803,15 +803,15 @@ static int tight_init_stream(VncState *vs, int stream_id, + return -1; + } + +- vs->tight.levels[stream_id] = level; ++ vs->tight->levels[stream_id] = level; + zstream->opaque = vs; + } + +- if (vs->tight.levels[stream_id] != level) { ++ if (vs->tight->levels[stream_id] != level) { + if (deflateParams(zstream, level, strategy) != Z_OK) { + return -1; + } +- vs->tight.levels[stream_id] = level; ++ vs->tight->levels[stream_id] = level; + } + return 0; + } +@@ -839,11 +839,11 @@ static void tight_send_compact_size(VncState *vs, size_t len) + static int tight_compress_data(VncState *vs, int stream_id, size_t bytes, + int level, int strategy) + { +- z_streamp zstream = &vs->tight.stream[stream_id]; ++ z_streamp zstream = &vs->tight->stream[stream_id]; + int previous_out; + + if (bytes < VNC_TIGHT_MIN_TO_COMPRESS) { +- vnc_write(vs, vs->tight.tight.buffer, vs->tight.tight.offset); ++ vnc_write(vs, vs->tight->tight.buffer, vs->tight->tight.offset); + return bytes; + } + +@@ -852,13 +852,13 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes, + } + + /* reserve memory in output buffer */ +- buffer_reserve(&vs->tight.zlib, bytes + 64); ++ buffer_reserve(&vs->tight->zlib, bytes + 64); + + /* set pointers */ +- zstream->next_in = vs->tight.tight.buffer; +- zstream->avail_in = vs->tight.tight.offset; +- zstream->next_out = vs->tight.zlib.buffer + vs->tight.zlib.offset; +- zstream->avail_out = vs->tight.zlib.capacity - vs->tight.zlib.offset; ++ zstream->next_in = vs->tight->tight.buffer; ++ zstream->avail_in = vs->tight->tight.offset; ++ zstream->next_out = vs->tight->zlib.buffer + vs->tight->zlib.offset; ++ zstream->avail_out = vs->tight->zlib.capacity - vs->tight->zlib.offset; + previous_out = zstream->avail_out; + zstream->data_type = Z_BINARY; + +@@ -868,14 +868,14 @@ static int tight_compress_data(VncState *vs, int stream_id, size_t bytes, + return -1; + } + +- vs->tight.zlib.offset = vs->tight.zlib.capacity - zstream->avail_out; ++ vs->tight->zlib.offset = vs->tight->zlib.capacity - zstream->avail_out; + /* ...how much data has actually been produced by deflate() */ + bytes = previous_out - zstream->avail_out; + + tight_send_compact_size(vs, bytes); +- vnc_write(vs, vs->tight.zlib.buffer, bytes); ++ vnc_write(vs, vs->tight->zlib.buffer, bytes); + +- buffer_reset(&vs->tight.zlib); ++ buffer_reset(&vs->tight->zlib); + + return bytes; + } +@@ -927,16 +927,17 @@ static int send_full_color_rect(VncState *vs, int x, int y, int w, int h) + + vnc_write_u8(vs, stream << 4); /* no flushing, no filter */ + +- if (vs->tight.pixel24) { +- tight_pack24(vs, vs->tight.tight.buffer, w * h, &vs->tight.tight.offset); ++ if (vs->tight->pixel24) { ++ tight_pack24(vs, vs->tight->tight.buffer, w * h, ++ &vs->tight->tight.offset); + bytes = 3; + } else { + bytes = vs->client_pf.bytes_per_pixel; + } + + bytes = tight_compress_data(vs, stream, w * h * bytes, +- tight_conf[vs->tight.compression].raw_zlib_level, +- Z_DEFAULT_STRATEGY); ++ tight_conf[vs->tight->compression].raw_zlib_level, ++ Z_DEFAULT_STRATEGY); + + return (bytes >= 0); + } +@@ -947,14 +948,14 @@ static int send_solid_rect(VncState *vs) + + vnc_write_u8(vs, VNC_TIGHT_FILL << 4); /* no flushing, no filter */ + +- if (vs->tight.pixel24) { +- tight_pack24(vs, vs->tight.tight.buffer, 1, &vs->tight.tight.offset); ++ if (vs->tight->pixel24) { ++ tight_pack24(vs, vs->tight->tight.buffer, 1, &vs->tight->tight.offset); + bytes = 3; + } else { + bytes = vs->client_pf.bytes_per_pixel; + } + +- vnc_write(vs, vs->tight.tight.buffer, bytes); ++ vnc_write(vs, vs->tight->tight.buffer, bytes); + return 1; + } + +@@ -963,7 +964,7 @@ static int send_mono_rect(VncState *vs, int x, int y, + { + ssize_t bytes; + int stream = 1; +- int level = tight_conf[vs->tight.compression].mono_zlib_level; ++ int level = tight_conf[vs->tight->compression].mono_zlib_level; + + #ifdef CONFIG_VNC_PNG + if (tight_can_send_png_rect(vs, w, h)) { +@@ -991,26 +992,26 @@ static int send_mono_rect(VncState *vs, int x, int y, + uint32_t buf[2] = {bg, fg}; + size_t ret = sizeof (buf); + +- if (vs->tight.pixel24) { ++ if (vs->tight->pixel24) { + tight_pack24(vs, (unsigned char*)buf, 2, &ret); + } + vnc_write(vs, buf, ret); + +- tight_encode_mono_rect32(vs->tight.tight.buffer, w, h, bg, fg); ++ tight_encode_mono_rect32(vs->tight->tight.buffer, w, h, bg, fg); + break; + } + case 2: + vnc_write(vs, &bg, 2); + vnc_write(vs, &fg, 2); +- tight_encode_mono_rect16(vs->tight.tight.buffer, w, h, bg, fg); ++ tight_encode_mono_rect16(vs->tight->tight.buffer, w, h, bg, fg); + break; + default: + vnc_write_u8(vs, bg); + vnc_write_u8(vs, fg); +- tight_encode_mono_rect8(vs->tight.tight.buffer, w, h, bg, fg); ++ tight_encode_mono_rect8(vs->tight->tight.buffer, w, h, bg, fg); + break; + } +- vs->tight.tight.offset = bytes; ++ vs->tight->tight.offset = bytes; + + bytes = tight_compress_data(vs, stream, bytes, level, Z_DEFAULT_STRATEGY); + return (bytes >= 0); +@@ -1040,7 +1041,7 @@ static void write_palette(int idx, uint32_t color, void *opaque) + static bool send_gradient_rect(VncState *vs, int x, int y, int w, int h) + { + int stream = 3; +- int level = tight_conf[vs->tight.compression].gradient_zlib_level; ++ int level = tight_conf[vs->tight->compression].gradient_zlib_level; + ssize_t bytes; + + if (vs->client_pf.bytes_per_pixel == 1) { +@@ -1050,23 +1051,23 @@ static bool send_gradient_rect(VncState *vs, int x, int y, int w, int h) + vnc_write_u8(vs, (stream | VNC_TIGHT_EXPLICIT_FILTER) << 4); + vnc_write_u8(vs, VNC_TIGHT_FILTER_GRADIENT); + +- buffer_reserve(&vs->tight.gradient, w * 3 * sizeof (int)); ++ buffer_reserve(&vs->tight->gradient, w * 3 * sizeof(int)); + +- if (vs->tight.pixel24) { +- tight_filter_gradient24(vs, vs->tight.tight.buffer, w, h); ++ if (vs->tight->pixel24) { ++ tight_filter_gradient24(vs, vs->tight->tight.buffer, w, h); + bytes = 3; + } else if (vs->client_pf.bytes_per_pixel == 4) { +- tight_filter_gradient32(vs, (uint32_t *)vs->tight.tight.buffer, w, h); ++ tight_filter_gradient32(vs, (uint32_t *)vs->tight->tight.buffer, w, h); + bytes = 4; + } else { +- tight_filter_gradient16(vs, (uint16_t *)vs->tight.tight.buffer, w, h); ++ tight_filter_gradient16(vs, (uint16_t *)vs->tight->tight.buffer, w, h); + bytes = 2; + } + +- buffer_reset(&vs->tight.gradient); ++ buffer_reset(&vs->tight->gradient); + + bytes = w * h * bytes; +- vs->tight.tight.offset = bytes; ++ vs->tight->tight.offset = bytes; + + bytes = tight_compress_data(vs, stream, bytes, + level, Z_FILTERED); +@@ -1077,7 +1078,7 @@ static int send_palette_rect(VncState *vs, int x, int y, + int w, int h, VncPalette *palette) + { + int stream = 2; +- int level = tight_conf[vs->tight.compression].idx_zlib_level; ++ int level = tight_conf[vs->tight->compression].idx_zlib_level; + int colors; + ssize_t bytes; + +@@ -1104,12 +1105,12 @@ static int send_palette_rect(VncState *vs, int x, int y, + palette_iter(palette, write_palette, &priv); + vnc_write(vs, header, sizeof(header)); + +- if (vs->tight.pixel24) { ++ if (vs->tight->pixel24) { + tight_pack24(vs, vs->output.buffer + old_offset, colors, &offset); + vs->output.offset = old_offset + offset; + } + +- tight_encode_indexed_rect32(vs->tight.tight.buffer, w * h, palette); ++ tight_encode_indexed_rect32(vs->tight->tight.buffer, w * h, palette); + break; + } + case 2: +@@ -1119,7 +1120,7 @@ static int send_palette_rect(VncState *vs, int x, int y, + + palette_iter(palette, write_palette, &priv); + vnc_write(vs, header, sizeof(header)); +- tight_encode_indexed_rect16(vs->tight.tight.buffer, w * h, palette); ++ tight_encode_indexed_rect16(vs->tight->tight.buffer, w * h, palette); + break; + } + default: +@@ -1127,7 +1128,7 @@ static int send_palette_rect(VncState *vs, int x, int y, + break; + } + bytes = w * h; +- vs->tight.tight.offset = bytes; ++ vs->tight->tight.offset = bytes; + + bytes = tight_compress_data(vs, stream, bytes, + level, Z_DEFAULT_STRATEGY); +@@ -1146,7 +1147,7 @@ static int send_palette_rect(VncState *vs, int x, int y, + static void jpeg_init_destination(j_compress_ptr cinfo) + { + VncState *vs = cinfo->client_data; +- Buffer *buffer = &vs->tight.jpeg; ++ Buffer *buffer = &vs->tight->jpeg; + + cinfo->dest->next_output_byte = (JOCTET *)buffer->buffer + buffer->offset; + cinfo->dest->free_in_buffer = (size_t)(buffer->capacity - buffer->offset); +@@ -1156,7 +1157,7 @@ static void jpeg_init_destination(j_compress_ptr cinfo) + static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo) + { + VncState *vs = cinfo->client_data; +- Buffer *buffer = &vs->tight.jpeg; ++ Buffer *buffer = &vs->tight->jpeg; + + buffer->offset = buffer->capacity; + buffer_reserve(buffer, 2048); +@@ -1168,7 +1169,7 @@ static boolean jpeg_empty_output_buffer(j_compress_ptr cinfo) + static void jpeg_term_destination(j_compress_ptr cinfo) + { + VncState *vs = cinfo->client_data; +- Buffer *buffer = &vs->tight.jpeg; ++ Buffer *buffer = &vs->tight->jpeg; + + buffer->offset = buffer->capacity - cinfo->dest->free_in_buffer; + } +@@ -1187,7 +1188,7 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality) + return send_full_color_rect(vs, x, y, w, h); + } + +- buffer_reserve(&vs->tight.jpeg, 2048); ++ buffer_reserve(&vs->tight->jpeg, 2048); + + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_compress(&cinfo); +@@ -1222,9 +1223,9 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality) + + vnc_write_u8(vs, VNC_TIGHT_JPEG << 4); + +- tight_send_compact_size(vs, vs->tight.jpeg.offset); +- vnc_write(vs, vs->tight.jpeg.buffer, vs->tight.jpeg.offset); +- buffer_reset(&vs->tight.jpeg); ++ tight_send_compact_size(vs, vs->tight->jpeg.offset); ++ vnc_write(vs, vs->tight->jpeg.buffer, vs->tight->jpeg.offset); ++ buffer_reset(&vs->tight->jpeg); + + return 1; + } +@@ -1240,7 +1241,7 @@ static void write_png_palette(int idx, uint32_t pix, void *opaque) + VncState *vs = priv->vs; + png_colorp color = &priv->png_palette[idx]; + +- if (vs->tight.pixel24) ++ if (vs->tight->pixel24) + { + color->red = (pix >> vs->client_pf.rshift) & vs->client_pf.rmax; + color->green = (pix >> vs->client_pf.gshift) & vs->client_pf.gmax; +@@ -1267,10 +1268,10 @@ static void png_write_data(png_structp png_ptr, png_bytep data, + { + VncState *vs = png_get_io_ptr(png_ptr); + +- buffer_reserve(&vs->tight.png, vs->tight.png.offset + length); +- memcpy(vs->tight.png.buffer + vs->tight.png.offset, data, length); ++ buffer_reserve(&vs->tight->png, vs->tight->png.offset + length); ++ memcpy(vs->tight->png.buffer + vs->tight->png.offset, data, length); + +- vs->tight.png.offset += length; ++ vs->tight->png.offset += length; + } + + static void png_flush_data(png_structp png_ptr) +@@ -1295,8 +1296,8 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, + png_infop info_ptr; + png_colorp png_palette = NULL; + pixman_image_t *linebuf; +- int level = tight_png_conf[vs->tight.compression].png_zlib_level; +- int filters = tight_png_conf[vs->tight.compression].png_filters; ++ int level = tight_png_conf[vs->tight->compression].png_zlib_level; ++ int filters = tight_png_conf[vs->tight->compression].png_filters; + uint8_t *buf; + int dy; + +@@ -1340,21 +1341,23 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, + png_set_PLTE(png_ptr, info_ptr, png_palette, palette_size(palette)); + + if (vs->client_pf.bytes_per_pixel == 4) { +- tight_encode_indexed_rect32(vs->tight.tight.buffer, w * h, palette); ++ tight_encode_indexed_rect32(vs->tight->tight.buffer, w * h, ++ palette); + } else { +- tight_encode_indexed_rect16(vs->tight.tight.buffer, w * h, palette); ++ tight_encode_indexed_rect16(vs->tight->tight.buffer, w * h, ++ palette); + } + } + + png_write_info(png_ptr, info_ptr); + +- buffer_reserve(&vs->tight.png, 2048); ++ buffer_reserve(&vs->tight->png, 2048); + linebuf = qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, w); + buf = (uint8_t *)pixman_image_get_data(linebuf); + for (dy = 0; dy < h; dy++) + { + if (color_type == PNG_COLOR_TYPE_PALETTE) { +- memcpy(buf, vs->tight.tight.buffer + (dy * w), w); ++ memcpy(buf, vs->tight->tight.buffer + (dy * w), w); + } else { + qemu_pixman_linebuf_fill(linebuf, vs->vd->server, w, x, y + dy); + } +@@ -1372,27 +1375,27 @@ static int send_png_rect(VncState *vs, int x, int y, int w, int h, + + vnc_write_u8(vs, VNC_TIGHT_PNG << 4); + +- tight_send_compact_size(vs, vs->tight.png.offset); +- vnc_write(vs, vs->tight.png.buffer, vs->tight.png.offset); +- buffer_reset(&vs->tight.png); ++ tight_send_compact_size(vs, vs->tight->png.offset); ++ vnc_write(vs, vs->tight->png.buffer, vs->tight->png.offset); ++ buffer_reset(&vs->tight->png); + return 1; + } + #endif /* CONFIG_VNC_PNG */ + + static void vnc_tight_start(VncState *vs) + { +- buffer_reset(&vs->tight.tight); ++ buffer_reset(&vs->tight->tight); + + // make the output buffer be the zlib buffer, so we can compress it later +- vs->tight.tmp = vs->output; +- vs->output = vs->tight.tight; ++ vs->tight->tmp = vs->output; ++ vs->output = vs->tight->tight; + } + + static void vnc_tight_stop(VncState *vs) + { + // switch back to normal output/zlib buffers +- vs->tight.tight = vs->output; +- vs->output = vs->tight.tmp; ++ vs->tight->tight = vs->output; ++ vs->output = vs->tight->tmp; + } + + static int send_sub_rect_nojpeg(VncState *vs, int x, int y, int w, int h, +@@ -1426,9 +1429,9 @@ static int send_sub_rect_jpeg(VncState *vs, int x, int y, int w, int h, + int ret; + + if (colors == 0) { +- if (force || (tight_jpeg_conf[vs->tight.quality].jpeg_full && ++ if (force || (tight_jpeg_conf[vs->tight->quality].jpeg_full && + tight_detect_smooth_image(vs, w, h))) { +- int quality = tight_conf[vs->tight.quality].jpeg_quality; ++ int quality = tight_conf[vs->tight->quality].jpeg_quality; + + ret = send_jpeg_rect(vs, x, y, w, h, quality); + } else { +@@ -1440,9 +1443,9 @@ static int send_sub_rect_jpeg(VncState *vs, int x, int y, int w, int h, + ret = send_mono_rect(vs, x, y, w, h, bg, fg); + } else if (colors <= 256) { + if (force || (colors > 96 && +- tight_jpeg_conf[vs->tight.quality].jpeg_idx && ++ tight_jpeg_conf[vs->tight->quality].jpeg_idx && + tight_detect_smooth_image(vs, w, h))) { +- int quality = tight_conf[vs->tight.quality].jpeg_quality; ++ int quality = tight_conf[vs->tight->quality].jpeg_quality; + + ret = send_jpeg_rect(vs, x, y, w, h, quality); + } else { +@@ -1480,20 +1483,20 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) + qemu_thread_atexit_add(&vnc_tight_cleanup_notifier); + } + +- vnc_framebuffer_update(vs, x, y, w, h, vs->tight.type); ++ vnc_framebuffer_update(vs, x, y, w, h, vs->tight->type); + + vnc_tight_start(vs); + vnc_raw_send_framebuffer_update(vs, x, y, w, h); + vnc_tight_stop(vs); + + #ifdef CONFIG_VNC_JPEG +- if (!vs->vd->non_adaptive && vs->tight.quality != (uint8_t)-1) { ++ if (!vs->vd->non_adaptive && vs->tight->quality != (uint8_t)-1) { + double freq = vnc_update_freq(vs, x, y, w, h); + +- if (freq < tight_jpeg_conf[vs->tight.quality].jpeg_freq_min) { ++ if (freq < tight_jpeg_conf[vs->tight->quality].jpeg_freq_min) { + allow_jpeg = false; + } +- if (freq >= tight_jpeg_conf[vs->tight.quality].jpeg_freq_threshold) { ++ if (freq >= tight_jpeg_conf[vs->tight->quality].jpeg_freq_threshold) { + force_jpeg = true; + vnc_sent_lossy_rect(vs, x, y, w, h); + } +@@ -1503,7 +1506,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) + colors = tight_fill_palette(vs, x, y, w * h, &bg, &fg, color_count_palette); + + #ifdef CONFIG_VNC_JPEG +- if (allow_jpeg && vs->tight.quality != (uint8_t)-1) { ++ if (allow_jpeg && vs->tight->quality != (uint8_t)-1) { + ret = send_sub_rect_jpeg(vs, x, y, w, h, bg, fg, colors, + color_count_palette, force_jpeg); + } else { +@@ -1520,7 +1523,7 @@ static int send_sub_rect(VncState *vs, int x, int y, int w, int h) + + static int send_sub_rect_solid(VncState *vs, int x, int y, int w, int h) + { +- vnc_framebuffer_update(vs, x, y, w, h, vs->tight.type); ++ vnc_framebuffer_update(vs, x, y, w, h, vs->tight->type); + + vnc_tight_start(vs); + vnc_raw_send_framebuffer_update(vs, x, y, w, h); +@@ -1538,8 +1541,8 @@ static int send_rect_simple(VncState *vs, int x, int y, int w, int h, + int rw, rh; + int n = 0; + +- max_size = tight_conf[vs->tight.compression].max_rect_size; +- max_width = tight_conf[vs->tight.compression].max_rect_width; ++ max_size = tight_conf[vs->tight->compression].max_rect_size; ++ max_width = tight_conf[vs->tight->compression].max_rect_width; + + if (split && (w > max_width || w * h > max_size)) { + max_sub_width = (w > max_width) ? max_width : w; +@@ -1648,16 +1651,16 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y, + + if (vs->client_pf.bytes_per_pixel == 4 && vs->client_pf.rmax == 0xFF && + vs->client_pf.bmax == 0xFF && vs->client_pf.gmax == 0xFF) { +- vs->tight.pixel24 = true; ++ vs->tight->pixel24 = true; + } else { +- vs->tight.pixel24 = false; ++ vs->tight->pixel24 = false; + } + + #ifdef CONFIG_VNC_JPEG +- if (vs->tight.quality != (uint8_t)-1) { ++ if (vs->tight->quality != (uint8_t)-1) { + double freq = vnc_update_freq(vs, x, y, w, h); + +- if (freq > tight_jpeg_conf[vs->tight.quality].jpeg_freq_threshold) { ++ if (freq > tight_jpeg_conf[vs->tight->quality].jpeg_freq_threshold) { + return send_rect_simple(vs, x, y, w, h, false); + } + } +@@ -1669,8 +1672,8 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y, + + /* Calculate maximum number of rows in one non-solid rectangle. */ + +- max_rows = tight_conf[vs->tight.compression].max_rect_size; +- max_rows /= MIN(tight_conf[vs->tight.compression].max_rect_width, w); ++ max_rows = tight_conf[vs->tight->compression].max_rect_size; ++ max_rows /= MIN(tight_conf[vs->tight->compression].max_rect_width, w); + + return find_large_solid_color_rect(vs, x, y, w, h, max_rows); + } +@@ -1678,33 +1681,33 @@ static int tight_send_framebuffer_update(VncState *vs, int x, int y, + int vnc_tight_send_framebuffer_update(VncState *vs, int x, int y, + int w, int h) + { +- vs->tight.type = VNC_ENCODING_TIGHT; ++ vs->tight->type = VNC_ENCODING_TIGHT; + return tight_send_framebuffer_update(vs, x, y, w, h); + } + + int vnc_tight_png_send_framebuffer_update(VncState *vs, int x, int y, + int w, int h) + { +- vs->tight.type = VNC_ENCODING_TIGHT_PNG; ++ vs->tight->type = VNC_ENCODING_TIGHT_PNG; + return tight_send_framebuffer_update(vs, x, y, w, h); + } + + void vnc_tight_clear(VncState *vs) + { + int i; +- for (i=0; itight.stream); i++) { +- if (vs->tight.stream[i].opaque) { +- deflateEnd(&vs->tight.stream[i]); ++ for (i = 0; i < ARRAY_SIZE(vs->tight->stream); i++) { ++ if (vs->tight->stream[i].opaque) { ++ deflateEnd(&vs->tight->stream[i]); + } + } + +- buffer_free(&vs->tight.tight); +- buffer_free(&vs->tight.zlib); +- buffer_free(&vs->tight.gradient); ++ buffer_free(&vs->tight->tight); ++ buffer_free(&vs->tight->zlib); ++ buffer_free(&vs->tight->gradient); + #ifdef CONFIG_VNC_JPEG +- buffer_free(&vs->tight.jpeg); ++ buffer_free(&vs->tight->jpeg); + #endif + #ifdef CONFIG_VNC_PNG +- buffer_free(&vs->tight.png); ++ buffer_free(&vs->tight->png); + #endif + } +diff --git a/ui/vnc-enc-zlib.c b/ui/vnc-enc-zlib.c +index 33e9df2..900ae5b 100644 +--- a/ui/vnc-enc-zlib.c ++++ b/ui/vnc-enc-zlib.c +@@ -76,7 +76,8 @@ static int vnc_zlib_stop(VncState *vs) + zstream->zalloc = vnc_zlib_zalloc; + zstream->zfree = vnc_zlib_zfree; + +- err = deflateInit2(zstream, vs->tight.compression, Z_DEFLATED, MAX_WBITS, ++ err = deflateInit2(zstream, vs->tight->compression, Z_DEFLATED, ++ MAX_WBITS, + MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY); + + if (err != Z_OK) { +@@ -84,16 +85,16 @@ static int vnc_zlib_stop(VncState *vs) + return -1; + } + +- vs->zlib.level = vs->tight.compression; ++ vs->zlib.level = vs->tight->compression; + zstream->opaque = vs; + } + +- if (vs->tight.compression != vs->zlib.level) { +- if (deflateParams(zstream, vs->tight.compression, ++ if (vs->tight->compression != vs->zlib.level) { ++ if (deflateParams(zstream, vs->tight->compression, + Z_DEFAULT_STRATEGY) != Z_OK) { + return -1; + } +- vs->zlib.level = vs->tight.compression; ++ vs->zlib.level = vs->tight->compression; + } + + // reserve memory in output buffer +diff --git a/ui/vnc-enc-zrle.c b/ui/vnc-enc-zrle.c +index 7493a84..17fd28a 100644 +--- a/ui/vnc-enc-zrle.c ++++ b/ui/vnc-enc-zrle.c +@@ -37,18 +37,18 @@ static const int bits_per_packed_pixel[] = { + + static void vnc_zrle_start(VncState *vs) + { +- buffer_reset(&vs->zrle.zrle); ++ buffer_reset(&vs->zrle->zrle); + + /* make the output buffer be the zlib buffer, so we can compress it later */ +- vs->zrle.tmp = vs->output; +- vs->output = vs->zrle.zrle; ++ vs->zrle->tmp = vs->output; ++ vs->output = vs->zrle->zrle; + } + + static void vnc_zrle_stop(VncState *vs) + { + /* switch back to normal output/zlib buffers */ +- vs->zrle.zrle = vs->output; +- vs->output = vs->zrle.tmp; ++ vs->zrle->zrle = vs->output; ++ vs->output = vs->zrle->tmp; + } + + static void *zrle_convert_fb(VncState *vs, int x, int y, int w, int h, +@@ -56,24 +56,24 @@ static void *zrle_convert_fb(VncState *vs, int x, int y, int w, int h, + { + Buffer tmp; + +- buffer_reset(&vs->zrle.fb); +- buffer_reserve(&vs->zrle.fb, w * h * bpp + bpp); ++ buffer_reset(&vs->zrle->fb); ++ buffer_reserve(&vs->zrle->fb, w * h * bpp + bpp); + + tmp = vs->output; +- vs->output = vs->zrle.fb; ++ vs->output = vs->zrle->fb; + + vnc_raw_send_framebuffer_update(vs, x, y, w, h); + +- vs->zrle.fb = vs->output; ++ vs->zrle->fb = vs->output; + vs->output = tmp; +- return vs->zrle.fb.buffer; ++ return vs->zrle->fb.buffer; + } + + static int zrle_compress_data(VncState *vs, int level) + { +- z_streamp zstream = &vs->zrle.stream; ++ z_streamp zstream = &vs->zrle->stream; + +- buffer_reset(&vs->zrle.zlib); ++ buffer_reset(&vs->zrle->zlib); + + if (zstream->opaque != vs) { + int err; +@@ -93,13 +93,13 @@ static int zrle_compress_data(VncState *vs, int level) + } + + /* reserve memory in output buffer */ +- buffer_reserve(&vs->zrle.zlib, vs->zrle.zrle.offset + 64); ++ buffer_reserve(&vs->zrle->zlib, vs->zrle->zrle.offset + 64); + + /* set pointers */ +- zstream->next_in = vs->zrle.zrle.buffer; +- zstream->avail_in = vs->zrle.zrle.offset; +- zstream->next_out = vs->zrle.zlib.buffer + vs->zrle.zlib.offset; +- zstream->avail_out = vs->zrle.zlib.capacity - vs->zrle.zlib.offset; ++ zstream->next_in = vs->zrle->zrle.buffer; ++ zstream->avail_in = vs->zrle->zrle.offset; ++ zstream->next_out = vs->zrle->zlib.buffer + vs->zrle->zlib.offset; ++ zstream->avail_out = vs->zrle->zlib.capacity - vs->zrle->zlib.offset; + zstream->data_type = Z_BINARY; + + /* start encoding */ +@@ -108,8 +108,8 @@ static int zrle_compress_data(VncState *vs, int level) + return -1; + } + +- vs->zrle.zlib.offset = vs->zrle.zlib.capacity - zstream->avail_out; +- return vs->zrle.zlib.offset; ++ vs->zrle->zlib.offset = vs->zrle->zlib.capacity - zstream->avail_out; ++ return vs->zrle->zlib.offset; + } + + /* Try to work out whether to use RLE and/or a palette. We do this by +@@ -259,14 +259,14 @@ static int zrle_send_framebuffer_update(VncState *vs, int x, int y, + size_t bytes; + int zywrle_level; + +- if (vs->zrle.type == VNC_ENCODING_ZYWRLE) { +- if (!vs->vd->lossy || vs->tight.quality == (uint8_t)-1 +- || vs->tight.quality == 9) { ++ if (vs->zrle->type == VNC_ENCODING_ZYWRLE) { ++ if (!vs->vd->lossy || vs->tight->quality == (uint8_t)-1 ++ || vs->tight->quality == 9) { + zywrle_level = 0; +- vs->zrle.type = VNC_ENCODING_ZRLE; +- } else if (vs->tight.quality < 3) { ++ vs->zrle->type = VNC_ENCODING_ZRLE; ++ } else if (vs->tight->quality < 3) { + zywrle_level = 3; +- } else if (vs->tight.quality < 6) { ++ } else if (vs->tight->quality < 6) { + zywrle_level = 2; + } else { + zywrle_level = 1; +@@ -337,30 +337,30 @@ static int zrle_send_framebuffer_update(VncState *vs, int x, int y, + + vnc_zrle_stop(vs); + bytes = zrle_compress_data(vs, Z_DEFAULT_COMPRESSION); +- vnc_framebuffer_update(vs, x, y, w, h, vs->zrle.type); ++ vnc_framebuffer_update(vs, x, y, w, h, vs->zrle->type); + vnc_write_u32(vs, bytes); +- vnc_write(vs, vs->zrle.zlib.buffer, vs->zrle.zlib.offset); ++ vnc_write(vs, vs->zrle->zlib.buffer, vs->zrle->zlib.offset); + return 1; + } + + int vnc_zrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) + { +- vs->zrle.type = VNC_ENCODING_ZRLE; ++ vs->zrle->type = VNC_ENCODING_ZRLE; + return zrle_send_framebuffer_update(vs, x, y, w, h); + } + + int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h) + { +- vs->zrle.type = VNC_ENCODING_ZYWRLE; ++ vs->zrle->type = VNC_ENCODING_ZYWRLE; + return zrle_send_framebuffer_update(vs, x, y, w, h); + } + + void vnc_zrle_clear(VncState *vs) + { +- if (vs->zrle.stream.opaque) { +- deflateEnd(&vs->zrle.stream); ++ if (vs->zrle->stream.opaque) { ++ deflateEnd(&vs->zrle->stream); + } +- buffer_free(&vs->zrle.zrle); +- buffer_free(&vs->zrle.fb); +- buffer_free(&vs->zrle.zlib); ++ buffer_free(&vs->zrle->zrle); ++ buffer_free(&vs->zrle->fb); ++ buffer_free(&vs->zrle->zlib); + } +diff --git a/ui/vnc-enc-zrle.inc.c b/ui/vnc-enc-zrle.inc.c +index abf6b86..c107d8a 100644 +--- a/ui/vnc-enc-zrle.inc.c ++++ b/ui/vnc-enc-zrle.inc.c +@@ -96,7 +96,7 @@ static void ZRLE_ENCODE(VncState *vs, int x, int y, int w, int h, + static void ZRLE_ENCODE_TILE(VncState *vs, ZRLE_PIXEL *data, int w, int h, + int zywrle_level) + { +- VncPalette *palette = &vs->zrle.palette; ++ VncPalette *palette = &vs->zrle->palette; + + int runs = 0; + int single_pixels = 0; +diff --git a/ui/vnc.c b/ui/vnc.c +index bc43c4c..87b8045 100644 +--- a/ui/vnc.c ++++ b/ui/vnc.c +@@ -1307,6 +1307,8 @@ void vnc_disconnect_finish(VncState *vs) + object_unref(OBJECT(vs->sioc)); + vs->sioc = NULL; + vs->magic = 0; ++ g_free(vs->zrle); ++ g_free(vs->tight); + g_free(vs); + } + +@@ -2058,8 +2060,8 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) + + vs->features = 0; + vs->vnc_encoding = 0; +- vs->tight.compression = 9; +- vs->tight.quality = -1; /* Lossless by default */ ++ vs->tight->compression = 9; ++ vs->tight->quality = -1; /* Lossless by default */ + vs->absolute = -1; + + /* +@@ -2127,11 +2129,11 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings) + vs->features |= VNC_FEATURE_LED_STATE_MASK; + break; + case VNC_ENCODING_COMPRESSLEVEL0 ... VNC_ENCODING_COMPRESSLEVEL0 + 9: +- vs->tight.compression = (enc & 0x0F); ++ vs->tight->compression = (enc & 0x0F); + break; + case VNC_ENCODING_QUALITYLEVEL0 ... VNC_ENCODING_QUALITYLEVEL0 + 9: + if (vs->vd->lossy) { +- vs->tight.quality = (enc & 0x0F); ++ vs->tight->quality = (enc & 0x0F); + } + break; + default: +@@ -3034,6 +3036,8 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc, + int i; + + trace_vnc_client_connect(vs, sioc); ++ vs->zrle = g_new0(VncZrle, 1); ++ vs->tight = g_new0(VncTight, 1); + vs->magic = VNC_MAGIC; + vs->sioc = sioc; + object_ref(OBJECT(vs->sioc)); +@@ -3045,19 +3049,19 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc, + buffer_init(&vs->output, "vnc-output/%p", sioc); + buffer_init(&vs->jobs_buffer, "vnc-jobs_buffer/%p", sioc); + +- buffer_init(&vs->tight.tight, "vnc-tight/%p", sioc); +- buffer_init(&vs->tight.zlib, "vnc-tight-zlib/%p", sioc); +- buffer_init(&vs->tight.gradient, "vnc-tight-gradient/%p", sioc); ++ buffer_init(&vs->tight->tight, "vnc-tight/%p", sioc); ++ buffer_init(&vs->tight->zlib, "vnc-tight-zlib/%p", sioc); ++ buffer_init(&vs->tight->gradient, "vnc-tight-gradient/%p", sioc); + #ifdef CONFIG_VNC_JPEG +- buffer_init(&vs->tight.jpeg, "vnc-tight-jpeg/%p", sioc); ++ buffer_init(&vs->tight->jpeg, "vnc-tight-jpeg/%p", sioc); + #endif + #ifdef CONFIG_VNC_PNG +- buffer_init(&vs->tight.png, "vnc-tight-png/%p", sioc); ++ buffer_init(&vs->tight->png, "vnc-tight-png/%p", sioc); + #endif + buffer_init(&vs->zlib.zlib, "vnc-zlib/%p", sioc); +- buffer_init(&vs->zrle.zrle, "vnc-zrle/%p", sioc); +- buffer_init(&vs->zrle.fb, "vnc-zrle-fb/%p", sioc); +- buffer_init(&vs->zrle.zlib, "vnc-zrle-zlib/%p", sioc); ++ buffer_init(&vs->zrle->zrle, "vnc-zrle/%p", sioc); ++ buffer_init(&vs->zrle->fb, "vnc-zrle-fb/%p", sioc); ++ buffer_init(&vs->zrle->zlib, "vnc-zrle-zlib/%p", sioc); + + if (skipauth) { + vs->auth = VNC_AUTH_NONE; +diff --git a/ui/vnc.h b/ui/vnc.h +index 8643860..fea79c2 100644 +--- a/ui/vnc.h ++++ b/ui/vnc.h +@@ -338,10 +338,10 @@ struct VncState + /* Encoding specific, if you add something here, don't forget to + * update vnc_async_encoding_start() + */ +- VncTight tight; ++ VncTight *tight; + VncZlib zlib; + VncHextile hextile; +- VncZrle zrle; ++ VncZrle *zrle; + VncZywrle zywrle; + + Notifier mouse_mode_notifier; +-- +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 Thu Mar 19 10:05:49 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:49 +0000 Subject: [oe-commits] [openembedded-core] 04/07: aspell: CVE-2019-20433 In-Reply-To: <158461234560.28224.759514127728700692@git.openembedded.org> References: <158461234560.28224.759514127728700692@git.openembedded.org> Message-ID: <20200319100546.640372362A9@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 07dc85604baf696cccf784c909dbad67275ad7b3 Author: Stefan Ghinea AuthorDate: Thu Mar 12 11:23:22 2020 +0200 aspell: CVE-2019-20433 libaspell.a in GNU Aspell before 0.60.8 has a buffer over-read for a string ending with a single '\0' byte, if the encoding is set to ucs-2 or ucs-4 outside of the application, as demonstrated by the ASPELL_CONF environment variable. References: https://nvd.nist.gov/vuln/detail/CVE-2019-20433 Upstream patches: https://github.com/GNUAspell/aspell/commit/de29341638833ba7717bd6b5e6850998454b044b https://github.com/GNUAspell/aspell/commit/cefd447e5528b08bb0cd6656bc52b4255692cefc Signed-off-by: Stefan Ghinea Signed-off-by: Anuj Mittal --- .../aspell/aspell/CVE-2019-20433-0001.patch | 999 +++++++++++++++++++++ .../aspell/aspell/CVE-2019-20433-0002.patch | 68 ++ meta/recipes-support/aspell/aspell_0.60.7.bb | 2 + 3 files changed, 1069 insertions(+) diff --git a/meta/recipes-support/aspell/aspell/CVE-2019-20433-0001.patch b/meta/recipes-support/aspell/aspell/CVE-2019-20433-0001.patch new file mode 100644 index 0000000..fd68461 --- /dev/null +++ b/meta/recipes-support/aspell/aspell/CVE-2019-20433-0001.patch @@ -0,0 +1,999 @@ +From de29341638833ba7717bd6b5e6850998454b044b Mon Sep 17 00:00:00 2001 +From: Kevin Atkinson +Date: Sat, 17 Aug 2019 17:06:53 -0400 +Subject: [PATCH 1/2] Don't allow null-terminated UCS-2/4 strings using the + original API. + +Detect if the encoding is UCS-2/4 and the length is -1 in affected API +functions and refuse to convert the string. If the string ends up +being converted somehow, abort with an error message in DecodeDirect +and ConvDirect. To convert a null terminated string in +Decode/ConvDirect, a negative number corresponding to the width of the +underlying character type for the encoding is expected; for example, +if the encoding is "ucs-2" then a the size is expected to be -2. + +Also fix a 1-3 byte over-read in DecodeDirect when reading UCS-2/4 +strings when a size is provided (found by OSS-Fuzz). + +Also fix a bug in DecodeDirect that caused DocumentChecker to return +the wrong offsets when working with UCS-2/4 strings. + +CVE: CVE-2019-20433 +Upstream-Status: Backport [https://github.com/GNUAspell/aspell/commit/de29341638833ba7717bd6b5e6850998454b044b] + +[SG: - adjusted context + - discarded test changes as test framework is not available + - discarded manual entry changes for features that aren't backported] +Signed-off-by: Stefan Ghinea +--- + auto/MkSrc/CcHelper.pm | 99 ++++++++++++++++++++++++++++++++++--- + auto/MkSrc/Create.pm | 5 +- + auto/MkSrc/Info.pm | 5 +- + auto/MkSrc/ProcCc.pm | 24 +++++---- + auto/MkSrc/ProcImpl.pm | 57 +++++++++++++++------ + auto/MkSrc/Read.pm | 4 +- + auto/mk-src.in | 44 +++++++++++++++-- + common/convert.cpp | 39 ++++++++++++--- + common/convert.hpp | 38 +++++++++++++- + common/document_checker.cpp | 17 ++++++- + common/document_checker.hpp | 1 + + common/version.cpp | 15 ++++-- + configure.ac | 8 +++ + manual/aspell.texi | 58 ++++++++++++++++------ + manual/readme.texi | 70 +++++++++++++++++++++----- + 15 files changed, 409 insertions(+), 75 deletions(-) + +diff --git a/auto/MkSrc/CcHelper.pm b/auto/MkSrc/CcHelper.pm +index f2de991..0044335 100644 +--- a/auto/MkSrc/CcHelper.pm ++++ b/auto/MkSrc/CcHelper.pm +@@ -10,8 +10,8 @@ BEGIN { + use Exporter; + our @ISA = qw(Exporter); + our @EXPORT = qw(to_c_return_type c_error_cond +- to_type_name make_desc make_func call_func +- make_c_method call_c_method form_c_method ++ to_type_name make_desc make_func call_func get_c_func_name ++ make_c_method make_wide_macro call_c_method form_c_method + make_cxx_method); + } + +@@ -90,6 +90,69 @@ sub make_func ( $ \@ $ ; \% ) { + ')')); + } + ++=item make_wide_version NAME @TYPES PARMS ; %ACCUM ++ ++Creates the wide character version of the function if needed ++ ++=cut ++ ++sub make_wide_version ( $ \@ $ ; \% ) { ++ my ($name, $d, $p, $accum) = @_; ++ my @d = @$d; ++ shift @d; ++ return '' unless grep {$_->{type} eq 'encoded string'} @d; ++ $accum->{sys_headers}{'stddef.h'} = true; ++ $accum->{suffix}[5] = <<'---'; ++ ++/******************* private implemantion details *********************/ ++ ++#ifdef __cplusplus ++# define aspell_cast_(type, expr) (static_cast(expr)) ++# define aspell_cast_from_wide_(str) (static_cast(str)) ++#else ++# define aspell_cast_(type, expr) ((type)(expr)) ++# define aspell_cast_from_wide_(str) ((const char *)(str)) ++#endif ++--- ++ my @parms = map {$_->{type} eq 'encoded string' ++ ? ($_->{name}, $_->{name}.'_size') ++ : $_->{name}} @d; ++ $name = to_lower $name; ++ $accum->{suffix}[0] = <<'---'; ++/**********************************************************************/ ++ ++#ifdef ASPELL_ENCODE_SETTING_SECURE ++--- ++ $accum->{suffix}[2] = "#endif\n"; ++ my @args = map {$_->{type} eq 'encoded string' ++ ? ($_->{name}, "$_->{name}_size", '-1') ++ : $_->{name}} @d; ++ $accum->{suffix}[1] .= ++ (join '', ++ "#define $name", ++ '(', join(', ', @parms), ')', ++ "\\\n ", ++ $name, '_wide', ++ '(', join(', ', @args), ')', ++ "\n"); ++ @args = map {$_->{type} eq 'encoded string' ++ ? ("aspell_cast_from_wide_($_->{name})", ++ "$_->{name}_size*aspell_cast_(int,sizeof(*($_->{name})))", ++ "sizeof(*($_->{name}))") ++ : $_->{name}} @d; ++ return (join '', ++ "\n", ++ "/* version of $name that is safe to use with (null terminated) wide characters */\n", ++ '#define ', ++ $name, '_w', ++ '(', join(', ', @parms), ')', ++ "\\\n ", ++ $name, '_wide', ++ '(', join(', ', @args), ')', ++ "\n"); ++} ++ ++ + =item call_func NAME @TYPES PARMS ; %ACCUM + + Return a string to call a func. Will prefix the function with return +@@ -103,7 +166,6 @@ Parms can be any of: + + sub call_func ( $ \@ $ ; \% ) { + my ($name, $d, $p, $accum) = @_; +- $accum = {} unless defined $accum; + my @d = @$d; + my $func_ret = to_type_name(shift @d, {%$p,pos=>'return'}, %$accum); + return (join '', +@@ -148,8 +210,14 @@ sub to_type_name ( $ $ ; \% ) { + my $name = $t->{name}; + my $type = $t->{type}; + +- return ( (to_type_name {%$d, type=>'string'}, $p, %$accum) , +- (to_type_name {%$d, type=>'int', name=>"$d->{name}_size"}, $p, %$accum) ) ++ if ($name eq 'encoded string' && $is_cc && $pos eq 'parm') { ++ my @types = ((to_type_name {%$d, type=>($p->{wide}?'const void pointer':'string')}, $p, %$accum), ++ (to_type_name {%$d, type=>'int', name=>"$d->{name}_size"}, $p, %$accum)); ++ push @types, (to_type_name {%$d, type=>'int', name=>"$d->{name}_type_width"}, $p, %$accum) if $p->{wide}; ++ return @types; ++ } ++ return ( (to_type_name {%$d, type=>($p->{wide}?'const void pointer':'string')}, $p, %$accum) , ++ (to_type_name {%$d, type=>'int', name=>"$d->{name}_size"}, $p, %$accum) ) + if $name eq 'encoded string' && $is_cc && $pos eq 'parm'; + + my $str; +@@ -174,7 +242,7 @@ sub to_type_name ( $ $ ; \% ) { + $str .= "String"; + } + } elsif ($name eq 'encoded string') { +- $str .= "const char *"; ++ $str .= $p->{wide} ? "const void *" : "const char *"; + } elsif ($name eq '') { + $str .= "void"; + } elsif ($name eq 'bool' && $is_cc) { +@@ -186,7 +254,7 @@ sub to_type_name ( $ $ ; \% ) { + if ($t->{pointer}) { + $accum->{types}->{$name} = $t; + } else { +- $accum->{headers}->{$t->{created_in}} = true; ++ $accum->{headers}->{$t->{created_in}} = true unless $mode eq 'cc'; + } + $str .= "$c_type Aspell" if $mode eq 'cc'; + $str .= to_mixed($name); +@@ -214,6 +282,7 @@ sub to_type_name ( $ $ ; \% ) { + return $str; + } + ++ + =item make_desc DESC ; LEVEL + + Make a C comment out of DESC optionally indenting it LEVEL spaces. +@@ -286,6 +355,7 @@ sub form_c_method ($ $ $ ; \% ) + } else { + $func = "aspell $class $name"; + } ++ $func .= " wide" if $p->{wide}; + if (exists $d->{'const'}) { + splice @data, 1, 0, {type => "const $class", name=> $this_name}; + } else { +@@ -306,6 +376,21 @@ sub make_c_method ($ $ $ ; \%) + return &make_func(@ret); + } + ++sub get_c_func_name ($ $ $) ++{ ++ my @ret = &form_c_method(@_); ++ return undef unless @ret > 0; ++ return to_lower $ret[0]; ++} ++ ++sub make_wide_macro ($ $ $ ; \%) ++{ ++ my @ret = &form_c_method(@_); ++ return undef unless @ret > 0; ++ my $str = &make_wide_version(@ret); ++ return $str; ++} ++ + sub call_c_method ($ $ $ ; \%) + { + my @ret = &form_c_method(@_); +diff --git a/auto/MkSrc/Create.pm b/auto/MkSrc/Create.pm +index d39b60e..630ede5 100644 +--- a/auto/MkSrc/Create.pm ++++ b/auto/MkSrc/Create.pm +@@ -77,8 +77,10 @@ sub create_cc_file ( % ) { + $file .= "#include \"aspell.h\"\n" if $p{type} eq 'cxx'; + $file .= "#include \"settings.h\"\n" if $p{type} eq 'native_impl' && $p{name} eq 'errors'; + $file .= "#include \"gettext.h\"\n" if $p{type} eq 'native_impl' && $p{name} eq 'errors'; ++ $file .= cmap {"#include <$_>\n"} sort keys %{$accum{sys_headers}}; + $file .= cmap {"#include \"".to_lower($_).".hpp\"\n"} sort keys %{$accum{headers}}; +- $file .= "#ifdef __cplusplus\nextern \"C\" {\n#endif\n" if $p{header} && !$p{cxx}; ++ $file .= "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n" if $p{header} && !$p{cxx}; ++ $file .= join('', grep {defined $_} @{$accum{prefix}}); + $file .= "\nnamespace $p{namespace} {\n\n" if $p{cxx}; + if (defined $info{forward}{proc}{$p{type}}) { + my @types = sort {$a->{name} cmp $b->{name}} (values %{$accum{types}}); +@@ -86,6 +88,7 @@ sub create_cc_file ( % ) { + } + $file .= "\n"; + $file .= $body; ++ $file .= join('', grep {defined $_} @{$accum{suffix}}); + $file .= "\n\n}\n\n" if $p{cxx}; + $file .= "#ifdef __cplusplus\n}\n#endif\n" if $p{header} && !$p{cxx}; + $file .= "#endif /* $hm */\n" if $p{header}; +diff --git a/auto/MkSrc/Info.pm b/auto/MkSrc/Info.pm +index c644028..ace8e21 100644 +--- a/auto/MkSrc/Info.pm ++++ b/auto/MkSrc/Info.pm +@@ -60,6 +60,7 @@ each proc sub should take the following argv + the object from which it is a member of + no native: do not attempt to create a native implementation + treat as object: treat as a object rather than a pointer ++ no conv: do not converted an encoded string + + The %info structure is initialized as follows: + +@@ -104,8 +105,8 @@ The %info structure is initialized as follows: + errors => {}, # possible errors + method => { + # A class method +- options => ['desc', 'posib err', 'c func', 'const', +- 'c only', 'c impl', 'cxx impl'], ++ options => ['desc', 'posib err', 'c func', 'const', 'no conv', 'on conv error', ++ 'c only', 'c impl', 'cxx impl', 'cc extra'], + groups => undef}, + constructor => { + # A class constructor +diff --git a/auto/MkSrc/ProcCc.pm b/auto/MkSrc/ProcCc.pm +index 47c4338..98cc435 100644 +--- a/auto/MkSrc/ProcCc.pm ++++ b/auto/MkSrc/ProcCc.pm +@@ -23,7 +23,7 @@ use MkSrc::Info; + sub make_c_object ( $ @ ); + + $info{group}{proc}{cc} = sub { +- my ($data) = @_; ++ my ($data, at rest) = @_; + my $ret; + my $stars = (70 - length $data->{name})/2; + $ret .= "/"; +@@ -33,14 +33,14 @@ $info{group}{proc}{cc} = sub { + $ret .= "/\n"; + foreach my $d (@{$data->{data}}) { + $ret .= "\n\n"; +- $ret .= $info{$d->{type}}{proc}{cc}->($d); ++ $ret .= $info{$d->{type}}{proc}{cc}->($d, at rest); + } + $ret .= "\n\n"; + return $ret; + }; + + $info{enum}{proc}{cc} = sub { +- my ($d) = @_; ++ my ($d, at rest) = @_; + my $n = "Aspell".to_mixed($d->{name}); + return ("\n". + make_desc($d->{desc}). +@@ -58,21 +58,26 @@ $info{struct}{proc}{cc} = sub { + }; + + $info{union}{proc}{cc} = sub { +- return make_c_object "union", $_[0]; ++ return make_c_object "union", @_; + }; + + $info{class}{proc}{cc} = sub { +- my ($d) = @_; ++ my ($d,$accum) = @_; + my $class = $d->{name}; + my $classname = "Aspell".to_mixed($class); + my $ret = ""; + $ret .= "typedef struct $classname $classname;\n\n"; + foreach (@{$d->{data}}) { +- my $s = make_c_method($class, $_, {mode=>'cc'}); ++ my $s = make_c_method($class, $_, {mode=>'cc'}, %$accum); + next unless defined $s; + $ret .= "\n"; + $ret .= make_desc($_->{desc}); +- $ret .= make_c_method($class, $_, {mode=>'cc'}).";\n"; ++ $ret .= make_c_method($class, $_, {mode=>'cc'}, %$accum).";\n"; ++ if (grep {$_->{type} eq 'encoded string'} @{$_->{data}}) { ++ $ret .= make_c_method($class, $_, {mode=>'cc', wide=>true}, %$accum).";\n"; ++ $ret .= make_wide_macro($class, $_, {mode=>'cc'}, %$accum); ++ } ++ $ret .= "\n".$_->{'cc extra'}."\n" if defined $_->{'cc extra'}; + } + $ret .= "\n"; + return $ret; +@@ -105,7 +110,8 @@ $info{errors}{proc}{cc} = sub { + }; + + sub make_c_object ( $ @ ) { +- my ($t, $d) = @_; ++ my ($t, $d, $accum) = @_; ++ $accum = {} unless defined $accum; + my $struct; + $struct .= "Aspell"; + $struct .= to_mixed($d->{name}); +@@ -120,7 +126,7 @@ sub make_c_object ( $ @ ) { + "\n};\n"), + "typedef $t $struct $struct;", + join ("\n", +- map {make_c_method($d->{name}, $_, {mode=>'cc'}).";"} ++ map {make_c_method($d->{name}, $_, {mode=>'cc'}, %$accum).";"} + grep {$_->{type} eq 'method'} + @{$d->{data}}) + )."\n"; +diff --git a/auto/MkSrc/ProcImpl.pm b/auto/MkSrc/ProcImpl.pm +index b8628fd..3d0f220 100644 +--- a/auto/MkSrc/ProcImpl.pm ++++ b/auto/MkSrc/ProcImpl.pm +@@ -45,10 +45,13 @@ $info{class}{proc}{impl} = sub { + foreach (grep {$_ ne ''} split /\s*,\s*/, $data->{'c impl headers'}) { + $accum->{headers}{$_} = true; + } +- foreach my $d (@{$data->{data}}) { ++ my @d = @{$data->{data}}; ++ while (@d) { ++ my $d = shift @d; ++ my $need_wide = false; + next unless one_of $d->{type}, qw(method constructor destructor); + my @parms = @{$d->{data}} if exists $d->{data}; +- my $m = make_c_method $data->{name}, $d, {mode=>'cc_cxx', use_name=>true}, %$accum; ++ my $m = make_c_method $data->{name}, $d, {mode=>'cc_cxx', use_name=>true, wide=>$d->{wide}}, %$accum; + next unless defined $m; + $ret .= "extern \"C\" $m\n"; + $ret .= "{\n"; +@@ -57,24 +60,49 @@ $info{class}{proc}{impl} = sub { + } else { + if ($d->{type} eq 'method') { + my $ret_type = shift @parms; +- my $ret_native = to_type_name $ret_type, {mode=>'native_no_err', pos=>'return'}, %$accum; ++ my $ret_native = to_type_name $ret_type, {mode=>'native_no_err', pos=>'return', wide=>$d->{wide}}, %$accum; + my $snum = 0; ++ my $call_fun = $d->{name}; ++ my @call_parms; + foreach (@parms) { + my $n = to_lower($_->{name}); +- if ($_->{type} eq 'encoded string') { +- $accum->{headers}{'mutable string'} = true; +- $accum->{headers}{'convert'} = true; +- $ret .= " ths->temp_str_$snum.clear();\n"; +- $ret .= " ths->to_internal_->convert($n, ${n}_size, ths->temp_str_$snum);\n"; +- $ret .= " unsigned int s$snum = ths->temp_str_$snum.size();\n"; +- $_ = "MutableString(ths->temp_str_$snum.mstr(), s$snum)"; +- $snum++; ++ if ($_->{type} eq 'encoded string' && !exists($d->{'no conv'})) { ++ $need_wide = true unless $d->{wide}; ++ die unless exists $d->{'posib err'}; ++ $accum->{headers}{'mutable string'} = true; ++ $accum->{headers}{'convert'} = true; ++ my $name = get_c_func_name $data->{name}, $d, {mode=>'cc_cxx', use_name=>true, wide=>$d->{wide}}; ++ $ret .= " ths->temp_str_$snum.clear();\n"; ++ if ($d->{wide}) { ++ $ret .= " ${n}_size = get_correct_size(\"$name\", ths->to_internal_->in_type_width(), ${n}_size, ${n}_type_width);\n"; ++ } else { ++ $ret .= " PosibErr ${n}_fixed_size = get_correct_size(\"$name\", ths->to_internal_->in_type_width(), ${n}_size);\n"; ++ if (exists($d->{'on conv error'})) { ++ $ret .= " if (${n}_fixed_size.get_err()) {\n"; ++ $ret .= " ".$d->{'on conv error'}."\n"; ++ $ret .= " } else {\n"; ++ $ret .= " ${n}_size = ${n}_fixed_size;\n"; ++ $ret .= " }\n"; ++ } else { ++ $ret .= " ths->err_.reset(${n}_fixed_size.release_err());\n"; ++ $ret .= " if (ths->err_ != 0) return ".(c_error_cond $ret_type).";\n"; ++ } ++ } ++ $ret .= " ths->to_internal_->convert($n, ${n}_size, ths->temp_str_$snum);\n"; ++ $ret .= " unsigned int s$snum = ths->temp_str_$snum.size();\n"; ++ push @call_parms, "MutableString(ths->temp_str_$snum.mstr(), s$snum)"; ++ $snum++; ++ } elsif ($_->{type} eq 'encoded string') { ++ $need_wide = true unless $d->{wide}; ++ push @call_parms, $n, "${n}_size"; ++ push @call_parms, "${n}_type_width" if $d->{wide}; ++ $call_fun .= " wide" if $d->{wide}; + } else { +- $_ = $n; ++ push @call_parms, $n; + } + } +- my $parms = '('.(join ', ', @parms).')'; +- my $exp = "ths->".to_lower($d->{name})."$parms"; ++ my $parms = '('.(join ', ', @call_parms).')'; ++ my $exp = "ths->".to_lower($call_fun)."$parms"; + if (exists $d->{'posib err'}) { + $accum->{headers}{'posib err'} = true; + $ret .= " PosibErr<$ret_native> ret = $exp;\n"; +@@ -118,6 +146,7 @@ $info{class}{proc}{impl} = sub { + } + } + $ret .= "}\n\n"; ++ unshift @d,{%$d, wide=>true} if $need_wide; + } + return $ret; + }; +diff --git a/auto/MkSrc/Read.pm b/auto/MkSrc/Read.pm +index 4b3d1d0..4bf640e 100644 +--- a/auto/MkSrc/Read.pm ++++ b/auto/MkSrc/Read.pm +@@ -88,13 +88,13 @@ sub advance ( ) { + $in_pod = $1 if $line =~ /^\=(\w+)/; + $line = '' if $in_pod; + $in_pod = undef if $in_pod && $in_pod eq 'cut'; +- $line =~ s/\#.*$//; ++ $line =~ s/(? "%expression" is not a valid regular expression. + parms => expression ++ + } + group: speller + { +@@ -650,6 +651,7 @@ class: speller + posib err + desc => Returns 0 if it is not in the dictionary, + 1 if it is, or -1 on error. ++ on conv error => return 0; + / + bool + encoded string: word +@@ -715,6 +717,8 @@ class: speller + desc => Return NULL on error. + The word list returned by suggest is only + valid until the next call to suggest. ++ on conv error => ++ word = NULL; word_size = 0; + / + const word list + encoded string: word +@@ -840,7 +844,6 @@ class: document checker + void + + method: process +- + desc => Process a string. + The string passed in should only be split on + white space characters. Furthermore, between +@@ -849,10 +852,10 @@ class: document checker + in the document. Passing in strings out of + order, skipping strings or passing them in + more than once may lead to undefined results. ++ no conv + / + void +- string: str +- int: size ++ encoded string: str + + method: next misspelling + +@@ -860,9 +863,23 @@ class: document checker + processed string. If there are no more + misspelled words, then token.word will be + NULL and token.size will be 0 ++ cc extra => ++ \#define aspell_document_checker_next_misspelling_w(type, ths) \\ ++ aspell_document_checker_next_misspelling_adj(ths, sizeof(type)) + / + token object + ++ method: next misspelling adj ++ desc => internal: do not use ++ c impl => ++ Token res = ths->next_misspelling(); ++ res.offset /= type_width; ++ res.len /= type_width; ++ return res; ++ / ++ token object ++ int: type_width ++ + method: filter + + desc => Returns the underlying filter class. +@@ -922,9 +939,30 @@ class: string enumeration + ths->from_internal_->append_null(ths->temp_str); + return ths->temp_str.data(); + \} ++ cc extra => ++ \#define aspell_string_enumeration_next_w(type, ths) \\ ++ aspell_cast_(const type *, aspell_string_enumeration_next_wide(ths, sizeof(type))) + / + const string + ++ method: next wide ++ c impl => ++ const char * s = ths->next(); ++ if (s == 0) { ++ return s; ++ } else if (ths->from_internal_ == 0) \{ ++ assert(type_width == 1); ++ return s; ++ \} else \{ ++ assert(type_width == ths->from_internal_->out_type_width()); ++ ths->temp_str.clear(); ++ ths->from_internal_->convert(s,-1,ths->temp_str); ++ ths->from_internal_->append_null(ths->temp_str); ++ return ths->temp_str.data(); ++ \} ++ / ++ const void pointer ++ int: type_width + } + group: info + { +diff --git a/common/convert.cpp b/common/convert.cpp +index 1add95a..7ae0317 100644 +--- a/common/convert.cpp ++++ b/common/convert.cpp +@@ -541,18 +541,25 @@ namespace acommon { + // Trivial Conversion + // + ++ const char * unsupported_null_term_wide_string_msg = ++ "Null-terminated wide-character strings unsupported when used this way."; ++ + template + struct DecodeDirect : public Decode + { ++ DecodeDirect() {type_width = sizeof(Chr);} + void decode(const char * in0, int size, FilterCharVector & out) const { + const Chr * in = reinterpret_cast(in0); +- if (size == -1) { ++ if (size == -sizeof(Chr)) { + for (;*in; ++in) +- out.append(*in); ++ out.append(*in, sizeof(Chr)); ++ } else if (size <= -1) { ++ fprintf(stderr, "%s\n", unsupported_null_term_wide_string_msg); ++ abort(); + } else { +- const Chr * stop = reinterpret_cast(in0 +size); ++ const Chr * stop = reinterpret_cast(in0) + size/sizeof(Chr); + for (;in != stop; ++in) +- out.append(*in); ++ out.append(*in, sizeof(Chr)); + } + } + PosibErr decode_ec(const char * in0, int size, +@@ -565,6 +572,7 @@ namespace acommon { + template + struct EncodeDirect : public Encode + { ++ EncodeDirect() {type_width = sizeof(Chr);} + void encode(const FilterChar * in, const FilterChar * stop, + CharVector & out) const { + for (; in != stop; ++in) { +@@ -594,11 +602,15 @@ namespace acommon { + template + struct ConvDirect : public DirectConv + { ++ ConvDirect() {type_width = sizeof(Chr);} + void convert(const char * in0, int size, CharVector & out) const { +- if (size == -1) { ++ if (size == -sizeof(Chr)) { + const Chr * in = reinterpret_cast(in0); + for (;*in != 0; ++in) + out.append(in, sizeof(Chr)); ++ } else if (size <= -1) { ++ fprintf(stderr, "%s\n", unsupported_null_term_wide_string_msg); ++ abort(); + } else { + out.append(in0, size); + } +@@ -1121,5 +1133,20 @@ namespace acommon { + } + return 0; + } +- ++ ++ PosibErr unsupported_null_term_wide_string_err_(const char * func) { ++ static bool reported_to_stderr = false; ++ PosibErr err = make_err(other_error, unsupported_null_term_wide_string_msg); ++ if (!reported_to_stderr) { ++ CERR.printf("ERROR: %s: %s\n", func, unsupported_null_term_wide_string_msg); ++ reported_to_stderr = true; ++ } ++ return err; ++ } ++ ++ void unsupported_null_term_wide_string_abort_(const char * func) { ++ CERR.printf("%s: %s\n", unsupported_null_term_wide_string_msg); ++ abort(); ++ } ++ + } +diff --git a/common/convert.hpp b/common/convert.hpp +index 76332ee..c948973 100644 +--- a/common/convert.hpp ++++ b/common/convert.hpp +@@ -7,6 +7,8 @@ + #ifndef ASPELL_CONVERT__HPP + #define ASPELL_CONVERT__HPP + ++#include "settings.h" ++ + #include "string.hpp" + #include "posib_err.hpp" + #include "char_vector.hpp" +@@ -25,8 +27,9 @@ namespace acommon { + typedef const Config CacheConfig; + typedef const char * CacheKey; + String key; ++ int type_width; // type width in bytes + bool cache_key_eq(const char * l) const {return key == l;} +- ConvBase() {} ++ ConvBase() : type_width(1) {} + private: + ConvBase(const ConvBase &); + void operator=(const ConvBase &); +@@ -56,6 +59,8 @@ namespace acommon { + virtual ~Encode() {} + }; + struct DirectConv { // convert directly from in_code to out_code. ++ int type_width; // type width in bytes ++ DirectConv() : type_width(1) {} + // should not take ownership of decode and encode. + // decode and encode guaranteed to stick around for the life + // of the object. +@@ -126,6 +131,9 @@ namespace acommon { + const char * in_code() const {return decode_->key.c_str();} + const char * out_code() const {return encode_->key.c_str();} + ++ int in_type_width() const {return decode_->type_width;} ++ int out_type_width() const {return encode_->type_width;} ++ + void append_null(CharVector & out) const + { + const char nul[4] = {0,0,0,0}; // 4 should be enough +@@ -191,6 +199,10 @@ namespace acommon { + } + } + ++ void convert(const void * in, int size, CharVector & out) { ++ convert(static_cast(in), size, out); ++ } ++ + void generic_convert(const char * in, int size, CharVector & out); + + }; +@@ -412,6 +424,30 @@ namespace acommon { + return operator()(str, str + byte_size);} + }; + ++#ifdef SLOPPY_NULL_TERM_STRINGS ++ static const bool sloppy_null_term_strings = true; ++#else ++ static const bool sloppy_null_term_strings = false; ++#endif ++ ++ PosibErr unsupported_null_term_wide_string_err_(const char * func); ++ void unsupported_null_term_wide_string_abort_(const char * func); ++ ++ static inline PosibErr get_correct_size(const char * func, int conv_type_width, int size) { ++ if (sloppy_null_term_strings && size <= -1) ++ return -conv_type_width; ++ if (size <= -1 && -conv_type_width != size) ++ return unsupported_null_term_wide_string_err_(func); ++ return size; ++ } ++ static inline int get_correct_size(const char * func, int conv_type_width, int size, int type_width) { ++ if ((sloppy_null_term_strings || type_width <= -1) && size <= -1) ++ return -conv_type_width; ++ if (size <= -1 && conv_type_width != type_width) ++ unsupported_null_term_wide_string_abort_(func); ++ return size; ++ } ++ + } + + #endif +diff --git a/common/document_checker.cpp b/common/document_checker.cpp +index 5e510c4..0ccf1cd 100644 +--- a/common/document_checker.cpp ++++ b/common/document_checker.cpp +@@ -44,7 +44,9 @@ namespace acommon { + void DocumentChecker::process(const char * str, int size) + { + proc_str_.clear(); +- conv_->decode(str, size, proc_str_); ++ PosibErr fixed_size = get_correct_size("aspell_document_checker_process", conv_->in_type_width(), size); ++ if (!fixed_size.has_err()) ++ conv_->decode(str, fixed_size, proc_str_); + proc_str_.append(0); + FilterChar * begin = proc_str_.pbegin(); + FilterChar * end = proc_str_.pend() - 1; +@@ -53,6 +55,19 @@ namespace acommon { + tokenizer_->reset(begin, end); + } + ++ void DocumentChecker::process_wide(const void * str, int size, int type_width) ++ { ++ proc_str_.clear(); ++ int fixed_size = get_correct_size("aspell_document_checker_process", conv_->in_type_width(), size, type_width); ++ conv_->decode(static_cast(str), fixed_size, proc_str_); ++ proc_str_.append(0); ++ FilterChar * begin = proc_str_.pbegin(); ++ FilterChar * end = proc_str_.pend() - 1; ++ if (filter_) ++ filter_->process(begin, end); ++ tokenizer_->reset(begin, end); ++ } ++ + Token DocumentChecker::next_misspelling() + { + bool correct; +diff --git a/common/document_checker.hpp b/common/document_checker.hpp +index d35bb88..11a3c73 100644 +--- a/common/document_checker.hpp ++++ b/common/document_checker.hpp +@@ -36,6 +36,7 @@ namespace acommon { + PosibErr setup(Tokenizer *, Speller *, Filter *); + void reset(); + void process(const char * str, int size); ++ void process_wide(const void * str, int size, int type_width); + Token next_misspelling(); + + Filter * filter() {return filter_;} +diff --git a/common/version.cpp b/common/version.cpp +index 414d938..9e60b75 100644 +--- a/common/version.cpp ++++ b/common/version.cpp +@@ -1,8 +1,17 @@ + #include "settings.h" + +-extern "C" const char * aspell_version_string() { + #ifdef NDEBUG +- return VERSION " NDEBUG"; ++# define NDEBUG_STR " NDEBUG" ++#else ++# define NDEBUG_STR ++#endif ++ ++#ifdef SLOPPY_NULL_TERM_STRINGS ++# define SLOPPY_STR " SLOPPY" ++#else ++# define SLOPPY_STR + #endif +- return VERSION; ++ ++extern "C" const char * aspell_version_string() { ++ return VERSION NDEBUG_STR SLOPPY_STR; + } +diff --git a/configure.ac b/configure.ac +index 60e3b39..a5d51e3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -73,6 +73,9 @@ AC_ARG_ENABLE(filter-version-control, + AC_ARG_ENABLE(32-bit-hash-fun, + AS_HELP_STRING([--enable-32-bit-hash-fun],[use 32-bit hash function for compiled dictionaries])) + ++AC_ARG_ENABLE(sloppy-null-term-strings, ++ AS_HELP_STRING([--enable-sloppy-null-term-strings],[allows allow null terminated UCS-2 and UCS-4 strings])) ++ + AC_ARG_ENABLE(pspell-compatibility, + AS_HELP_STRING([--disable-pspell-compatibility],[don't install pspell compatibility libraries])) + +@@ -141,6 +144,11 @@ then + AC_DEFINE(USE_32_BIT_HASH_FUN, 1, [Defined if 32-bit hash function should be used for compiled dictionaries.]) + fi + ++if test "$enable_sloppy_null_term_strings" = "yes" ++then ++ AC_DEFINE(SLOPPY_NULL_TERM_STRINGS, 1, [Defined if null-terminated UCS-2 and UCS-4 strings should always be allowed.]) ++fi ++ + AM_CONDITIONAL(PSPELL_COMPATIBILITY, + [test "$enable_pspell_compatibility" != "no"]) + AM_CONDITIONAL(INCREMENTED_SONAME, +diff --git a/manual/aspell.texi b/manual/aspell.texi +index 45fa091..f400e06 100644 +--- a/manual/aspell.texi ++++ b/manual/aspell.texi +@@ -158,7 +158,8 @@ Installing + + * Generic Install Instructions:: + * HTML Manuals and "make clean":: +-* Curses Notes:: ++* Curses Notes:: ++* Upgrading from Aspell 0.60.7:: + * Loadable Filter Notes:: + * Upgrading from Aspell 0.50:: + * Upgrading from Aspell .33/Pspell .12:: +@@ -2206,18 +2207,26 @@ int correct = aspell_speller_check(spell_checker, @var{word}, @var{size}); + @end smallexample + + @noindent +- at var{word} is expected to be a @code{const char *} character +-string. If the encoding is set to be @code{ucs-2} or +- at code{ucs-4} @var{word} is expected to be a cast +-from either @code{const u16int *} or @code{const u32int *} +-respectively. @code{u16int} and @code{u32int} are generally +- at code{unsigned short} and @code{unsigned int} respectively. +- at var{size} is the length of the string or @code{-1} if the string +-is null terminated. If the string is a cast from @code{const u16int +-*} or @code{const u32int *} then @code{@i{size}} is the amount of +-space in bytes the string takes up after being cast to @code{const +-char *} and not the true size of the string. @code{sspell_speller_check} +-will return @code{0} if it is not found and non-zero otherwise. ++ at var{word} is expected to be a @code{const char *} character string. ++ at var{size} is the length of the string or @code{-1} if the string is ++null terminated. @code{aspell_speller_check} will return @code{0} if it is not found ++and non-zero otherwise. ++ ++If you are using the @code{ucs-2} or @code{ucs-4} encoding then the ++string is expected to be either a 2 or 4 byte wide integer ++(respectively) and the @code{_w} macro vesion should be used: ++ ++ at smallexample ++int correct = aspell_speller_check_w(spell_checker, @var{word}, @var{size}); ++ at end smallexample ++ ++The macro will cast the string to to the correct type and convert ++ at var{size} into bytes for you and then a call the special wide version of the ++function that will make sure the encoding is correct for the type ++passed in. For compatibility with older versions of Aspell the normal ++non-wide functions can still be used provided that the size of the ++string, in bytes, is also passed in. Null terminated @code{ucs-2} or ++ at code{ucs-4} are no longer supported when using the non-wide functions. + + If the word is not correct, then the @code{suggest} method can be used + to come up with likely replacements. +@@ -2236,7 +2245,28 @@ delete_aspell_string_enumeration(elements); + + Notice how @code{elements} is deleted but @code{suggestions} is not. + The value returned by @code{suggestions} is only valid to the next +-call to @code{suggest}. Once a replacement is made the ++call to @code{suggest}. ++ ++If you are using the @code{ucs-2} or @code{ucs-4} encoding then, in ++addition to using the @code{_w} macro for the @code{suggest} method, you ++should also use the @code{_w} macro with the @code{next} method which ++will cast the string to the correct type for you. For example, if you ++are using the @code{ucs-2} encoding and the string is a @code{const ++uint16_t *} then you should use: ++ ++ at smallexample ++AspellWordList * suggestions = aspell_speller_suggest_w(spell_checker, ++ @var{word}, @var{size}); ++AspellStringEnumeration * elements = aspell_word_list_elements(suggestions); ++const uint16_t * word; ++while ( (word = aspell_string_enumeration_next_w(uint16_t, aspell_elements)) != NULL ) ++@{ ++ // add to suggestion list ++@} ++delete_aspell_string_enumeration(elements); ++ at end smallexample ++ ++Once a replacement is made the + @code{store_repl} method should be used to communicate the replacement + pair back to the spell checker (for the reason, @pxref{Notes on + Storing Replacement Pairs}). Its usage is as follows: +diff --git a/manual/readme.texi b/manual/readme.texi +index 669ab8e..531721f 100644 +--- a/manual/readme.texi ++++ b/manual/readme.texi +@@ -15,15 +15,16 @@ The latest version can always be found at GNU Aspell's home page at + @uref{http://aspell.net}. + + @menu +-* Generic Install Instructions:: +-* HTML Manuals and "make clean":: +-* Curses Notes:: +-* Loadable Filter Notes:: +-* Using 32-Bit Dictionaries on a 64-Bit System:: +-* Upgrading from Aspell 0.50:: +-* Upgrading from Aspell .33/Pspell .12:: +-* Upgrading from a Pre-0.50 snapshot:: +-* WIN32 Notes:: ++* Generic Install Instructions:: ++* HTML Manuals and "make clean":: ++* Curses Notes:: ++* Upgrading from Aspell 0.60.7:: ++* Loadable Filter Notes:: ++* Using 32-Bit Dictionaries on a 64-Bit System:: ++* Upgrading from Aspell 0.50:: ++* Upgrading from Aspell .33/Pspell .12:: ++* Upgrading from a Pre-0.50 snapshot:: ++* WIN32 Notes:: + @end menu + + @node Generic Install Instructions +@@ -121,17 +122,62 @@ In addition your system must also support the @code{mblen} function. + Although this function was defined in the ISO C89 standard (ANSI + X3.159-1989), not all systems have it. + ++ at node Upgrading from Aspell 0.60.7 ++ at appendixsec Upgrading from Aspell 0.60.7 ++ ++To prevent a potentially unbounded buffer over-read, Aspell no longer ++supports null-terminated UCS-2 and UCS-4 encoded strings with the ++original C API. Null-termianted 8-bit or UTF-8 encoded strings are ++still supported, as are UCS-2 and UCS-4 encoded strings when the ++length is passed in. ++ ++As of Aspell 0.60.8 a function from the original API that expects an ++encoded string as a parameter will return meaningless results (or an ++error code) if string is null terminated and the encoding is set to ++ at code{ucs-2} or @code{ucs-4}. In addition, a single: ++ at example ++ERROR: aspell_speller_check: Null-terminated wide-character strings unsupported when used this way. ++ at end example ++will be printed to standard error the first time one of those ++functions is called. ++ ++Application that use null-terminated UCS-2/4 strings should either (1) ++use the interface intended for working with wide-characters ++(@xref{Through the C API}); or (2) define ++ at code{ASPELL_ENCODE_SETTING_SECURE} before including @code{aspell.h}. ++In the latter case is is important that the application explicitly ++sets the encoding to a known value. Defining ++ at code{ASPELL_ENCODE_SETTING_SECURE} and not setting the encoding ++explicitly or allowing user of the application to set the encoding ++could result in an unbounded buffer over-read. ++ ++If it is necessary to preserve binary compatibility with older ++versions of Aspell, the easiest thing would be to determine the length ++of the UCS-2/4 string---in bytes---and pass that in. Due to an ++implemenation detail, existing API functions can be made to work with ++null-terminated UCS-2/4 strings safely by passing in either @code{-2} ++or @code{-4} (corresponding to the width of the character type) as the ++size. Doing so, however, will cause a buffer over-read for unpatched ++version of Aspell. To avoid this it will be necessary to parse the ++version string to determine the correct value to use. However, no ++official support will be provided for the latter method. ++ ++If the application can not be recompiled, then Aspell can be configured ++to preserve the old behavior by passing ++ at option{--enable-sloppy-null-term-strings} to @command{configure}. When Aspell ++is compiled this way the version string will include the string ++ at samp{ SLOPPY}. ++ + @node Loadable Filter Notes + @appendixsec Loadable Filter Notes +- ++ + Support for being able to load additional filter modules at run-time + has only been verified to work on Linux platforms. If you get linker + errors when trying to use a filter, then it is likely that loadable + filter support is not working yet on your platform. Thus, in order to + get Aspell to work correctly you will need to avoid compiling the + filters as individual modules by using the +- at option{--enable-compile-in-filters} when configuring Aspell with +- at command{./configure}. ++ at option{--enable-compile-in-filters} @command{configure} option. + + @node Using 32-Bit Dictionaries on a 64-Bit System + @appendixsec Using 32-Bit Dictionaries on a 64-Bit System +-- +2.17.1 + diff --git a/meta/recipes-support/aspell/aspell/CVE-2019-20433-0002.patch b/meta/recipes-support/aspell/aspell/CVE-2019-20433-0002.patch new file mode 100644 index 0000000..9569dde --- /dev/null +++ b/meta/recipes-support/aspell/aspell/CVE-2019-20433-0002.patch @@ -0,0 +1,68 @@ +From cefd447e5528b08bb0cd6656bc52b4255692cefc Mon Sep 17 00:00:00 2001 +From: Kevin Atkinson +Date: Sat, 17 Aug 2019 20:25:21 -0400 +Subject: [PATCH 2/2] Increment library version to reflect API changes. + +CVE: CVE-2019-20433 +Upstream-Status: Backport [https://github.com/GNUAspell/aspell/commit/cefd447e5528b08bb0cd6656bc52b4255692cefc] + +Signed-off-by: Stefan Ghinea +--- + Makefile.am | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 7e15851..19dc044 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -94,18 +94,25 @@ libaspell_la_SOURCES =\ + + libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) + +-## Libtool to so name +-## C:R:A => (C-A).(A).(R) +-## 16:5:0 => 16.0.5 +-## 16:5:1 => 15.1.5 +-## 18:0:2 => 16.2.0 +-## 17:0:2 => 15.2.0 +- ++## The version string is current[:revision[:age]] ++## ++## Before a release that has changed the source code at all ++## increment revision. ++## ++## After merging changes that have changed the API in a backwards ++## comptable way set revision to 0 and bump both current and age. ++## ++## Do not change the API in a backwards incompatible way. ++## ++## See "Libtool: Updating version info" ++## (https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html) ++## for more into ++## + if INCREMENTED_SONAME +-libaspell_la_LDFLAGS = -version-info 18:0:2 -no-undefined ++libaspell_la_LDFLAGS = -version-info 19:0:3 -no-undefined + else + ## Use C-1:R:A +-libaspell_la_LDFLAGS = -version-info 17:0:2 -no-undefined ++libaspell_la_LDFLAGS = -version-info 18:0:3 -no-undefined + endif + + if PSPELL_COMPATIBILITY +@@ -113,11 +120,7 @@ libpspell_la_SOURCES = lib/dummy.cpp + + libpspell_la_LIBADD = libaspell.la + +-if INCREMENTED_SONAME +-libpspell_la_LDFLAGS = -version-info 18:0:2 -no-undefined +-else +-libpspell_la_LDFLAGS = -version-info 17:0:2 -no-undefined +-endif ++libpspell_la_LDFLAGS = $(libaspell_la_LDFLAGS) + + endif + +-- +2.17.1 + diff --git a/meta/recipes-support/aspell/aspell_0.60.7.bb b/meta/recipes-support/aspell/aspell_0.60.7.bb index b565cb3..1e104c2 100644 --- a/meta/recipes-support/aspell/aspell_0.60.7.bb +++ b/meta/recipes-support/aspell/aspell_0.60.7.bb @@ -8,6 +8,8 @@ PR = "r1" SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ file://0001-Fix-various-bugs-found-by-OSS-Fuze.patch \ + file://CVE-2019-20433-0001.patch \ + file://CVE-2019-20433-0002.patch \ " SRC_URI[md5sum] = "8ef2252609c511cd2bb26f3a3932ef28" SRC_URI[sha256sum] = "5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:50 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:50 +0000 Subject: [oe-commits] [openembedded-core] 05/07: python3: Upgrade 3.7.6 -> 3.7.7 In-Reply-To: <158461234560.28224.759514127728700692@git.openembedded.org> References: <158461234560.28224.759514127728700692@git.openembedded.org> Message-ID: <20200319100546.706DA2362AA@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 3c40cfe7433999272e1698e2c914d6d190f76b63 Author: Adrian Bunk AuthorDate: Sun Mar 15 20:04:24 2020 +0200 python3: Upgrade 3.7.6 -> 3.7.7 THE LICENSE checksum changed in this update due to copyright notice added for 2020. Signed-off-by: Adrian Bunk Signed-off-by: Anuj Mittal --- meta/recipes-devtools/python/{python3_3.7.6.bb => python3_3.7.7.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/python/python3_3.7.6.bb b/meta/recipes-devtools/python/python3_3.7.7.bb similarity index 98% rename from meta/recipes-devtools/python/python3_3.7.6.bb rename to meta/recipes-devtools/python/python3_3.7.7.bb index b33b702..823eb2f 100644 --- a/meta/recipes-devtools/python/python3_3.7.6.bb +++ b/meta/recipes-devtools/python/python3_3.7.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.python.org" LICENSE = "PSFv2" SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498" +LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://run-ptest \ @@ -38,8 +38,8 @@ SRC_URI_append_class-nativesdk = " \ file://0001-main.c-if-OEPYTHON3HOME-is-set-use-instead-of-PYTHON.patch \ " -SRC_URI[md5sum] = "c08fbee72ad5c2c95b0f4e44bf6fd72c" -SRC_URI[sha256sum] = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f" +SRC_URI[md5sum] = "172c650156f7bea68ce31b2fd01fa766" +SRC_URI[sha256sum] = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P\d+(\.\d+)+).tar" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:51 +0000 Subject: [oe-commits] [openembedded-core] 06/07: libarchive: Fix CVE-2020-9308 In-Reply-To: <158461234560.28224.759514127728700692@git.openembedded.org> References: <158461234560.28224.759514127728700692@git.openembedded.org> Message-ID: <20200319100546.7DF7A2362AB@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 878817358eb7c25ffa48d10dde9475299674a96c Author: Wenlin Kang AuthorDate: Sat Mar 14 05:19:23 2020 -0700 libarchive: Fix CVE-2020-9308 Fix CVE-2020-9308 Signed-off-by: Wenlin Kang Signed-off-by: Anuj Mittal --- ...-reject-files-that-declare-invalid-header.patch | 124 +++++++++++++++++++++ .../libarchive/libarchive_3.4.0.bb | 1 + 2 files changed, 125 insertions(+) diff --git a/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch new file mode 100644 index 0000000..a84c1f1 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/0001-RAR5-reader-reject-files-that-declare-invalid-header.patch @@ -0,0 +1,124 @@ +From c1fe0a8cc8dde8ba3eae3d17e34060d2d6e4eb96 Mon Sep 17 00:00:00 2001 +From: Grzegorz Antoniak +Date: Sun, 2 Feb 2020 08:04:41 +0100 +Subject: [PATCH] RAR5 reader: reject files that declare invalid header flags + +One of the fields in RAR5's base block structure is the size of the +header. Some invalid files declare a 0 header size setting, which can +confuse the unpacker. Minimum header size for RAR5 base blocks is 7 +bytes (4 bytes for CRC, and 3 bytes for the rest), so block size of 0 +bytes should be rejected at header parsing stage. + +The fix adds an error condition if header size of 0 bytes is detected. +In this case, the unpacker will not attempt to unpack the file, as the +header is corrupted. + +The commit also adds OSSFuzz #20459 sample to test further regressions +in this area. + +Upstream-Status: Backport[https://github.com/libarchive/libarchive/commit/94821008d6eea81e315c5881cdf739202961040a] +CVE: CVE-2020-9308 + +Signed-off-by: Wenlin Kang +--- + Makefile.am | 1 + + libarchive/archive_read_support_format_rar5.c | 17 +++++++++++++++-- + libarchive/test/test_read_format_rar5.c | 15 +++++++++++++++ + ...d_format_rar5_block_size_is_too_small.rar.uu | 8 ++++++++ + 4 files changed, 39 insertions(+), 2 deletions(-) + create mode 100644 libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu + +diff --git a/Makefile.am b/Makefile.am +index da78b24..01abf20 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -863,6 +863,7 @@ libarchive_test_EXTRA_DIST=\ + libarchive/test/test_read_format_rar5_symlink.rar.uu \ + libarchive/test/test_read_format_rar5_truncated_huff.rar.uu \ + libarchive/test/test_read_format_rar5_win32.rar.uu \ ++ libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu \ + libarchive/test/test_read_format_raw.bufr.uu \ + libarchive/test/test_read_format_raw.data.gz.uu \ + libarchive/test/test_read_format_raw.data.Z.uu \ +diff --git a/libarchive/archive_read_support_format_rar5.c b/libarchive/archive_read_support_format_rar5.c +index 7c24627..f73393c 100644 +--- a/libarchive/archive_read_support_format_rar5.c ++++ b/libarchive/archive_read_support_format_rar5.c +@@ -2034,6 +2034,8 @@ static int scan_for_signature(struct archive_read* a); + static int process_base_block(struct archive_read* a, + struct archive_entry* entry) + { ++ const size_t SMALLEST_RAR5_BLOCK_SIZE = 3; ++ + struct rar5* rar = get_context(a); + uint32_t hdr_crc, computed_crc; + size_t raw_hdr_size = 0, hdr_size_len, hdr_size; +@@ -2057,15 +2059,26 @@ static int process_base_block(struct archive_read* a, + return ARCHIVE_EOF; + } + ++ hdr_size = raw_hdr_size + hdr_size_len; ++ + /* Sanity check, maximum header size for RAR5 is 2MB. */ +- if(raw_hdr_size > (2 * 1024 * 1024)) { ++ if(hdr_size > (2 * 1024 * 1024)) { + archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, + "Base block header is too large"); + + return ARCHIVE_FATAL; + } + +- hdr_size = raw_hdr_size + hdr_size_len; ++ /* Additional sanity checks to weed out invalid files. */ ++ if(raw_hdr_size == 0 || hdr_size_len == 0 || ++ hdr_size < SMALLEST_RAR5_BLOCK_SIZE) ++ { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, ++ "Too small block encountered (%ld bytes)", ++ raw_hdr_size); ++ ++ return ARCHIVE_FATAL; ++ } + + /* Read the whole header data into memory, maximum memory use here is + * 2MB. */ +diff --git a/libarchive/test/test_read_format_rar5.c b/libarchive/test/test_read_format_rar5.c +index 1408f37..32e7ed8 100644 +--- a/libarchive/test/test_read_format_rar5.c ++++ b/libarchive/test/test_read_format_rar5.c +@@ -1194,3 +1194,18 @@ DEFINE_TEST(test_read_format_rar5_fileattr) + + EPILOGUE(); + } ++ ++DEFINE_TEST(test_read_format_rar5_block_size_is_too_small) ++{ ++ char buf[4096]; ++ PROLOGUE("test_read_format_rar5_block_size_is_too_small.rar"); ++ ++ /* This file is damaged, so those functions should return failure. ++ * Additionally, SIGSEGV shouldn't be raised during execution ++ * of those functions. */ ++ ++ assertA(archive_read_next_header(a, &ae) != ARCHIVE_OK); ++ assertA(archive_read_data(a, buf, sizeof(buf)) <= 0); ++ ++ EPILOGUE(); ++} +diff --git a/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu +new file mode 100644 +index 0000000..5cad219 +--- /dev/null ++++ b/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu +@@ -0,0 +1,8 @@ ++begin 644 test_read_format_rar5_block_size_is_too_small.rar ++M4F%R(1H'`0"-[P+2``+'(!P,("`@N`,!`B`@("`@("`@("`@("`@("#_("`@ ++M("`@("`@("`@((:Q;2!4-'-^4B`!((WO`M(``O\@$/\@-R`@("`@("`@("`@ ++M``X@("`@("`@____("`@("`@(/\@("`@("`@("`@("#_(+6U,2"UM;6UM[CU ++M)B`@*(0G(`!.`#D\3R``(/__(,+_````-0#_($&%*/HE=C+N`"```"```"`D ++J`)$#("#_("#__P`@__\@_R#_("`@("`@("#_("#__R`@(/__("#__R`" ++` ++end +-- +2.23.0 + diff --git a/meta/recipes-extended/libarchive/libarchive_3.4.0.bb b/meta/recipes-extended/libarchive/libarchive_3.4.0.bb index c196382..db45ccf 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.4.0.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.4.0.bb @@ -33,6 +33,7 @@ EXTRA_OECONF += "--enable-largefile" SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://CVE-2019-19221.patch \ + file://0001-RAR5-reader-reject-files-that-declare-invalid-header.patch \ " SRC_URI[md5sum] = "6046396255bd7cf6d0f6603a9bda39ac" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:52 +0000 Subject: [oe-commits] [openembedded-core] 07/07: bluez: fix CVE-2020-0556 In-Reply-To: <158461234560.28224.759514127728700692@git.openembedded.org> References: <158461234560.28224.759514127728700692@git.openembedded.org> Message-ID: <20200319100546.8B7F52362AC@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 c940e4b858d6be28b198770768117ecc098fa0d3 Author: Anuj Mittal AuthorDate: Fri Mar 13 09:09:38 2020 +0800 bluez: fix CVE-2020-0556 It was discovered that BlueZ's HID and HOGP profiles implementations don't specifically require bonding between the device and the host. This creates an opportunity for an malicious device to connect to a target host to either impersonate an existing HID device without security or to cause an SDP or GATT service discovery to take place which would allow HID reports to be injected to the input subsystem from a non-bonded source. (From OE-Core rev: d598f8eee0741148416e8660e10c716654205cb5) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie (cherry picked from commit bed169a07b04a7dc003958fa309e6ff761f85a72) --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 + .../bluez5/bluez5/CVE-2020-0556-1.patch | 35 +++++ .../bluez5/bluez5/CVE-2020-0556-2.patch | 143 +++++++++++++++++++++ 3 files changed, 180 insertions(+) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index f582a07..75fc2db 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -58,6 +58,8 @@ SRC_URI = "\ file://CVE-2018-10910.patch \ file://gcc9-fixes.patch \ file://0001-tools-Fix-build-after-y2038-changes-in-glibc.patch \ + file://CVE-2020-0556-1.patch \ + file://CVE-2020-0556-2.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch new file mode 100644 index 0000000..a6bf31e --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch @@ -0,0 +1,35 @@ +From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:16 +0000 +Subject: [PATCH 1/2] HOGP must only accept data from bonded devices. + +HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1] +Signed-off-by: Anuj Mittal +CVE: CVE-2020-0556 +--- + profiles/input/hog.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/profiles/input/hog.c b/profiles/input/hog.c +index 83c017dcb..dfac68921 100644 +--- a/profiles/input/hog.c ++++ b/profiles/input/hog.c +@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) + return -EINVAL; + } + ++ /* HOGP 1.0 Section 6.1 requires bonding */ ++ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) ++ return -ECONNREFUSED; ++ + /* TODO: Replace GAttrib with bt_gatt_client */ + bt_hog_attach(dev->hog, attrib); + +-- +2.24.1 + diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch new file mode 100644 index 0000000..8acb2f1 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch @@ -0,0 +1,143 @@ +From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 +From: Alain Michaud +Date: Tue, 10 Mar 2020 02:35:18 +0000 +Subject: [PATCH 2/2] HID accepts bonded device connections only. + +This change adds a configuration for platforms to choose a more secure +posture for the HID profile. While some older mice are known to not +support pairing or encryption, some platform may choose a more secure +posture by requiring the device to be bonded and require the +connection to be encrypted when bonding is required. + +Reference: +https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787] +Signed-off-by: Anuj Mittal +CVE: CVE-2020-0556 + +--- + profiles/input/device.c | 23 ++++++++++++++++++++++- + profiles/input/device.h | 1 + + profiles/input/input.conf | 8 ++++++++ + profiles/input/manager.c | 13 ++++++++++++- + 4 files changed, 43 insertions(+), 2 deletions(-) + +diff --git a/profiles/input/device.c b/profiles/input/device.c +index 2cb3811c8..d89da2d7c 100644 +--- a/profiles/input/device.c ++++ b/profiles/input/device.c +@@ -92,6 +92,7 @@ struct input_device { + + static int idle_timeout = 0; + static bool uhid_enabled = false; ++static bool classic_bonded_only = false; + + void input_set_idle_timeout(int timeout) + { +@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) + uhid_enabled = state; + } + ++void input_set_classic_bonded_only(bool state) ++{ ++ classic_bonded_only = state; ++} ++ + static void input_device_enter_reconnect_mode(struct input_device *idev); + static int connection_disconnect(struct input_device *idev, uint32_t flags); + +@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) + if (device_name_known(idev->device)) + device_get_name(idev->device, req->name, sizeof(req->name)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) { ++ error("Rejected connection from !bonded device %s", dst_addr); ++ goto cleanup; ++ } ++ + /* Encryption is mandatory for keyboards */ +- if (req->subclass & 0x40) { ++ /* Some platforms may choose to require encryption for all devices */ ++ /* Note that this only matters for pre 2.1 devices as otherwise the */ ++ /* device is encrypted by default by the lower layers */ ++ if (classic_bonded_only || req->subclass & 0x40) { + if (!bt_io_set(idev->intr_io, &gerr, + BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, + BT_IO_OPT_INVALID)) { +@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) + DBG("path=%s reconnect_mode=%s", idev->path, + reconnect_mode_to_string(idev->reconnect_mode)); + ++ /* Make sure the device is bonded if required */ ++ if (classic_bonded_only && !device_is_bonded(idev->device, ++ btd_device_get_bdaddr_type(idev->device))) ++ return; ++ + /* Only attempt an auto-reconnect when the device is required to + * accept reconnections from the host. + */ +diff --git a/profiles/input/device.h b/profiles/input/device.h +index 51a9aee18..3044db673 100644 +--- a/profiles/input/device.h ++++ b/profiles/input/device.h +@@ -29,6 +29,7 @@ struct input_conn; + + void input_set_idle_timeout(int timeout); + void input_enable_userspace_hid(bool state); ++void input_set_classic_bonded_only(bool state); + + int input_device_register(struct btd_service *service); + void input_device_unregister(struct btd_service *service); +diff --git a/profiles/input/input.conf b/profiles/input/input.conf +index 3e1d65aae..166aff4a4 100644 +--- a/profiles/input/input.conf ++++ b/profiles/input/input.conf +@@ -11,3 +11,11 @@ + # Enable HID protocol handling in userspace input profile + # Defaults to false (HIDP handled in HIDP kernel module) + #UserspaceHID=true ++ ++# Limit HID connections to bonded devices ++# The HID Profile does not specify that devices must be bonded, however some ++# platforms may want to make sure that input connections only come from bonded ++# device connections. Several older mice have been known for not supporting ++# pairing/encryption. ++# Defaults to false to maximize device compatibility. ++#ClassicBondedOnly=true +diff --git a/profiles/input/manager.c b/profiles/input/manager.c +index 1d31b0652..5cd27b839 100644 +--- a/profiles/input/manager.c ++++ b/profiles/input/manager.c +@@ -96,7 +96,7 @@ static int input_init(void) + config = load_config_file(CONFIGDIR "/input.conf"); + if (config) { + int idle_timeout; +- gboolean uhid_enabled; ++ gboolean uhid_enabled, classic_bonded_only; + + idle_timeout = g_key_file_get_integer(config, "General", + "IdleTimeout", &err); +@@ -114,6 +114,17 @@ static int input_init(void) + input_enable_userspace_hid(uhid_enabled); + } else + g_clear_error(&err); ++ ++ classic_bonded_only = g_key_file_get_boolean(config, "General", ++ "ClassicBondedOnly", &err); ++ ++ if (!err) { ++ DBG("input.conf: ClassicBondedOnly=%s", ++ classic_bonded_only ? "true" : "false"); ++ input_set_classic_bonded_only(classic_bonded_only); ++ } else ++ g_clear_error(&err); ++ + } + + btd_profile_register(&input_profile); +-- +2.24.1 + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:51 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:51 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (61d80b0 -> f791a07) Message-ID: <158461235104.28588.11005839557737087833@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 61d80b0 build-appliance-image: Update to master head revision new 59bfdc3 runqemu: support multiple NICs new 75b29a6 libucontext: Fix multilib build new 483c2d3 oeqa/manual/bsp-hw.json: fix syntax error new 8784b66 classes/populate_sdk_base: Implement xz compression options new 6825564 lttng-modules: update to 2.11.2 new f074b22 cmake: Update 3.16.1 -> 3.16.5 new dd5dd04 base-passwd: LICENSE changed to GPLv2 new 0bcc830 gtk+3: upgrade 3.24.13 -> 3.24.14 new 6737704 linuxloader: Add get_musl_loader_arch function new 8679af2 musl: Add support for multilib new 224d93c meson: upgrade 0.53.1 -> 0.53.2 new 1c53491 bluez5: upgrade 5.53 -> 5.54 new 1c4c59c fribidi: upgrade 1.0.8 -> 1.0.9 new 3e2dd62 glew: upgrade 2.1.0 -> 2.2.0 new 60d9b48 icu: upgrade 65.1 ->66.1 new 1c94bd6 libxcrypt: upgrade 4.4.14 -> 4.4.15 new fa7671b mc: upgrade 4.8.23 -> 4.8.24 new f791a07 lttng-ust: upgrade 2.11.0 -> 2.11.1 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/linuxloader.bbclass | 29 +++-- meta/classes/populate_sdk_base.bbclass | 3 +- meta/classes/qemuboot.bbclass | 14 ++ meta/lib/oeqa/manual/bsp-hw.json | 2 +- meta/recipes-connectivity/bluez5/bluez5.inc | 2 - .../bluez5/bluez5/CVE-2020-0556-1.patch | 35 ----- .../bluez5/bluez5/CVE-2020-0556-2.patch | 143 --------------------- .../bluez5/{bluez5_5.53.bb => bluez5_5.54.bb} | 4 +- .../recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 +- ...compat_4.4.14.bb => libxcrypt-compat_4.4.15.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../{libxcrypt_4.4.14.bb => libxcrypt_4.4.15.bb} | 0 .../0001-Makefile-Add-LIBDIR-variable.patch | 46 +++++++ meta/recipes-core/musl/libucontext_git.bb | 3 +- meta/recipes-core/musl/musl_git.bb | 10 +- ...ake-native_3.16.1.bb => cmake-native_3.16.5.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 4 +- .../cmake/{cmake_3.16.1.bb => cmake_3.16.5.bb} | 0 meta/recipes-devtools/meson/meson.inc | 4 +- .../meson/{meson_0.53.1.bb => meson_0.53.2.bb} | 0 ...k-meson_0.53.1.bb => nativesdk-meson_0.53.2.bb} | 0 ...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 +- .../gtk+/{gtk+3_3.24.13.bb => gtk+3_3.24.14.bb} | 4 +- ...ed-compilation-with-current-mesa-versions.patch | 73 ----------- .../glew/{glew_2.1.0.bb => glew_2.2.0.bb} | 7 +- ...g-modules_2.11.1.bb => lttng-modules_2.11.2.bb} | 8 +- .../{lttng-ust_2.11.0.bb => lttng-ust_2.11.1.bb} | 4 +- .../fribidi/{fribidi_1.0.8.bb => fribidi_1.0.9.bb} | 6 +- .../icu/{icu_65.1.bb => icu_66.1.bb} | 6 +- scripts/runqemu | 16 ++- 32 files changed, 128 insertions(+), 514 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch rename meta/recipes-connectivity/bluez5/{bluez5_5.53.bb => bluez5_5.54.bb} (91%) rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.14.bb => libxcrypt-compat_4.4.15.bb} (100%) rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.14.bb => libxcrypt_4.4.15.bb} (100%) create mode 100644 meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch rename meta/recipes-devtools/cmake/{cmake-native_3.16.1.bb => cmake-native_3.16.5.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.16.1.bb => cmake_3.16.5.bb} (100%) rename meta/recipes-devtools/meson/{meson_0.53.1.bb => meson_0.53.2.bb} (100%) rename meta/recipes-devtools/meson/{nativesdk-meson_0.53.1.bb => nativesdk-meson_0.53.2.bb} (100%) 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-gnome/gtk+/{gtk+3_3.24.13.bb => gtk+3_3.24.14.bb} (85%) delete mode 100644 meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch rename meta/recipes-graphics/glew/{glew_2.1.0.bb => glew_2.2.0.bb} (87%) rename meta/recipes-kernel/lttng/{lttng-modules_2.11.1.bb => lttng-modules_2.11.2.bb} (86%) rename meta/recipes-kernel/lttng/{lttng-ust_2.11.0.bb => lttng-ust_2.11.1.bb} (93%) rename meta/recipes-support/fribidi/{fribidi_1.0.8.bb => fribidi_1.0.9.bb} (72%) rename meta/recipes-support/icu/{icu_65.1.bb => icu_66.1.bb} (82%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:52 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:52 +0000 Subject: [oe-commits] [openembedded-core] 01/18: runqemu: support multiple NICs In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.7F8AC2362A6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 59bfdc331c1494c05ab38804b281878a1f571f6d Author: Adrian Freihofer AuthorDate: Tue Mar 17 16:26:50 2020 +0100 runqemu: support multiple NICs Emulating more than one network interface with runqemu is a bit tricky, but possible. For example, the following leads to an emulated device with eth0 and eth1: QB_NETWORK_DEVICE_prepend = " \ -device virtio-net-device,mac=52:54:00:12:34:03 \ " or QB_NETWORK_DEVICE_append = " \ -device virtio-net-pci,mac=52:54:00:12:34:03 \ " When booting Qemu with two NICs, the kernel does not know which interface the specified ip=192.168.7.... command line argument should be applied. This delays the boot process for a very long time and a guest wihtout IP configuration. This add two new configuraton parameters to runqemu: QB_CMDLINE_IP_SLIRP and QB_CMDLINE_IP_TAP to explicitely specify the ip= kernel command line arguments for tap and slirp mode. Note: Simply adding "::eth0" broke some builds on the Yocto autobuilder. Signed-off-by: Adrian Freihofer Signed-off-by: Richard Purdie --- meta/classes/qemuboot.bbclass | 14 ++++++++++++++ scripts/runqemu | 16 ++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass index 15a9e63..54044c3 100644 --- a/meta/classes/qemuboot.bbclass +++ b/meta/classes/qemuboot.bbclass @@ -36,6 +36,9 @@ # Note, runqemu will replace @MAC@ with a predefined mac, you can set # a custom one, but that may cause conflicts when multiple qemus are # running on the same host. +# Note: If more than one interface of type -device virtio-net-device gets added, +# QB_NETWORK_DEVICE_prepend might be used, since Qemu enumerates the eth* +# devices in reverse order to -device arguments. # # QB_TAP_OPT: netowrk option for 'tap' mode, e.g., # "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" @@ -43,6 +46,15 @@ # # QB_SLIRP_OPT: network option for SLIRP mode, e.g., -netdev user,id=net0" # +# QB_CMDLINE_IP_SLIRP: If QB_NETWORK_DEVICE adds more than one network interface to qemu, usually the +# ip= kernel comand line argument needs to be changed accordingly. Details are documented +# in the kernel docuemntation https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt +# Example to configure only the first interface: "ip=eth0:dhcp" +# QB_CMDLINE_IP_TAP: This parameter is similar to the QB_CMDLINE_IP_SLIRP parameter. Since the tap interface requires +# static IP configuration @CLIENT@ and @GATEWAY@ place holders are replaced by the IP and the gateway +# address of the qemu guest by runqemu. +# Example: "ip=192.168.7. at CLIENT@::192.168.7. at GATEWAY@:255.255.255.0::eth0" +# # QB_ROOTFS_OPT: used as rootfs, e.g., # "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" # Note, runqemu will replace "@ROOTFS@" with the one which is used, such as core-image-minimal-qemuarm64.ext4. @@ -63,6 +75,8 @@ QB_DEFAULT_KERNEL ?= "${KERNEL_IMAGETYPE}" QB_DEFAULT_FSTYPE ?= "ext4" QB_OPT_APPEND ?= "-show-cursor" QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@" +QB_CMDLINE_IP_SLIRP ?= "ip=dhcp" +QB_CMDLINE_IP_TAP ?= "ip=192.168.7. at CLIENT@::192.168.7. at GATEWAY@:255.255.255.0" # This should be kept align with ROOT_VM QB_DRIVE_TYPE ?= "/dev/sd" diff --git a/scripts/runqemu b/scripts/runqemu index dd0aa4b..6f24093 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -185,6 +185,8 @@ class BaseConfig(object): self.vmtypes = ('hddimg', 'iso') self.fsinfo = {} self.network_device = "-device e1000,netdev=net0,mac=@MAC@" + self.cmdline_ip_slirp = "ip=dhcp" + self.cmdline_ip_tap = "ip=192.168.7. at CLIENT@::192.168.7. at GATEWAY@:255.255.255.0" # Use different mac section for tap and slirp to avoid # conflicts, e.g., when one is running with tap, the other is # running with slirp. @@ -1032,7 +1034,9 @@ class BaseConfig(object): if self.fstype == 'nfs': self.setup_nfs() - self.kernel_cmdline_script += ' ip=dhcp' + netconf = " " + self.cmdline_ip_slirp + logger.info("Network configuration:%s", netconf) + self.kernel_cmdline_script += netconf # Port mapping hostfwd = ",hostfwd=tcp::2222-:22,hostfwd=tcp::2323-:23" qb_slirp_opt_default = "-netdev user,id=net0%s,tftp=%s" % (hostfwd, self.get('DEPLOY_DIR_IMAGE')) @@ -1147,9 +1151,11 @@ class BaseConfig(object): client = gateway + 1 if self.fstype == 'nfs': self.setup_nfs() - netconf = "192.168.7.%s::192.168.7.%s:255.255.255.0" % (client, gateway) - logger.info("Network configuration: %s", netconf) - self.kernel_cmdline_script += " ip=%s" % netconf + netconf = " " + self.cmdline_ip_tap + netconf = netconf.replace('@CLIENT@', str(client)) + netconf = netconf.replace('@GATEWAY@', str(gateway)) + logger.info("Network configuration:%s", netconf) + self.kernel_cmdline_script += netconf mac = "%s%02x" % (self.mac_tap, client) qb_tap_opt = self.get('QB_TAP_OPT') if qb_tap_opt: @@ -1171,8 +1177,10 @@ class BaseConfig(object): if self.net_bridge: self.setup_net_bridge() elif self.slirp_enabled: + self.cmdline_ip_slirp = self.get('QB_CMDLINE_IP_SLIRP') or self.cmdline_ip_slirp self.setup_slirp() else: + self.cmdline_ip_tap = self.get('QB_CMDLINE_IP_TAP') or self.cmdline_ip_tap self.setup_tap() def setup_rootfs(self): -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:54 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:54 +0000 Subject: [oe-commits] [openembedded-core] 03/18: oeqa/manual/bsp-hw.json: fix syntax error In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.9DFB82362A8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 483c2d318c63fc2927680c1613d60864bb6287ab Author: Yi Zhao AuthorDate: Wed Mar 18 11:38:00 2020 +0800 oeqa/manual/bsp-hw.json: fix syntax error Remove the redundant comma to fix the json decode error: $ resulttool manualexecution ../meta/lib/oeqa/manual/bsp-hw.json Traceback (most recent call last): [snip] File "/usr/lib/python3.6/json/decoder.py", line 357, in raw_decode raise JSONDecodeError("Expecting value", s, err.value) from None json.decoder.JSONDecodeError: Expecting value: line 948 column 1 (char 39810) Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/lib/oeqa/manual/bsp-hw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/manual/bsp-hw.json b/meta/lib/oeqa/manual/bsp-hw.json index 73cbaaa..a9bc7d4 100644 --- a/meta/lib/oeqa/manual/bsp-hw.json +++ b/meta/lib/oeqa/manual/bsp-hw.json @@ -944,5 +944,5 @@ }, "summary": "System_can_boot_up_via_NFS" } - }, + } ] -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:55 +0000 Subject: [oe-commits] [openembedded-core] 04/18: classes/populate_sdk_base: Implement xz compression options In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.AE7462362A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8784b663f474fa3a912c2e5415a9c62cc9d7971f Author: Mike Looijmans AuthorDate: Wed Mar 18 13:21:56 2020 +0100 classes/populate_sdk_base: Implement xz compression options Building an SDK on a machine with 8GB RAM resulted in excessive swapping due to the xz compressor using ~20GB of memory. This is because xz is being called with "-T 0 -9". To allow tuning the compression versus memory usage, introduce a variable named SDK_XZ_OPTIONS that defaults to a more sane default: SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${XZ_COMPRESSION_LEVEL}" Thus, inherit any XZ tuning already done, and allow users to specify overrides for this task in their config by supplying SDK_XZ_OPTIONS. Since XZ_COMPRESSION_LEVEL defaults to -9 this does not change the standard behavior. Signed-off-by: Mike Looijmans Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 3248bb0..33f3a98 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -49,6 +49,7 @@ TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" # Default archived SDK's suffix SDK_ARCHIVE_TYPE ?= "tar.xz" +SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${XZ_COMPRESSION_LEVEL}" # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz python () { @@ -59,7 +60,7 @@ python () { d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; zip -r ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE} .') else: d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') - d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz -T 0 -9 > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') + d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') } SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:53 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:53 +0000 Subject: [oe-commits] [openembedded-core] 02/18: libucontext: Fix multilib build In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.8E05B2362A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 75b29a68f11f9c10a89ba413abd1023cfcf90982 Author: Khem Raj AuthorDate: Tue Mar 17 11:32:20 2020 -0700 libucontext: Fix multilib build libdir is hardcoded to /lib which is not going to work in multilib scene, patch makefile to add a variable to override the libdir from env Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../0001-Makefile-Add-LIBDIR-variable.patch | 46 ++++++++++++++++++++++ meta/recipes-core/musl/libucontext_git.bb | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch b/meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch new file mode 100644 index 0000000..4f91c8f --- /dev/null +++ b/meta/recipes-core/musl/libucontext/0001-Makefile-Add-LIBDIR-variable.patch @@ -0,0 +1,46 @@ +From 9bc3cedba54708c40c4a853b240c46e69f87de3c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Mar 2020 10:04:40 -0700 +Subject: [PATCH] Makefile: Add LIBDIR variable + +This ensures that it can be installed into custom location and also + +Upstream-Status: Submitted +Signed-off-by: Khem Raj +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + ARCH := $(shell uname -m) +- ++LIBDIR := /lib + CFLAGS = -ggdb3 -O2 -Wall -Iarch/${ARCH} + + LIBUCONTEXT_C_SRC = $(wildcard arch/${ARCH}/*.c) +@@ -10,8 +10,8 @@ LIBUCONTEXT_SOVERSION = 0 + LIBUCONTEXT_NAME = libucontext.so + LIBUCONTEXT_STATIC_NAME = libucontext.a + LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} +-LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} +-LIBUCONTEXT_STATIC_PATH = /lib/${LIBUCONTEXT_STATIC_NAME} ++LIBUCONTEXT_PATH = ${LIBDIR}/${LIBUCONTEXT_SONAME} ++LIBUCONTEXT_STATIC_PATH = ${LIBDIR}/${LIBUCONTEXT_STATIC_NAME} + + all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} + +@@ -36,9 +36,9 @@ clean: + ${LIBUCONTEXT_OBJ} test_libucontext + + install: all +- install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}/${LIBUCONTEXT_PATH} +- install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}/${LIBUCONTEXT_STATIC_PATH} +- ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}/lib/${LIBUCONTEXT_NAME} ++ install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}${LIBUCONTEXT_PATH} ++ install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}${LIBUCONTEXT_STATIC_PATH} ++ ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}${LIBDIR}/${LIBUCONTEXT_NAME} + + check: test_libucontext ${LIBUCONTEXT_SONAME} + env LD_LIBRARY_PATH=$(shell pwd) ./test_libucontext diff --git a/meta/recipes-core/musl/libucontext_git.bb b/meta/recipes-core/musl/libucontext_git.bb index 72e15aa..92cb703 100644 --- a/meta/recipes-core/musl/libucontext_git.bb +++ b/meta/recipes-core/musl/libucontext_git.bb @@ -12,6 +12,7 @@ PV = "0.1.3+${SRCPV}" SRCREV = "e6b4d7516dae9b200e94fcfcb9ebc9331389655f" SRC_URI = "git://code.foxkit.us/adelie/libucontext.git;protocol=https \ file://0001-pass-LDFLAGS-to-link-step.patch \ + file://0001-Makefile-Add-LIBDIR-variable.patch \ " S = "${WORKDIR}/git" @@ -51,7 +52,7 @@ export ARCH = "${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}" CFLAGS += "-Iarch/${ARCH}" -EXTRA_OEMAKE = "CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" +EXTRA_OEMAKE = "CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' LIBDIR='${base_libdir}'" do_compile() { oe_runmake ARCH=${ARCH} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:57 +0000 Subject: [oe-commits] [openembedded-core] 06/18: cmake: Update 3.16.1 -> 3.16.5 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.CE52F2362AB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f074b22b1147e79b2c26fc0395b25734af3dc650 Author: Domarys Correa AuthorDate: Tue Mar 17 09:44:54 2020 -0300 cmake: Update 3.16.1 -> 3.16.5 Signed-off-by: Domarys Correa Signed-off-by: Richard Purdie --- .../cmake/{cmake-native_3.16.1.bb => cmake-native_3.16.5.bb} | 0 meta/recipes-devtools/cmake/cmake.inc | 4 ++-- meta/recipes-devtools/cmake/{cmake_3.16.1.bb => cmake_3.16.5.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.16.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.16.5.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.16.1.bb rename to meta/recipes-devtools/cmake/cmake-native_3.16.5.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 9d14c14..09949b5 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -22,7 +22,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[md5sum] = "142cf11cd9a7c298cf875604cee96434" -SRC_URI[sha256sum] = "a275b3168fa8626eca4465da7bb159ff07c8c6cb0fb7179be59e12cbdfa725fd" +SRC_URI[md5sum] = "d86ccaf3d2462b6b5947919abe5b9f15" +SRC_URI[sha256sum] = "5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.16.1.bb b/meta/recipes-devtools/cmake/cmake_3.16.5.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.16.1.bb rename to meta/recipes-devtools/cmake/cmake_3.16.5.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:58 +0000 Subject: [oe-commits] [openembedded-core] 07/18: base-passwd: LICENSE changed to GPLv2 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.DEC0B2362AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit dd5dd0496625687e0150fd9d6c37d3a699515a68 Author: Wang Mingyu AuthorDate: Tue Mar 17 00:16:48 2020 -0700 base-passwd: LICENSE changed to GPLv2 The source code such as update-passwd.c states the license to be under GPL v2 only and does not contain the "or later" clause so correct the recipe LICENSE field to match. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index d1aab09..d01cd7e 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb @@ -1,7 +1,7 @@ SUMMARY = "Base system master password/group files" DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files." SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" RECIPE_NO_UPDATE_REASON = "Version 3.5.38 requires cdebconf for update-passwd utility" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:59 +0000 Subject: [oe-commits] [openembedded-core] 08/18: gtk+3: upgrade 3.24.13 -> 3.24.14 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.F14D62362AD@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 0bcc8304bba0aaabb7d1e1fc37d4c3619a8a71c2 Author: Wang Mingyu AuthorDate: Tue Mar 17 00:16:49 2020 -0700 gtk+3: upgrade 3.24.13 -> 3.24.14 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/{gtk+3_3.24.13.bb => gtk+3_3.24.14.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb similarity index 85% rename from meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb rename to meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb index 025d887..ab1f87c 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.14.bb @@ -9,8 +9,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://link_fribidi.patch \ file://sort-resources.patch \ " -SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" -SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" +SRC_URI[md5sum] = "62e39212fa0a84016a3392a9d291faf8" +SRC_URI[sha256sum] = "1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88" S = "${WORKDIR}/gtk+-${PV}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:05:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:05:56 +0000 Subject: [oe-commits] [openembedded-core] 05/18: lttng-modules: update to 2.11.2 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100551.BEAE52362AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 68255641a3ce4f9e22dfea59519d097541fd1fd0 Author: Daniel Dragomir AuthorDate: Wed Mar 18 16:42:35 2020 +0000 lttng-modules: update to 2.11.2 Upgrade to version 2.11.2 in order to fix some build errors with latest 5.4 kernel. - conflicting types for 'trace_fast_page_fault' Reproductible on kernel greater than v5.4.19, starting with commit 8a1cd01bee ("KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit KVM") Error messages: lttng-modules-2.11.1/probes/../probes/lttng-tracepoint-event-impl.h:130:6: error: 130 | void trace_##_name(_proto); tmp/work-shared/axxiax86-64/kernel-source/include/linux/tracepoint.h:233:21: note: previous definition of 'trace_fast_page_fault' was here 233 | static inline void trace_##name(proto) - conflicting types for 'trace_rcu_dyntick' Reproductible on kernel greater than v5.4.22, starting with commit 6cf539a87a ("rcu: Fix data-race due to atomic_t copy-by-value") Error messages: lttng-modules-2.11.1/probes/../probes/lttng-tracepoint-event-impl.h:130:6: error: conflicting types for 'trace_rcu_dyntick' 130 | void trace_##_name tmp/work-shared/axxiax86-64/kernel-source/include/linux/tracepoint.h:233:21: note: previous definition of 'trace_rcu_dyntick' was here 233 | static inline void trace_##name(proto) Signed-off-by: Daniel Dragomir Signed-off-by: Richard Purdie --- .../lttng/{lttng-modules_2.11.1.bb => lttng-modules_2.11.2.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.11.2.bb similarity index 86% rename from meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb rename to meta/recipes-kernel/lttng/lttng-modules_2.11.2.bb index c833ff7..6fff096 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.11.1.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.11.2.bb @@ -13,8 +13,8 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRC_URI[md5sum] = "0d964723c8765b39835e5e6efc60a604" -SRC_URI[sha256sum] = "d3e5648937e59dee983ef844f9316c55e9961f9dc8515b9260c473bbb70696c1" +SRC_URI[md5sum] = "2e3bc8cfb264fa13f374618b46f170e7" +SRC_URI[sha256sum] = "8a42240813b8fd1d001835cd6f5ec687f7d7f3b26070d4e21604c35a51a6441d" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -37,7 +37,7 @@ SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.1 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRCREV_class-devupstream = "6ad0e68b43c3e52fcb3d47c4d823a7b84aeb443a" -PV_class-devupstream = "2.11.1+git${SRCPV}" +SRCREV_class-devupstream = "17c413953603f063f2a9d6c3788bec914ce6f955" +PV_class-devupstream = "2.11.2+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 Thu Mar 19 10:06:01 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:01 +0000 Subject: [oe-commits] [openembedded-core] 10/18: musl: Add support for multilib In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.1D4412362A6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 8679af292dad937384c6ce639ee5d55a5aa453f7 Author: Khem Raj AuthorDate: Tue Mar 17 00:04:17 2020 -0700 musl: Add support for multilib ldso is always stored in /lib regardless of multilib add ld-musl-${MUSL_LDSO_ARCH}.path to aid ldso finding default library loading paths, it helps when using multilib, where system libraries are moved to lib32 or lib64 paths under / or /usr [YOCTO #11971] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/musl_git.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 2a15a78..82379fd 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -29,6 +29,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \ libssp-nonshared \ " GLIBC_LDSO = "${@get_glibc_loader(d)}" +MUSL_LDSO_ARCH = "${@get_musl_loader_arch(d)}" export CROSS_COMPILE="${TARGET_PREFIX}" @@ -48,7 +49,7 @@ CONFIGUREOPTS = " \ --bindir=${bindir} \ --libdir=${libdir} \ --includedir=${includedir} \ - --syslibdir=${base_libdir} \ + --syslibdir=/lib \ " do_configure() { @@ -61,8 +62,9 @@ do_compile() { do_install() { oe_runmake install DESTDIR='${D}' - - install -d ${D}${bindir} + install -d ${D}${bindir} ${D}${base_libdir} ${D}${sysconfdir} + echo "${base_libdir}" > ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path + echo "${libdir}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} @@ -70,6 +72,7 @@ do_install() { PACKAGES =+ "${PN}-glibc-compat" +FILES_${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" FILES_${PN}-glibc-compat += "${GLIBC_LDSO}" FILES_${PN}-staticdev = "${libdir}/libc.a" FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ @@ -83,3 +86,4 @@ RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" LEAD_SONAME = "libc.so" INSANE_SKIP_${PN}-dev = "staticdev" +INSANE_SKIP_${PN} = "libdir" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:06:02 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:02 +0000 Subject: [oe-commits] [openembedded-core] 11/18: meson: upgrade 0.53.1 -> 0.53.2 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.2B7BE2362A8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 224d93c636b171f18ed0327ea208b79269b6bbfc Author: William A. Kennington III AuthorDate: Tue Mar 17 00:14:10 2020 -0700 meson: upgrade 0.53.1 -> 0.53.2 Signed-off-by: William A. Kennington III Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 4 ++-- meta/recipes-devtools/meson/{meson_0.53.1.bb => meson_0.53.2.bb} | 0 .../meson/{nativesdk-meson_0.53.1.bb => nativesdk-meson_0.53.2.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index d391c9c..50fb41a 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] = "ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04" -SRC_URI[md5sum] = "9bf73f7b5a2426a7c8674a809bb8cae2" +SRC_URI[sha256sum] = "3e8f830f33184397c2eb0b651ec502adb63decb28978bdc84b3558d71284c21f" +SRC_URI[md5sum] = "80303535995fcae72bdb887df102b421" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/meta/recipes-devtools/meson/meson_0.53.1.bb b/meta/recipes-devtools/meson/meson_0.53.2.bb similarity index 100% rename from meta/recipes-devtools/meson/meson_0.53.1.bb rename to meta/recipes-devtools/meson/meson_0.53.2.bb diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb similarity index 100% rename from meta/recipes-devtools/meson/nativesdk-meson_0.53.1.bb rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:06:00 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:00 +0000 Subject: [oe-commits] [openembedded-core] 09/18: linuxloader: Add get_musl_loader_arch function In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.0D3692362A5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 673770432b37879f69edbb1210af15eaf02c891c Author: Khem Raj AuthorDate: Tue Mar 17 00:04:16 2020 -0700 linuxloader: Add get_musl_loader_arch function get_musl_loader_arch returns the arch part of ldso for musl, this is used in get_musl_loader() as well as independently usable, which is needed for multilib support in musl. Musl stores all ldso in /lib be it multilib or not, therefore do not use base_libdir instead directly use /lib [YOCTO #11971] Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/linuxloader.bbclass | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/meta/classes/linuxloader.bbclass b/meta/classes/linuxloader.bbclass index e2876ce..ec0e055 100644 --- a/meta/classes/linuxloader.bbclass +++ b/meta/classes/linuxloader.bbclass @@ -1,27 +1,31 @@ -def get_musl_loader(d): +def get_musl_loader_arch(d): import re - dynamic_loader = None + ldso_arch = None targetarch = d.getVar("TARGET_ARCH") if targetarch.startswith("microblaze"): - dynamic_loader = "${base_libdir}/ld-musl-microblaze${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'el' ,d)}.so.1" + ldso_arch = "microblaze${@bb.utils.contains('TUNE_FEATURES', 'bigendian', '', 'el' ,d)}" elif targetarch.startswith("mips"): - dynamic_loader = "${base_libdir}/ld-musl-mips${ABIEXTENSION}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}.so.1" + ldso_arch = "mips${ABIEXTENSION}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}" elif targetarch == "powerpc": - dynamic_loader = "${base_libdir}/ld-musl-powerpc${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}.so.1" + ldso_arch = "powerpc${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}" elif targetarch == "powerpc64": - dynamic_loader = "${base_libdir}/ld-musl-powerpc64.so.1" + ldso_arch = "powerpc64" elif targetarch == "x86_64": - dynamic_loader = "${base_libdir}/ld-musl-x86_64.so.1" + ldso_arch = "x86_64" elif re.search("i.86", targetarch): - dynamic_loader = "${base_libdir}/ld-musl-i386.so.1" + ldso_arch = "i386" elif targetarch.startswith("arm"): - dynamic_loader = "${base_libdir}/ld-musl-arm${ARMPKGSFX_ENDIAN}${ARMPKGSFX_EABI}.so.1" + ldso_arch = "arm${ARMPKGSFX_ENDIAN}${ARMPKGSFX_EABI}" elif targetarch.startswith("aarch64"): - dynamic_loader = "${base_libdir}/ld-musl-aarch64${ARMPKGSFX_ENDIAN_64}.so.1" + ldso_arch = "aarch64${ARMPKGSFX_ENDIAN_64}" elif targetarch.startswith("riscv64"): - dynamic_loader = "${base_libdir}/ld-musl-riscv64${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}.so.1" - return dynamic_loader + ldso_arch = "riscv64${@['', '-sf'][d.getVar('TARGET_FPU') == 'soft']}" + return ldso_arch + +def get_musl_loader(d): + import re + return "/lib/ld-musl-" + get_musl_loader_arch(d) + ".so.1" def get_glibc_loader(d): import re @@ -62,4 +66,5 @@ def get_linuxloader(d): get_linuxloader[vardepvalue] = "${@get_linuxloader(d)}" get_musl_loader[vardepvalue] = "${@get_musl_loader(d)}" +get_musl_loader_arch[vardepvalue] = "${@get_musl_loader_arch(d)}" get_glibc_loader[vardepvalue] = "${@get_glibc_loader(d)}" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:06:06 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:06 +0000 Subject: [oe-commits] [openembedded-core] 15/18: icu: upgrade 65.1 ->66.1 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.69F662362AF@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 60d9b481869fa390df43a96f2e2e8ab25850a8b8 Author: Wang Mingyu AuthorDate: Thu Mar 19 00:41:45 2020 -0700 icu: upgrade 65.1 ->66.1 -License-Update: Copyright year updated to 2020. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/icu/{icu_65.1.bb => icu_66.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/icu/icu_65.1.bb b/meta/recipes-support/icu/icu_66.1.bb similarity index 82% rename from meta/recipes-support/icu/icu_65.1.bb rename to meta/recipes-support/icu/icu_66.1.bb index bd932d7..5018464 100644 --- a/meta/recipes-support/icu/icu_65.1.bb +++ b/meta/recipes-support/icu/icu_66.1.bb @@ -1,6 +1,6 @@ require icu.inc -LIC_FILES_CHKSUM = "file://../LICENSE;md5=8bc5d32052a96f214cbdd1e53dfc935d" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=a3808a5b70071b07f87ff2205e4d75a0" def icu_download_version(d): pvsplit = d.getVar('PV').split('.') @@ -28,8 +28,8 @@ SRC_URI = "${BASE_SRC_URI} \ SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "d1ff436e26cabcb28e6cb383d32d1339" -SRC_URI[sha256sum] = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948" +SRC_URI[md5sum] = "b33dc6766711517c98d318447e5110f8" +SRC_URI[sha256sum] = "52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e" 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 Thu Mar 19 10:06:07 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:07 +0000 Subject: [oe-commits] [openembedded-core] 16/18: libxcrypt: upgrade 4.4.14 -> 4.4.15 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.753632362AB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1c94bd64d5dc29a41274e99bc44d2683485e3e6f Author: Wang Mingyu AuthorDate: Thu Mar 19 00:41:46 2020 -0700 libxcrypt: upgrade 4.4.14 -> 4.4.15 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../{libxcrypt-compat_4.4.14.bb => libxcrypt-compat_4.4.15.bb} | 0 meta/recipes-core/libxcrypt/libxcrypt.inc | 2 +- .../recipes-core/libxcrypt/{libxcrypt_4.4.14.bb => libxcrypt_4.4.15.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.15.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.14.bb rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.15.bb diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index e59a096..bee1367 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 = "5c43f7d56a31667bcdaa334bbb4edafb75672872" +SRCREV = "823437d015cd4ab4d100ed205f218681b03ae45c" SRCBRANCH ?= "develop" PROVIDES = "virtual/crypt" diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.4.15.bb similarity index 100% rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.14.bb rename to meta/recipes-core/libxcrypt/libxcrypt_4.4.15.bb -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:06:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:03 +0000 Subject: [oe-commits] [openembedded-core] 12/18: bluez5: upgrade 5.53 -> 5.54 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.3C2102362A7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1c53491ed569df3153186f6d278410fd4e385e4d Author: Wang Mingyu AuthorDate: Thu Mar 19 00:41:42 2020 -0700 bluez5: upgrade 5.53 -> 5.54 CVE-2020-0556-1.patch CVE-2020-0556-2.patch removed since they are included in 5.54 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 - .../bluez5/bluez5/CVE-2020-0556-1.patch | 35 ----- .../bluez5/bluez5/CVE-2020-0556-2.patch | 143 --------------------- .../bluez5/{bluez5_5.53.bb => bluez5_5.54.bb} | 4 +- 4 files changed, 2 insertions(+), 182 deletions(-) diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 708fa1c..150d909 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -52,8 +52,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ - file://CVE-2020-0556-1.patch \ - file://CVE-2020-0556-2.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch deleted file mode 100644 index a6bf31e..0000000 --- a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-1.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8cdbd3b09f29da29374e2f83369df24228da0ad1 Mon Sep 17 00:00:00 2001 -From: Alain Michaud -Date: Tue, 10 Mar 2020 02:35:16 +0000 -Subject: [PATCH 1/2] HOGP must only accept data from bonded devices. - -HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=8cdbd3b09f29da29374e2f83369df24228da0ad1] -Signed-off-by: Anuj Mittal -CVE: CVE-2020-0556 ---- - profiles/input/hog.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/profiles/input/hog.c b/profiles/input/hog.c -index 83c017dcb..dfac68921 100644 ---- a/profiles/input/hog.c -+++ b/profiles/input/hog.c -@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service) - return -EINVAL; - } - -+ /* HOGP 1.0 Section 6.1 requires bonding */ -+ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) -+ return -ECONNREFUSED; -+ - /* TODO: Replace GAttrib with bt_gatt_client */ - bt_hog_attach(dev->hog, attrib); - --- -2.24.1 - diff --git a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch b/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch deleted file mode 100644 index 8acb2f1..0000000 --- a/meta/recipes-connectivity/bluez5/bluez5/CVE-2020-0556-2.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 3cccdbab2324086588df4ccf5f892fb3ce1f1787 Mon Sep 17 00:00:00 2001 -From: Alain Michaud -Date: Tue, 10 Mar 2020 02:35:18 +0000 -Subject: [PATCH 2/2] HID accepts bonded device connections only. - -This change adds a configuration for platforms to choose a more secure -posture for the HID profile. While some older mice are known to not -support pairing or encryption, some platform may choose a more secure -posture by requiring the device to be bonded and require the -connection to be encrypted when bonding is required. - -Reference: -https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=3cccdbab2324086588df4ccf5f892fb3ce1f1787] -Signed-off-by: Anuj Mittal -CVE: CVE-2020-0556 - ---- - profiles/input/device.c | 23 ++++++++++++++++++++++- - profiles/input/device.h | 1 + - profiles/input/input.conf | 8 ++++++++ - profiles/input/manager.c | 13 ++++++++++++- - 4 files changed, 43 insertions(+), 2 deletions(-) - -diff --git a/profiles/input/device.c b/profiles/input/device.c -index 2cb3811c8..d89da2d7c 100644 ---- a/profiles/input/device.c -+++ b/profiles/input/device.c -@@ -92,6 +92,7 @@ struct input_device { - - static int idle_timeout = 0; - static bool uhid_enabled = false; -+static bool classic_bonded_only = false; - - void input_set_idle_timeout(int timeout) - { -@@ -103,6 +104,11 @@ void input_enable_userspace_hid(bool state) - uhid_enabled = state; - } - -+void input_set_classic_bonded_only(bool state) -+{ -+ classic_bonded_only = state; -+} -+ - static void input_device_enter_reconnect_mode(struct input_device *idev); - static int connection_disconnect(struct input_device *idev, uint32_t flags); - -@@ -970,8 +976,18 @@ static int hidp_add_connection(struct input_device *idev) - if (device_name_known(idev->device)) - device_get_name(idev->device, req->name, sizeof(req->name)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) { -+ error("Rejected connection from !bonded device %s", dst_addr); -+ goto cleanup; -+ } -+ - /* Encryption is mandatory for keyboards */ -- if (req->subclass & 0x40) { -+ /* Some platforms may choose to require encryption for all devices */ -+ /* Note that this only matters for pre 2.1 devices as otherwise the */ -+ /* device is encrypted by default by the lower layers */ -+ if (classic_bonded_only || req->subclass & 0x40) { - if (!bt_io_set(idev->intr_io, &gerr, - BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, - BT_IO_OPT_INVALID)) { -@@ -1203,6 +1219,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev) - DBG("path=%s reconnect_mode=%s", idev->path, - reconnect_mode_to_string(idev->reconnect_mode)); - -+ /* Make sure the device is bonded if required */ -+ if (classic_bonded_only && !device_is_bonded(idev->device, -+ btd_device_get_bdaddr_type(idev->device))) -+ return; -+ - /* Only attempt an auto-reconnect when the device is required to - * accept reconnections from the host. - */ -diff --git a/profiles/input/device.h b/profiles/input/device.h -index 51a9aee18..3044db673 100644 ---- a/profiles/input/device.h -+++ b/profiles/input/device.h -@@ -29,6 +29,7 @@ struct input_conn; - - void input_set_idle_timeout(int timeout); - void input_enable_userspace_hid(bool state); -+void input_set_classic_bonded_only(bool state); - - int input_device_register(struct btd_service *service); - void input_device_unregister(struct btd_service *service); -diff --git a/profiles/input/input.conf b/profiles/input/input.conf -index 3e1d65aae..166aff4a4 100644 ---- a/profiles/input/input.conf -+++ b/profiles/input/input.conf -@@ -11,3 +11,11 @@ - # Enable HID protocol handling in userspace input profile - # Defaults to false (HIDP handled in HIDP kernel module) - #UserspaceHID=true -+ -+# Limit HID connections to bonded devices -+# The HID Profile does not specify that devices must be bonded, however some -+# platforms may want to make sure that input connections only come from bonded -+# device connections. Several older mice have been known for not supporting -+# pairing/encryption. -+# Defaults to false to maximize device compatibility. -+#ClassicBondedOnly=true -diff --git a/profiles/input/manager.c b/profiles/input/manager.c -index 1d31b0652..5cd27b839 100644 ---- a/profiles/input/manager.c -+++ b/profiles/input/manager.c -@@ -96,7 +96,7 @@ static int input_init(void) - config = load_config_file(CONFIGDIR "/input.conf"); - if (config) { - int idle_timeout; -- gboolean uhid_enabled; -+ gboolean uhid_enabled, classic_bonded_only; - - idle_timeout = g_key_file_get_integer(config, "General", - "IdleTimeout", &err); -@@ -114,6 +114,17 @@ static int input_init(void) - input_enable_userspace_hid(uhid_enabled); - } else - g_clear_error(&err); -+ -+ classic_bonded_only = g_key_file_get_boolean(config, "General", -+ "ClassicBondedOnly", &err); -+ -+ if (!err) { -+ DBG("input.conf: ClassicBondedOnly=%s", -+ classic_bonded_only ? "true" : "false"); -+ input_set_classic_bonded_only(classic_bonded_only); -+ } else -+ g_clear_error(&err); -+ - } - - btd_profile_register(&input_profile); --- -2.24.1 - diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.53.bb b/meta/recipes-connectivity/bluez5/bluez5_5.54.bb similarity index 91% rename from meta/recipes-connectivity/bluez5/bluez5_5.53.bb rename to meta/recipes-connectivity/bluez5/bluez5_5.54.bb index 055e76b..260eee1 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.53.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.54.bb @@ -1,7 +1,7 @@ require bluez5.inc -SRC_URI[md5sum] = "85b14abb138948f50b1650aa866cb019" -SRC_URI[sha256sum] = "38aa2da8302fefad53116bb281a11968732a42eeb19c5fb3668342f39b7938bc" +SRC_URI[md5sum] = "e637feb2dbb7582bbbff1708367a847c" +SRC_URI[sha256sum] = "68cdab9e63e8832b130d5979dc8c96fdb087b31278f342874d992af3e56656dc" # 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 Thu Mar 19 10:06:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:04 +0000 Subject: [oe-commits] [openembedded-core] 13/18: fribidi: upgrade 1.0.8 -> 1.0.9 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.4CDD52362A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 1c4c59c78f8c63bc3ed0fe4e9921fc56d5d63cae Author: Wang Mingyu AuthorDate: Thu Mar 19 00:41:43 2020 -0700 fribidi: upgrade 1.0.8 -> 1.0.9 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-support/fribidi/{fribidi_1.0.8.bb => fribidi_1.0.9.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/fribidi/fribidi_1.0.8.bb b/meta/recipes-support/fribidi/fribidi_1.0.9.bb similarity index 72% rename from meta/recipes-support/fribidi/fribidi_1.0.8.bb rename to meta/recipes-support/fribidi/fribidi_1.0.9.bb index bab068f..21217ab 100644 --- a/meta/recipes-support/fribidi/fribidi_1.0.8.bb +++ b/meta/recipes-support/fribidi/fribidi_1.0.9.bb @@ -3,10 +3,10 @@ SECTION = "libs" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.xz \ " -SRC_URI[md5sum] = "962c7d8ebaa711d4e306161dbe14aa55" -SRC_URI[sha256sum] = "94c7b68d86ad2a9613b4dcffe7bbeb03523d63b5b37918bdf2e4ef34195c1e6c" +SRC_URI[md5sum] = "1b767c259c3cd8e0c8496970f63c22dc" +SRC_URI[sha256sum] = "c5e47ea9026fb60da1944da9888b4e0a18854a0e2410bbfe7ad90a054d36e0c7" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:06:08 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:08 +0000 Subject: [oe-commits] [openembedded-core] 17/18: mc: upgrade 4.8.23 -> 4.8.24 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.87C2E2362AC@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit fa7671b7abc84781dc54585533f4fea18e5f9af4 Author: Wang Mingyu AuthorDate: Thu Mar 19 00:41:47 2020 -0700 mc: upgrade 4.8.23 -> 4.8.24 0001-Add-option-to-control-configure-args.patch 0001-Ticket-3629-configure.ac-drop-bundled-gettext.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 Mar 19 10:06:09 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:09 +0000 Subject: [oe-commits] [openembedded-core] 18/18: lttng-ust: upgrade 2.11.0 -> 2.11.1 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.98E6F2362A6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit f791a077e5b4e44341429e538b9842a64a08f972 Author: Richard Purdie AuthorDate: Tue Mar 17 15:50:46 2020 -0700 lttng-ust: upgrade 2.11.0 -> 2.11.1 Signed-off-by: Richard Purdie --- .../recipes-kernel/lttng/{lttng-ust_2.11.0.bb => lttng-ust_2.11.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.11.1.bb similarity index 93% rename from meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-ust_2.11.1.bb index 0e03a31..3bd0dfa 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.11.1.bb @@ -31,8 +31,8 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ " -SRC_URI[md5sum] = "99823cfeb76562d753ffe67880e9cc59" -SRC_URI[sha256sum] = "683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8" +SRC_URI[md5sum] = "7de04a8ff1f0a4effa09a42620ec4081" +SRC_URI[sha256sum] = "7fbab963d60741ffd4d8dd0a246f6cf168cdfe3b2385798bd90550f5f0bba869" CVE_PRODUCT = "ust" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 10:06:05 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 10:06:05 +0000 Subject: [oe-commits] [openembedded-core] 14/18: glew: upgrade 2.1.0 -> 2.2.0 In-Reply-To: <158461235104.28588.11005839557737087833@git.openembedded.org> References: <158461235104.28588.11005839557737087833@git.openembedded.org> Message-ID: <20200319100552.5E0492362AE@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 3e2dd622cf6cdc40d36bd95840e894d6df7ab7c5 Author: Wang Mingyu AuthorDate: Thu Mar 19 00:41:44 2020 -0700 glew: upgrade 2.1.0 -> 2.2.0 0001-Fixed-compilation-with-current-mesa-versions.patch removed since it is included in 2.2.0 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- ...ed-compilation-with-current-mesa-versions.patch | 73 ---------------------- .../glew/{glew_2.1.0.bb => glew_2.2.0.bb} | 7 +-- 2 files changed, 3 insertions(+), 77 deletions(-) diff --git a/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch b/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch deleted file mode 100644 index 64f3e2f..0000000 --- a/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7f65a36866f4e24dd1446fe1c9d21424f28bcabd Mon Sep 17 00:00:00 2001 -From: Deve -Date: Wed, 14 Nov 2018 21:07:29 +0100 -Subject: [PATCH] Fixed compilation with current mesa versions. - -As you can see in -https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h -now the file uses __gl_glext_h_ instead of __glext_h_ -It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada - -Backoprt notes: - -* The original patch adjusts auto/src/glew_head.h only -* include/GL/glew.h is not part of git repo and gets created on tarball - creation - -=> patch include/GL/glew.h either to cause the desired fix - -Upstream-Status: Backport [1] - -[1] https://github.com/nigels-com/glew/commit/7f65a36866f4e24dd1446fe1c9d21424f28bcabd - -Signed-off-by: Andreas M?ller ---- - auto/src/glew_head.h | 3 ++- - include/GL/glew.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h -index c19cefb..8f313d9 100644 ---- a/auto/src/glew_head.h -+++ b/auto/src/glew_head.h -@@ -14,7 +14,7 @@ - #if defined(__REGAL_H__) - #error Regal.h included before glew.h - #endif --#if defined(__glext_h_) || defined(__GLEXT_H_) -+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) - #error glext.h included before glew.h - #endif - #if defined(__gl_ATI_h_) -@@ -30,6 +30,7 @@ - #define __X_GL_H - #define __glext_h_ - #define __GLEXT_H_ -+#define __gl_glext_h_ - #define __gl_ATI_h_ - - #if defined(_WIN32) -diff --git a/include/GL/glew.h b/include/GL/glew.h -index b5b6987..a9f9e4b 100644 ---- a/include/GL/glew.h -+++ b/include/GL/glew.h -@@ -93,7 +93,7 @@ - #if defined(__REGAL_H__) - #error Regal.h included before glew.h - #endif --#if defined(__glext_h_) || defined(__GLEXT_H_) -+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) - #error glext.h included before glew.h - #endif - #if defined(__gl_ATI_h_) -@@ -109,6 +109,7 @@ - #define __X_GL_H - #define __glext_h_ - #define __GLEXT_H_ -+#define __gl_glext_h_ - #define __gl_ATI_h_ - - #if defined(_WIN32) --- -2.20.1 - diff --git a/meta/recipes-graphics/glew/glew_2.1.0.bb b/meta/recipes-graphics/glew/glew_2.2.0.bb similarity index 87% rename from meta/recipes-graphics/glew/glew_2.1.0.bb rename to meta/recipes-graphics/glew/glew_2.2.0.bb index edcbdc0..8948444 100644 --- a/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/meta/recipes-graphics/glew/glew_2.2.0.bb @@ -6,11 +6,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ - file://no-strip.patch \ - file://0001-Fixed-compilation-with-current-mesa-versions.patch" + file://no-strip.patch" -SRC_URI[md5sum] = "b2ab12331033ddfaa50dc39345343980" -SRC_URI[sha256sum] = "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" +SRC_URI[md5sum] = "3579164bccaef09e36c0af7f4fd5c7c7" +SRC_URI[sha256sum] = "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew" UPSTREAM_CHECK_REGEX = "/glew/(?P(\d+[\.\-_]*)+)/" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 11:29:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 11:29:03 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (f791a07 -> b09a4f7) Message-ID: <158461734343.23591.6978654293879954401@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 f791a07 lttng-ust: upgrade 2.11.0 -> 2.11.1 discard fa7671b mc: upgrade 4.8.23 -> 4.8.24 new b09a4f7 lttng-ust: upgrade 2.11.0 -> 2.11.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 (f791a07) \ N -- N -- N refs/heads/master-next (b09a4f7) 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-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 +- 3 files changed, 213 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%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 11:29:04 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 11:29:04 +0000 Subject: [oe-commits] [openembedded-core] 01/01: lttng-ust: upgrade 2.11.0 -> 2.11.1 In-Reply-To: <158461734343.23591.6978654293879954401@git.openembedded.org> References: <158461734343.23591.6978654293879954401@git.openembedded.org> Message-ID: <20200319112903.AC4B42362A6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit b09a4f78c8f05d246a7a9730ee91b0c400505acd Author: Richard Purdie AuthorDate: Tue Mar 17 15:50:46 2020 -0700 lttng-ust: upgrade 2.11.0 -> 2.11.1 Signed-off-by: Richard Purdie --- .../recipes-kernel/lttng/{lttng-ust_2.11.0.bb => lttng-ust_2.11.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.11.1.bb similarity index 93% rename from meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb rename to meta/recipes-kernel/lttng/lttng-ust_2.11.1.bb index 0e03a31..3bd0dfa 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.11.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.11.1.bb @@ -31,8 +31,8 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ " -SRC_URI[md5sum] = "99823cfeb76562d753ffe67880e9cc59" -SRC_URI[sha256sum] = "683280cfe5e12021e64c32cef9eeb0128f1f23dec32ba28adb5a2074be37c4d8" +SRC_URI[md5sum] = "7de04a8ff1f0a4effa09a42620ec4081" +SRC_URI[sha256sum] = "7fbab963d60741ffd4d8dd0a246f6cf168cdfe3b2385798bd90550f5f0bba869" CVE_PRODUCT = "ust" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 11:29:14 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 11:29:14 +0000 Subject: [oe-commits] [bitbake] branch master updated (e67dfa4 -> 4780df4) Message-ID: <158461735488.23833.10546141713384364558@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 e67dfa4 tinfoil: Update to match recent knotty console changes new a37189f bitbake-user-manual: Fix order of end tags new 4780df4 bitbake-user-manual: immediate-variable-expansion: Correct description 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: doc/bitbake-user-manual/bitbake-user-manual-execution.xml | 4 ++-- doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 11:29:15 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 11:29:15 +0000 Subject: [oe-commits] [bitbake] 01/02: bitbake-user-manual: Fix order of end tags In-Reply-To: <158461735488.23833.10546141713384364558@git.openembedded.org> References: <158461735488.23833.10546141713384364558@git.openembedded.org> Message-ID: <20200319112915.063DB2362A7@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 a37189fbdba399437cb9fcb28aa963515679cc65 Author: Jacob Kroon AuthorDate: Thu Mar 19 00:17:36 2020 +0100 bitbake-user-manual: Fix order of end tags Fixes commit e22565968828c86983162e67f52ebb106242ca76. Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie --- doc/bitbake-user-manual/bitbake-user-manual-execution.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml index 3b31f74..6c5234e 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-execution.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-execution.xml @@ -976,7 +976,7 @@ False, that logger will be completely replaced by user configuration. In this case, no other rules will apply to that logger. - + All user defined filter and handlers properties for a given logger @@ -987,7 +987,7 @@ configuration adds a filter called BitBake.defaultFilter, both filters will be applied to the logger - + -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 11:29:16 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 11:29:16 +0000 Subject: [oe-commits] [bitbake] 02/02: bitbake-user-manual: immediate-variable-expansion: Correct description In-Reply-To: <158461735488.23833.10546141713384364558@git.openembedded.org> References: <158461735488.23833.10546141713384364558@git.openembedded.org> Message-ID: <20200319112915.1270F2362A8@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 4780df48d5998d619dc36b699400e344187fc134 Author: Jacob Kroon AuthorDate: Thu Mar 19 00:17:37 2020 +0100 bitbake-user-manual: immediate-variable-expansion: Correct description References to undefined variables are preserved as is and do not expand to nothing as in GNU Make. Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie --- doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml index bb5a7f8..10b5883 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml +++ b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml @@ -294,17 +294,20 @@ rather than when the variable is actually used: T = "123" - A := "${B} ${A} test ${T}" + A := "test ${T}" T = "456" - B = "${T} bval" + B := "${T} ${C}" C = "cval" C := "${C}append" In this example, A contains - "test 123" because ${B} and - ${A} at the time of parsing are undefined, - which leaves "test 123". - And, the variable C + "test 123", even though the final value of T + is "456". + The variable B will end up containing "456 cvalappend". + This is because references to undefined variables are preserved as is + during (immediate)expansion. This is in contrast to GNU Make, where undefined + variables expand to nothing. + The variable C contains "cvalappend" since ${C} immediately expands to "cval". -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 11:29:20 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 11:29:20 +0000 Subject: [oe-commits] [bitbake] branch master-next updated (e67dfa4 -> 4780df4) Message-ID: <158461736055.24122.5269345198986403437@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 e67dfa4 tinfoil: Update to match recent knotty console changes add a37189f bitbake-user-manual: Fix order of end tags add 4780df4 bitbake-user-manual: immediate-variable-expansion: Correct description No new revisions were added by this update. Summary of changes: doc/bitbake-user-manual/bitbake-user-manual-execution.xml | 4 ++-- doc/bitbake-user-manual/bitbake-user-manual-metadata.xml | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Thu Mar 19 16:26:03 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Thu, 19 Mar 2020 16:26:03 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated: libev: upgrade 4.31 -> 4.33 Message-ID: <158463516373.21850.16828976661479031023@git.openembedded.org> 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 f0f5e20 libev: upgrade 4.31 -> 4.33 f0f5e20 is described below commit f0f5e2027241f9d245f5e9c8d87726ecd1e49836 Author: Pierre-Jean Texier AuthorDate: Thu Mar 19 14:41:08 2020 +0100 libev: upgrade 4.31 -> 4.33 The complete Changes since 4.31 are: 4.33 Wed Mar 18 13:22:29 CET 2020 - the 4.31 timerfd code wrongly changed the priority of the signal fd watcher, which is usually harmless unless signal fds are also used (found via cpan tester service). - the documentation wrongly claimed that user may modify fd and events members in io watchers when the watcher was stopped (found by b_jonas). - new ev_io_modify mutator which changes only the events member, which can be faster. also added ev::io::set (int events) method to ev++.h. - officially allow a zero events mask for io watchers. this should work with older libev versions as well but was not officially allowed before. - do not wake up every minute when timerfd is used to detect timejumps. - do not wake up every minute when periodics are disabled and we have a monotonic clock. - support a lot more "uncommon" compile time configurations, such as ev_embed enabled but ev_timer disabled. - use a start/stop wrapper class to reduce code duplication in ev++.h and make it needlessly more c++-y. - the linux aio backend is no longer compiled in by default. - update to libecb version 0x00010008. Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/libev/{libev_4.31.bb => libev_4.33.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-connectivity/libev/libev_4.31.bb b/meta-oe/recipes-connectivity/libev/libev_4.33.bb similarity index 80% rename from meta-oe/recipes-connectivity/libev/libev_4.31.bb rename to meta-oe/recipes-connectivity/libev/libev_4.33.bb index beea855..760c2db 100644 --- a/meta-oe/recipes-connectivity/libev/libev_4.31.bb +++ b/meta-oe/recipes-connectivity/libev/libev_4.33.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] = "20111fda0df0a289c152faa2aac91b08" -SRC_URI[sha256sum] = "ed855d2b52118e32c0c1a6a32bd18c97f9e6711ca511f5ee12de3b9eccc66e5a" +SRC_URI[md5sum] = "a3433f23583167081bf4acdd5b01b34f" +SRC_URI[sha256sum] = "507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea" inherit autotools -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 00:03:56 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 00:03:56 +0000 Subject: [oe-commits] [openembedded-core] 01/04: bison: Update to 3.5.3 In-Reply-To: <158466263572.24455.14990920338082455562@git.openembedded.org> References: <158466263572.24455.14990920338082455562@git.openembedded.org> Message-ID: <20200320000356.237512362A8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 2d9c5e98021e3e3aa4cf77d71adf12e6fc13d3d5 Author: Khem Raj AuthorDate: Sat Mar 14 09:07:06 2020 -0700 bison: Update to 3.5.3 bugfix release [1] [1] https://lists.gnu.org/archive/html/bison-announce/2020-03/msg00000.html Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/{bison_3.5.2.bb => bison_3.5.3.bb} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.5.2.bb b/meta/recipes-devtools/bison/bison_3.5.3.bb similarity index 90% rename from meta/recipes-devtools/bison/bison_3.5.2.bb rename to meta/recipes-devtools/bison/bison_3.5.3.bb index b5b4a8e..09e4b18 100644 --- a/meta/recipes-devtools/bison/bison_3.5.2.bb +++ b/meta/recipes-devtools/bison/bison_3.5.3.bb @@ -13,13 +13,11 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://dont-depend-on-help2man.patch.patch \ file://add-with-bisonlocaledir.patch \ " +SRC_URI[sha256sum] = "2bf85b5f88a5f2fa8069aed2a2dfc3a9f8d15a97e59c713e3906e5fdd982a7c4" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "49fc2cf23e31e697d5072835e1662a97" -SRC_URI[sha256sum] = "24e273db9eb6da8bbb6f0648284d0724a5cbd6268a163db402f961350a4e50dd" - inherit autotools gettext texinfo # The automatic m4 path detection gets confused, so force the right value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 00:03:55 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 00:03:55 +0000 Subject: [oe-commits] [openembedded-core] branch master-next updated (b09a4f7 -> 00261a1) Message-ID: <158466263572.24455.14990920338082455562@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 b09a4f7 lttng-ust: upgrade 2.11.0 -> 2.11.1 new 2d9c5e9 bison: Update to 3.5.3 new 7c9b576 bison: Reset load average settings if specified in environment new 23ba888 gcc-target: Use --with-arch=native for target gcc new 00261a1 toolchain-shar-extract: check for available python 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/files/toolchain-shar-extract.sh | 7 ++++++- meta/recipes-devtools/bison/{bison_3.5.2.bb => bison_3.5.3.bb} | 8 ++++++-- meta/recipes-devtools/gcc/gcc-target.inc | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) rename meta/recipes-devtools/bison/{bison_3.5.2.bb => bison_3.5.3.bb} (80%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 00:03:58 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 00:03:58 +0000 Subject: [oe-commits] [openembedded-core] 03/04: gcc-target: Use --with-arch=native for target gcc In-Reply-To: <158466263572.24455.14990920338082455562@git.openembedded.org> References: <158466263572.24455.14990920338082455562@git.openembedded.org> Message-ID: <20200320000356.385D32362AA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 23ba88896a1fafe05c9c4e223f2c525a9cb7cb08 Author: Khem Raj AuthorDate: Mon Mar 16 15:20:56 2020 -0700 gcc-target: Use --with-arch=native for target gcc This should help gcc detect and use target ISA on x86_64 machines when -march is not used on cmdline [YOCTO #139] Signed-off-by: Khem Raj Cc: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-target.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 204f947..34c1b22 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -19,6 +19,7 @@ EXTRA_OECONF_append_armv6 = " --with-arch=armv6${ARMFPARCHEXT}" EXTRA_OECONF_append_armv7a = " --with-arch=armv7-a${ARMFPARCHEXT}" EXTRA_OECONF_append_armv7ve = " --with-arch=armv7ve${ARMFPARCHEXT}" EXTRA_OECONF_append_arc = " --with-cpu=${TUNE_PKGARCH}" +EXTRA_OECONF_append_x86-64 = " --with-arch=native" # libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is # set in subdir gcc, so subdir libcc1 can't use it, export it here to -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 00:03:57 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 00:03:57 +0000 Subject: [oe-commits] [openembedded-core] 02/04: bison: Reset load average settings if specified in environment In-Reply-To: <158466263572.24455.14990920338082455562@git.openembedded.org> References: <158466263572.24455.14990920338082455562@git.openembedded.org> Message-ID: <20200320000356.2DE062362A9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 7c9b576e3929421218f208ac5d281d57723689ec Author: Khem Raj AuthorDate: Sat Mar 14 21:29:47 2020 -0700 bison: Reset load average settings if specified in environment In some cases, we run into parallel build failures where BUILT_SOURCES is skipped, as a result required header files are not generated and the build fails with missing header errors like ../bison-3.5.2/lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory #include "uniwidth.h" ^~~~~~~~~~~~ compilation terminated. BUILT_SOURCES should be built automatically with `make all` [1] therefore ensure that make is invoked with `all` target bison-native parallel build fails when -l is passed globally from build environment, errors like below due to race starts to show up Therefore removes a previous load limit if set [1] https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Built-Sources-Example Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/bison_3.5.3.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/bison/bison_3.5.3.bb b/meta/recipes-devtools/bison/bison_3.5.3.bb index 09e4b18..27e0943 100644 --- a/meta/recipes-devtools/bison/bison_3.5.3.bb +++ b/meta/recipes-devtools/bison/bison_3.5.3.bb @@ -18,6 +18,12 @@ SRC_URI[sha256sum] = "2bf85b5f88a5f2fa8069aed2a2dfc3a9f8d15a97e59c713e3906e5fdd9 # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" +# Reset any loadavg set via environment, it breaks parallel build +# | ../bison-3.5.2/lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory +# | #include "uniwidth.h" +# | ^~~~~~~~~~~~ +EXTRA_OEMAKE_append = " -l" + inherit autotools gettext texinfo # The automatic m4 path detection gets confused, so force the right value -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 00:03:59 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 00:03:59 +0000 Subject: [oe-commits] [openembedded-core] 04/04: toolchain-shar-extract: check for available python In-Reply-To: <158466263572.24455.14990920338082455562@git.openembedded.org> References: <158466263572.24455.14990920338082455562@git.openembedded.org> Message-ID: <20200320000356.42FCA2362AB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. rpurdie pushed a commit to branch master-next in repository openembedded-core. commit 00261a1556d122249d690031905fcd465da5e502 Author: Jeremy Puhlman AuthorDate: Thu Mar 19 11:20:48 2020 -0700 toolchain-shar-extract: check for available python centos7 doesn't have python3 intalled by default, so running the script errors in novel ways if it is not installed. Signed-off-by: Jeremy A. Puhlman Signed-off-by: Richard Purdie --- meta/files/toolchain-shar-extract.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 2e0fe94..04527f8 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -1,8 +1,13 @@ #!/bin/sh export LC_ALL=en_US.UTF-8 +#Make sure at least one python is installed +INIT_PYTHON=$(which python3 2>/dev/null ) +[ -z "$INIT_PYTHON" ] && INIT_PYTHON=$(which python2 2>/dev/null) +[ -z "$INIT_PYTHON" ] && echo "Error: The SDK needs a python installed" && exit 1 + # Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted -PATH=`python3 -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` +PATH=`$INIT_PYTHON -c 'import os; print(":".join(e for e in os.environ["PATH"].split(":") if os.path.exists(e)))'` tweakpath () { case ":${PATH}:" in -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:37 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:37 +0000 Subject: [oe-commits] [meta-openembedded] 01/12: crash: fix crash-cross build on x86_64 In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144636.D6E4B232CC0@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit fa91738a942756582d7fd2bfd5a9a72abde65f6e Author: Goran Cengic AuthorDate: Thu Mar 19 19:43:55 2020 +0100 crash: fix crash-cross build on x86_64 Remove -m32 from CFLAGS even for -cross recipe. Also remove ${GDB_CONF_FLAGS} from GDB_TARGET variable (that is passed to the gdb configuration) since the use of GDB_CONF_FLAGS is removed by 0001-cross_add_configure_option.patch. Signed-off-by: Goran Cengic Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/crash/crash_7.2.8.bb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb index 61cc71f..5fc25f4 100644 --- a/meta-oe/recipes-kernel/crash/crash_7.2.8.bb +++ b/meta-oe/recipes-kernel/crash/crash_7.2.8.bb @@ -10,7 +10,7 @@ SECTION = "devel" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING3;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "zlib readline coreutils-native" +DEPENDS = "zlib readline coreutils-native ncurses-native" S = "${WORKDIR}/git" SRC_URI = "git://github.com/crash-utility/${BPN}.git \ @@ -49,9 +49,7 @@ EXTRA_OEMAKE = 'RPMPKG="${PV}" \ ' EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \ - GDB_TARGET="${BUILD_SYS} \ - \${GDB_CONF_FLAGS} \ - --target=${TARGET_SYS}" \ + GDB_TARGET="${BUILD_SYS} --target=${TARGET_SYS}" \ GDB_HOST="${BUILD_SYS}" \ GDB_MAKE_JOBS="${PARALLEL_MAKE}" \ ' @@ -59,10 +57,6 @@ EXTRA_OEMAKE_class-cross = 'RPMPKG="${PV}" \ EXTRA_OEMAKE_append_class-native = " LDFLAGS='${BUILD_LDFLAGS}'" EXTRA_OEMAKE_append_class-cross = " LDFLAGS='${BUILD_LDFLAGS}'" -REMOVE_M32 = "sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c" - -REMOVE_M32_class-cross = "" - do_configure() { : } @@ -79,7 +73,7 @@ do_compile_prepend() { esac sed -i s/FORCE_DEFINE_ARCH/"${ARCH}"/g ${S}/configure.c - ${REMOVE_M32} + sed -i -e 's/#define TARGET_CFLAGS_ARM_ON_X86_64.*/#define TARGET_CFLAGS_ARM_ON_X86_64\t\"TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64\"/g' ${S}/configure.c sed -i 's/>/>/g' ${S}/Makefile } -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:38 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:38 +0000 Subject: [oe-commits] [meta-openembedded] 02/12: nvme-cli: upgrade 1.9 -> 1.10.1 In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144636.E096A232CC1@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e4a1287bf181483a95d10e0074c894c86a4620d3 Author: Pierre-Jean Texier AuthorDate: Thu Mar 19 20:49:59 2020 +0100 nvme-cli: upgrade 1.9 -> 1.10.1 Also backport a patch to fix a build failure with the mucl libc. Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../nvme-cli/0001-fix-musl-compilation.patch | 26 ++++++++++++++++++++++ .../{nvme-cli_1.9.bb => nvme-cli_1.10.1.bb} | 6 +++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch new file mode 100644 index 0000000..be5d0da --- /dev/null +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch @@ -0,0 +1,26 @@ +From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001 +From: Neel Chotai +Date: Fri, 14 Feb 2020 17:56:23 +0000 +Subject: [PATCH] fix musl compilation + +Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f] +Signed-off-by: Pierre-Jean Texier +--- + plugins/micron/micron-nvme.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c +index 8240887..165fcf0 100644 +--- a/plugins/micron/micron-nvme.c ++++ b/plugins/micron/micron-nvme.c +@@ -13,6 +13,7 @@ + #include "nvme-print.h" + #include "nvme-ioctl.h" + #include ++#include + + #define CREATE_CMD + #include "micron-nvme.h" +-- +2.7.4 + diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb similarity index 85% rename from meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb rename to meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb index ea8bc17..4f4bb2d 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "util-linux" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" -SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45" +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ + file://0001-fix-musl-compilation.patch \ +" +SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108" 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 Mar 20 14:46:40 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:40 +0000 Subject: [oe-commits] [meta-openembedded] 04/12: python3-xlrd: Enable ptest In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.01240232CC3@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 54201bae76ddfeaebb077c79fdf28740de76d88e Author: Zang Ruochen AuthorDate: Fri Mar 20 10:21:00 2020 +0800 python3-xlrd: Enable ptest Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-xlrd.inc | 16 ++++++++++++++++ .../recipes-devtools/python/python3-xlrd/run-ptest | 3 +++ 2 files changed, 19 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-xlrd.inc b/meta-python/recipes-devtools/python/python-xlrd.inc index f87d2ab..ee73e76 100644 --- a/meta-python/recipes-devtools/python/python-xlrd.inc +++ b/meta-python/recipes-devtools/python/python-xlrd.inc @@ -12,3 +12,19 @@ SRC_URI[sha256sum] = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" +inherit ptest + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/examples + cp -rf ${S}/examples/* ${D}${PTEST_PATH}/examples/ +} diff --git a/meta-python/recipes-devtools/python/python3-xlrd/run-ptest b/meta-python/recipes-devtools/python/python3-xlrd/run-ptest new file mode 100644 index 0000000..5cec711 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-xlrd/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:36 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:36 +0000 Subject: [oe-commits] [meta-openembedded] branch master-next updated (f0f5e20 -> 46ae082) Message-ID: <158471559653.28731.508036046773303053@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 f0f5e20 libev: upgrade 4.31 -> 4.33 new fa91738 crash: fix crash-cross build on x86_64 new e4a1287 nvme-cli: upgrade 1.9 -> 1.10.1 new e36ff20 python3-webcolors: Enable ptest new 54201ba python3-xlrd: Enable ptest new 5c474d0 python3-xmltodict: Enable ptest new 380bd91 python3-xxhash: Enable ptest new ddd3d75 python3-yappi: Enable ptest new 64aa859 python3-yarl: Enable ptest new 15963a0 civetweb: upgrade 1.11 -> 1.12 new 1f457c2 node: Enable cross-compiling options and disable dtrace and etw new e9fdc5a safec: Put perl requiring tools into separate package new 46ae082 layers: update LAYERSERIES_COMPAT to dunfell The 12 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-filesystems/conf/layer.conf | 2 +- meta-gnome/conf/layer.conf | 2 +- meta-initramfs/conf/layer.conf | 2 +- meta-multimedia/conf/layer.conf | 2 +- meta-networking/conf/layer.conf | 2 +- .../recipes-connectivity/civetweb/civetweb_git.bb | 6 ++--- meta-oe/conf/layer.conf | 2 +- .../nvme-cli/0001-fix-musl-compilation.patch | 26 ++++++++++++++++++++++ .../{nvme-cli_1.9.bb => nvme-cli_1.10.1.bb} | 6 +++-- meta-oe/recipes-core/safec/safec_3.5.bb | 6 ++++- meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 4 +++- meta-oe/recipes-kernel/crash/crash_7.2.8.bb | 12 +++------- meta-perl/conf/layer.conf | 2 +- meta-python/conf/layer.conf | 2 +- .../recipes-devtools/python/python-webcolors.inc | 14 ++++++++++++ .../recipes-devtools/python/python-xlrd.inc | 16 +++++++++++++ .../recipes-devtools/python/python-xxhash.inc | 15 +++++++++++++ .../recipes-devtools/python/python-yappi.inc | 18 ++++++++++++++- .../recipes-devtools/python/python-yarl.inc | 15 ++++++++++++- .../run-ptest | 2 +- .../run-ptest | 3 ++- .../run-ptest | 3 ++- .../python/python3-xmltodict_0.12.0.bb | 15 ++++++++++++- .../python/python3-xxhash/run-ptest | 3 +++ .../run-ptest | 3 ++- .../run-ptest | 3 ++- meta-webserver/conf/layer.conf | 2 +- meta-xfce/conf/layer.conf | 2 +- 28 files changed, 156 insertions(+), 34 deletions(-) create mode 100644 meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch rename meta-oe/recipes-bsp/nvme-cli/{nvme-cli_1.9.bb => nvme-cli_1.10.1.bb} (85%) copy meta-python/recipes-devtools/python/{python3-cryptography => python3-webcolors}/run-ptest (55%) copy meta-python/recipes-devtools/python/{python3-cryptography => python3-xlrd}/run-ptest (55%) copy meta-python/recipes-devtools/python/{python3-cryptography => python3-xmltodict}/run-ptest (55%) create mode 100644 meta-python/recipes-devtools/python/python3-xxhash/run-ptest copy meta-python/recipes-devtools/python/{python3-cryptography => python3-yappi}/run-ptest (55%) copy meta-python/recipes-devtools/python/{python-cryptography => python3-yarl}/run-ptest (52%) -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:39 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:39 +0000 Subject: [oe-commits] [meta-openembedded] 03/12: python3-webcolors: Enable ptest In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144636.EBBE3232CC2@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e36ff205b27e3043c19c17f70156d11f20311a04 Author: Zang Ruochen AuthorDate: Fri Mar 20 10:20:10 2020 +0800 python3-webcolors: Enable ptest Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-webcolors.inc | 14 ++++++++++++++ .../recipes-devtools/python/python3-webcolors/run-ptest | 2 ++ 2 files changed, 16 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-webcolors.inc b/meta-python/recipes-devtools/python/python-webcolors.inc index ef254e3..ad012c9 100644 --- a/meta-python/recipes-devtools/python/python-webcolors.inc +++ b/meta-python/recipes-devtools/python/python-webcolors.inc @@ -10,3 +10,17 @@ RDEPENDS_${PN}_class-target = "\ " BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" +inherit ptest + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-python/recipes-devtools/python/python3-webcolors/run-ptest b/meta-python/recipes-devtools/python/python3-webcolors/run-ptest new file mode 100644 index 0000000..40c2847 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-webcolors/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +pytest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:41 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:41 +0000 Subject: [oe-commits] [meta-openembedded] 05/12: python3-xmltodict: Enable ptest In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.0B7A9232CC4@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 5c474d09a8497ee0c8dd2561311d614e7cc05c44 Author: Zang Ruochen AuthorDate: Fri Mar 20 10:21:33 2020 +0800 python3-xmltodict: Enable ptest Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- .../recipes-devtools/python/python3-xmltodict/run-ptest | 3 +++ .../recipes-devtools/python/python3-xmltodict_0.12.0.bb | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest b/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest new file mode 100644 index 0000000..5cec711 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest diff --git a/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb b/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb index 00aa818..d078883 100644 --- a/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb +++ b/meta-python/recipes-devtools/python/python3-xmltodict_0.12.0.bb @@ -9,4 +9,17 @@ SRC_URI[sha256sum] = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d16 PYPI_PACKAGE = "xmltodict" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:42 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:42 +0000 Subject: [oe-commits] [meta-openembedded] 06/12: python3-xxhash: Enable ptest In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.15815232CC5@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 380bd91766eb32a93191b079a1388fe01a25aacf Author: Zang Ruochen AuthorDate: Fri Mar 20 10:22:05 2020 +0800 python3-xxhash: Enable ptest Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-xxhash.inc | 15 +++++++++++++++ .../recipes-devtools/python/python3-xxhash/run-ptest | 3 +++ 2 files changed, 18 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-xxhash.inc b/meta-python/recipes-devtools/python/python-xxhash.inc index 80f5e9c..c02c29e 100644 --- a/meta-python/recipes-devtools/python/python-xxhash.inc +++ b/meta-python/recipes-devtools/python/python-xxhash.inc @@ -5,3 +5,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" SRC_URI[md5sum] = "ce9cbbcc89620fd47a2468badd08dcf0" SRC_URI[sha256sum] = "8b6b1afe7731d7d9cbb0398b4a811ebb5e6be5c174f72c68abf81f919a435de9" + +SRC_URI += " \ + file://run-ptest \ +" + +inherit ptest + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-python/recipes-devtools/python/python3-xxhash/run-ptest b/meta-python/recipes-devtools/python/python3-xxhash/run-ptest new file mode 100644 index 0000000..6a26348 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-xxhash/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest tests/test.py -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:43 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:43 +0000 Subject: [oe-commits] [meta-openembedded] 07/12: python3-yappi: Enable ptest In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.1F69B232CC6@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit ddd3d75b88974de76da631498d2dc8818079a7a4 Author: Zang Ruochen AuthorDate: Fri Mar 20 10:22:33 2020 +0800 python3-yappi: Enable ptest Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-yappi.inc | 18 +++++++++++++++++- .../recipes-devtools/python/python3-yappi/run-ptest | 3 +++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-yappi.inc b/meta-python/recipes-devtools/python/python-yappi.inc index b3718d7..d6e9d4e 100644 --- a/meta-python/recipes-devtools/python/python-yappi.inc +++ b/meta-python/recipes-devtools/python/python-yappi.inc @@ -7,10 +7,26 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=9a193c13f346884e597acdcac7fe9ac8" SRC_URI[md5sum] = "a545101aa8a435b0780f06f4723f58c8" SRC_URI[sha256sum] = "7f814131515d51db62b1a3468bcb84de30499124752806a5a6e11caf0b4344bf" -inherit pypi setuptools3 +SRC_URI += " \ + file://run-ptest \ +" + +inherit pypi setuptools3 ptest RDEPENDS_${PN} += "\ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-pickle \ ${PYTHON_PN}-threading \ " + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-profile \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -f ${S}/yappi.py ${D}/${PTEST_PATH}/ +} diff --git a/meta-python/recipes-devtools/python/python3-yappi/run-ptest b/meta-python/recipes-devtools/python/python3-yappi/run-ptest new file mode 100644 index 0000000..5cec711 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-yappi/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:44 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:44 +0000 Subject: [oe-commits] [meta-openembedded] 08/12: python3-yarl: Enable ptest In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.2A5F9232CC7@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 64aa85936bb93b3f3670b13592402451bf7663d6 Author: Zang Ruochen AuthorDate: Fri Mar 20 10:23:01 2020 +0800 python3-yarl: Enable ptest Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-yarl.inc | 15 ++++++++++++++- .../recipes-devtools/python/python3-yarl/run-ptest | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-yarl.inc b/meta-python/recipes-devtools/python/python-yarl.inc index 98066d7..911c79d 100644 --- a/meta-python/recipes-devtools/python/python-yarl.inc +++ b/meta-python/recipes-devtools/python/python-yarl.inc @@ -6,9 +6,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b" SRC_URI[md5sum] = "08ba0d6e18f460b44d9e5459f3d217ba" SRC_URI[sha256sum] = "58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b" +SRC_URI += " \ + file://run-ptest \ +" + PYPI_PACKAGE = "yarl" -inherit pypi +inherit pypi ptest RDEPENDS_${PN} = "\ ${PYTHON_PN}-multidict \ ${PYTHON_PN}-idna \ " + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-python/recipes-devtools/python/python3-yarl/run-ptest b/meta-python/recipes-devtools/python/python3-yarl/run-ptest new file mode 100644 index 0000000..f82f6ea --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-yarl/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:45 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:45 +0000 Subject: [oe-commits] [meta-openembedded] 09/12: civetweb: upgrade 1.11 -> 1.12 In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.3593D232CC8@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 15963a059b817d281309d53e8e34f9202d58f039 Author: Wang Mingyu AuthorDate: Fri Mar 20 00:05:58 2020 -0700 civetweb: upgrade 1.11 -> 1.12 -License-Update: Copyright year updated to 2020. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/civetweb/civetweb_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb index 71368c1..2820f9f 100644 --- a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb +++ b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb @@ -2,10 +2,10 @@ SUMMARY = "Civetweb embedded web server" HOMEPAGE = "https://github.com/civetweb/civetweb" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f28fdcba0dda735eed62bac6a397562" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=50bd1d7f135b50d7e218996ba28d0d88" -SRCREV = "6423faea4800f6cd4055750a7af2da85cdbe4e96" -PV = "1.11+git${SRCPV}" +SRCREV = "4b440a339979852d5a51fb11a822952712231c23" +PV = "1.12+git${SRCPV}" SRC_URI = "git://github.com/civetweb/civetweb.git \ file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ " -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:47 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:47 +0000 Subject: [oe-commits] [meta-openembedded] 11/12: safec: Put perl requiring tools into separate package In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.4AA43232CCA@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit e9fdc5acb4dca61f33575ae176a373b01f8323fc Author: Khem Raj AuthorDate: Thu Mar 19 23:47:55 2020 -0700 safec: Put perl requiring tools into separate package There is one script - a check tool that needs perl on target, which perhaps is only needed during development and testing therefore move that to a separate package. Rest of safec is then independent of perl runtime requirement. Signed-off-by: Khem Raj --- meta-oe/recipes-core/safec/safec_3.5.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-oe/recipes-core/safec/safec_3.5.bb index c9ace3b..66b1f6a 100644 --- a/meta-oe/recipes-core/safec/safec_3.5.bb +++ b/meta-oe/recipes-core/safec/safec_3.5.bb @@ -16,4 +16,8 @@ CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' -RDEPENDS_${PN} = "perl" +PACKAGES =+ "${PN}-check" + +FILES_${PN}-check += "${bindir}/check_for_unsafe_apis" + +RDEPENDS_${PN}-check += "perl" -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:46 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:46 +0000 Subject: [oe-commits] [meta-openembedded] 10/12: node: Enable cross-compiling options and disable dtrace and etw In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.3F72E232CC9@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 1f457c22c89555d88a691baec1045b3dc7862f8b Author: Khem Raj AuthorDate: Thu Mar 19 23:44:00 2020 -0700 node: Enable cross-compiling options and disable dtrace and etw dtrace and etw are hardly used for embedded usecase Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb | 4 +++- 1 file changed, 3 insertions(+), 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 a482c6b..28b4136 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb @@ -99,7 +99,9 @@ do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --prefix=${prefix} --without-snapshot --shared-openssl \ + python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ + --without-dtrace \ + --without-etw \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ --libdir=${D}${libdir} \ -- To stop receiving notification emails like this one, please contact the administrator of this repository. From git at git.openembedded.org Fri Mar 20 14:46:48 2020 From: git at git.openembedded.org (git at git.openembedded.org) Date: Fri, 20 Mar 2020 14:46:48 +0000 Subject: [oe-commits] [meta-openembedded] 12/12: layers: update LAYERSERIES_COMPAT to dunfell In-Reply-To: <158471559653.28731.508036046773303053@git.openembedded.org> References: <158471559653.28731.508036046773303053@git.openembedded.org> Message-ID: <20200320144637.542FC232CCB@git.openembedded.org> This is an automated email from the git hooks/post-receive script. khem pushed a commit to branch master-next in repository meta-openembedded. commit 46ae08202a52af4788372ba8c8e0ecefaa7eb301 Author: Khem Raj AuthorDate: Fri Mar 20 00:15:18 2020 -0700 layers: update LAYERSERIES_COMPAT to dunfell Signed-off-by: Khem Raj --- meta-filesystems/conf/layer.conf | 2 +- meta-gnome/conf/layer.conf | 2 +- meta-initramfs/conf/layer.conf | 2 +- meta-multimedia/conf/layer.conf | 2 +- meta-networking/conf/layer.conf | 2 +- meta-oe/conf/layer.conf | 2 +- meta-perl/conf/layer.conf | 2 +- meta-python/conf/layer.conf | 2 +- meta-webserver/conf/layer.conf | 2 +- meta-xfce/conf/layer.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index e8bd362..be1635d 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_filesystems-layer = "thud warrior zeus dunfell" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index d381fdf..7aa9507 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -17,4 +17,4 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus dunfell" diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index 93220b1..634e088 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "8" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus" +LAYERSERIES_COMPAT_meta-initramfs = "thud warrior zeus dunfell" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index 74dd4a1..2d52fb9 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_multimedia-layer = "thud warrior zeus dunfell" diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index 866bda7..7bc0702 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" -LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_networking-layer = "thud warrior zeus dunfell" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index 652a378..434537f 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -34,7 +34,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_openembedded-layer = "thud warrior zeus dunfell" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf index 2c730e4..1361fe0 100644 --- a/meta-perl/conf/layer.conf +++ b/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_perl-layer = "thud warrior zeus dunfell" diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index db65943..7cfeafe 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "thud warrior zeus" +LAYERSERIES_COMPAT_meta-python = "thud warrior zeus dunfell" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf index 2c6fad4..2446911 100644 --- a/meta-webserver/conf/layer.conf +++ b/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "thud warrior zeus" +LAYERSERIES_COMPAT_webserver = "thud warrior zeus dunfell" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index 070ea6a..199c69e 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf @@ -19,4 +19,4 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus" +LAYERSERIES_COMPAT_xfce-layer = "thud warrior zeus dunfell" -- To stop receiving notification emails like this one, please contact the administrator of this repository.