Makefile: Fix for 'make distcheck'
Phil Sutter
reviewerPATCH 1/1 Makefile: Fix for 'make distcheck'
Make sure the files in tools/ are added to the tarball and that the created nftables.service file is removed upon 'make clean'.
--- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+)
Makefile.am +4 -0
@@ -409,8 +409,12 @@ EXTRA_DIST += \ EXTRA_DIST += \ files \ tests \ + tools/nftables.service.8 \ + tools/nftables.service.in \ $(NULL) +CLEANFILES += tools/nftables.service + AM_TESTS_ENVIRONMENT = RUN_FULL_TESTSUITE=1; export RUN_FULL_TESTSUITE; TESTS = tests/json_echo/run-test.py \ tests/monitor/run-tests.sh \
Signature · 1 line
2.51.0
Quoted 5 lines · Phil Sutter
Make sure the files in
tools/are added to the tarball and that the created nftables.service file is removed upon 'make clean'.Fixes c4b17cf830510 ("tools: add a systemd unit for static rulesets")Signed-off-by Phil Sutter <[email protected]>
Thanks
Pablo Neira Ayuso
maintainerQuoted 8 lines · Pablo Neira Ayuso
Quoted 5 lines · Phil Sutter
Make sure the files in
tools/are added to the tarball and that the created nftables.service file is removed upon 'make clean'.Fixes c4b17cf830510 ("tools: add a systemd unit for static rulesets")Signed-off-by Phil Sutter <[email protected]>Reviewed-by Pablo Neira Ayuso <[email protected]>
I was preparing the release, however, this fix is not enough.
When I run:
make distcheck
/usr/bin/mkdir -p '/lib/systemd/system'
/usr/bin/install -c -m 644 tools/nftables.service '/lib/systemd/system'/usr/bin/install: cannot create regular file '/lib/systemd/system/nftables.service': Permission denied
This is not regarding the _inst directory, ie. nftables-x.y.z/_inst/ that make distcheck creates as non-root.
This needs a fix.
Quoted 10 lines · Pablo Neira Ayuso
Quoted 4 lines · Pablo Neira Ayuso
Quoted 3 lines · Phil Sutter
Make sure the files in
tools/are added to the tarball and that the created nftables.service file is removed upon 'make clean'.make distcheck
/usr/bin/install: cannot create regular file '/lib/systemd/system/nftables.service': Permission deniedThis needs a fix.
I encountered this previously in other software and know a pattern; let me cook up a concrete patch .
PATCH 1/1 build: make `make distcheck` succeed in the face of absolute paths
make distcheck has an expectation that, if only --prefix is specified, all other potentially-configurable paths are somehow relative to '${prefix}', e.g. bindir defaults to '${prefix}/bin'.
We get an absolute path from $(pkg-config systemd ...) at all times in case systemd.pc is present, and an empty path in case it is not, which collides with the aforementioned expectation two ways. Add an internal --with-dcprefix configure option for the sake of distcheck.
--- Makefile.am | 1 + configure.ac | 5 +++++ 2 files changed, 6 insertions(+)
Makefile.am +1 -0
@@ -23,6 +23,7 @@ libnftables_LIBVERSION = 2:0:1 ############################################################################### ACLOCAL_AMFLAGS = -I m4 +AM_DISTCHECK_CONFIGURE_FLAGS = --with-dcprefix='$${prefix}' EXTRA_DIST = BUILT_SOURCES =
configure.ac +5 -0
@@ -122,6 +122,11 @@ AC_ARG_WITH([unitdir], AS_IF([test -z "$unitdir"], [unitdir='${prefix}/lib/systemd/system']) ]) AC_SUBST([unitdir]) +AC_ARG_WITH([dcprefix], + [AS_HELP_STRING([Extra path inserted for distcheck])], + [dcprefix="$withval"]) +AC_SUBST([dcprefix]) +AS_IF([test -z "$unitdir"], [unitdir='${prefix}/lib/systemd/system'], [unitdir='${dcprefix}'"$unitdir"]) AC_CONFIG_FILES([ \
Signature · 1 line
2.51.0
Pablo Neira Ayuso
maintainerRe: [PATCH] build: make `make distcheck` succeed in the face of absolute paths
Quoted 8 lines · Jan Engelhardt
make distcheckhas an expectation that, if only --prefix is specified, all other potentially-configurable paths are somehow relative to '${prefix}', e.g. bindir defaults to '${prefix}/bin'.We get an absolute path from $(pkg-config systemd ...) at all times in case systemd.pc is present, and an empty path in case it is not, which collides with the aforementioned expectation two ways. Add an internal --with-dcprefix configure option for the sake of distcheck.
Subtle internal detail is exposed:
nft configuration:
cli support: editline
enable debugging symbols: yes
use mini-gmp: no
enable man page: yes
libxtables support: no
json output support: no
systemd unit: ${dcprefix}/lib/systemd/system
^---------^When running ./configure on the extracted tarball file.
I modified your patch to expose the systemd unit: file to provide a hint that service file is being installed.
Any suggestion to refine this?
Quoted 36 lines
--- Makefile.am | 1 + configure.ac | 5 +++++ 2 files changed, 6 insertions(+)Makefile.am +1
-0@@ -23,6 +23,7 @@ libnftables_LIBVERSION = 2:0:1 ############################################################################### ACLOCAL_AMFLAGS = -I m4 +AM_DISTCHECK_CONFIGURE_FLAGS = --with-dcprefix='$${prefix}' EXTRA_DIST = BUILT_SOURCES =configure.ac +5
-0@@ -122,6 +122,11 @@ AC_ARG_WITH([unitdir], AS_IF([test -z "$unitdir"], [unitdir='${prefix}/lib/systemd/system']) ]) AC_SUBST([unitdir]) +AC_ARG_WITH([dcprefix], + [AS_HELP_STRING([Extra path inserted for distcheck])], + [dcprefix="$withval"]) +AC_SUBST([dcprefix]) +AS_IF([test -z "$unitdir"], [unitdir='${prefix}/lib/systemd/system'], [unitdir='${dcprefix}'"$unitdir"]) AC_CONFIG_FILES([ \Signature · 1 line
2.51.0
Re: [PATCH] build: make `make distcheck` succeed in the face of absolute paths
Quoted 13 lines · Pablo Neira Ayuso
Quoted 8 lines · Jan Engelhardt
make distcheckhas an expectation that, if only --prefix is specified, all other potentially-configurable paths are somehow relative to '${prefix}', e.g. bindir defaults to '${prefix}/bin'.We get an absolute path from $(pkg-config systemd ...) at all times in case systemd.pc is present, and an empty path in case it is not, which collides with the aforementioned expectation two ways. Add an internal --with-dcprefix configure option for the sake of distcheck.
Subtle internal detail is exposed:
nft configuration:
Quoted 8 lines
cli support: editline
enable debugging symbols: yes
use mini-gmp: no
enable man page: yes
libxtables support: no
json output support: no
systemd unit: ${dcprefix}/lib/systemd/system
^---------^That is unavoidable. Variables with paths are expected to be recursively expanded -- make will do that, sh won't.
And that is why you will see '${var}' when directly echoing from configure.ac. This is nothing specific to ${dcprefix}, you will also observe this when doing something as trivial as
# configure.ac
echo "bindir: ${bindir}"
AC_OUTPUTPhil Sutter
reviewerRe: [PATCH] build: make `make distcheck` succeed in the face of absolute paths
In reply to Jan EngelhardtQuoted 30 lines · Jan Engelhardt
make distcheckhas an expectation that, if only --prefix is specified, all other potentially-configurable paths are somehow relative to '${prefix}', e.g. bindir defaults to '${prefix}/bin'.We get an absolute path from $(pkg-config systemd ...) at all times in case systemd.pc is present, and an empty path in case it is not, which collides with the aforementioned expectation two ways. Add an internal --with-dcprefix configure option for the sake of distcheck.
--- Makefile.am | 1 + configure.ac | 5 +++++ 2 files changed, 6 insertions(+)Makefile.am +1
-0@@ -23,6 +23,7 @@ libnftables_LIBVERSION = 2:0:1 ############################################################################### ACLOCAL_AMFLAGS = -I m4 +AM_DISTCHECK_CONFIGURE_FLAGS = --with-dcprefix='$${prefix}' EXTRA_DIST = BUILT_SOURCES =configure.ac +0
-0
configure.ac AC_ARG_WITH([unitdir], · line 129
Quoted 8 lines
configure.ac +5
-0@@ -122,6 +122,11 @@ AC_ARG_WITH([unitdir], AS_IF([test -z "$unitdir"], [unitdir='${prefix}/lib/systemd/system']) ]) AC_SUBST([unitdir]) +AC_ARG_WITH([dcprefix], + [AS_HELP_STRING([Extra path inserted for distcheck])], + [dcprefix="$withval"]) +AC_SUBST([dcprefix]) +AS_IF([test -z "$unitdir"], [unitdir='${prefix}/lib/systemd/system'], [unitdir='${dcprefix}'"$unitdir"])
Shouldn't this test for '-z "$dcprefix"'?
Cheers, Phil
Phil Sutter
reviewerQuoted 5 lines · Phil Sutter
Make sure the files in
tools/are added to the tarball and that the created nftables.service file is removed upon 'make clean'.Fixes c4b17cf830510 ("tools: add a systemd unit for static rulesets")Signed-off-by Phil Sutter <[email protected]>
Patch applied.