cannelloni: Update to latest and fix multilib builds
PATCH 1/23 cannelloni: Update to latest and fix multilib builds
--- ...allDirs-instead-of-hard-coding-paths.patch | 43 +++++++++++++++++++ .../cannelloni/cannelloni_git.bb | 6 ++- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch
meta-networking/recipes-connectivity/cannelloni/cannelloni/0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch new file +43 -0
@@ -0,0 +1,43 @@ +From c74f04dbab4d586287347b1d5517f36e2f0c3d8e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 15:52:34 -0800 +Subject: [PATCH] Use GNUInstallDirs instead of hard-coding paths + +Bump minimum cmake version to be >= 3.1 + +Upstream-Status: Submitted [https://github.com/mguentner/cannelloni/pull/22] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 51b354f..958e0eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.1) + project(cannelloni) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") +@@ -60,6 +60,8 @@ set_target_properties ( cannelloni-common + SOVERSION 0 + ) + ++include(GNUInstallDirs) ++ + if(SCTP_SUPPORT) + add_library(sctpthread STATIC sctpthread.cpp) + target_link_libraries(sctpthread addsources sctp) +@@ -68,5 +70,5 @@ endif(SCTP_SUPPORT) + set_target_properties(addsources PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + target_link_libraries(cannelloni addsources cannelloni-common pthread) + +-install(TARGETS cannelloni DESTINATION bin) +-install(TARGETS cannelloni-common DESTINATION lib) ++install(TARGETS cannelloni DESTINATION ${CMAKE_INSTALL_BINDIR}) ++install(TARGETS cannelloni-common DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.24.1 +
meta-networking/recipes-connectivity/cannelloni/cannelloni_git.bb +4 -2
@@ -2,8 +2,10 @@ SUMMARY = "a SocketCAN over Ethernet tunnel" HOMEPAGE = "https://github.com/mguentner/cannelloni" LICENSE = "GPLv2" -SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https" -SRCREV = "44080bb021d1a143e6906f2ec4610513c4e1cece" +SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https \ + file://0001-Use-GNUInstallDirs-instead-of-hard-coding-paths.patch \ + " +SRCREV = "82aa49b417b96fe46bb3f017ae1bfea928f20f9a" PV = "20160414+${SRCPV}"
Signature · 1 line
2.24.1
PATCH 2/23 nvme-cli: Use nonarch libdir for dracut config files
Fixes packaging errors where libdir != nonarch_libdir
--- meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +1 -1
@@ -27,7 +27,7 @@ pkg_postinst_ontarget_${PN}() { PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN}-dracut = "${libdir}/dracut/dracut.conf.d" +FILES_${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" RDEPENDS_${PN} = "util-linux-uuidgen"
Signature · 1 line
2.24.1
PATCH 3/23 cli11: Fix multilib build
In reply to Khem Raj--- meta-oe/recipes-support/cli11/cli11_1.8.0.bb | 1 + ...stallDirs-instead-of-hard-coded-path.patch | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch
meta-oe/recipes-support/cli11/cli11_1.8.0.bb +1 -0
@@ -8,6 +8,7 @@ PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/CLIUtils/CLI11 \ file://0001-Add-CLANG_TIDY-check.patch \ + file://0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch \ " S = "${WORKDIR}/git"
meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 8c51221f748bca1483fe1141e584867d2ff34a07 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 16:26:39 -0800 +Subject: [PATCH] Use GNUInstallDirs instead of hard-coded path + +Upstream-Status: Submitted [https://github.com/CLIUtils/CLI11/pull/373] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7073a0b..5236fd2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,17 +120,18 @@ endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CLI11ConfigVersion.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" @ONLY) + ++include(GNUInstallDirs) + # These installs only make sense for a local project + if(CUR_PROJ) + # Make version available in the install + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" +- DESTINATION lib/cmake/CLI11) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) + + # Install the export target as a file + install(EXPORT CLI11Targets + FILE CLI11Config.cmake + NAMESPACE CLI11:: +- DESTINATION lib/cmake/CLI11) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11) + + # Use find_package on the installed package + export(TARGETS CLI11 +-- +2.24.1 +
Signature · 1 line
2.24.1
PATCH 4/23 lockdev: Make baselib configurable
In reply to Khem RajThis ensures that baselib can be passed from bitbake tasks via environment
Refresh patches
--- meta-oe/recipes-support/lockdev/lockdev/build.patch | 2 +- .../recipes-support/lockdev/lockdev/cross_compile.patch | 8 +++++--- meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-)
meta-oe/recipes-support/lockdev/lockdev/build.patch +1 -1
@@ -18,7 +18,7 @@ Date: Tue Feb 9 14:56:23 2010 +0100 soname = ${libname}.so.${MVER} # overwritten by caller (e.g.: debian/rules) -@@ -72,6 +72,7 @@ install_doc: docs/lockdev.3 +@@ -73,6 +73,7 @@ install_doc: docs/lockdev.3 install_run: ${shared} install -m755 -d ${libdir} install -m644 ${shared} ${libdir}
meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch +5 -3
@@ -1,14 +1,16 @@ --- a/Makefile +++ b/Makefile -@@ -15,17 +15,17 @@ shared = ${libname}.${VER}.so +@@ -15,17 +15,18 @@ shared = ${libname}.${VER}.so soname = ${libname}.so.${MVER} # overwritten by caller (e.g.: debian/rules) -basedir = /usr/local +basedir ?= /usr/local ++baselib ?= lib srcdir=. - libdir = ${basedir}/lib +-libdir = ${basedir}/lib ++libdir = ${basedir}/${baselib} incdir = ${basedir}/include mandir = ${basedir}/share/man
@@ -17,7 +19,7 @@ -CFLAGS = -g -LDLIBS = -llockdev +CC ?= gcc -+LCFLAGS ?= -g -O2 -fPIC -Wall -pipe -D_REENTRANT ++LCFLAGS ?= -g -O2 -fPIC -Wall -pipe -D_REENTRANT +CFLAGS ?= -g +LDLIBS ?= -llockdev
meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb +3 -3
@@ -15,15 +15,15 @@ SRC_URI[debianpatch.md5sum] = "5ef6267c42fca9145e0af006ccb6aff7" SRC_URI[debianpatch.sha256sum] = "a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e" inherit lib_package perlnative -export basedir="${D}${prefix}" CFLAGS += " -D__GNU_LIBRARY__" TARGET_CC_ARCH += "${LDFLAGS}" +EXTRA_OEMAKE = "basedir=${D}${prefix} baselib=${baselib} LD='${CC}' LD='${CC}'" do_compile() { - oe_runmake basedir=${D}${prefix} LD="${CC}" LD="${CC}" shared static + oe_runmake shared static } do_install() { - oe_runmake DESTDIR=${D} basedir=${D}${prefix} install + oe_runmake DESTDIR=${D} install }
Signature · 1 line
2.24.1
PATCH 5/23 avro-c: Update to 1.9.1
In reply to Khem RajBackport a patch to fix build with musl ( already in future 1.10.x release) Add a cmake patch to fix build on mulilibbed env
delete already upstreamed patch
--- ...-C-to-be-built-on-musl-based-systems.patch | 42 +++++++++++ ...avro-c-Fix-build-with-clang-compiler.patch | 37 ---------- ...tallDirs-instead-of-hard-coded-paths.patch | 70 +++++++++++++++++++ meta-oe/recipes-support/avro/avro-c_1.8.1.bb | 20 ------ meta-oe/recipes-support/avro/avro-c_1.9.1.bb | 19 +++++ 5 files changed, 131 insertions(+), 57 deletions(-) create mode 100644 meta-oe/recipes-support/avro/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch delete mode 100644 meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch create mode 100644 meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch delete mode 100644 meta-oe/recipes-support/avro/avro-c_1.8.1.bb create mode 100644 meta-oe/recipes-support/avro/avro-c_1.9.1.bb
meta-oe/recipes-support/avro/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001 +From: Titouan Christophe <[email protected]> +Date: Sun, 8 Dec 2019 01:55:59 +0100 +Subject: [PATCH] Allow avro C to be built on musl based systems. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The type `ssize_t` is defined in sys/types.h, and nowhere else +in the musl standard C library, so it should be included for the +compilation to succeed. + +This fixes several errors like: + + In file included from src/generic.c:29:0: + src/generic.c: In function ‘avro_generic_value_new’: + src/avro_generic_internal.h:63:39: + error: ‘ssize_t’ undeclared (first use in this function); + did you mean ‘size_t’? + +Upstream-Status: Backport +Signed-off-by: Titouan Christophe <[email protected]> +--- + lang/c/src/avro_generic_internal.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lang/c/src/avro_generic_internal.h b/lang/c/src/avro_generic_internal.h +index 709403c03..9843ed652 100644 +--- a/lang/c/src/avro_generic_internal.h ++++ b/lang/c/src/avro_generic_internal.h +@@ -24,6 +24,8 @@ extern "C" { + #define CLOSE_EXTERN + #endif + ++#include <sys/types.h> ++ + #include "avro/generic.h" + #include "avro/schema.h" + #include "avro/value.h" +-- +2.24.1 +
meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 518bb8ccfb3f3fc143fbd571782f3e40573d01b5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 10 Apr 2017 09:15:04 -0700 -Subject: [PATCH] avro-c: Fix build with clang compiler - -Clang advertizes itself to be compatible with gcc 4.2.1 -while that was true several years ago, it now supports -a lot more newer features, the test to just check gcc -version should be supplanted with clang check as well -so atomic support in clang can be asserted as well - -Fixes - -lang/c/src/avro/refcount.h:301:2: error: "No atomic implementation!" - -Signed-off-by: Khem Raj <[email protected]> ---- - lang/c/src/avro/refcount.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/lang/c/src/avro/refcount.h b/lang/c/src/avro/refcount.h -index 69afa4fc..d76ba057 100644 ---- a/lang/c/src/avro/refcount.h -+++ b/lang/c/src/avro/refcount.h -@@ -118,7 +118,8 @@ avro_refcount_dec(volatile int *refcount) - * GCC intrinsics - */ - --#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 -+#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40500 \ -+|| defined(__clang__) - - static inline void - avro_refcount_set(volatile int *refcount, int value) --- -2.12.2 -
meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch new file +70 -0
70 lines not on this page · raw message
meta-oe/recipes-support/avro/avro-c_1.8.1.bb deleted +0 -20
@@ -1,20 +0,0 @@ -SUMMARY = "Apache Avro data serialization system." -HOMEPAGE = "http://apr.apache.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=73bdf70f268f0b3b9c5a83dd7a6f3324" - -DEPENDS = "jansson zlib xz" -PV .= "+git${SRCPV}" - -SRCREV = "4b3677c32b879e0e7f717eb95f9135ac654da760" -SRC_URI = "git://github.com/apache/avro \ - file://0001-avro-c-Fix-build-with-clang-compiler.patch;patchdir=../../ \ -" - -S = "${WORKDIR}/git/lang/c" - -LDFLAGS_append_libc-uclibc = " -lm" - -inherit cmake
meta-oe/recipes-support/avro/avro-c_1.9.1.bb new file +19 -0
@@ -0,0 +1,19 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "http://apr.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" + +DEPENDS = "jansson zlib xz" + +BRANCH = "branch-1.9" +SRCREV = "89218262cde62e98fcb3778b86cd3f03056c54f3" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ + file://0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch;patchdir=../../ \ + file://0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch;patchdir=../../ \ + " + +S = "${WORKDIR}/git/lang/c" + +inherit cmake
Signature · 1 line
2.24.1
PATCH 6/23 nftables: Package python scripts into nonarch libdir
In reply to Khem RajHelps fixing packaging errors on mulilib builds
--- meta-networking/recipes-filter/nftables/nftables_0.9.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-filter/nftables/nftables_0.9.3.bb +1 -1
@@ -29,5 +29,5 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} RRECOMMENDS_${PN} += "kernel-module-nf-tables" PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${libdir}/${PYTHON_DIR}" +FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" RDEPENDS_${PN}-python = "python3-core python3-json"
Signature · 1 line
2.24.1
PATCH 7/23 mercurial: Add python scripts into separate python package
In reply to Khem Raj--- meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-devtools/mercurial/mercurial_5.2.bb +3 -0
@@ -30,6 +30,9 @@ do_install () { oe_runmake -e install-bin DESTDIR=${D} PREFIX=${prefix} sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/hg } +PACKAGES =+ "${PN}-python" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +
Signature · 1 line
2.24.1
PATCH 8/23 fluentbit: Fix packaging in multilib env
In reply to Khem RajFixes
ERROR: fluentbit-0.12.19-r0 do_package: QA Issue: fluentbit: Files/directories were installed but not shipped in any package:/usr/lib/libfluent-bit.so
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
--- .../fluentbit/fluentbit/cmake_multilib.patch | 18 ++++++++++++++++++ .../fluentbit/fluentbit_0.12.19.bb | 1 + 2 files changed, 19 insertions(+) create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch
meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch new file +18 -0
@@ -0,0 +1,18 @@ +Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib path + +Helps build on platforms where libpaths are not lib/ but say lib64/ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -182,7 +182,7 @@ if(NOT FLB_WITHOUT_SHARED_LIB) + PROPERTIES OUTPUT_NAME fluent-bit) + + # Library install routines +- install(TARGETS fluent-bit-shared LIBRARY DESTINATION lib) ++ install(TARGETS fluent-bit-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + + # Static Library
meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb +1 -0
@@ -4,6 +4,7 @@ BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ file://jemalloc.patch \ + file://cmake_multilib.patch \ " SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34" SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241"
Signature · 1 line
2.24.1
PATCH 9/23 dcadec: Define BASELIB as a knob
In reply to Khem RajUse https protocol in fetcher
Fixes
ERROR: dcadec-0.2.0-r0 do_package: QA Issue: dcadec: Files/directories were installed but not shipped in any package:/usr/lib/usr/lib/libdcadec.so.0/usr/lib/libdcadec.so.0.1.0/usr/lib/libdcadec.so/usr/lib/pkgconfig/usr/lib/pkgconfig/dcadec.pc
--- .../0001-define-BASELIB-make-variable.patch | 31 +++++++++++++++++++ .../recipes-multimedia/dca/dcadec_0.2.0.bb | 8 +++-- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch
meta-multimedia/recipes-multimedia/dca/dcadec/0001-define-BASELIB-make-variable.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 18cc69460d2a0c756880bd54fda36afb0173ea02 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 19:47:36 -0800 +Subject: [PATCH] define BASELIB make variable + +This helps to override the default libdir from environment + +Upstream-Status: Submitted [https://github.com/foo86/dcadec/pull/61] +Signed-off-by: Khem Raj <[email protected]> +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index a503698..8f323be 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,8 +7,9 @@ API_PATCH = 0 + CFLAGS := -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wall -Wextra -O3 -ffast-math -g -MMD $(CFLAGS) + + PREFIX ?= /usr/local ++BASELIB ?= lib + BINDIR ?= $(PREFIX)/bin +-LIBDIR ?= $(PREFIX)/lib ++LIBDIR ?= $(PREFIX)/$(BASELIB) + INCLUDEDIR ?= $(PREFIX)/include + + SRC_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) +-- +2.24.1 +
meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb +5 -3
@@ -4,14 +4,16 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c" SRCREV = "b93deed1a231dd6dd7e39b9fe7d2abe05aa00158" -SRC_URI = "git://github.com/foo86/dcadec.git;protocol=http" +SRC_URI = "git://github.com/foo86/dcadec.git;protocol=https \ + file://0001-define-BASELIB-make-variable.patch \ + " S = "${WORKDIR}/git" inherit lib_package -EXTRA_OEMAKE = "CONFIG_SHARED=1" +EXTRA_OEMAKE = "CONFIG_SHARED=1 PREFIX=${prefix} BASELIB=${baselib}" do_install() { - oe_runmake install DESTDIR="${D}" PREFIX="${prefix}" + oe_runmake install DESTDIR="${D}" }
Signature · 1 line
2.24.1
PATCH 10/23 dbus-broker: Use nonarch_libdir for systemd catalog files
In reply to Khem RajFixes
ERROR: dbus-broker-21-r0 do_package: QA Issue: dbus-broker: Files/directories were installed but not shipped in any package:/usr/lib/systemd/catalog/usr/lib/systemd/catalog/dbus-broker.catalog/usr/lib/systemd/catalog/dbus-broker-launch.catalog
--- meta-oe/recipes-core/dbus/dbus-broker_21.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-core/dbus/dbus-broker_21.bb +2 -1
@@ -26,7 +26,8 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" FILES_${PN} += "${systemd_system_unitdir}" FILES_${PN} += "${systemd_user_unitdir}" -FILES_${PN} += "${libdir}/systemd/catalog" +FILES_${PN} += "${nonarch_libdir}/systemd/catalog" EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" +
Signature · 1 line
2.24.1
PATCH 11/23 websocketapp: Fix multilib build
In reply to Khem RajFixes
ERROR: websocketpp-0.8.1-r0 do_package: QA Issue: websocketpp: Files/directories were installed but not shipped in any package:/usr/lib/usr/lib/cmake/usr/lib/cmake/websocketpp/usr/lib/cmake/websocketpp/websocketpp-configVersion.cmake /usr/lib/cmake/websocketpp/websocketpp-config.cmake
--- .../0001-cmake-Use-GNUInstallDirs.patch | 35 +++++++++++++++++++ .../websocketpp/websocketpp_0.8.1.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch
meta-oe/recipes-support/websocketpp/websocketpp-0.8.1/0001-cmake-Use-GNUInstallDirs.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 20:07:11 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2786aba..080be3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,11 +39,13 @@ endif() + + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + ++include(GNUInstallDirs) ++ + set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") + if (WIN32 AND NOT CYGWIN) + set (DEF_INSTALL_CMAKE_DIR cmake) + else () +- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) ++ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp) + endif () + set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + +-- +2.24.1 +
meta-oe/recipes-support/websocketpp/websocketpp_0.8.1.bb +1 -0
@@ -8,6 +8,7 @@ DEPENDS = "openssl boost zlib" SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ file://0001-Replace-make_shared-with-new-in-some-cases.patch \ file://0002-Fix-missed-entries-fix-testing.patch \ + file://0001-cmake-Use-GNUInstallDirs.patch \ " # tag 0.8.1
Signature · 1 line
2.24.1
PATCH 12/23 ade: Fix install paths in multilib builds
In reply to Khem RajFixes
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
--- ...tallDirs-for-detecting-install-paths.patch | 39 +++++++++++++++++++ meta-oe/recipes-support/opencv/ade_0.1.1f.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch
meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +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 <[email protected]> +--- + 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 +
meta-oe/recipes-support/opencv/ade_0.1.1f.bb +1 -0
@@ -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"
Signature · 1 line
2.24.1
PATCH 13/23 thrift: Upgrade to 0.13
In reply to Khem RajLicense-Update: Copyright years changed
Fix build for multilib
Use python3 during build
---
...onPaths.cmake-Define-libdir-in-terms.patch | 42 +++++++++++++++++++
.../{thrift_0.12.0.bb => thrift_0.13.0.bb} | 13 +++---
2 files changed, 49 insertions(+), 6 deletions(-)
create mode 100644 meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch
rename meta-oe/recipes-connectivity/thrift/{thrift_0.12.0.bb => thrift_0.13.0.bb} (83%)meta-oe/recipes-connectivity/thrift/thrift/0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch new file +42 -0
@@ -0,0 +1,42 @@ +From a07e56e1a2e70a9b81eb0a65f345cf45a7a93a81 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 21:56:23 -0800 +Subject: [PATCH] DefineInstallationPaths.cmake: Define libdir in terms of + LIB_SUFFIX + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + build/cmake/DefineInstallationPaths.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/build/cmake/DefineInstallationPaths.cmake ++++ b/build/cmake/DefineInstallationPaths.cmake +@@ -22,11 +22,11 @@ + set(BIN_INSTALL_DIR "bin" CACHE PATH "The binary install dir (default: bin)") + set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The library install dir (default: lib${LIB_SUFFIX})") + set(INCLUDE_INSTALL_DIR "include" CACHE PATH "The library install dir (default: include)") +-set(CMAKE_INSTALL_DIR "lib/cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)") +-set(PKGCONFIG_INSTALL_DIR "lib/pkgconfig" CACHE PATH "The subdirectory to install pkgconfig config files (default: lib/pkgconfig)") ++set(CMAKE_INSTALL_DIR "lib${LIB_SUFFIX}/cmake" CACHE PATH "The subdirectory to install cmake config files (default: cmake)") ++set(PKGCONFIG_INSTALL_DIR "lib${LIB_SUFFIX}/pkgconfig" CACHE PATH "The subdirectory to install pkgconfig config files (default: lib/pkgconfig)") + set(DOC_INSTALL_DIR "share/doc" CACHE PATH "The subdirectory to install documentation files (default: share/doc)") + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "${CMAKE_INSTALL_PREFIX}/bin") +-set(libdir "${CMAKE_INSTALL_PREFIX}/lib") ++set(libdir "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") + set(includedir "${CMAKE_INSTALL_PREFIX}/include") + set(cmakedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DIR}") +--- a/build/cmake/DefineCMakeDefaults.cmake ++++ b/build/cmake/DefineCMakeDefaults.cmake +@@ -44,8 +44,8 @@ include(BuildType) + # top of the build tree rather than in hard-to-find leaf + # directories. This simplifies manual testing and the use of the build + # tree rather than installed thrift libraries. +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}) ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + + #
meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb renamed from meta-oe/recipes-connectivity/thrift/thrift_0.12.0.bb +7 -6
@@ -4,18 +4,19 @@ HOMEPAGE = "https://thrift.apache.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=394465e125cffc0f133695ed43f14047 \ - file://NOTICE;md5=42748ae4646b45fbfa5182807321fb6c" + file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" DEPENDS = "thrift-native boost flex-native bison-native openssl" -SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "3deebbb4d1ca77dd9c9e009a1ea02183" -SRC_URI[sha256sum] = "c336099532b765a6815173f62df0ed897528a9d551837d627c1f87fadad90428" +SRC_URI = "https://www-eu.apache.org/dist/thrift//${PV}/${BPN}-${PV}.tar.gz \ + file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ + " +SRC_URI[md5sum] = "38a27d391a2b03214b444cb13d5664f1" +SRC_URI[sha256sum] = "7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179" BBCLASSEXTEND = "native nativesdk" -inherit pkgconfig cmake pythonnative +inherit pkgconfig cmake python3native export STAGING_INCDIR export STAGING_LIBDIR
Signature · 1 line
2.24.1
PATCH 14/23 gattlib: Update to latest tip
In reply to Khem RajFix multilib builds
--- .../files/0001-cmake-Use-GNUInstallDirs.patch | 53 +++++++++++++++++++ .../gattlib/gattlib_git.bb | 8 +-- 2 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch
meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch new file +53 -0
@@ -0,0 +1,53 @@ +From 63dc2d0c9384d85482dc4cbb3c179b4b0bb18d4e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 22:32:01 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/labapart/gattlib/pull/139] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 5 +++-- + dbus/CMakeLists.txt | 18 ++++++++++-------- + 2 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12d8d71..ded7239 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,8 @@ endif() + # + # List of file to install + # +-install(FILES include/gattlib.h DESTINATION include) +-install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION lib/pkgconfig) ++include(GNUInstallDirs) ++install(FILES include/gattlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + include(CPack) +diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt +index f5096ce..cef031f 100644 +--- a/dbus/CMakeLists.txt ++++ b/dbus/CMakeLists.txt +@@ -19,7 +19,7 @@ + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.0) + + find_package(PkgConfig REQUIRED) + +@@ -119,4 +119,6 @@ endif() + add_library(gattlib SHARED ${gattlib_SRCS}) + target_link_libraries(gattlib ${gattlib_LIBS}) + +-install(TARGETS gattlib LIBRARY DESTINATION lib) ++include(GNUInstallDirs) ++ ++install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.24.1 +
meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +5 -3
@@ -9,11 +9,13 @@ DEPENDS += "glib-2.0-native" PV = "0.2+git${SRCPV}" -SRC_URI = "git://github.com/labapart/gattlib.git" -SRC_URI += "file://dbus-avoid-strange-chars-from-the-build-dir.patch" +SRC_URI = "git://github.com/labapart/gattlib.git \ + file://dbus-avoid-strange-chars-from-the-build-dir.patch \ + file://0001-cmake-Use-GNUInstallDirs.patch \ + " SRCBRANCH = "master" -SRCREV = "c6a33252221dff904cf277e085e2ce70aced8788" +SRCREV = "5c7ee43bd70ee09a7170ddd55b9fdbdef69e9080" S = "${WORKDIR}/git"
Signature · 1 line
2.24.1
PATCH 15/23 rygel: Use nonarch_libdir for systemd units
In reply to Khem Raj--- .../recipes-connectivity/rygel/rygel_0.37.0.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb +5 -3
@@ -37,10 +37,12 @@ do_install_append() { # Remove .la files for loadable modules rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la - if [ -e ${D}${libdir}/systemd/user/rygel.service ]; then + if [ -e ${D}${nonarch_libdir}/systemd/user/rygel.service ]; then mkdir -p ${D}${systemd_unitdir}/system - mv ${D}${libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system - rmdir ${D}${libdir}/systemd/user ${D}${libdir}/systemd + mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system + rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ + ${D}${nonarch_libdir}/systemd \ + ${D}${nonarch_libdir} fi }
Signature · 1 line
2.24.1
PATCH 16/23 firewalld: Package firewalld files
In reply to Khem RajERROR: firewalld-0.7.2-r0 do_package: QA Issue: firewalld: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/firewalld
/usr/lib/firewalld/zones
--- .../recipes-connectivity/firewalld/firewalld_0.7.2.bb | 1 + 1 file changed, 1 insertion(+)
meta-networking/recipes-connectivity/firewalld/firewalld_0.7.2.bb +1 -0
@@ -66,6 +66,7 @@ do_install_append() { FILES_${PN} += "\ ${PYTHON_SITEPACKAGES_DIR}/firewall \ + ${nonarch_libdir}/firewalld \ ${datadir}/dbus-1 \ ${datadir}/polkit-1 \ ${datadir}/metainfo \
Signature · 1 line
2.24.1
PATCH 17/23 iwd: Package module conf files via nonarch_libdir
In reply to Khem RajFixes
ERROR: iwd-1.0-r0 do_package: QA Issue: iwd: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/modules-load.d
/usr/lib/modules-load.d/pkcs8.conf
--- meta-oe/recipes-connectivity/iwd/iwd_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/iwd/iwd_1.0.bb +1 -1
@@ -28,7 +28,7 @@ do_install_append() { install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} } -FILES_${PN} += "${datadir}/dbus-1 ${libdir}/modules-load.d ${systemd_unitdir}/network/" +FILES_${PN} += "${datadir}/dbus-1 ${nonarch_libdir}/modules-load.d ${systemd_unitdir}/network/" SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}"
Signature · 1 line
2.24.1
PATCH 18/23 civetweb: Upgrade to latest tip
In reply to Khem Raj--- meta-networking/recipes-connectivity/civetweb/civetweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/civetweb/civetweb_git.bb +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/civetweb/civetweb" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f28fdcba0dda735eed62bac6a397562" -SRCREV = "ce8f6d38a60eb16c996afee1e5340f76ef4d0923" +SRCREV = "6423faea4800f6cd4055750a7af2da85cdbe4e96" PV = "1.11+git${SRCPV}" SRC_URI = "git://github.com/civetweb/civetweb.git \ file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \
Signature · 1 line
2.24.1
PATCH 19/23 ruli: Define OOP_LIB_DIR and INSTALL_LIB_DIR
In reply to Khem RajThis helps in taking care of multilib install dir
--- meta-networking/recipes-support/ruli/ruli_0.36.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-support/ruli/ruli_0.36.bb +4 -1
@@ -19,7 +19,10 @@ SRC_URI[sha256sum] = "11d32def5b514748fbd9ea8c88049ae99e1bb358efc74eb91a4d268a39 B = "${S}" -EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" INSTALL_BASE_DIR="${D}${exec_prefix}"' +EXTRA_OEMAKE = 'CC="${CC}" OOP_BASE_DIR="${STAGING_EXECPREFIXDIR}" \ + INSTALL_BASE_DIR="${D}${exec_prefix}" \ + OOP_LIB_DIR=${STAGING_EXECPREFIXDIR}/${baselib} \ + INSTALL_LIB_DIR=${D}${libdir}' do_configure() { touch configure-stamp
Signature · 1 line
2.24.1
PATCH 20/23 liblightmodbus: Fix packaging errors when using multilib
In reply to Khem RajFixes
ERROR: liblightmodbus-2.0.2-r0 do_package: QA Issue: liblightmodbus: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/liblightmodbus.a
--- ...tallDirs-instead-of-hardcoding-lib-p.patch | 37 +++++++++++++++++++ .../liblightmodbus/liblightmodbus_2.0.2.bb | 4 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch
meta-oe/recipes-extended/liblightmodbus/liblightmodbus/0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 066c49158a71ea77598c9e1ae16bba63d6ac6bb5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 19 Dec 2019 23:41:35 -0800 +Subject: [PATCH] cmake: Use GNUInstallDirs instead of hardcoding lib path + +Upstream-Status: Submitted [https://github.com/Jacajack/liblightmodbus/pull/12] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ce6cc88..bee83aa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,14 +242,14 @@ if ( DEFINED AVR ) + ) + endif( ) + +- ++include(GNUInstallDirs) + #Installation + install( + TARGETS lightmodbus +- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/" + ) + + #Install headers + install( + DIRECTORY "${CMAKE_SOURCE_DIR}/include/" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/" FILES_MATCHING PATTERN "*.h" +-) +\ No newline at end of file ++) +-- +2.24.1 +
meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb +3 -1
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit cmake pkgconfig -SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https" +SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https \ + file://0001-cmake-Use-GNUInstallDirs-instead-of-hardcoding-lib-p.patch \ + " SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81" S = "${WORKDIR}/git"
Signature · 1 line
2.24.1
PATCH 21/23 ostree: Fix packaging errors when using lib64 libdir
In reply to Khem RajFixes
ERROR: ostree-2019.6-r0 do_package: QA Issue: ostree: Files/directories were installed but not shipped in any package:
/usr/lib/ostree/ostree-prepare-root
/usr/lib/ostree/ostree-remount
--- meta-oe/recipes-extended/ostree/ostree_2019.6.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta-oe/recipes-extended/ostree/ostree_2019.6.bb +3 -2
@@ -117,7 +117,7 @@ FILES_${PN} = " \ ${bindir}/rofiles-fuse \ ${datadir}/${BPN} \ ${datadir}/gir-1.0 \ - ${libdir}/${BPN}/ostree-remount \ + ${nonarch_libdir}/${BPN}/ostree-remount \ ${libdir}/girepository-1.0 \ ${libdir}/lib*${SOLIBS} \ ${libdir}/ostree/ostree-grub-generator \
@@ -127,6 +127,7 @@ FILES_${PN} = " \ ${systemd_unitdir}/system/ostree-finalize-staged.path \ ${systemd_unitdir}/system/ostree-finalize-staged.service \ ${systemd_unitdir}/system/ostree-remount.service \ + ${nonarch_libdir}/tmpfiles.d \ " FILES_${PN}-dracut = " \ ${sysconfdir}/dracut.conf.d \
@@ -141,7 +142,7 @@ FILES_${PN}-mkinitcpio = " \ ${libdir}/initcpio \ " FILES_${PN}-switchroot = " \ - ${libdir}/ostree/ostree-prepare-root \ + ${nonarch_libdir}/ostree/ostree-prepare-root \ ${systemd_unitdir}/system/ostree-prepare-root.service \ " FILES_${PN}-trivial-httpd = " \
Signature · 1 line
2.24.1
PATCH 22/23 boinc-client: Use nonarch_libdir for systemd_units
In reply to Khem Raj--- meta-oe/recipes-extended/boinc/boinc-client_7.16.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/boinc/boinc-client_7.16.bb +7 -4
@@ -74,11 +74,14 @@ do_compile_prepend () { sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/${TARGET_SYS}-libtool } do_install_append() { - if [ -e ${D}${libdir}/systemd/system/boinc-client.service ]; then - install -D -m 0644 \ - ${D}${libdir}/systemd/system/boinc-client.service \ + if [ -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service ]; then + install -d ${D}${systemd_system_unitdir} + mv \ + ${D}${nonarch_libdir}/systemd/system/boinc-client.service \ ${D}${systemd_system_unitdir}/boinc-client.service - rm -rf ${D}${libdir}/systemd + rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/system \ + ${D}${nonarch_libdir}/systemd \ + ${D}${nonarch_libdir} fi }
Signature · 1 line
2.24.1
PATCH 23/23 spirv-tools: Fix multilib builds
In reply to Khem Raj--- ...STALL_LIBDIR-in-installed-CMake-file.patch | 35 +++++++++++++++++++ .../recipes-graphics/spir/spirv-tools_git.bb | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch new file +35 -0
@@ -0,0 +1,35 @@ +From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Fri, 20 Dec 2019 07:02:24 -0800 +Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files + +Upstream-Status: Submitted [https://github.com/google/effcee/pull/36] +Signed-off-by: Khem Raj <[email protected]> +--- + CMakeLists.txt | 1 + + effcee/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +--- a/external/effcee/CMakeLists.txt ++++ b/external/effcee/CMakeLists.txt +@@ -27,6 +27,7 @@ endif() + + include(cmake/setup_build.cmake) + include(cmake/utils.cmake) ++include(GNUInstallDirs) + + add_subdirectory(third_party) + add_subdirectory(effcee) +--- a/external/effcee/effcee/CMakeLists.txt ++++ b/external/effcee/effcee/CMakeLists.txt +@@ -14,8 +14,8 @@ install( + DESTINATION + include/effcee) + install(TARGETS effcee +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(EFFCEE_BUILD_TESTING) + add_executable(effcee-test
meta-oe/recipes-graphics/spir/spirv-tools_git.bb +2 -1
@@ -9,11 +9,12 @@ SECTION = "graphics" S = "${WORKDIR}/git" DEST_DIR = "${S}/external" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \ - file://0001-tools-lesspipe-Allow-generic-shell.patch \ git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \ git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \ git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \ git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \ + file://0001-tools-lesspipe-Allow-generic-shell.patch \ + file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \ " SRCREV_spirv-tools = "167f1270a9ee641b17c016a545741e4aadfabe86" SRCREV_spirv-headers = "4618b86e9e4b027a22040732dfee35e399cd2c47"
Signature · 1 line
2.24.1