From 243d7231688f40c3dbd613be09358d60031a2777 Mon Sep 17 00:00:00 2001 From: nqb Date: Fri, 11 Jun 2021 14:57:17 +0200 Subject: [PATCH] build directly native pkgs due to update of changelog --- Makefile | 1 - ci/debian/convert-to-native-package.sh | 12 ------------ ci/lib/release/prep-release.sh | 2 +- debian/source/format | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 ci/debian/convert-to-native-package.sh diff --git a/Makefile b/Makefile index 420cbfe7f82b..6ede6fad97dd 100644 --- a/Makefile +++ b/Makefile @@ -224,7 +224,6 @@ build_rpm: rpm/.rpmmacros .PHONY: build_deb build_deb: - $(SRC_CIDIR)/debian/convert-to-native-package.sh cp $(SRC_CIDIR)/debian/.devscripts $(HOME) QUILT_PATCHES=$(SRC_DEBDIR)/patches quilt push ci-build-pkg $(SRC_DEBDIR) diff --git a/ci/debian/convert-to-native-package.sh b/ci/debian/convert-to-native-package.sh deleted file mode 100755 index 82a7fc05bbb0..000000000000 --- a/ci/debian/convert-to-native-package.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -o nounset -o pipefail -o errexit - -# Switch a Debian non-native package to native package -# to simplify build using gitlab-buildpkg-tools - -# change package format -sed -i 's/3.0 (quilt)/3.0 (native)/' debian/source/format - -# remove revision in changelog file, prerequisite for native package -sed -i "1{s/-[0-9]*//}" debian/changelog - diff --git a/ci/lib/release/prep-release.sh b/ci/lib/release/prep-release.sh index 3666bca54629..89a33b8bd15b 100755 --- a/ci/lib/release/prep-release.sh +++ b/ci/lib/release/prep-release.sh @@ -56,7 +56,7 @@ update_deb_changelog() { --distribution "unstable" \ -t "Version ${PF_NEW_PATCH_RELEASE}" ) || die "dch failed" - head $DEB_CHLOG + head -n3 $DEB_CHLOG } update_rpm_changelog() { diff --git a/debian/source/format b/debian/source/format index 163aaf8d82b6..89ae9db8f88b 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)