]> git.ipfire.org Git - thirdparty/dracut.git/blobdiff - Makefile
feat: also restore the initramfs from /lib/modules
[thirdparty/dracut.git] / Makefile
index a031440c25591c411b696fc7cf72b3e8a5c3ddcf..a438b8b9e23f539420fcffa503b4f598eebd195e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,9 @@ ifeq ($(DRACUT_FULL_VERSION),)
 DRACUT_FULL_VERSION = $(DRACUT_VERSION)
 endif
 
+HAVE_SHELLCHECK ?= $(shell which shellcheck >/dev/null 2>&1 && echo yes)
 HAVE_SHFMT ?= $(shell which shfmt >/dev/null  2>&1 && echo yes)
+HAVE_RPMBUILD ?= $(shell which rpmbuild >/dev/null  2>&1 && echo yes)
 
 -include Makefile.inc
 
@@ -26,18 +28,16 @@ CFLAGS ?= -O2 -g -Wall -std=gnu99 -D_FILE_OFFSET_BITS=64 -Wformat -Werror=format
 bashcompletiondir ?= ${datadir}/bash-completion/completions
 pkgconfigdatadir ?= $(datadir)/pkgconfig
 
-man1pages = lsinitrd.1
+man1pages = man/lsinitrd.1
 
-man5pages = dracut.conf.5
+man5pages = man/dracut.conf.5
 
-man7pages = dracut.cmdline.7 \
-            dracut.bootup.7 \
-            dracut.modules.7
+man7pages = man/dracut.cmdline.7 \
+            man/dracut.bootup.7 \
+            man/dracut.modules.7
 
-man8pages = dracut.8 \
-            dracut-catimages.8 \
-            mkinitrd.8 \
-            mkinitrd-suse.8 \
+man8pages = man/dracut.8 \
+            man/dracut-catimages.8 \
             modules.d/98dracut-systemd/dracut-cmdline.service.8 \
             modules.d/98dracut-systemd/dracut-initqueue.service.8 \
             modules.d/98dracut-systemd/dracut-mount.service.8 \
@@ -51,7 +51,7 @@ manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
 
 .PHONY: install clean archive rpm srpm testimage test all check AUTHORS CONTRIBUTORS doc dracut-version.sh
 
-all: dracut-version.sh dracut.pc dracut-install skipcpio/skipcpio dracut-util
+all: dracut-version.sh dracut.pc dracut-install src/skipcpio/skipcpio dracut-util
 
 %.o : %.c
        $(CC) -c $(CFLAGS) $(CPPFLAGS) $(KMOD_CFLAGS) $< -o $@
@@ -75,25 +75,29 @@ install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h ins
 install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
        $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(FTS_LIBS) $(KMOD_LIBS)
 
-logtee: logtee.c
+logtee: src/logtee/logtee.c
        $(CC) $(LDFLAGS) -o $@ $<
 
 dracut-install: install/dracut-install
        ln -fs $< $@
 
-SKIPCPIO_OBJECTS = skipcpio/skipcpio.o
-skipcpio/skipcpio.o: skipcpio/skipcpio.c
+SKIPCPIO_OBJECTS = src/skipcpio/skipcpio.o
+skipcpio/skipcpio.o: src/skipcpio/skipcpio.c
 skipcpio/skipcpio: $(SKIPCPIO_OBJECTS)
 
-UTIL_OBJECTS = util/util.o
-util/util.o: util/util.c
+UTIL_OBJECTS = src/util/util.o
+util/util.o: src/util/util.c
 util/util: $(UTIL_OBJECTS)
 
-dracut-util: util/util
+dracut-util: src/util/util
        cp -a $< $@
 
