fix(release): maintain dracut-version.sh in the source tree

Update dracut-version.sh as part of release generation.

diff --git a/.gitignore b/.gitignore
index 9bb2b556a442c016c42cbe7262519baa4a0c3a40..8404b7a9f3463d0053d8349418f005f6903500ac 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@
 test*.img
 /.buildpath
 /.project
-/dracut-version.sh
 /src/install/dracut-install
 /*.rpm
 /*.[0-9]

diff --git a/Makefile b/Makefile
index 69cb31f7a610fa4901e197acbbf44d5795d1e6ea..333cd68d6e0221a28da18c22290f7cc699280c33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,9 @@ man8pages = man/dracut.8 \
 
 manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
 
-.PHONY: install clean archive testimage test all check AUTHORS CONTRIBUTORS doc dracut-version.sh
+.PHONY: install clean archive testimage test all check AUTHORS CONTRIBUTORS doc
 
-all: dracut-version.sh dracut.pc dracut-install src/skipcpio/skipcpio dracut-util
+all: dracut.pc dracut-install src/skipcpio/skipcpio dracut-util
 
 %.o : %.c
        $(CC) -c $(CFLAGS) $(CPPFLAGS) $(KMOD_CFLAGS) $< -o $@
@@ -218,10 +218,6 @@ endif
        mkdir -p $(DESTDIR)${pkgconfigdatadir}
        install -m 0644 dracut.pc $(DESTDIR)${pkgconfigdatadir}/dracut.pc
 
-dracut-version.sh:
-       @rm -f dracut-version.sh
-       @printf "#!/bin/sh\n# shellcheck disable=SC2034\nDRACUT_VERSION=%s\n" "$(DRACUT_FULL_VERSION)" > dracut-version.sh
-
 clean:
        $(RM) *~
        $(RM) */*~
@@ -229,7 +225,6 @@ clean:
        $(RM) $(manpages:%=%.xml) dracut.xml
        $(RM) test-*.img
        $(RM) dracut-*.tar.bz2 dracut-*.tar.xz
-       $(RM) dracut-version.sh
        $(RM) dracut-install src/install/dracut-install $(DRACUT_INSTALL_OBJECTS)
        $(RM) skipcpio/skipcpio $(SKIPCPIO_OBJECTS)
        $(RM) dracut-util util/util $(UTIL_OBJECTS)
@@ -241,10 +236,9 @@ clean:
 dist: dracut-$(DRACUT_MAIN_VERSION).tar.xz
 
 dracut-$(DRACUT_MAIN_VERSION).tar.xz: doc syncheck
-       @echo "DRACUT_VERSION=$(DRACUT_MAIN_VERSION)" > dracut-version.sh
        git archive --format=tar $(DRACUT_MAIN_VERSION) --prefix=dracut-$(DRACUT_MAIN_VERSION)/ > dracut-$(DRACUT_MAIN_VERSION).tar
        mkdir -p dracut-$(DRACUT_MAIN_VERSION)
-       for i in $(manpages) dracut.html dracut-version.sh; do [ "$${i%/*}" != "$$i" ] && mkdir -p "dracut-$(DRACUT_MAIN_VERSION)/$${i%/*}"; cp "$$i" "dracut-$(DRACUT_MAIN_VERSION)/$$i"; done
+       for i in $(manpages) dracut.html; do [ "$${i%/*}" != "$$i" ] && mkdir -p "dracut-$(DRACUT_MAIN_VERSION)/$${i%/*}"; cp "$$i" "dracut-$(DRACUT_MAIN_VERSION)/$$i"; done
        tar --owner=root --group=root -rf dracut-$(DRACUT_MAIN_VERSION).tar $$(find dracut-$(DRACUT_MAIN_VERSION) -type f)
        rm -fr -- dracut-$(DRACUT_MAIN_VERSION).tar.xz dracut-$(DRACUT_MAIN_VERSION)
        xz -9 dracut-$(DRACUT_MAIN_VERSION).tar

diff --git a/dracut-version.sh b/dracut-version.sh
new file mode 100755 (executable)
index 0000000..a626907
--- /dev/null
+++ b/dracut-version.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# shellcheck disable=SC2034
+DRACUT_VERSION=059

diff --git a/tools/release.sh b/tools/release.sh
index 05527c3b32f681630efaa13a6822cf89dd3d24c7..b6f78266ce54ff5f9c4200bc8c7362b33aa43292 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -41,10 +41,13 @@ cat NEWS_header.md NEWS_header_new.md NEWS_body_new.md NEWS_body_with_conttribut
 # message for https://github.com/dracutdevs/dracut/releases/tag
 cat -s NEWS_body_new.md CONTRIBUTORS.md > release.md
 
+# dracut-version.sh
+printf "#!/bin/sh\n# shellcheck disable=SC2034\nDRACUT_VERSION=%s\n" "$NEW_VERSION" > dracut-version.sh
+
 # Check in AUTHORS and NEWS.md
 git config user.name "Dracut Release Bot"
 git config user.email "<>"
-git commit -m "docs: update NEWS.md and AUTHORS" NEWS.md AUTHORS
+git commit -m "docs: update NEWS.md and AUTHORS" NEWS.md AUTHORS dracut-version.sh
 git push origin master
 git tag "$NEW_VERSION" -m "$NEW_VERSION"
 git push --tags