diff options
| author | Alfredo Cardigliano <cardigliano@ntop.org> | 2019-10-21 09:26:40 +0200 |
|---|---|---|
| committer | Alfredo Cardigliano <cardigliano@ntop.org> | 2019-10-21 09:26:40 +0200 |
| commit | b2832cee8e8415822b66299d1f451bd427b733d6 (patch) | |
| tree | c8d21e3304995c80b7335fed7e123e5a1e710d99 /packages | |
| parent | 960aa77b6da9bd70081621ae8e975e548ce7cc13 (diff) | |
rpm-sign fix for centos8
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/rpm/Makefile.in | 4 | ||||
| -rwxr-xr-x | packages/rpm/configure | 12 | ||||
| -rw-r--r-- | packages/rpm/configure.in | 11 |
3 files changed, 25 insertions, 2 deletions
diff --git a/packages/rpm/Makefile.in b/packages/rpm/Makefile.in index 9546e4473..88649cc57 100644 --- a/packages/rpm/Makefile.in +++ b/packages/rpm/Makefile.in @@ -29,8 +29,8 @@ build-rpm: build-src cleanup-rpm tar cvfz $(HOME)/rpmbuild/SOURCES/ndpi-@PACKAGE_VERSION@.tgz ndpi-@PACKAGE_VERSION@ @rm -f $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE) @rpmbuild -bb ./$(APPL).spec --define "buildnumber $(GIT_REVISION)" - @if [[ $EUID -ne 0 ]]; then ./rpm-sign.exp $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE); fi - @if [[ $EUID -ne 0 ]]; then ./rpm-sign.exp $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(DEV_PACKAGE); fi + @if [[ $EUID -ne 0 ]]; then @RPM_SIGN_CMD@ $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE); fi + @if [[ $EUID -ne 0 ]]; then @RPM_SIGN_CMD@ $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(DEV_PACKAGE); fi @echo "" @echo "Package contents:" @rpm -qpl $(HOME)/rpmbuild/RPMS/$(PLATFORM)/$(PACKAGE) diff --git a/packages/rpm/configure b/packages/rpm/configure index f1d1084c3..6609f7326 100755 --- a/packages/rpm/configure +++ b/packages/rpm/configure @@ -583,6 +583,7 @@ PACKAGE_URL='' ac_subst_vars='LTLIBOBJS LIBOBJS +RPM_SIGN_CMD MAJOR_RELEASE GIT_REVISION KERNEL @@ -1698,6 +1699,16 @@ PACKAGE_VERSION=`../version.sh --release` MAJOR_RELEASE=`../version.sh --major-release` GIT_REVISION=`../version.sh --revision` +CENTOS_RELEASE=`cat /etc/centos-release | cut -d ' ' -f 3|cut -d '.' -f 1` +if test $CENTOS_RELEASE = "release"; then + CENTOS_RELEASE=`cat /etc/centos-release | cut -d ' ' -f 4|cut -d '.' -f 1` +fi + +RPM_SIGN_CMD="rpm --addsign" +if test "$CENTOS_RELEASE" -ne 8; then + RPM_SIGN_CMD="./rpm-sign.exp" +fi + ac_config_files="$ac_config_files Makefile ndpi.spec" @@ -1710,6 +1721,7 @@ ac_config_files="$ac_config_files Makefile ndpi.spec" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure diff --git a/packages/rpm/configure.in b/packages/rpm/configure.in index 1eaa0ea34..67f1b470b 100644 --- a/packages/rpm/configure.in +++ b/packages/rpm/configure.in @@ -29,6 +29,16 @@ PACKAGE_VERSION=`../version.sh --release` MAJOR_RELEASE=`../version.sh --major-release` GIT_REVISION=`../version.sh --revision` +CENTOS_RELEASE=`cat /etc/centos-release | cut -d ' ' -f 3|cut -d '.' -f 1` +if test $CENTOS_RELEASE = "release"; then + CENTOS_RELEASE=`cat /etc/centos-release | cut -d ' ' -f 4|cut -d '.' -f 1` +fi + +RPM_SIGN_CMD="rpm --addsign" +if test "$CENTOS_RELEASE" -ne 8; then + RPM_SIGN_CMD="./rpm-sign.exp" +fi + AC_CONFIG_FILES([Makefile ndpi.spec]) AC_SUBST(PACKAGE_VERSION) @@ -39,6 +49,7 @@ AC_SUBST(DATE) AC_SUBST(KERNEL) AC_SUBST(GIT_REVISION) AC_SUBST(MAJOR_RELEASE) +AC_SUBST(RPM_SIGN_CMD) AC_OUTPUT |