From 6ac36e29d47c08f189829cff457d991db6ff4fdf Mon Sep 17 00:00:00 2001 From: mstroh76 Date: Fri, 1 Mar 2024 16:53:26 +0100 Subject: [PATCH 1/2] #192 --- build | 4 +++- debian-template/wiringPi/DEBIAN/control | 13 ------------- debian-template/wiringPi/control_template | 13 +++++++++++++ 3 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 debian-template/wiringPi/DEBIAN/control create mode 100644 debian-template/wiringPi/control_template diff --git a/build b/build index 4911751..309f75d 100755 --- a/build +++ b/build @@ -86,6 +86,8 @@ if [ x$1 = "xdebian" ]; then here=`pwd` deb_destdir=${here}/debian-template/wiringPi cd debian-template/wiringPi + ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) + envsubst < control_template > DEBIAN/control rm -rf usr cd $here/wiringPi make install-deb DEB_DESTDIR=${deb_destdir} @@ -95,7 +97,7 @@ if [ x$1 = "xdebian" ]; then make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib DEB_DESTDIR=${deb_destdir} cd $here/debian-template fakeroot dpkg-deb --build wiringPi - mv wiringPi.deb wiringpi-`cat $here/VERSION`-1.deb + dpkg-name wiringPi.deb exit fi diff --git a/debian-template/wiringPi/DEBIAN/control b/debian-template/wiringPi/DEBIAN/control deleted file mode 100644 index 2d1ae2c..0000000 --- a/debian-template/wiringPi/DEBIAN/control +++ /dev/null @@ -1,13 +0,0 @@ -Package: wiringpi -Version: 3.0 -Section: libraries -Priority: optional -Architecture: armhf -Depends: libc6 -Maintainer: Grazer Computer Club - GC2 -Uploaders: Grazer Computer Club - GC2 -Description: The wiringPi libraries, headers and gpio command - Libraries to allow GPIO access on a Raspberry Pi from C and C++ - programs as well as from the command-line -Homepage: https://github.com/WiringPi/WiringPi -Bugs: https://github.com/WiringPi/WiringPi/issues diff --git a/debian-template/wiringPi/control_template b/debian-template/wiringPi/control_template new file mode 100644 index 0000000..383b388 --- /dev/null +++ b/debian-template/wiringPi/control_template @@ -0,0 +1,13 @@ +Package: wiringpi +Version: 3.0 +Section: libraries +Priority: optional +Architecture: $ARCH +Depends: libc6 +Maintainer: Grazer Computer Club - GC2 +Uploaders: Grazer Computer Club - GC2 +Description: The wiringPi libraries, headers and gpio command + Libraries to allow GPIO access on a Raspberry Pi from C and C++ + programs as well as from the command-line +Homepage: https://github.com/WiringPi/WiringPi +Bugs: https://github.com/WiringPi/WiringPi/issues From d0e2f8fcb3f4b81f0be07b25ec876eafcedd7c0e Mon Sep 17 00:00:00 2001 From: mstroh76 Date: Fri, 1 Mar 2024 18:59:58 +0100 Subject: [PATCH 2/2] #192 --- build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build b/build index 309f75d..c993792 100755 --- a/build +++ b/build @@ -86,7 +86,8 @@ if [ x$1 = "xdebian" ]; then here=`pwd` deb_destdir=${here}/debian-template/wiringPi cd debian-template/wiringPi - ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) + export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) + echo architecture $ARCH envsubst < control_template > DEBIAN/control rm -rf usr cd $here/wiringPi @@ -97,7 +98,7 @@ if [ x$1 = "xdebian" ]; then make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib DEB_DESTDIR=${deb_destdir} cd $here/debian-template fakeroot dpkg-deb --build wiringPi - dpkg-name wiringPi.deb + dpkg-name -o wiringPi.deb exit fi