From 3d94bcdbd8164f916844319f8f0c9120ade6c446 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 3 Jun 2019 14:43:29 +0900 Subject: DEB build script: fixed parameters for pbuilder/dpkg-buildpackage. Signed-off-by: Michele Calgaro --- debian/_buildscripts/local/01_base_01.sh | 2 +- debian/_buildscripts/local/additional_files/etc/pbuilderrc | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh index 4b7979475..351e3c940 100755 --- a/debian/_buildscripts/local/01_base_01.sh +++ b/debian/_buildscripts/local/01_base_01.sh @@ -19,6 +19,6 @@ build_module "dependencies/libcaldav" build_module "dependencies/libcarddav" build_module "tdelibs" build_module "libraries/libtdeldap" -build_module "tdebase" +build_module "tdebase" set_log_end diff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index 010efdddb..6e9d9d8f1 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -128,14 +128,8 @@ if [ -z "$(stat -L --print "%d\n" $APTCACHE/. /var/cache/pbuilder/build/. | uniq fi #-- extra options -DEBBUILDOPTS="-B" -if [ "$ARCHITECTURE" == "amd64" ]; then - DEBBUILDOPTS="-b" -fi -if [ "${DISTRIBUTION#raspbian}" != "$DISTRIBUTION" ] && [ "$ARCHITECTURE" == "armhf" ]; then - DEBBUILDOPTS="-b" - DISTRIBUTION=${DISTRIBUTION#raspbian-} -fi +DEBBUILDOPTS="-b" + if [ -z "$DEB_SIGN_KEYID" ]; then AUTO_DEBSIGN=${AUTO_DEBSIGN:-no} fi -- cgit v1.2.1