mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-21 09:51:00 +00:00
networkmanager: fix Files/directories were installed but not shipped
Since networkmanager: upgrade 1.22.10 -> 1.22.14, it added a new build option 'firewalld-zone', while enabling multilib, there is a QA issue ... ERROR: QA Issue: networkmanager: Files/directories were installed but not shipped in any package: /usr/lib/firewalld /usr/lib/firewalld/zones /usr/lib/firewalld/zones/nm-shared.xml ... Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
74f2b5780d
commit
f500029f3c
@ -0,0 +1,30 @@
|
||||
From 6388b16b93ba805f8877a94f47509f701250812f Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Mon, 6 Jul 2020 19:33:54 -0700
|
||||
Subject: [PATCH] install firewalld to var-libdir rather than hardcod lib
|
||||
|
||||
The oe install firewalld (split packages) to ${libdir}/firewalld/zones
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 358b01a..5745339 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -4778,7 +4778,7 @@ data/server.conf: $(srcdir)/data/server.conf.in
|
||||
$(AM_V_GEN) $(data_edit) $< >$@
|
||||
|
||||
if WITH_FIREWALLD_ZONE
|
||||
-firewalldzonedir = $(prefix)/lib/firewalld/zones
|
||||
+firewalldzonedir = $(libdir)/firewalld/zones
|
||||
firewalldzone_DATA = data/nm-shared.xml
|
||||
endif
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -26,6 +26,7 @@ SRC_URI = " \
|
||||
file://${BPN}.initd \
|
||||
file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
|
||||
file://0002-Do-not-create-settings-settings-property-documentati.patch \
|
||||
file://0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \
|
||||
"
|
||||
SRC_URI_append_libc-musl = " \
|
||||
file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user