3d94bcdb | 2019-06-03 05:43:29 | Michele Calgaro |
DEB build script: fixed parameters for pbuilder/dpkg-buildpackage. Signed-off-by: Michele Calgaro <michele.calgaro@...> |
||
M debian/_buildscripts/local/01_base_01.sh M debian/_buildscripts/local/additional_files/etc/pbuilderrc |
||
debian/_buildscripts/local/01_base_01.shdiff --git a/debian/_buildscripts/local/01_base_01.sh b/debian/_buildscripts/local/01_base_01.sh index 4b79794..351e3c9 100755 --- a/debian/_buildscripts/local/01_base_01.sh +++ b/debian/_buildscripts/local/01_base_01.sh @@ -19,6 +19,6 @@ build_module "dependencies/libcarddav" build_module "tdelibs" build_module "libraries/libtdeldap" -build_module "tdebase" +build_module "tdebase" set_log_end debian/_buildscripts/local/additional_files/etc/pbuilderrcdiff --git a/debian/_buildscripts/local/additional_files/etc/pbuilderrc b/debian/_buildscripts/local/additional_files/etc/pbuilderrc index 010efdd..6e9d9d8 100644 --- a/debian/_buildscripts/local/additional_files/etc/pbuilderrc +++ b/debian/_buildscripts/local/additional_files/etc/pbuilderrc @@ -128,14 +128,8 @@ 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 |