From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- ...0001-Correctly-install-the-shared-library.patch | 28 --------- ...-set-PYTHON_INSTALL_DIR-by-running-python.patch | 14 ++--- ...etup-of-logging-log-domains-RhBug-1645897.patch | 73 ---------------------- .../createrepo-c/createrepo-c_git.bb | 8 +-- 4 files changed, 9 insertions(+), 114 deletions(-) delete mode 100644 poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch delete mode 100644 poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch (limited to 'poky/meta/recipes-devtools/createrepo-c') diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch deleted file mode 100644 index cd72084ee..000000000 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fef835e1fdedc72c97d9c3e5704302e56e1bdef0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 2 Jan 2017 17:23:59 +0200 -Subject: [PATCH] Correctly install the shared library - -Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/78] -Signed-off-by: Alexander Kanavin ---- - src/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f3635e8..46dc037 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -110,7 +110,8 @@ CONFIGURE_FILE("deltarpms.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/deltarpms.h" @ONLY) - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET (LIB_SUFFIX "64") - ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8") --SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -+SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") - - INSTALL(FILES ${headers} DESTINATION "include/createrepo_c") - INSTALL(FILES "createrepo_c.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") --- -2.11.0 - diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 953107093..c0f07fe2c 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -1,27 +1,25 @@ -From bef487b5c2515062c5dd73c21082ce42f69aa717 Mon Sep 17 00:00:00 2001 +From 4644d18157296257284bedd857f4610f1037d50e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:31:02 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- src/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 9f1ac64..eae0cbb 100644 +index 3d873f7..e977b2f 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt -@@ -19,7 +19,7 @@ else() - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) - endif() +@@ -21,7 +21,7 @@ if (NOT SKBUILD) + endif () + endif (NOT SKBUILD) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") --- -2.11.0 - diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch deleted file mode 100644 index 6de9c0557..000000000 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 80810f04f2de6bae6e394f52ad9cdd2189862f74 Mon Sep 17 00:00:00 2001 -From: Jaroslav Rohel -Date: Fri, 9 Nov 2018 07:35:13 +0100 -Subject: [PATCH] Fix setup of logging (log domains) (RhBug:1645897) - -New debug messages were added into GLib library. These messages come -from the "GLib" log domain and were not hidden in the standard and -quiet mode of the application. -This fix hides log messages regardless on source log domain. - -Upstream-Status: Backport - -Signed-off-by: Zheng Ruoqin ---- - src/createrepo_shared.c | 19 ++++++------------- - src/misc.c | 5 ++++- - 2 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c -index 8a26787..7cb8ba8 100644 ---- a/src/createrepo_shared.c -+++ b/src/createrepo_shared.c -@@ -270,24 +270,17 @@ cr_lock_repo(const gchar *repo_dir, - void - cr_setup_logging(gboolean quiet, gboolean verbose) - { -- g_log_set_default_handler (cr_log_fn, NULL); -- - if (quiet) { - // Quiet mode -- GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | -- G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING; -- g_log_set_handler(NULL, levels, cr_null_log_fn, NULL); -- g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL); -+ GLogLevelFlags hidden_levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | -+ G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING; -+ g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels)); - } else if (verbose) { - // Verbose mode -- GLogLevelFlags levels = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | -- G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_WARNING; -- g_log_set_handler(NULL, levels, cr_log_fn, NULL); -- g_log_set_handler("C_CREATEREPOLIB", levels, cr_log_fn, NULL); -+ g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(0)); - } else { - // Standard mode -- GLogLevelFlags levels = G_LOG_LEVEL_DEBUG; -- g_log_set_handler(NULL, levels, cr_null_log_fn, NULL); -- g_log_set_handler("C_CREATEREPOLIB", levels, cr_null_log_fn, NULL); -+ GLogLevelFlags hidden_levels = G_LOG_LEVEL_DEBUG; -+ g_log_set_default_handler (cr_log_fn, GINT_TO_POINTER(hidden_levels)); - } - } -diff --git a/src/misc.c b/src/misc.c -index 9937480..9549a44 100644 ---- a/src/misc.c -+++ b/src/misc.c -@@ -912,8 +912,11 @@ void - cr_log_fn(const gchar *log_domain, - GLogLevelFlags log_level, - const gchar *message, -- G_GNUC_UNUSED gpointer user_data) -+ gpointer user_data) - { -+ gint hidden_log_levels = GPOINTER_TO_INT(user_data); -+ if (log_level & hidden_log_levels) -+ return; - switch(log_level) { - case G_LOG_LEVEL_ERROR: - if (log_domain) g_printerr("%s: ", log_domain); --- -1.8.3.1 - diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb index 08766b312..9aa8d2ae7 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb @@ -6,12 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ - file://0001-Correctly-install-the-shared-library.patch \ - file://0001-Fix-setup-of-logging-log-domains-RhBug-1645897.patch \ " -PV = "0.11.1+git${SRCPV}" -SRCREV = "434a40babdde57ab405e9a1085a30e9575ea0c92" +PV = "0.12.1" +SRCREV = "7744554ddef7c5be2cd7fbcac49c8b24ce60ef88" S = "${WORKDIR}/git" @@ -20,7 +18,7 @@ DEPENDS_append_class-native = " file-replacement-native" inherit cmake pkgconfig bash-completion distutils3-base -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3" +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.1