From c56a3b6c1124ae4fd9497ea98f9afc9e48d4cbad Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 24 Oct 2018 21:05:29 +0200 Subject: [PATCH 1/4] build: unconditionally dist ibft test files Even if ibft support is disabled, test files should be included in distribution. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/65 (cherry picked from commit bc6071aed696f8c2dccb60dc080e18b6863df45f) --- Makefile.am | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1e100f603b..ef03027bde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2392,6 +2392,13 @@ src_settings_plugins_ibft_tests_test_ibft_LDADD = \ $(src_settings_plugins_ibft_tests_test_ibft_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la + $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) + +check_local += check-local-symbols-settings-ibft + +endif + EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ src/settings/plugins/ibft/tests/iscsiadm-test-static \ @@ -2401,16 +2408,7 @@ EXTRA_DIST += \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \ src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ - src/settings/plugins/ibft/tests/iscsiadm-test-vlan - -check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so) - -check_local += check-local-symbols-settings-ibft - -endif - -EXTRA_DIST += \ + src/settings/plugins/ibft/tests/iscsiadm-test-vlan \ src/settings/plugins/ibft/meson.build \ src/settings/plugins/ibft/tests/meson.build From dd76fe3ccd435491a7f07fe5f44c3d3bcd00bec5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Oct 2018 21:34:36 +0200 Subject: [PATCH 2/4] build: fix build_clean.sh script to enable ibft autotools build has/had a bug, where ibft test files would only be disted if the ibft plugin was enabled. Regardless of that, `build_clean.sh --release` is our suggested way to create a release tarball. It should always enable the ibft plugin. It didn't do so, due to a bug. (cherry picked from commit b660a41c7c3d77aa122b92b93dcd0624470f3301) --- contrib/fedora/rpm/build_clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh index 4ceedf40ac..c486be5129 100755 --- a/contrib/fedora/rpm/build_clean.sh +++ b/contrib/fedora/rpm/build_clean.sh @@ -151,7 +151,7 @@ if [[ $NO_DIST != 1 ]]; then --with-libnm-glib \ --enable-ifcfg-rh \ --enable-ifupdown \ - --enable-ibft \ + --enable-config-plugin-ibft \ --with-config-logging-backend-default=syslog \ --with-libaudit=yes-disabled-by-default \ --enable-polkit=yes \ From 036d49b39802296ea66ceebd58f7ac2afc0d82b7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Oct 2018 21:43:07 +0200 Subject: [PATCH 3/4] build: enable ibft plugin for make dist-check (cherry picked from commit 0677b51549cc29e487f7bee2dd7614780aed8a7d) --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ef03027bde..41cb711eca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,7 +167,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --disable-dependency-tracking + --enable-config-plugin-ibft \ + --disable-dependency-tracking \ + $(NULL) dist-configure-check: @echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection --with-libnm-glib'. ***" From 3d7b6ac8f95c8720a804ebf72273a5e05b444c73 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 24 Oct 2018 22:10:31 +0200 Subject: [PATCH 4/4] build: fix ibft option in create-exports-NetworkManager.sh (cherry picked from commit 1408ffd9f6b60e4ac40802c1d923a2ab8bfdfe3f) --- tools/create-exports-NetworkManager.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh index 3c5789d884..375141aa9d 100755 --- a/tools/create-exports-NetworkManager.sh +++ b/tools/create-exports-NetworkManager.sh @@ -19,7 +19,7 @@ die() { _build() { git clean -fdx ./autogen.sh --enable-ld-gc --enable-ifcfg-rh --enable-ifupdown \ - --enable-ibft --enable-teamdctl --enable-wifi \ + --enable-config-plugin-ibft --enable-teamdctl --enable-wifi \ --with-modem-manager-1 --with-ofono --with-more-asserts \ --with-more-logging make -j20