From b248447c7ab16c86b28e9bda5f7224a9d106ac43 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 30 Apr 2019 13:53:58 +0200 Subject: update packaging - fix build number, when not specified defaults to 0 which doesn't affect number when it is defined. - fix bionic release version - remove suggested vpp-nsh-package since it is not being built anymore (last version is 18.07) Change-Id: Ic92118d2c3096879b3ed2f10454cf41f0fa2a0b8 Signed-off-by: Michal Cmarada --- packaging/deb/bionic/prepare.sh | 4 ++-- packaging/deb/common/prepare.sh | 2 +- packaging/rpm/release | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packaging') diff --git a/packaging/deb/bionic/prepare.sh b/packaging/deb/bionic/prepare.sh index 49949525f..19be36174 100755 --- a/packaging/deb/bionic/prepare.sh +++ b/packaging/deb/bionic/prepare.sh @@ -35,7 +35,7 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR} cat <> ${BUILD_DIR}/debian/changelog honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low - * 19.04 release + * 19.08 release -- mcmarada Thu, 18 Oct 2018 13:42:07 +0200 EOT @@ -60,7 +60,7 @@ Vcs-Browser: https://git.fd.io/cgit/hc2vpp/tree/ Package: honeycomb Architecture: all Depends: ${VPP_DEPENDENCIES}, openjdk-11-jre-headless -Suggests: vpp-nsh-plugin +Suggests: Description: Honeycomb agent for VPP EOT diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index bb5788498..724a882d8 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -60,7 +60,7 @@ Vcs-Browser: https://git.fd.io/cgit/hc2vpp/tree/ Package: honeycomb Architecture: all Depends: ${VPP_DEPENDENCIES}, openjdk-8-jre-headless -Suggests: vpp-nsh-plugin +Suggests: Description: Honeycomb agent for VPP EOT diff --git a/packaging/rpm/release b/packaging/rpm/release index 0d10fc06d..6aa0c5b3c 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -3,7 +3,7 @@ # Snapshot version (do not use on stable branch) # # -echo $(expr $BUILD_NUMBER) +echo $(expr $BUILD_NUMBER + 0) # # Stable versions # -- cgit 1.2.3-korg