Simplifications and improvements for package building

.github/workflows/tests.yml

@@ -410,8 +410,13 @@
         run: |
           sudo apt-get update
           sudo apt-get install debhelper build-essential \
+            devscripts \
             crossbuild-essential-${{ matrix.arch }}
 
+      - name: Hack dpkg-shlibdeps
+        run: |
+          echo '#!/bin/bash' | sudo tee /usr/bin/dpkg-shlibdeps
+
       - name: Configure
         # The HOST_TRIPLET line is not easily foldable
         # yamllint disable rule:line-length
@@ -420,8 +425,6 @@
           HOST_TRIPLET=$(dpkg-architecture -a${{ matrix.arch }} -q DEB_HOST_GNU_TYPE)
           ./autogen.sh
           ./configure --host $HOST_TRIPLET
-          cd packages/debian/
-          ./configure EXTN=${{ matrix.arch }}
         # yamllint enable rule:line-length
 
       - name: Build
@@ -486,13 +489,13 @@
         include:
           - name: mips_24kc
             sdk_ver: 22.03.3
             sdk: https://downloads.openwrt.org/releases/22.03.3/targets/lantiq/xrx200/openwrt-sdk-22.03.3-lantiq-xrx200_gcc-11.2.0_musl.Linux-x86_64.tar.xz
           - name: i386_pentium4
             sdk_ver: 22.03.3
             sdk: https://downloads.openwrt.org/releases/22.03.3/targets/x86/generic/openwrt-sdk-22.03.3-x86-generic_gcc-11.2.0_musl.Linux-x86_64.tar.xz
           - name: x86_64
             sdk_ver: 22.03.3
             sdk: https://downloads.openwrt.org/releases/22.03.3/targets/x86/64/openwrt-sdk-22.03.3-x86-64_gcc-11.2.0_musl.Linux-x86_64.tar.xz
 
     defaults:
       run:

.gitignore

@@ -24,14 +24,7 @@ build
 .idea
 .vscode
 .vs
-packages/debian/debian/changelog
-packages/debian/debian/control
 packages/debian/debian/files
-packages/debian/debian/rules
-packages/etc/systemd/system/[email protected]
-packages/etc/systemd/system/edge.service
-packages/etc/systemd/system/[email protected]
-packages/etc/systemd/system/supernode.service
 *dSYM*
 
 __pycache__

packages/debian/Makefile.in → packages/debian/Makefile

@@ -4,6 +4,13 @@
 N2N_HOME=$(PWD)/../..
 N2N_BUILD=${N2N_HOME}/packages/debian/n2n
 
+include ${N2N_HOME}/config.mak
+
+# TODO: continue to untangle the version generation
+# we either should not need to override the config.mak here or
+# should never set the version in config.mak and always calculate it
+PACKAGE_VERSION := $(shell ${N2N_HOME}/scripts/version.sh)
+
 all: clean pkg
 
 pkg:
@@ -19,7 +26,8 @@ pkg:
 	install -m644 ../../community.list ${N2N_BUILD}/usr/share/doc/n2n/examples/
 	install -m644 ../../doc/*.md ${N2N_BUILD}/usr/share/doc/n2n/
 	@/bin/rm -f ../n2n*.deb
-	dpkg-buildpackage -rfakeroot -d -us -uc -a@EXTN@
+	[email protected] dch -v ${PACKAGE_VERSION} --no-auto-nmu Auto Build
+	dpkg-buildpackage -rfakeroot -d -us -uc --host-type ${CONFIG_HOST}
 	-dpkg-sig --sign builder -k D1EB60BE ../n2n_*deb
 	@\rm -f ../n2n_*dsc ../n2n_*.gz ../n2n_*changes
 	@/bin/mv ../n2n_*deb .

packages/debian/README

@@ -1,6 +1,6 @@
 Prerequisites
 -------------
-apt-get install debhelper fakeroot dpkg-sig
+apt-get install debhelper fakeroot dpkg-sig devscripts
 
 EdgeOS
 ------