build: allow to override git-rev and timestamp build info

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: javalsai <javalsai@proton.me>

Makefile

@@ -22,14 +22,15 @@ DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS))
 _OBJ = main.o log.o util.o ui.o ui_state.o config.o desktop.o auth.o ofield.o efield.o users.o sessions.o chvt.o launch_state.o
 OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
 
-.git/HEAD:
+INFO_GIT_REV?=$$(git describe --long --tags --always || echo '?')
+INFO_BUILD_TS?=$$(date +%s)
 
-$(IDIR)/version.h: Makefile .git/HEAD
+$(IDIR)/version.h: Makefile
 	@tmp=$$(mktemp); \
 	printf '' > $$tmp; \
 	echo '#define LIDM_VERSION "'$(VERSION)'"' >> $$tmp; \
-	echo '#define LIDM_GIT_REV "'$$(git describe --long --tags --always || echo '?')'"' >> $$tmp; \
+	echo '#define LIDM_GIT_REV "'$(INFO_GIT_REV)'"' >> $$tmp; \
-	echo '#define LIDM_BUILD_TS '$$(date +%s) >> $$tmp; \
+	echo '#define LIDM_BUILD_TS '$(INFO_BUILD_TS) >> $$tmp; \
 	if ! cmp -s $$tmp $@; then \
 		mv $$tmp $@; \
 	fi; \

assets/pkg/aur/lidm-bin/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lidm-bin
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary)
-	pkgver = 1.2.0
+	pkgver = 1.2.3
 	pkgrel = 1
 	url = https://github.com/javalsai/lidm
 	arch = x86_64
@@ -8,11 +8,11 @@ pkgbase = lidm-bin
 	depends = pam
 	provides = lidm
 	conflicts = lidm
-	source = lidm::https://github.com/javalsai/lidm/releases/download/v1.2.0/lidm-amd64
+	source = lidm-1.2.3-1::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-amd64
-	source = default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/themes/default.ini
+	source = lidm-default-theme-1.2.3-1.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/themes/default.ini
-	source = lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/assets/man/lidm.1
+	source = lidm-1.2.3-1.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm.1
-	source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/assets/man/lidm-config.5
+	source = lidm-config-1.2.3-1.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm-config.5
-	sha256sums = 6bf4403c21bd26607302d99d7bd1a129822e7d2506e949fb483ea445e022eb6d
+	sha256sums = a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b
 	sha256sums = ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca
 	sha256sums = 7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8
 	sha256sums = 0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9

assets/pkg/aur/lidm-bin/PKGBUILD

@@ -1,7 +1,7 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm-bin
-pkgver=1.2.0
+pkgver=1.2.3
 pkgrel=1
 depends=('pam')
 pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)"
@@ -10,20 +10,21 @@ url="https://github.com/javalsai/lidm"
 license=('GPL')
 provides=('lidm')
 conflicts=('lidm')
+_ver="${pkgver}-${pkgrel}"
 source=(
-    "lidm::$url/releases/download/v$pkgver/lidm-amd64"
+    "lidm-${_ver}::$url/releases/download/v$pkgver/lidm-amd64"
-    "default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/themes/default.ini"
+    "lidm-default-theme-${_ver}.ini::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/themes/default.ini"
-    "lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1"
+    "lidm-${_ver}.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1"
-    "lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5"
+    "lidm-config-${_ver}.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5"
 )
