From 125c19266449741a7a87f3643aa7b54286f22c67 Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Sat, 13 Apr 2019 23:41:44 +0800 Subject: [PATCH] build-package: fix conffiles for subpackages conffiles was being created after control.tar.gz, which makes it being omitted --- scripts/build/termux_create_subpackages.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build/termux_create_subpackages.sh b/scripts/build/termux_create_subpackages.sh index 8304488c8..320dc507b 100644 --- a/scripts/build/termux_create_subpackages.sh +++ b/scripts/build/termux_create_subpackages.sh @@ -59,6 +59,7 @@ termux_create_subpackages() { mkdir -p DEBIAN cd DEBIAN + cat > control <<-HERE Package: $SUB_PKG_NAME Architecture: ${SUB_PKG_ARCH} @@ -72,10 +73,11 @@ termux_create_subpackages() { test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control test ! -z "$TERMUX_SUBPKG_REPLACES" && echo "Replaces: $TERMUX_SUBPKG_REPLACES" >> control echo "Description: $TERMUX_SUBPKG_DESCRIPTION" >> control - tar -czf "$SUB_PKG_PACKAGE_DIR/control.tar.gz" . for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done + tar -czf "$SUB_PKG_PACKAGE_DIR/control.tar.gz" . + # Create the actual .deb file: 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"