Browse Source

Remove the need for autoconf in the debian package

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.
pull/1147/head
Hamish Coleman 1 year ago
parent
commit
b0d742b3f5
  1. 2
      .github/workflows/tests.yml
  2. 11
      packages/debian/Makefile
  3. 2923
      packages/debian/configure
  4. 3
      packages/debian/configure.ac
  5. 39
      packages/debian/configure.in

2
.github/workflows/tests.yml

@ -425,8 +425,6 @@ jobs:
HOST_TRIPLET=$(dpkg-architecture -a${{ matrix.arch }} -q DEB_HOST_GNU_TYPE) HOST_TRIPLET=$(dpkg-architecture -a${{ matrix.arch }} -q DEB_HOST_GNU_TYPE)
./autogen.sh ./autogen.sh
./configure --host $HOST_TRIPLET ./configure --host $HOST_TRIPLET
cd packages/debian/
./configure EXTN=${{ matrix.arch }}
# yamllint enable rule:line-length # yamllint enable rule:line-length
- name: Build - name: Build

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

@ -4,6 +4,13 @@
N2N_HOME=$(PWD)/../.. N2N_HOME=$(PWD)/../..
N2N_BUILD=${N2N_HOME}/packages/debian/n2n 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 all: clean pkg
pkg: pkg:
@ -19,8 +26,8 @@ pkg:
install -m644 ../../community.list ${N2N_BUILD}/usr/share/doc/n2n/examples/ install -m644 ../../community.list ${N2N_BUILD}/usr/share/doc/n2n/examples/
install -m644 ../../doc/*.md ${N2N_BUILD}/usr/share/doc/n2n/ install -m644 ../../doc/*.md ${N2N_BUILD}/usr/share/doc/n2n/
@/bin/rm -f ../n2n*.deb @/bin/rm -f ../n2n*.deb
DEBEMAIL=builder@example.com dch -v @N2N_VERSION@ --no-auto-nmu Auto Build DEBEMAIL=builder@example.com dch -v ${PACKAGE_VERSION} --no-auto-nmu Auto Build
dpkg-buildpackage -rfakeroot -d -us -uc -a@EXTN@ dpkg-buildpackage -rfakeroot -d -us -uc --host-type ${CONFIG_HOST}
-dpkg-sig --sign builder -k D1EB60BE ../n2n_*deb -dpkg-sig --sign builder -k D1EB60BE ../n2n_*deb
@\rm -f ../n2n_*dsc ../n2n_*.gz ../n2n_*changes @\rm -f ../n2n_*dsc ../n2n_*.gz ../n2n_*changes
@/bin/mv ../n2n_*deb . @/bin/mv ../n2n_*deb .

2923
packages/debian/configure

File diff suppressed because it is too large

3
packages/debian/configure.ac

@ -0,0 +1,3 @@
AC_INIT([Makefile.in], 1.0)
# TODO: Remove this file before the next stable release
echo "This configure script is no longer needed, update your build system"

39
packages/debian/configure.in

@ -1,39 +0,0 @@
AC_INIT([Makefile.in], 1.0)
AC_ARG_WITH(edgex, [ --with-edgex Build for Ubiquity-X])
# NOTE: this file is not actually used. You need to edit configure as well!
N2N_VERSION=$(../../scripts/version.sh)
if test "${EXTN+set}" != set; then
MACHINE=`uname -m`
SHORT_MACHINE=`echo $MACHINE | cut -b1-3`
if test $MACHINE = "x86_64"; then
EXTN="amd64"
else
if test $SHORT_MACHINE = "aar"; then
EXTN="arm64"
else
if test $SHORT_MACHINE = "arm"; then
EXTN="armhf"
else
if test $SHORT_MACHINE = "mip"; then
EXTN="mips"
else
EXTN="i386"
fi
fi
fi
fi
fi
if test "${with_edgex+set}" = set; then
EXTN="mipsel"
fi
AC_SUBST(N2N_VERSION)
AC_SUBST(EXTN)
AC_CONFIG_FILES(Makefile)
AC_OUTPUT
Loading…
Cancel
Save