diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2020-07-06 19:43:22 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-07-07 11:02:13 -0700 |
| commit | f500029f3c488b8873c3f006e78bbb930fbe56a0 (patch) | |
| tree | 464870a66cd584362fe493793ca4453281e0fc70 /meta-networking | |
| parent | 74f2b5780dd29b9128be8b24208daa859b08e706 (diff) | |
| download | meta-openembedded-f500029f3c488b8873c3f006e78bbb930fbe56a0.tar.gz | |
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>
Diffstat (limited to 'meta-networking')
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch new file mode 100644 index 0000000000..11741897f6 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-install-firewalld-to-var-libdir-rather-than-hardcod-.patch @@ -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 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb index 30c6ebe6ff..5eb2aefa77 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb @@ -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 \ |