X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/cd83eaf6692ae1ab6b59754ce85a670eaace3fda..dc6476e9eadbdd6476a870cacc4ce63dba99c51c:/build-package.sh diff --git a/build-package.sh b/build-package.sh index d950d678..6b3b2f83 100755 --- a/build-package.sh +++ b/build-package.sh @@ -29,21 +29,25 @@ test -f $HOME/.termuxrc && . $HOME/.termuxrc if [ ! -d "$NDK" ]; then echo 'ERROR: $NDK not defined as pointing at a directory - define it pointing at a android NDK installation!'; exit 1; fi : ${TERMUX_MAKE_PROCESSES:='4'} : ${TERMUX_TOPDIR:="$HOME/termux"} -: ${TERMUX_ARCH:="arm"} # (arm|aarch64|i686|x86_64) - the 64 bit variants do not work yet +: ${TERMUX_ARCH:="arm"} # (arm|aarch64|i686|x86_64) - the x86_64 arch is not yet used or tested. TERMUX_ARCH_BITS="32" if [ "x86_64" = $TERMUX_ARCH -o "aarch64" = $TERMUX_ARCH ]; then TERMUX_ARCH_BITS="64" fi +: ${TERMUX_CLANG:=""} # Set to non-empty to use clang. : ${TERMUX_HOST_PLATFORM:="${TERMUX_ARCH}-linux-android"} if [ $TERMUX_ARCH = "arm" ]; then TERMUX_HOST_PLATFORM="${TERMUX_HOST_PLATFORM}eabi"; fi : ${TERMUX_PREFIX:='/data/data/com.termux/files/usr'} : ${TERMUX_ANDROID_HOME:='/data/data/com.termux/files/home'} : ${TERMUX_DEBUG:=""} : ${TERMUX_PROCESS_DEB:=""} -: ${TERMUX_GCC_VERSION:="4.9"} : ${TERMUX_API_LEVEL:="21"} -: ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc${TERMUX_GCC_VERSION}"} -: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="22.0.1"} +if [ "$TERMUX_CLANG" = "" ]; then + : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-gcc4.9"} +else + : ${TERMUX_STANDALONE_TOOLCHAIN:="$HOME/lib/android-standalone-toolchain-${TERMUX_ARCH}-api${TERMUX_API_LEVEL}-clang38"} +fi +: ${TERMUX_ANDROID_BUILD_TOOLS_VERSION:="23.0.2"} # We do not put all of build-tools/$TERMUX_ANDROID_BUILD_TOOLS_VERSION/ into PATH # to avoid stuff like arm-linux-androideabi-ld there to conflict with ones from # the standalone toolchain. @@ -59,15 +63,31 @@ export TERMUX_TOUCH="touch" test `uname` = "Darwin" && TERMUX_TOUCH=gtouch # Compute NDK version. We remove the first character (the r in e.g. r9d) to get a version number which can be used in packages): -export TERMUX_NDK_VERSION=`cut -d ' ' -f 1 $NDK/RELEASE.TXT | cut -c 2-` +export TERMUX_NDK_VERSION=11 +if grep -s -q "Pkg.Revision = $TERMUX_NDK_VERSION" $NDK/source.properties; then + : +else + echo "Wrong NDK version - we need $TERMUX_NDK_VERSION" + exit 1 +fi export prefix=${TERMUX_PREFIX} # prefix is used by some makefiles #export ACLOCAL="aclocal -I $TERMUX_PREFIX/share/aclocal" export AR=$TERMUX_HOST_PLATFORM-ar -export AS=${TERMUX_HOST_PLATFORM}-gcc -export CC=$TERMUX_HOST_PLATFORM-gcc +if [ "$TERMUX_CLANG" = "" ]; then + export AS=${TERMUX_HOST_PLATFORM}-gcc + export CC=$TERMUX_HOST_PLATFORM-gcc + export CXX=$TERMUX_HOST_PLATFORM-g++ + _SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec" +else + export AS=${TERMUX_HOST_PLATFORM}-clang + export CC=$TERMUX_HOST_PLATFORM-clang + export CXX=$TERMUX_HOST_PLATFORM-clang++ + # TODO: clang does not have specs file, how to ensure pie + # binaries gets built? + _SPECSFLAG="" +fi export CPP=${TERMUX_HOST_PLATFORM}-cpp -export CXX=$TERMUX_HOST_PLATFORM-g++ export CC_FOR_BUILD=gcc export LD=$TERMUX_HOST_PLATFORM-ld export OBJDUMP=$TERMUX_HOST_PLATFORM-objdump @@ -78,7 +98,6 @@ export RANLIB=$TERMUX_HOST_PLATFORM-ranlib export READELF=$TERMUX_HOST_PLATFORM-readelf export STRIP=$TERMUX_HOST_PLATFORM-strip -_SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec" export CFLAGS="$_SPECSFLAG" export LDFLAGS="$_SPECSFLAG -L${TERMUX_PREFIX}/lib" @@ -95,10 +114,13 @@ if [ "$TERMUX_ARCH" = "arm" ]; then # make your application link statically to a libm compiled for the hard float ABI. The only downside of this # is that your application will increase somewhat in size." CFLAGS+=" -march=armv7-a -mfpu=neon -mhard-float -Wl,--no-warn-mismatch" - LDFLAGS+=" -march=armv7-a -Wl,--no-warn-mismatch" + LDFLAGS+=" -march=armv7-a -Wl,--no-warn-mismatch" elif [ $TERMUX_ARCH = "i686" ]; then # From $NDK/docs/CPU-ARCH-ABIS.html: CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse" +elif [ $TERMUX_ARCH = "aarch64" ]; then + LDFLAGS+=" -Wl,-rpath-link,$TERMUX_PREFIX/lib" + LDFLAGS+=" -Wl,-rpath-link,$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib" fi if [ -n "$TERMUX_DEBUG" ]; then @@ -123,11 +145,17 @@ if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then else _TERMUX_NDK_TOOLCHAIN_NAME="$TERMUX_HOST_PLATFORM" fi - bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_NDK_TOOLCHAIN_NAME}-${TERMUX_GCC_VERSION} \ - --install-dir=$TERMUX_STANDALONE_TOOLCHAIN --system=`uname | tr '[:upper:]' '[:lower:]'`-x86_64 + + if [ "$TERMUX_CLANG" = "" ]; then + _TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-4.9" + else + _TERMUX_TOOLCHAIN="${_TERMUX_NDK_TOOLCHAIN_NAME}-clang" + fi + bash $NDK/build/tools/make-standalone-toolchain.sh --platform=android-$TERMUX_API_LEVEL --toolchain=${_TERMUX_TOOLCHAIN} \ + --install-dir=$TERMUX_STANDALONE_TOOLCHAIN if [ "arm" = $TERMUX_ARCH ]; then # Fix to allow e.g. to be included: - cp $TERMUX_STANDALONE_TOOLCHAIN/include/c++/$TERMUX_GCC_VERSION/arm-linux-androideabi/armv7-a/bits/* $TERMUX_STANDALONE_TOOLCHAIN/include/c++/$TERMUX_GCC_VERSION/bits + cp $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/arm-linux-androideabi/armv7-a/bits/* $TERMUX_STANDALONE_TOOLCHAIN/include/c++/4.9/bits fi cd $TERMUX_STANDALONE_TOOLCHAIN/sysroot for f in $TERMUX_SCRIPTDIR/ndk_patches/*.patch; do @@ -175,15 +203,15 @@ TERMUX_PKG_FOLDERNAME="" TERMUX_PKG_KEEP_STATIC_LIBRARIES="false" TERMUX_PKG_KEEP_HEADER_FILES="false" TERMUX_PKG_ESSENTIAL="" +TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts TERMUX_PKG_CONFFILES="" +TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="" # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR: TERMUX_PKG_HOSTBUILD="" TERMUX_PKG_MAINTAINER="Fredrik Fornwall " # Cleanup old state rm -Rf $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_SRCDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_MASSAGEDIR -# Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) -mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp} # If $TERMUX_PREFIX already exists, it may have been built for a different arch TERMUX_ARCH_FILE=/data/TERMUX_ARCH @@ -211,6 +239,13 @@ if [ -f "${TERMUX_ARCH_FILE}" ]; then fi echo $TERMUX_ARCH > $TERMUX_ARCH_FILE +# Ensure folders present (but not $TERMUX_PKG_SRCDIR, it will be created in build) +mkdir -p $TERMUX_PKG_BUILDDIR $TERMUX_PKG_PACKAGEDIR $TERMUX_PKG_TMPDIR $TERMUX_PKG_CACHEDIR $TERMUX_PKG_MASSAGEDIR $PKG_CONFIG_LIBDIR $TERMUX_PREFIX/{bin,etc,lib,libexec,share,tmp,include} + +# Make $TERMUX_PREFIX/bin/sh executable on the builder, so that build script can assume that it works +# on both builder and host later on: +ln -f -s /bin/sh $TERMUX_PREFIX/bin/sh + if [ ! -f $PKG_CONFIG ]; then echo "Creating pkg-config wrapper..." # We use path to host pkg-config to avoid picking up a cross-compiled pkg-config later on @@ -235,16 +270,18 @@ Requires: Libs: -L$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib -lz Cflags: -I$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/include HERE - sleep 1 # Sleep so that zlib.c get older timestamp then TERMUX_BUILD_TS_FILE. fi TERMUX_ELF_CLEANER=$TERMUX_COMMON_CACHEDIR/termux-elf-cleaner -if [ ! -f $TERMUX_ELF_CLEANER ]; then - g++ -std=c++11 -Wall -Wextra -pedantic -Os $TERMUX_SCRIPTDIR/packages/termux-tools/termux-elf-cleaner.cpp -o $TERMUX_ELF_CLEANER +TERMUX_ELF_CLEANER_SRC=$TERMUX_SCRIPTDIR/packages/termux-elf-cleaner/termux-elf-cleaner.cpp +if [ $TERMUX_ELF_CLEANER_SRC -nt $TERMUX_ELF_CLEANER ]; then + g++ -std=c++11 -Wall -Wextra -pedantic -Os $TERMUX_ELF_CLEANER_SRC -o $TERMUX_ELF_CLEANER fi # Keep track of when build started so we can see what files have been created export TERMUX_BUILD_TS_FILE=$TERMUX_PKG_TMPDIR/timestamp_$TERMUX_PKG_NAME +sleep 1 # Sleep so that any generated files above (such as zlib.c and $PREFIX/bin/sh) + #get older timestamp then TERMUX_BUILD_TS_FILE rm -f $TERMUX_BUILD_TS_FILE && touch $TERMUX_BUILD_TS_FILE # Run just after sourcing $TERMUX_PKG_BUILDER_SCRIPT @@ -289,7 +326,9 @@ termux_step_patch_package () { cd $TERMUX_PKG_SRCDIR # Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses: for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,}; do - test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | patch -p1 + test -f $patch && sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $patch | \ + sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \ + patch -p1 done find . -name config.sub -exec chmod u+w '{}' \; -exec cp $TERMUX_COMMON_CACHEDIR/config.sub '{}' \; @@ -336,7 +375,18 @@ termux_step_configure () { set -e -o pipefail export PATH=$TERMUX_PKG_TMPDIR/config-scripts:$PATH - $TERMUX_PKG_SRCDIR/configure \ + # See http://wiki.buici.com/xwiki/bin/view/Programing+C+and+C%2B%2B/Autoconf+and+RPL_MALLOC + # about this problem which may cause linker errors in test scripts not undef:ing malloc and + # also cause problems with e.g. malloc interceptors such as libgc: + local AVOID_AUTOCONF_WRAPPERS="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" + # Similarly, disable gnulib's rpl_getcwd(). It returns the wrong value, affecting zile. See + # . + AVOID_AUTOCONF_WRAPPERS+=" gl_cv_func_getcwd_null=yes gl_cv_func_getcwd_posix_signature=yes gl_cv_func_getcwd_path_max=yes gl_cv_func_getcwd_abort_bug=no" + AVOID_AUTOCONF_WRAPPERS+=" gl_cv_header_working_fcntl_h=yes gl_cv_func_fcntl_f_dupfd_cloexec=yes gl_cv_func_fcntl_f_dupfd_works=yes" + # Remove rpl_gettimeofday reference when building at least coreutils: + AVOID_AUTOCONF_WRAPPERS+=" gl_cv_func_tzset_clobber=no gl_cv_func_gettimeofday_clobber=no gl_cv_func_gettimeofday_posix_signature=yes" + + env $AVOID_AUTOCONF_WRAPPERS $TERMUX_PKG_SRCDIR/configure \ --disable-dependency-tracking \ --prefix=$TERMUX_PREFIX \ --disable-rpath --disable-rpath-hack \ @@ -400,13 +450,22 @@ termux_step_massage () { # Remove lib/charset.alias which is installed by gettext-using packages: rm -f lib/charset.alias + # Remove non-english man pages: test -d share/man && (cd share/man; for f in `ls | grep -v man`; do rm -Rf $f; done ) - # Remove info pages and other docs: - rm -Rf share/info share/doc share/locale + + if [ -z ${TERMUX_PKG_KEEP_INFOPAGES+x} ]; then + # Remove info pages: + rm -Rf share/info + fi + + # Remove other docs: + rm -Rf share/doc share/locale + # Remove old kept libraries (readline): find . -name '*.old' -delete - # .. remove static libraries: + + # Remove static libraries: if [ $TERMUX_PKG_KEEP_STATIC_LIBRARIES = "false" ]; then find . -name '*.a' -delete find . -name '*.la' -delete @@ -423,13 +482,15 @@ termux_step_massage () { if [ "$TERMUX_DEBUG" = "" ]; then find . -type f | xargs file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | xargs $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*' fi - # Remove DT_ entries which the android 5.1 linker warns about: - find . -type f | xargs $TERMUX_ELF_CLEANER # Fix shebang paths: - for file in `find . -type f`; do - head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file + for file in `find -L . -type f`; do + head -c 100 $file | grep -E "^#\!.*\\/bin\\/.*" | grep -q -E -v "^#\! ?\\/system" && sed --follow-symlinks -i -E "1 s@^#\!(.*)/bin/(.*)@#\!$TERMUX_PREFIX/bin/\2@" $file done set -e -o pipefail + # Remove DT_ entries which the android 5.1 linker warns about: + if [ "$TERMUX_DEBUG" = "" ]; then + find . -type f -print0 | xargs -0 $TERMUX_ELF_CLEANER + fi test ! -z "$TERMUX_PKG_RM_AFTER_INSTALL" && rm -Rf $TERMUX_PKG_RM_AFTER_INSTALL @@ -439,9 +500,13 @@ termux_step_massage () { if [ -d include -a -z "${TERMUX_PKG_NO_DEVELSPLIT}" ]; then # Add virtual -dev sub package if there are include files: _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh - echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal\" > $_DEVEL_SUBPACKAGE_FILE + echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > $_DEVEL_SUBPACKAGE_FILE echo TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\" >> $_DEVEL_SUBPACKAGE_FILE echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE + if [ x$TERMUX_PKG_CONFLICTS != x ]; then + # Assume that dev packages conflicts as well. + echo "TERMUX_SUBPKG_CONFLICTS=${TERMUX_PKG_CONFLICTS}-dev" >> $_DEVEL_SUBPACKAGE_FILE + fi fi # Now build all sub packages rm -Rf $TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages @@ -453,6 +518,7 @@ termux_step_massage () { echo "$SUB_PKG_NAME => $subpackage" SUB_PKG_DIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/subpackages/$SUB_PKG_NAME TERMUX_SUBPKG_DEPENDS="" + TERMUX_SUBPKG_CONFLICTS="" SUB_PKG_MASSAGE_DIR=$SUB_PKG_DIR/massage/$TERMUX_PREFIX SUB_PKG_PACKAGE_DIR=$SUB_PKG_DIR/package mkdir -p $SUB_PKG_MASSAGE_DIR $SUB_PKG_PACKAGE_DIR @@ -462,7 +528,8 @@ termux_step_massage () { for includeset in $TERMUX_SUBPKG_INCLUDE; do _INCLUDE_DIRSET=`dirname $includeset` test "$_INCLUDE_DIRSET" = "." && _INCLUDE_DIRSET="" - if [ -e $includeset ]; then + if [ -e $includeset -o -L $includeset ]; then + # Add the -L clause to handle relative symbolic links: mkdir -p $SUB_PKG_MASSAGE_DIR/$_INCLUDE_DIRSET mv $includeset $SUB_PKG_MASSAGE_DIR/$_INCLUDE_DIRSET fi @@ -473,7 +540,7 @@ termux_step_massage () { cd $SUB_PKG_DIR/massage SUB_PKG_INSTALLSIZE=`du -sk . | cut -f 1` - $TERMUX_TAR --xz -cf $SUB_PKG_PACKAGE_DIR/data.tar.xz . + $TERMUX_TAR -cJf $SUB_PKG_PACKAGE_DIR/data.tar.xz . mkdir -p DEBIAN cd DEBIAN @@ -487,13 +554,14 @@ Description: $TERMUX_SUBPKG_DESCRIPTION Homepage: $TERMUX_PKG_HOMEPAGE HERE test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control - $TERMUX_TAR -czf $SUB_PKG_PACKAGE_DIR/control.tar.gz . + test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control + $TERMUX_TAR -cJf $SUB_PKG_PACKAGE_DIR/control.tar.xz . # Create the actual .deb file: - TERMUX_SUBPKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${SUB_PKG_NAME}-${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb + TERMUX_SUBPKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb ar cr $TERMUX_SUBPKG_DEBFILE \ $TERMUX_COMMON_CACHEDIR/debian-binary \ - $SUB_PKG_PACKAGE_DIR/control.tar.gz \ + $SUB_PKG_PACKAGE_DIR/control.tar.xz \ $SUB_PKG_PACKAGE_DIR/data.tar.xz if [ "$TERMUX_PROCESS_DEB" != "" ]; then $TERMUX_PROCESS_DEB $TERMUX_SUBPKG_DEBFILE @@ -517,6 +585,41 @@ termux_step_create_debscripts () { return } +termux_setup_golang () { + export GOOS=android + export CGO_ENABLED=1 + export GO_LDFLAGS="-extldflags=-pie" + if [ "$TERMUX_ARCH" = "arm" ]; then + export GOARCH=arm + export GOARM=7 + elif [ "$TERMUX_ARCH" = "i686" ]; then + export GOARCH=386 + export GO386=sse2 + elif [ "$TERMUX_ARCH" = "aarch64" ]; then + export GOARCH=arm64 + elif [ "$TERMUX_ARCH" = "x86_64" ]; then + export GOARCH=amd64 + else + echo "ERROR: Unsupported arch: $TERMUX_ARCH" + exit 1 + fi + + local TERMUX_GO_VERSION=go1.6.1 + local TERMUX_GO_PLATFORM=linux-amd64 + test `uname` = "Darwin" && TERMUX_GO_PLATFORM=darwin-amd64 + + export TERMUX_BUILDGO_FOLDER=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM} + export GOROOT=$TERMUX_BUILDGO_FOLDER + export PATH=$GOROOT/bin:$PATH + + if [ -d $TERMUX_BUILDGO_FOLDER ]; then return; fi + + local TERMUX_BUILDGO_TAR=$TERMUX_COMMON_CACHEDIR/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz + rm -Rf $TERMUX_COMMON_CACHEDIR/go $TERMUX_BUILDGO_FOLDER + curl -o $TERMUX_BUILDGO_TAR https://storage.googleapis.com/golang/${TERMUX_GO_VERSION}.${TERMUX_GO_PLATFORM}.tar.gz + ( cd $TERMUX_COMMON_CACHEDIR; tar xf $TERMUX_BUILDGO_TAR; mv go $TERMUX_BUILDGO_FOLDER; rm $TERMUX_BUILDGO_TAR ) +} + source $TERMUX_PKG_BUILDER_SCRIPT # Compute full version: @@ -608,7 +711,9 @@ cd $TERMUX_PKG_BUILDDIR termux_step_post_make_install cd $TERMUX_PKG_MASSAGEDIR termux_step_extract_into_massagedir +cd $TERMUX_PKG_MASSAGEDIR termux_step_massage +cd $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX termux_step_post_massage # Create data tarball containing files to package: @@ -617,7 +722,7 @@ if [ "`find . -type f`" = "" ]; then echo "ERROR: No files in package" exit 1 fi -$TERMUX_TAR --xz -cf $TERMUX_PKG_PACKAGEDIR/data.tar.xz . +$TERMUX_TAR -cJf $TERMUX_PKG_PACKAGEDIR/data.tar.xz . # Get install size. This will be written as the "Installed-Size" deb field so is measured in 1024-byte blocks: TERMUX_PKG_INSTALLSIZE=`du -sk . | cut -f 1` @@ -640,6 +745,7 @@ Homepage: $TERMUX_PKG_HOMEPAGE HERE test ! -z "$TERMUX_PKG_DEPENDS" && echo "Depends: $TERMUX_PKG_DEPENDS" >> DEBIAN/control test ! -z "$TERMUX_PKG_ESSENTIAL" && echo "Essential: yes" >> DEBIAN/control +test ! -z "$TERMUX_PKG_CONFLICTS" && echo "Conflicts: $TERMUX_PKG_CONFLICTS" >> DEBIAN/control # Create DEBIAN/conffiles (see https://www.debian.org/doc/debian-policy/ap-pkg-conffiles.html): for f in $TERMUX_PKG_CONFFILES; do echo $TERMUX_PREFIX/$f >> DEBIAN/conffiles; done @@ -647,14 +753,14 @@ for f in $TERMUX_PKG_CONFFILES; do echo $TERMUX_PREFIX/$f >> DEBIAN/conffiles; d cd DEBIAN termux_step_create_debscripts -# Create control.tar.gz -$TERMUX_TAR -czf $TERMUX_PKG_PACKAGEDIR/control.tar.gz . +# Create control.tar.xz +$TERMUX_TAR -cJf $TERMUX_PKG_PACKAGEDIR/control.tar.xz . # In the .deb ar file there should be a file "debian-binary" with "2.0" as the content: -TERMUX_PKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${TERMUX_PKG_NAME}-${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb +TERMUX_PKG_DEBFILE=$TERMUX_COMMON_DEBDIR/${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb # Create the actual .deb file: ar cr $TERMUX_PKG_DEBFILE \ $TERMUX_COMMON_CACHEDIR/debian-binary \ - $TERMUX_PKG_PACKAGEDIR/control.tar.gz \ + $TERMUX_PKG_PACKAGEDIR/control.tar.xz \ $TERMUX_PKG_PACKAGEDIR/data.tar.xz if [ "$TERMUX_PROCESS_DEB" != "" ]; then