-sha256sums=('6bf4403c21bd26607302d99d7bd1a129822e7d2506e949fb483ea445e022eb6d'
+sha256sums=('a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b'
             'ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca'
             '7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8'
             '0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9')
 
 package() {
-    install -Dm755 lidm "${pkgdir}/usr/bin/lidm"
+    install -Dm755 "lidm-${_ver}" "${pkgdir}/usr/bin/lidm"
-    install -Dm644 default-theme.ini "${pkgdir}/etc/lidm.ini"
+    install -Dm644 "lidm-default-theme-${_ver}.ini" "${pkgdir}/etc/lidm.ini"
-    install -Dm644 lidm.1 "${pkgdir}/usr/share/man/man1/lidm.1"
+    install -Dm644 "lidm-${_ver}.1" "${pkgdir}/usr/share/man/man1/lidm.1"
-    install -Dm644 lidm-config.5 "${pkgdir}/usr/share/man/man5/lidm-config.5"
+    install -Dm644 "lidm-config-${_ver}.5" "${pkgdir}/usr/share/man/man5/lidm-config.5"
 }

assets/pkg/aur/lidm-git/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lidm-git
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (last git commit)
-	pkgver = 0.1.0.r0.g8071694
+	pkgver = 1.2.3.r3.g363deea
 	pkgrel = 1
 	url = https://github.com/javalsai/lidm
 	arch = any

assets/pkg/aur/lidm-git/PKGBUILD

@@ -1,10 +1,10 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm-git
-pkgver=1.2.0.r0.g7f75b8e
+pkgver=1.2.3.r3.g363deea
 pkgrel=1
 depends=('pam')
-makedepends=('git' 'make' 'gcc')
+makedepends=('git')
 pkgdesc="A fully colorful customizable TUI display manager made in C. (last git commit)"
 arch=('any')
 url="https://github.com/javalsai/lidm"
@@ -22,7 +22,7 @@ pkgver() {
 
 build() {
     cd "lidm"
-    make CFLAGS="-O3"
+    make
 }
 
 package() {

assets/pkg/aur/lidm/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lidm
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag)
-	pkgver = 1.2.0
+	pkgver = 1.2.3
 	pkgrel = 1
 	url = https://github.com/javalsai/lidm
 	arch = any
@@ -8,7 +8,7 @@ pkgbase = lidm
 	makedepends = git
 	makedepends = gcc
 	depends = pam
-	source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.0.tar.gz
+	source = lidm-1.2.3-1.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.3.tar.gz
-	sha256sums = 0dffded5fcef45cb45fe88358b0cba8de04f614e323a9c6e4162f84b6e3a50b6
+	sha256sums = 1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93
 
 pkgname = lidm

assets/pkg/aur/lidm/PKGBUILD

@@ -1,22 +1,23 @@
 # shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm
-pkgver=1.2.0
+pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 depends=('pam')
-makedepends=('git' 'gcc')
+makedepends=('git')
 pkgdesc="A fully colorful customizable TUI display manager made in C. (build latest tag)"
 arch=('any')
 url="https://github.com/javalsai/lidm"
 license=('GPL')
-source=("tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
+_ver="${pkgver}-${pkgrel}"
-sha256sums=('0dffded5fcef45cb45fe88358b0cba8de04f614e323a9c6e4162f84b6e3a50b6')
+source=("${pkgname}-${_ver}.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93')
 
 build() {
-    tar -xzf "tarball.tar.gz"
+    tar -xzf "${pkgname}-${_ver}.tar.gz"
     cd "lidm-$pkgver"
 
-    make CFLAGS="-O3"
+    make
 }
 
 package() {

assets/pkg/aur/test-makepkg.sh

@@ -7,15 +7,6 @@ MYDIR=$(dirname "$MYSELF")
 for pkg in "$MYDIR"/*/; do
     printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg"
     cd "$pkg"
-
-    # shellcheck disable=SC1091
-    source "PKGBUILD"
-    for source in "${source[@]}"; do
-        awk -F'::' '{print $1}' <<<"$source" | xargs rm -rf
-    done
-
-    rm -rf ./*.{gz,zst} src pkg
     makepkg -f .
-
     echo
 done

assets/pkg/aur/update-pkgs.sh

@@ -17,12 +17,6 @@ for pkg in "$MYDIR"/lidm{,-bin}/; do
     sed -i "s/pkgver=.*/pkgver=$1/" PKGBUILD
     sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD
 
-    grep 'source = ' <.SRCINFO | awk -F'= |::' '{print $2}' | \
-    while read -r srcfile; do
-        printf "\x1b[31mDeleting '%s'\x1b[0m\n" "$srcfile"
-        rm -f "$srcfile"
-    done
-
     updpkgsums
     makepkg --printsrcinfo | tee .SRCINFO
     echo

assets/pkg/nix/module.nix

@@ -11,7 +11,7 @@ let
   dmcfg = config.services.displayManager;
   desktops = dmcfg.sessionData.desktops;
 
-  version = "1.2.2";
+  version = "1.2.3";
   lidmPkg = pkgs.callPackage ./lidm.nix {
     inherit pkgs;
     config = {
@@ -21,7 +21,7 @@ let
         owner = "javalsai";
         repo = "lidm";
         rev = "v${version}";
-        sha256 = "sha256-rvxSNv/F+ksy68D7zP7NwbCBV9/6OfEZSfGxKsGiVYc=";
+        sha256 = "sha256-eKgBoh+bRcl2Y7oOxW77Kjtb9Ws2Xln1SenknIsGxD4=";
       };
 
       xsessions = "${desktops}/share/xsessions";

docs/INSTALL.md

@@ -29,7 +29,7 @@ Then you can install the files onto your filesystem with:
 make install
 ```
 
-And additionally, to install service files (start-up behavior). <sup>[more docs](./assets/services/README.md)</sup>
+And additionally, to install service files (start-up behavior). <sup>[more docs](../assets/services/README.md)</sup>
 
 ```sh
 # automatically detects your init system
@@ -55,7 +55,7 @@ make install-service-s6-etc # s6 (/etc/s6/sv)
 [AUR packages](https://aur.archlinux.org/packages?K=lidm&SeB=n) will automatically install most files.
 
 > [!CAUTION]
-> [service files](./assets/pkg/aur#services) have to be manually installed by now.
+> [service files](../assets/pkg/aur#services) have to be manually installed by now.
 
 # Nix Flake
 
@@ -72,7 +72,7 @@ nix run github:javalsai/lidm
 ```
 
 > [!CAUTION]
-> This doesn't include [service files](./assets/pkg/aur#services) neither
+> This doesn't include [service files](../assets/pkg/aur#services) neither
 
 # Nix Module
 
@@ -125,4 +125,4 @@ with config.lidm.keysEnum; {
 > _it's not necessary to cover all keys and anything can be put there, even if it's not valid config_
 
 > [!NOTE]
-> [service files](./assets/pkg/aur#services) **are** included and enabled
+> [service files](../assets/pkg/aur#services) **are** included and enabled

docs/PACKAGERS.md

@@ -38,6 +38,17 @@ Lidm attempts to support being built by `gcc` and `clang` with preference over t
 
 Compiler flags should be passed with `CFLAGS`, its `-O3 -Wall` by default so adding anything will overwrite this.
 
+## Build Metadata
+
+`lidm -v` outputs some information about the build version, this can be weaked with `INFO_GIT_REV` and `INFO_BUILD_TS`, by default they are:
+
+```make
+INFO_GIT_REV?=$$(git describe --long --tags --always || echo '?')
+INFO_BUILD_TS?=$$(date +%s)
+```
+
+But this can be changed by just passing those env variables, for example, in the case git is not applicable in the build environment of the package.
+
 ## Target Directory
 
 `DESTDIR` can be used to for installation recipes to install on alternative root directories. Along with `PREFIX` (defaults to `/usr`) for systems which don't use the common `/usr` structure. e.g. `make install DESTDIR=$out PREFIX=`