mirror of
https://github.com/ntop/n2n.git
synced 2024-09-20 00:51:10 +02:00
Package fixes
This commit is contained in:
parent
8f57b6901c
commit
4d36f9f613
|
@ -1,3 +1,10 @@
|
||||||
|
|
||||||
|
# NOTE: these are needed by the configure.in inside the packages folder
|
||||||
|
N2N_VERSION_SHORT=@N2N_VERSION_SHORT@
|
||||||
|
GIT_COMMITS=@GIT_COMMITS@
|
||||||
|
|
||||||
|
########
|
||||||
|
|
||||||
CC?=gcc
|
CC?=gcc
|
||||||
DEBUG?=-g3
|
DEBUG?=-g3
|
||||||
#OPTIMIZATION?=-O2
|
#OPTIMIZATION?=-O2
|
||||||
|
@ -97,7 +104,7 @@ install: edge supernode edge.8.gz supernode.1.gz n2n.7.gz
|
||||||
|
|
||||||
# Docker builder section
|
# Docker builder section
|
||||||
DOCKER_IMAGE_NAME=ntop/supernode
|
DOCKER_IMAGE_NAME=ntop/supernode
|
||||||
DOCKER_IMAGE_VERSION=@N2N_VERSION_SHORT@
|
DOCKER_IMAGE_VERSION=$N2N_VERSION_SHORT
|
||||||
N2N_COMMIT_HASH=@GIT_REVISION@
|
N2N_COMMIT_HASH=@GIT_REVISION@
|
||||||
|
|
||||||
default: steps
|
default: steps
|
||||||
|
|
|
@ -2,12 +2,15 @@ odnl> Do not add anything above
|
||||||
AC_INIT([edge],@N2N_VERSION_SHORT@)
|
AC_INIT([edge],@N2N_VERSION_SHORT@)
|
||||||
dnl> Do not add anything above
|
dnl> Do not add anything above
|
||||||
|
|
||||||
|
N2N_VERSION_SHORT=${PACKAGE_VERSION}
|
||||||
|
|
||||||
if test -d ".git"; then
|
if test -d ".git"; then
|
||||||
|
# NOTE: keep in sync with the definitions for configure.in files under the packages folder
|
||||||
GIT_COMMITS=`git rev-list --count HEAD`
|
GIT_COMMITS=`git rev-list --count HEAD`
|
||||||
GIT_REVISION=`git rev-parse --short HEAD`
|
GIT_REVISION=`git rev-parse --short HEAD`
|
||||||
GIT_RELEASE="@N2N_VERSION_SHORT@.r${GIT_COMMITS}.${GIT_REVISION}"
|
GIT_RELEASE="${N2N_VERSION_SHORT}.r${GIT_COMMITS}.${GIT_REVISION}"
|
||||||
else
|
else
|
||||||
GIT_RELEASE=@N2N_VERSION_SHORT@
|
GIT_RELEASE=${N2N_VERSION_SHORT}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_LIB([crypto], [AES_cbc_encrypt])
|
AC_CHECK_LIB([crypto], [AES_cbc_encrypt])
|
||||||
|
|
8
packages/debian/configure
vendored
8
packages/debian/configure
vendored
|
@ -583,12 +583,11 @@ PACKAGE_URL=''
|
||||||
|
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
LIBOBJS
|
LIBOBJS
|
||||||
|
N2N_VERSION_SHORT
|
||||||
GIT_COMMITS
|
GIT_COMMITS
|
||||||
GIT_RELEASE
|
|
||||||
DATE
|
DATE
|
||||||
EXTN
|
EXTN
|
||||||
MACHINE
|
MACHINE
|
||||||
N2N_VERS
|
|
||||||
APP
|
APP
|
||||||
target_alias
|
target_alias
|
||||||
host_alias
|
host_alias
|
||||||
|
@ -1706,9 +1705,8 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
APP=n2n
|
APP=n2n
|
||||||
N2N_VERS=`grep N2N_VERSION ../../Makefile | head -1| cut -d "=" -f 2`
|
N2N_VERSION_SHORT=`grep N2N_VERSION_SHORT ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
GIT_RELEASE=`git rev-parse HEAD`
|
GIT_COMMITS=`grep GIT_COMMITS ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
GIT_COMMITS=`git rev-list --all |wc -l | tr -d '[:space:]'`
|
|
||||||
DATE=`date -R`
|
DATE=`date -R`
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
AC_INIT([Makefile.in], 1.0)
|
AC_INIT([Makefile.in], 1.0)
|
||||||
|
|
||||||
|
# NOTE: this file is not actually used. You need to edit configure as well!
|
||||||
|
N2N_VERSION_SHORT=`grep N2N_VERSION_SHORT ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
|
GIT_COMMITS=`grep GIT_COMMITS ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
|
|
||||||
MACHINE=`uname -m`
|
MACHINE=`uname -m`
|
||||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||||
|
|
||||||
|
@ -29,6 +33,8 @@ DATE=`date -R`
|
||||||
|
|
||||||
AC_SUBST(APP)
|
AC_SUBST(APP)
|
||||||
AC_SUBST(MACHINE)
|
AC_SUBST(MACHINE)
|
||||||
|
AC_SUBST(N2N_VERSION_SHORT)
|
||||||
|
AC_SUBST(GIT_COMMITS)
|
||||||
AC_SUBST(EXTN)
|
AC_SUBST(EXTN)
|
||||||
AC_SUBST(DATE)
|
AC_SUBST(DATE)
|
||||||
|
|
||||||
|
|
15
packages/rpm/configure
vendored
15
packages/rpm/configure
vendored
|
@ -583,13 +583,11 @@ PACKAGE_URL=''
|
||||||
|
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
LIBOBJS
|
LIBOBJS
|
||||||
REVISION
|
N2N_VERSION_SHORT
|
||||||
GIT_COMMITS
|
GIT_COMMITS
|
||||||
GIT_RELEASE
|
|
||||||
DATE
|
DATE
|
||||||
EXTN
|
EXTN
|
||||||
MACHINE
|
MACHINE
|
||||||
N2N_VERS
|
|
||||||
APP
|
APP
|
||||||
target_alias
|
target_alias
|
||||||
host_alias
|
host_alias
|
||||||
|
@ -1675,6 +1673,10 @@ SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||||
|
|
||||||
if test $MACHINE = "x86_64"; then
|
if test $MACHINE = "x86_64"; then
|
||||||
EXTN="amd64"
|
EXTN="amd64"
|
||||||
|
else
|
||||||
|
if test $SHORT_MACHINE = "aar"; then
|
||||||
|
EXTN="arm64"
|
||||||
|
EXTRA_DEPS=""
|
||||||
else
|
else
|
||||||
if test $SHORT_MACHINE = "arm"; then
|
if test $SHORT_MACHINE = "arm"; then
|
||||||
EXTN="armhf"
|
EXTN="armhf"
|
||||||
|
@ -1688,13 +1690,12 @@ else
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
APP=n2n
|
APP=n2n
|
||||||
N2N_VERS=`grep N2N_VERSION ../../Makefile | head -1| cut -d "=" -f 2`
|
N2N_VERSION_SHORT=`grep N2N_VERSION_SHORT ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
GIT_RELEASE=`git rev-parse HEAD`
|
GIT_COMMITS=`grep GIT_COMMITS ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
GIT_COMMITS=`git rev-list --all |wc -l | tr -d '[:space:]'`
|
|
||||||
DATE=`date -R`
|
DATE=`date -R`
|
||||||
REVISION=`git log --pretty=oneline | wc -l`
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,18 @@
|
||||||
AC_INIT([Makefile.in], 1.0)
|
AC_INIT([Makefile.in], 1.0)
|
||||||
|
|
||||||
|
# NOTE: this file is not actually used. You need to edit configure as well!
|
||||||
|
N2N_VERSION_SHORT=`grep N2N_VERSION_SHORT ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
|
GIT_COMMITS=`grep GIT_COMMITS ../../Makefile | head -1| cut -d "=" -f 2`
|
||||||
|
|
||||||
MACHINE=`uname -m`
|
MACHINE=`uname -m`
|
||||||
SHORT_MACHINE=`uname -m | cut -b1-3`
|
SHORT_MACHINE=`uname -m | cut -b1-3`
|
||||||
|
|
||||||
if test $MACHINE = "x86_64"; then
|
if test $MACHINE = "x86_64"; then
|
||||||
EXTN="amd64"
|
EXTN="amd64"
|
||||||
|
else
|
||||||
|
if test $SHORT_MACHINE = "aar"; then
|
||||||
|
EXTN="arm64"
|
||||||
|
EXTRA_DEPS=""
|
||||||
else
|
else
|
||||||
if test $SHORT_MACHINE = "arm"; then
|
if test $SHORT_MACHINE = "arm"; then
|
||||||
EXTN="armhf"
|
EXTN="armhf"
|
||||||
|
@ -18,12 +26,15 @@ else
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
APP=n2n
|
APP=n2n
|
||||||
DATE=`date -R`
|
DATE=`date -R`
|
||||||
|
|
||||||
AC_SUBST(APP)
|
AC_SUBST(APP)
|
||||||
AC_SUBST(MACHINE)
|
AC_SUBST(MACHINE)
|
||||||
|
AC_SUBST(N2N_VERSION_SHORT)
|
||||||
|
AC_SUBST(GIT_COMMITS)
|
||||||
AC_SUBST(EXTN)
|
AC_SUBST(EXTN)
|
||||||
AC_SUBST(DATE)
|
AC_SUBST(DATE)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user