1
0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-09-28 22:40:45 +00:00

fix debian package filename and contained version (#101)

The inner version should be the same as the one in the filename; the
filename pattern is "${name}_${version}_${arch}.deb".

Set the version suffix to avoid conflicts with a future Debian package
and include the Debian version this package was built against.
This commit is contained in:
Stefan Bühler 2019-08-30 19:32:48 +02:00 committed by Oliver Giles
parent e1fe5697d2
commit 5d31d4152e
2 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@ OUTPUT_DIR=$PWD
SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})) SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty) VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
DOCKER_TAG=$(docker build -q - <<EOS DOCKER_TAG=$(docker build -q - <<EOS
FROM debian:9-slim FROM debian:9-slim
@ -63,5 +63,5 @@ EOF
chmod +x laminar/DEBIAN/postinst chmod +x laminar/DEBIAN/postinst
dpkg-deb --build laminar dpkg-deb --build laminar
mv laminar.deb /output/laminar-$VERSION-1-amd64.deb mv laminar.deb /output/laminar_${VERSION}_amd64.deb
EOS EOS

View File

@ -4,7 +4,7 @@ OUTPUT_DIR=$PWD
SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})) SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty) VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
DOCKER_TAG=$(docker build -q - <<EOS DOCKER_TAG=$(docker build -q - <<EOS
FROM debian:9-slim FROM debian:9-slim
@ -83,5 +83,5 @@ EOF
chmod +x laminar/DEBIAN/postinst chmod +x laminar/DEBIAN/postinst
dpkg-deb --build laminar dpkg-deb --build laminar
mv laminar.deb /output/laminar-$VERSION-1-armhf.deb mv laminar.deb /output/laminar_${VERSION}_armhf.deb
EOS EOS