From 9b2f3b629b33d4424ec8861a9e4b9b9c76ee74dd Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 4 Mar 2018 20:05:40 +0100 Subject: [PATCH] build-package.sh: if debug, rename package to "package-dbg" Similar to how debian does it. --- build-package.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build-package.sh b/build-package.sh index 3dd39ccd..f632b001 100755 --- a/build-package.sh +++ b/build-package.sh @@ -393,6 +393,12 @@ termux_step_start_build() { TERMUX_PKG_FULLVERSION+="-$TERMUX_PKG_REVISION" fi + if [ "$TERMUX_DEBUG" == "true" ]; then + DEBUG="-dbg" + else + DEBUG="" + fi + if [ -z "$TERMUX_DEBUG" ] && [ -z "${TERMUX_FORCE_BUILD+x}" ] && [ -e "/data/data/.built-packages/$TERMUX_PKG_NAME" ]; then @@ -1103,7 +1109,7 @@ termux_step_massage() { mkdir -p DEBIAN cd DEBIAN cat > control <<-HERE - Package: $SUB_PKG_NAME + Package: $SUB_PKG_NAME$DEBUG Architecture: ${SUB_PKG_ARCH} Installed-Size: ${SUB_PKG_INSTALLSIZE} Maintainer: $TERMUX_PKG_MAINTAINER @@ -1119,7 +1125,7 @@ termux_step_massage() { for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done # Create the actual .deb file: - TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb + TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary" ar cr "$TERMUX_SUBPKG_DEBFILE" \ "$TERMUX_COMMON_CACHEDIR/debian-binary" \ @@ -1171,7 +1177,7 @@ termux_step_create_debfile() { mkdir -p DEBIAN cat > DEBIAN/control <<-HERE - Package: $TERMUX_PKG_NAME + Package: $TERMUX_PKG_NAME$DEBUG Architecture: ${TERMUX_ARCH} Installed-Size: ${TERMUX_PKG_INSTALLSIZE} Maintainer: $TERMUX_PKG_MAINTAINER @@ -1198,7 +1204,7 @@ termux_step_create_debfile() { tar -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" . test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary" - TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb + TERMUX_PKG_DEBFILE=$TERMUX_DEBDIR/${TERMUX_PKG_NAME}${DEBUG}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb # Create the actual .deb file: ar cr "$TERMUX_PKG_DEBFILE" \ "$TERMUX_COMMON_CACHEDIR/debian-binary" \ -- 2.11.0