diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/librepo | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/librepo')
-rw-r--r-- | poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch | 21 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch | 18 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/librepo/librepo_1.9.4.bb (renamed from poky/meta/recipes-devtools/librepo/librepo_1.8.1.bb) | 6 |
3 files changed, 17 insertions, 28 deletions
diff --git a/poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch index d69deb511..b61f0c932 100644 --- a/poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +++ b/poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch @@ -1,8 +1,7 @@ -From 5b6849d9d7e030c3a521b5245d86f853b0271a61 Mon Sep 17 00:00:00 2001 +From b08a3b71e716dd0485ef51036d32e4c304fb4e67 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:05:36 +0200 -Subject: [PATCH 1/2] Do not try to obtain PYTHON_INSTALL_DIR by running - python. +Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -13,12 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt -index 5ffbd62..90d3c22 100644 +index a0f1f9a..1665079 100644 --- a/librepo/python/python2/CMakeLists.txt +++ b/librepo/python/python2/CMakeLists.txt -@@ -1,11 +1,11 @@ - FIND_PACKAGE (PythonLibs 2 ) - FIND_PACKAGE (PythonInterp 2 REQUIRED) +@@ -1,9 +1,9 @@ -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " -from sys import stdout -from distutils import sysconfig @@ -35,13 +32,10 @@ index 5ffbd62..90d3c22 100644 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt -index 47559f7..b39adc2 100644 +index 52ba44e..da51e10 100644 --- a/librepo/python/python3/CMakeLists.txt +++ b/librepo/python/python3/CMakeLists.txt -@@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}") - - FIND_PACKAGE(PythonLibs 3.0) - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) +@@ -1,9 +1,9 @@ -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " -from sys import stdout -from distutils import sysconfig @@ -57,6 +51,3 @@ index 47559f7..b39adc2 100644 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") --- -2.14.1 - diff --git a/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch index f7d7ab3a2..73902e5f5 100644 --- a/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +++ b/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch @@ -1,29 +1,27 @@ -From a36be8192615e2a1fb5a5856d44565277f15583b Mon Sep 17 00:00:00 2001 +From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:23:27 +0200 -Subject: [PATCH 4/4] Set gpgme variables with pkg-config, not with cmake - module (which doesn't work properly) +Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module + (which doesn't work properly) Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef07d2d..f1fa09b 100644 +index e949dbe..c954b2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) - FIND_PACKAGE(EXPAT REQUIRED) + PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) FIND_PACKAGE(CURL REQUIRED) -FIND_PACKAGE(Gpgme REQUIRED) +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) - FIND_PACKAGE(Xattr REQUIRED) - INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS}) --- -2.11.0 - + + IF (WITH_ZCHUNK) diff --git a/poky/meta/recipes-devtools/librepo/librepo_1.8.1.bb b/poky/meta/recipes-devtools/librepo/librepo_1.9.4.bb index 456988558..c4d6c163e 100644 --- a/poky/meta/recipes-devtools/librepo/librepo_1.8.1.bb +++ b/poky/meta/recipes-devtools/librepo/librepo_1.9.4.bb @@ -7,15 +7,15 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "7b9b7bf388f3f059529c6f50c40b30919fef30f9" +SRCREV = "928c2d9c66f0d10477b8c9d1192785b88e2b1155" S = "${WORKDIR}/git" -DEPENDS = "curl expat glib-2.0 openssl attr gpgme" +DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2" inherit cmake distutils3-base pkgconfig -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DENABLE_TESTS=OFF -DENABLE_DOCS=OFF" +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DENABLE_TESTS=OFF -DENABLE_DOCS=OFF -DWITH_ZCHUNK=OFF" BBCLASSEXTEND = "native nativesdk" |