Skip to content

Commit 884b92a

Browse files
committed
Include last git commit date and hash in deb package version
1 parent 406a5b5 commit 884b92a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ qemu_build_deb:
4545

4646
sudo rm $(OUTPUT)/etc/resolv.conf
4747
echo nameserver 1.1.1.1 | sudo tee -a $(OUTPUT)/etc/resolv.conf
48-
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
48+
LC_ALL=C LC_CTYPE=C sudo chroot $(OUTPUT) /usr/src/PixelPilot_rk/tools/container_build.sh --wipe-boot \
49+
--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
4950
make umount
5051

5152
.PHONY: qemu_test

tools/container_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ case $BUILD_TYPE in
113113
apt-get install -y ./$BUILD_DEPS_FILE
114114
rm pixelpilot-rk-build-deps*
115115

116-
dpkg-buildpackage -uc -us -b
116+
dpkg-buildpackage -uc -us
117117

118118
#debuild -S -I
119119
;;

0 commit comments

Comments
 (0)