From 6a6caa7b31873ec03f26322ffff5998db4b1076a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 17 Dec 2022 14:29:52 +0100 Subject: [PATCH] Do not build .sh scripts from .sh.in The build process only replaces @@MKLIVE_VERSION@@ with the correct version string. This can also be done by simply sourcing a version.sh file. This way it's simpler, avoids one unnecessary build step and people won't accidentally run an old version of a script. --- .gitignore | 1 - Makefile | 16 +++------------- README.md | 9 +-------- build-x86-images.sh.in => build-x86-images.sh | 6 +++++- installer.sh.in => installer.sh | 2 ++ lib.sh.in => lib.sh | 0 mkimage.sh.in => mkimage.sh | 4 +++- mklive.sh.in => mklive.sh | 5 ++++- mknet.sh.in => mknet.sh | 5 ++++- mkplatformfs.sh.in => mkplatformfs.sh | 4 +++- mkrootfs.sh.in => mkrootfs.sh | 4 +++- release.sh.in => release.sh | 2 -- version.sh | 4 ++++ 13 files changed, 32 insertions(+), 30 deletions(-) rename build-x86-images.sh.in => build-x86-images.sh (94%) mode change 100644 => 100755 rename installer.sh.in => installer.sh (99%) mode change 100644 => 100755 rename lib.sh.in => lib.sh (100%) mode change 100644 => 100755 rename mkimage.sh.in => mkimage.sh (99%) mode change 100644 => 100755 rename mklive.sh.in => mklive.sh (99%) mode change 100644 => 100755 rename mknet.sh.in => mknet.sh (99%) mode change 100644 => 100755 rename mkplatformfs.sh.in => mkplatformfs.sh (99%) mode change 100644 => 100755 rename mkrootfs.sh.in => mkrootfs.sh (99%) mode change 100644 => 100755 rename release.sh.in => release.sh (99%) mode change 100644 => 100755 create mode 100644 version.sh diff --git a/.gitignore b/.gitignore index fa64bc2..88e987c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.sh *.img *.xz *.iso diff --git a/Makefile b/Makefile index 2741014..09a420c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,4 @@ -GITVER := $(shell git rev-parse --short HEAD) -VERSION = 0.23 -SHIN += $(shell find -type f -name '*.sh.in') -SCRIPTS += $(SHIN:.sh.in=.sh) +SCRIPTS += $(shell find -type f -name '*.sh') DATECODE=$(shell date "+%Y%m%d") SHELL=/bin/bash @@ -30,14 +27,7 @@ SUDO := sudo XBPS_REPOSITORY := -r https://repo-default.voidlinux.org/current -r https://repo-default.voidlinux.org/current/musl -r https://repo-default.voidlinux.org/current/aarch64 COMPRESSOR_THREADS=2 -%.sh: %.sh.in - sed -e "s|@@MKLIVE_VERSION@@|$(VERSION) $(GITVER)|g" $^ > $@ - chmod +x $@ - -all: $(SCRIPTS) - -clean: - -rm -f *.sh +all: distdir-$(DATECODE): mkdir -p distdir-$(DATECODE) @@ -89,4 +79,4 @@ pxe-all-print: void-%-NETBOOT-$(DATECODE).tar.gz: $(SCRIPTS) void-%-ROOTFS-$(DATECODE).tar.xz $(SUDO) ./mknet.sh void-$*-ROOTFS-$(DATECODE).tar.xz -.PHONY: clean dist rootfs-all-print rootfs-all platformfs-all-print platformfs-all pxe-all-print pxe-all +.PHONY: all dist rootfs-all-print rootfs-all platformfs-all-print platformfs-all pxe-all-print pxe-all diff --git a/README.md b/README.md index d65cdf4..0f39b79 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,6 @@ This repository contains utilities for Void Linux: * mkrootfs (The Void Linux rootfs maker for ARM platforms) * mknet (Script to generate netboot tarballs for Void) -## Build Dependencies - * make - ## Dependencies * Compression type for the initramfs image * liblz4 (for lz4, xz) (default) @@ -22,11 +19,7 @@ This repository contains utilities for Void Linux: ## Usage -Type - - $ make - -and then see the usage output: +See the usage output: $ ./mklive.sh -h $ ./mkrootfs.sh -h diff --git a/build-x86-images.sh.in b/build-x86-images.sh old mode 100644 new mode 100755 similarity index 94% rename from build-x86-images.sh.in rename to build-x86-images.sh index 7914ab0..975f92d --- a/build-x86-images.sh.in +++ b/build-x86-images.sh @@ -90,7 +90,11 @@ if [ ! -x mklive.sh ]; then fi if [ -x installer.sh ]; then - install -Dm755 installer.sh "$INCLUDEDIR"/usr/bin/void-installer + . ./version.sh + installer=$(mktemp) + sed "s/@@MKLIVE_VERSION@@/${MKLIVE_VERSION}/" installer.sh > "$installer" + install -Dm755 "$installer" "$INCLUDEDIR"/usr/bin/void-installer + rm "$installer" else echo installer.sh not found >&2 exit 1 diff --git a/installer.sh.in b/installer.sh old mode 100644 new mode 100755 similarity index 99% rename from installer.sh.in rename to installer.sh index 558f20c..7a9d9ea --- a/installer.sh.in +++ b/installer.sh @@ -25,6 +25,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- +. ./version.sh + # Make sure we don't inherit these from env. SOURCE_DONE= HOSTNAME_DONE= diff --git a/lib.sh.in b/lib.sh old mode 100644 new mode 100755 similarity index 100% rename from lib.sh.in rename to lib.sh diff --git a/mkimage.sh.in b/mkimage.sh old mode 100644 new mode 100755 similarity index 99% rename from mkimage.sh.in rename to mkimage.sh index 264adc0..360d434 --- a/mkimage.sh.in +++ b/mkimage.sh @@ -25,6 +25,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- +. ./version.sh + readonly PROGNAME=$(basename "$0") readonly ARCH=$(uname -m) @@ -94,7 +96,7 @@ while getopts "b:B:o:r:s:x:h:V" opt; do r) ROOT_FSTYPE="$OPTARG";; s) IMGSIZE="$OPTARG";; x) COMPRESSOR_THREADS="$OPTARG" ;; - V) echo "$PROGNAME @@MKLIVE_VERSION@@"; exit 0;; + V) echo "$PROGNAME $MKLIVE_VERSION"; exit 0;; h) usage;; esac done diff --git a/mklive.sh.in b/mklive.sh old mode 100644 new mode 100755 similarity index 99% rename from mklive.sh.in rename to mklive.sh index add279f..2873eb8 --- a/mklive.sh.in +++ b/mklive.sh @@ -29,6 +29,8 @@ trap 'error_out $? $LINENO' INT TERM 0 umask 022 +. ./version.sh + readonly REQUIRED_PKGS="base-files libgcc dash coreutils sed tar gawk syslinux grub-i386-efi grub-x86_64-efi squashfs-tools xorriso" readonly INITRAMFS_PKGS="binutils xz device-mapper dhclient dracut-network openresolv" readonly PROGNAME=$(basename "$0") @@ -292,7 +294,7 @@ generate_iso_image() { # # main() # -while getopts "a:b:r:c:C:T:Kk:l:i:I:S:s:o:p:v:h" opt; do +while getopts "a:b:r:c:C:T:Kk:l:i:I:S:s:o:p:v:Vh" opt; do case $opt in a) BASE_ARCH="$OPTARG";; b) BASE_SYSTEM_PKG="$OPTARG";; @@ -310,6 +312,7 @@ while getopts "a:b:r:c:C:T:Kk:l:i:I:S:s:o:p:v:h" opt; do C) BOOT_CMDLINE="$OPTARG";; T) BOOT_TITLE="$OPTARG";; v) LINUX_VERSION="$OPTARG";; + V) echo "$PROGNAME $MKLIVE_VERSION"; exit 0 ;; h) usage;; *) usage;; esac diff --git a/mknet.sh.in b/mknet.sh old mode 100644 new mode 100755 similarity index 99% rename from mknet.sh.in rename to mknet.sh index e53bb52..e546036 --- a/mknet.sh.in +++ b/mknet.sh @@ -27,6 +27,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- +. ./version.sh + readonly PROGNAME=$(basename "$0") readonly REQTOOLS="xbps-install tar" @@ -77,7 +79,7 @@ _EOF # SCRIPT EXECUTION STARTS HERE # ######################################## -while getopts "r:c:C:T:K:i:o:k:l:h" opt; do +while getopts "r:c:C:T:K:i:o:k:l:Vh" opt; do case $opt in r) XBPS_REPOSITORY="--repository=$OPTARG $XBPS_REPOSITORY";; c) XBPS_CACHEDIR="--cachedir=$OPTARG";; @@ -89,6 +91,7 @@ while getopts "r:c:C:T:K:i:o:k:l:h" opt; do C) BOOT_CMDLINE="$OPTARG";; T) BOOT_TITLE="$OPTARG";; S) SPLASH_IMAGE="OPTARG";; + V) echo "$PROGNAME $MKLIVE_VERSION"; exit 0 ;; h) usage;; esac done diff --git a/mkplatformfs.sh.in b/mkplatformfs.sh old mode 100644 new mode 100755 similarity index 99% rename from mkplatformfs.sh.in rename to mkplatformfs.sh index 0f48dbb..5ddcbd0 --- a/mkplatformfs.sh.in +++ b/mkplatformfs.sh @@ -24,6 +24,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- +. ./version.sh + readonly PROGNAME=$(basename "$0") readonly ARCH=$(uname -m) readonly REQTOOLS="xbps-install xbps-reconfigure tar xz" @@ -87,7 +89,7 @@ while getopts "b:p:k:c:C:r:x:o:nhV" opt; do o) FILENAME="$OPTARG" ;; n) COMPRESSION="n" ;; h) usage; exit 0 ;; - V) echo "$PROGNAME @@MKLIVE_VERSION@@"; exit 0 ;; + V) echo "$PROGNAME $MKLIVE_VERSION"; exit 0 ;; esac done shift $((OPTIND - 1)) diff --git a/mkrootfs.sh.in b/mkrootfs.sh old mode 100644 new mode 100755 similarity index 99% rename from mkrootfs.sh.in rename to mkrootfs.sh index 37570da..c3b2ba9 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh @@ -25,6 +25,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #- +. ./version.sh + readonly PROGNAME=$(basename "$0") readonly ARCH=$(uname -m) readonly REQTOOLS="xbps-install xbps-reconfigure tar xz" @@ -87,7 +89,7 @@ while getopts "b:C:c:hr:x:o:V" opt; do r) XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=$OPTARG";; x) COMPRESSOR_THREADS="$OPTARG" ;; o) FILENAME="$OPTARG" ;; - V) echo "$PROGNAME @@MKLIVE_VERSION@@"; exit 0;; + V) echo "$PROGNAME $MKLIVE_VERSION"; exit 0;; esac done shift $((OPTIND - 1)) diff --git a/release.sh.in b/release.sh old mode 100644 new mode 100755 similarity index 99% rename from release.sh.in rename to release.sh index 97aaaf8..126eeae --- a/release.sh.in +++ b/release.sh @@ -3,8 +3,6 @@ XBPS_REPOSITORY="-r /hostdir/binpkgs -r /hostdir/binpkgs/musl -r /hostdir/binpkgs/aarch64" DATECODE=$(date "+%Y%m%d") -make - ARCHS="$(echo x86_64{,-musl} i686 armv{6,7}l{,-musl} aarch64{,-musl})" PLATFORMS="$(echo rpi-{armv{6,7}l,aarch64}{,-musl})" SBC_IMGS="$(echo rpi-{armv{6,7}l,aarch64}{,-musl})" diff --git a/version.sh b/version.sh new file mode 100644 index 0000000..75c19d2 --- /dev/null +++ b/version.sh @@ -0,0 +1,4 @@ +if [ -z "${MKLIVE_REV}" ]; then + MKLIVE_REV="$(git rev-parse --short HEAD || echo "unknown")" +fi +MKLIVE_VERSION="0.23-$MKLIVE_REV"