feat(Makefile): roll cleaninstall target into the install target

Now that cleaninstall is well tested by the CI, lets roll it into
the regulal install step to help with packaging.

diff --git a/Makefile b/Makefile
index d7e265e5c25f98923e08f8054b8e4ab81b8db978..ba928dab42cee5611e5beb07b00d18da67949079 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ man8pages = man/dracut.8 \
 
 manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
 
-.PHONY: install cleaninstall clean archive test all check AUTHORS CONTRIBUTORS doc
+.PHONY: install clean archive test all check AUTHORS CONTRIBUTORS doc
 
 all: dracut.pc dracut-install src/skipcpio/skipcpio dracut-util
 
@@ -227,8 +227,6 @@ endif
        install -m 0644 shell-completion/bash/lsinitrd $(DESTDIR)${bashcompletiondir}/lsinitrd
        mkdir -p $(DESTDIR)${pkgconfigdatadir}
        install -m 0644 dracut.pc $(DESTDIR)${pkgconfigdatadir}/dracut.pc
-
-cleaninstall: install
        if ! [ -n "$(systemdsystemunitdir)" ]; then \
                rm -rf $(DESTDIR)$(pkglibdir)/modules.d/*systemd* $(DESTDIR)$(mandir)/*.service.* ; \
                for i in bluetooth connman dbus* fido2 lvmmerge lvmthinpool-monitor memstrack network-manager pcsc pkcs11 rngd squash* tpm2-tss; do \

diff --git a/test/test-github.sh b/test/test-github.sh
index 6261ce5675bb897621e5ea55bd4ace8509fa3a3b..fb03cd0d8e28b35a632685da82ddf5f752515555 100755 (executable)
--- a/test/test-github.sh
+++ b/test/test-github.sh
@@ -19,4 +19,4 @@ export DRACUT=dracut
 
 # treat warnings as error
 # shellcheck disable=SC2086
-CFLAGS="-Wextra -Werror" make TEST_RUN_ID="${TEST_RUN_ID:=$1}" TESTS="${TESTS:=$2}" V="${V:=1}" ${TARGETS:=all install cleaninstall check}
+CFLAGS="-Wextra -Werror" make TEST_RUN_ID="${TEST_RUN_ID:=$1}" TESTS="${TESTS:=$2}" V="${V:=1}" ${TARGETS:=all install check}

diff --git a/test/test.sh b/test/test.sh
index 2c2fceda1770fb9be4c31c8ab8658a8156d1c8e3..7cff08ef4c6347a9ad67815739077776797b61a9 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -9,7 +9,6 @@ export CONTAINER="${CONTAINER:=$1}"
 export CONTAINER="${CONTAINER:=fedora}"
 export TESTS="${TESTS:=$2}"
 export TEST_RUN_ID="${TEST_RUN_ID:=id}"
-export DRACUT=dracut
 
 if command -v podman &> /dev/null; then
     PODMAN=podman
@@ -18,7 +17,7 @@ else
 fi
 
 # clear previous test run
-TARGETS='clean all install cleaninstall check' "$PODMAN" run --rm -it \
+TARGETS='clean all install check' "$PODMAN" run --rm -it \
     --device=/dev/kvm \
     -e V -e TESTS -e TEST_RUN_ID -e TARGETS -e DRACUT \
     -v "$PWD"/:/z \