[oe,meta-oe,08/23] fluentbit: Fix packaging in multilib env

Message ID	20191221000635.1573390-8-raj.khem@gmail.com
State	Accepted
Commit	99fe1dec83456100e0bc1c02581defa7aaf04a16
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; From: Khem Raj <raj.khem@gmail.com> To: openembedded-devel@lists.openembedded.org Date: Fri, 20 Dec 2019 16:06:20 -0800 Message-Id: <20191221000635.1573390-8-raj.khem@gmail.com> In-Reply-To: <20191221000635.1573390-1-raj.khem@gmail.com> References: <20191221000635.1573390-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 08/23] fluentbit: Fix packaging in multilib env Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org
Series	[oe,meta-networking,01/23] cannelloni: Update to latest and fix multilib builds \| expand [oe,meta-networking,01/23] cannelloni: Update to latest and fix multilib builds [oe,meta-oe,02/23] nvme-cli: Use nonarch libdir for dracut config files [oe,meta-oe,03/23] cli11: Fix multilib build [oe,meta-oe,04/23] lockdev: Make baselib configurable [oe,meta-oe,05/23] avro-c: Update to 1.9.1 [oe,meta-networking,06/23] nftables: Package python scripts into nonarch libdir [oe,meta-oe,07/23] mercurial: Add python scripts into separate python package [oe,meta-oe,08/23] fluentbit: Fix packaging in multilib env [oe,meta-multimedia,09/23] dcadec: Define BASELIB as a knob [oe,meta-oe,10/23] dbus-broker: Use nonarch_libdir for systemd catalog files [oe,meta-oe,11/23] websocketapp: Fix multilib build [oe,meta-oe,12/23] ade: Fix install paths in multilib builds [oe,meta-oe,13/23] thrift: Upgrade to 0.13 [oe,meta-oe,14/23] gattlib: Update to latest tip [oe,meta-multimedia,15/23] rygel: Use nonarch_libdir for systemd units [oe,meta-networking,16/23] firewalld: Package firewalld files [oe,meta-oe,17/23] iwd: Package module conf files via nonarch_libdir [oe,meta-networking,18/23] civetweb: Upgrade to latest tip [oe,meta-networking,19/23] ruli: Define OOP_LIB_DIR and INSTALL_LIB_DIR [oe,meta-oe,20/23] liblightmodbus: Fix packaging errors when using multilib [oe,meta-oe,21/23] ostree: Fix packaging errors when using lib64 libdir [oe,meta-oe,22/23] boinc-client: Use nonarch_libdir for systemd_units [oe,meta-oe,23/23] spirv-tools: Fix multilib builds

Message ID

20191221000635.1573390-8-raj.khem@gmail.com

State

Accepted

Commit

99fe1dec83456100e0bc1c02581defa7aaf04a16

Headers

Received-SPF: pass (google.com: best guess record for domain of
	openembedded-devel-bounces@lists.openembedded.org designates
	140.211.169.62 as permitted sender) client-ip=140.211.169.62; 
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Date: Fri, 20 Dec 2019 16:06:20 -0800
Message-Id: <20191221000635.1573390-8-raj.khem@gmail.com>
In-Reply-To: <20191221000635.1573390-1-raj.khem@gmail.com>
References: <20191221000635.1573390-1-raj.khem@gmail.com>
MIME-Version: 1.0
Subject: [oe] [meta-oe][PATCH 08/23] fluentbit: Fix packaging in multilib env
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: openembedded-devel-bounces@lists.openembedded.org
Errors-To: openembedded-devel-bounces@lists.openembedded.org

Series

[oe,meta-networking,01/23] cannelloni: Update to latest and fix multilib builds | expand

Commit Message

Khem Raj Dec. 21, 2019, 12:06 a.m. UTC

Fixes
ERROR: fluentbit-0.12.19-r0 do_package: QA Issue: fluentbit: Files/directories were installed but not shipped in any package:
/usr/lib/libfluent-bit.so
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../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

-- 
2.24.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch
new file mode 100644
index 0000000000..8fe9f3e703
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch
@@ -0,0 +1,18 @@ 
+Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib path
+
+Helps build on platforms where libpaths are not lib/ but say lib64/
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -182,7 +182,7 @@ if(NOT FLB_WITHOUT_SHARED_LIB)
+     PROPERTIES OUTPUT_NAME fluent-bit)
+ 
+   # Library install routines
+-  install(TARGETS fluent-bit-shared LIBRARY DESTINATION lib)
++  install(TARGETS fluent-bit-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
+ 
+ # Static Library
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb
index e50aa71a9f..27b910b8be 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb
@@ -4,6 +4,7 @@  BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
 
 SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \
            file://jemalloc.patch \
+           file://cmake_multilib.patch \
            "
 SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34"
 SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241"

[oe,meta-oe,08/23] fluentbit: Fix packaging in multilib env

Commit Message

Patch