-indent:
-       indent -i8 -nut -br -linux -l120 $(wildcard *.[ch] */*.[ch])
+.PHONY: indent-c
+indent-c:
+       astyle -n --quiet --options=.astylerc $(wildcard *.[ch] */*.[ch] src/*/*.[ch])
+
+.PHONY: indent
+indent: indent-c
 ifeq ($(HAVE_SHFMT),yes)
        shfmt -w -s .
 endif
@@ -112,14 +116,15 @@ endif
        @rm -f -- "$@"
        asciidoc -a "version=$(DRACUT_FULL_VERSION)" -d manpage -b docbook -o "$@" $<
 
-dracut.8: dracut.usage.asc dracut.8.asc
+dracut.8: man/dracut.8.asc \
+       man/dracut.usage.asc
 
-dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
+dracut.html: man/dracut.asc $(manpages) dracut.css man/dracut.usage.asc
        @rm -f -- dracut.xml
        asciidoc -a "mainversion=$(DRACUT_MAIN_VERSION)" \
                -a "version=$(DRACUT_FULL_VERSION)" \
                -a numbered \
-               -d book -b docbook -o dracut.xml dracut.asc
+               -d book -b docbook -o dracut.xml man/dracut.asc
        @rm -f -- dracut.html
        xsltproc -o dracut.html --xinclude -nonet \
                --stringparam custom.css.source dracut.css \
@@ -143,7 +148,6 @@ install: all
        mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
        install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
        install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
-       install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
        install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
        install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
        mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
@@ -186,24 +190,24 @@ endif
        if [ -f install/dracut-install ]; then \
                install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
        fi
-       if [ -f skipcpio/skipcpio ]; then \
-               install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
+       if [ -f src/skipcpio/skipcpio ]; then \
+               install -m 0755 src/skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
        fi
        if [ -f dracut-util ]; then \
                install -m 0755 dracut-util $(DESTDIR)$(pkglibdir)/dracut-util; \
        fi
        mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
-       install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
-       install -m 0755 51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
+       install -m 0755 install.d/50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
+       install -m 0755 install.d/51-dracut-rescue.install $(DESTDIR)${prefix}/lib/kernel/install.d/51-dracut-rescue.install
        mkdir -p $(DESTDIR)${bashcompletiondir}
-       install -m 0644 dracut-bash-completion.sh $(DESTDIR)${bashcompletiondir}/dracut
-       install -m 0644 lsinitrd-bash-completion.sh $(DESTDIR)${bashcompletiondir}/lsinitrd
+       install -m 0644 shell-completion/bash/dracut $(DESTDIR)${bashcompletiondir}/dracut
+       install -m 0644 shell-completion/bash/lsinitrd $(DESTDIR)${bashcompletiondir}/lsinitrd
        mkdir -p $(DESTDIR)${pkgconfigdatadir}
        install -m 0644 dracut.pc $(DESTDIR)${pkgconfigdatadir}/dracut.pc
 
 dracut-version.sh:
        @rm -f dracut-version.sh
-       @echo "DRACUT_VERSION=$(DRACUT_FULL_VERSION)" > dracut-version.sh
+       @printf "#!/bin/sh\n# shellcheck disable=SC2034\nDRACUT_VERSION=%s\n" "$(DRACUT_FULL_VERSION)" > dracut-version.sh
 
 clean:
        $(RM) *~
@@ -232,10 +236,11 @@ dracut-$(DRACUT_MAIN_VERSION).tar.xz: doc syncheck
        xz -9 dracut-$(DRACUT_MAIN_VERSION).tar
        rm -f -- dracut-$(DRACUT_MAIN_VERSION).tar
 
+ifeq ($(HAVE_RPMBUILD),yes)
 rpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
        rpmbuild=$$(mktemp -d -p /var/tmp rpmbuild-dracut.XXXXXX); src=$$(pwd); \
        cp dracut-$(DRACUT_MAIN_VERSION).tar.xz "$$rpmbuild"; \
-       LC_MESSAGES=C $$src/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+       LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
        (cd "$$rpmbuild"; \
        wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
        rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
@@ -246,13 +251,18 @@ rpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
 srpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
        rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
        cp dracut-$(DRACUT_MAIN_VERSION).tar.xz "$$rpmbuild"; \
-       LC_MESSAGES=C $$src/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+       LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
        (cd "$$rpmbuild"; \
        [ -f $$src/lgpl-2.1.txt ] && cp $$src/lgpl-2.1.txt . || wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
        rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
                --define "_specdir $$PWD" --define "_srcrpmdir $$PWD" \
                --define "_rpmdir $$PWD" -bs dracut.spec; ) && \
        ( mv "$$rpmbuild"/*.src.rpm $(DESTDIR).; rm -fr -- "$$rpmbuild"; ls $(DESTDIR)*.rpm )
+else
+.PHONY: rpm srpm
+rpm: syncheck
+srpm: syncheck
+endif
 
 syncheck:
        @ret=0;for i in dracut-initramfs-restore.sh modules.d/*/*.sh; do \
@@ -262,10 +272,16 @@ syncheck:
                [ $$V ] && echo "checking for [[: $$i"; if grep -Fq '[[ ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains [["; fi; \
                [ $$V ] && echo "checking for echo -n: $$i"; if grep -Fq 'echo -n ' "$$i" ; then ret=$$(($$ret+1)); echo "$$i contains echo -n"; fi \
        done;exit $$ret
-       @ret=0;for i in *.sh mkinitrd-dracut.sh modules.d/*/*.sh \
-                       modules.d/*/module-setup.sh; do \
+       @ret=0;for i in *.sh modules.d/*/*.sh modules.d/*/module-setup.sh; do \
                [ $$V ] && echo "bash syntax check: $$i"; bash -n "$$i" ; ret=$$(($$ret+$$?)); \
        done;exit $$ret
+ifeq ($(HAVE_SHELLCHECK),yes)
+ifeq ($(HAVE_SHFMT),yes)
+       shellcheck $$(shfmt -f .)
+else
+       find . -name '*.sh' -print0 | xargs -0 shellcheck
+endif
+endif
 
 check: all syncheck rpm
        @[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }