From 884b92ade20b59e5c94c759807dbddb3de3b10e0 Mon Sep 17 00:00:00 2001 From: Sergey Prokhorov Date: Mon, 10 Nov 2025 01:01:30 +0100 Subject: [PATCH] Include last git commit date and hash in deb package version --- Makefile | 3 ++- tools/container_build.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e072eac9..12c27aac 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,8 @@ qemu_build_deb: sudo rm $(OUTPUT)/etc/resolv.conf echo nameserver 1.1.1.1 | sudo tee -a $(OUTPUT)/etc/resolv.conf - LC_ALL=en_US.UTF-8 sudo chroot $(OUTPUT) /usr/src/PixelPilot_rk/tools/container_build.sh --wipe-boot --pkg-version $(DEB_VERSION) --debian-codename $(DEBIAN_CODENAME) --build-type deb + LC_ALL=C LC_CTYPE=C sudo chroot $(OUTPUT) /usr/src/PixelPilot_rk/tools/container_build.sh --wipe-boot \ + --pkg-version $(shell git log --date=format:%Y%m%d --pretty='$(DEB_VERSION)~git%cd.%h' | head -n 1) --debian-codename $(DEBIAN_CODENAME) --build-type deb make umount .PHONY: qemu_test diff --git a/tools/container_build.sh b/tools/container_build.sh index edb2266b..601c7713 100755 --- a/tools/container_build.sh +++ b/tools/container_build.sh @@ -113,7 +113,7 @@ case $BUILD_TYPE in apt-get install -y ./$BUILD_DEPS_FILE rm pixelpilot-rk-build-deps* - dpkg-buildpackage -uc -us -b + dpkg-buildpackage -uc -us #debuild -S -I ;;