Skip to content

Commit

Permalink
Remove the need for autoconf in the debian package
Browse files Browse the repository at this point in the history
Continuing to try and simplify the build system, calculate the remaining
two autoconf variables from the existing config.mak.

For the moment, leave a configure and configure.ac file in place to
allow any old build systems to continue to function without errors.
  • Loading branch information
hamishcoleman committed Aug 30, 2023
1 parent 018add0 commit b0d742b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 2,963 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,6 @@ jobs:
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
Expand Down
11 changes: 9 additions & 2 deletions packages/debian/Makefile.in → packages/debian/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -19,8 +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
DEBEMAIL=builder@example.com dch -v @N2N_VERSION@ --no-auto-nmu Auto Build
dpkg-buildpackage -rfakeroot -d -us -uc -a@EXTN@
DEBEMAIL=builder@example.com 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 .
Expand Down
Loading

0 comments on commit b0d742b

Please sign in to comment.