|
|
@ -223,8 +223,6 @@ termux_step_setup_variables() { |
|
|
|
# that everyone gets an updated toolchain: |
|
|
|
TERMUX_STANDALONE_TOOLCHAIN+="-v17" |
|
|
|
|
|
|
|
export TERMUX_TAR="tar" |
|
|
|
export TERMUX_TOUCH="touch" |
|
|
|
export prefix=${TERMUX_PREFIX} |
|
|
|
export PREFIX=${TERMUX_PREFIX} |
|
|
|
export PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib/pkgconfig |
|
|
@ -408,7 +406,7 @@ termux_step_extract_package() { |
|
|
|
if [ "${file##*.}" = zip ]; then |
|
|
|
unzip -q "$file" |
|
|
|
else |
|
|
|
$TERMUX_TAR xf "$file" |
|
|
|
tar xf "$file" |
|
|
|
fi |
|
|
|
mv $folder "$TERMUX_PKG_SRCDIR" |
|
|
|
} |
|
|
@ -823,12 +821,12 @@ termux_step_extract_into_massagedir() { |
|
|
|
|
|
|
|
# Build diff tar with what has changed during the build: |
|
|
|
cd $TERMUX_PREFIX |
|
|
|
$TERMUX_TAR -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" . |
|
|
|
tar -N "$TERMUX_BUILD_TS_FILE" -czf "$TARBALL_ORIG" . |
|
|
|
|
|
|
|
# Extract tar in order to massage it |
|
|
|
mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX" |
|
|
|
cd "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX" |
|
|
|
$TERMUX_TAR xf "$TARBALL_ORIG" |
|
|
|
tar xf "$TARBALL_ORIG" |
|
|
|
rm "$TARBALL_ORIG" |
|
|
|
} |
|
|
|
|
|
|
@ -938,7 +936,7 @@ termux_step_massage() { |
|
|
|
cd "$SUB_PKG_DIR/massage" |
|
|
|
local SUB_PKG_INSTALLSIZE |
|
|
|
SUB_PKG_INSTALLSIZE=$(du -sk . | cut -f 1) |
|
|
|
$TERMUX_TAR -cJf "$SUB_PKG_PACKAGE_DIR/data.tar.xz" . |
|
|
|
tar -cJf "$SUB_PKG_PACKAGE_DIR/data.tar.xz" . |
|
|
|
|
|
|
|
mkdir -p DEBIAN |
|
|
|
cd DEBIAN |
|
|
@ -953,7 +951,7 @@ termux_step_massage() { |
|
|
|
HERE |
|
|
|
test ! -z "$TERMUX_SUBPKG_DEPENDS" && echo "Depends: $TERMUX_SUBPKG_DEPENDS" >> control |
|
|
|
test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control |
|
|
|
$TERMUX_TAR -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" . |
|
|
|
tar -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" . |
|
|
|
|
|
|
|
for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done |
|
|
|
|
|
|
@ -992,7 +990,7 @@ termux_step_create_datatar() { |
|
|
|
if [ -z "${TERMUX_PKG_METAPACKAGE+x}" ] && [ "$(find . -type f)" = "" ]; then |
|
|
|
termux_error_exit "No files in package" |
|
|
|
fi |
|
|
|
$TERMUX_TAR -cJf "$TERMUX_PKG_PACKAGEDIR/data.tar.xz" . |
|
|
|
tar -cJf "$TERMUX_PKG_PACKAGEDIR/data.tar.xz" . |
|
|
|
} |
|
|
|
|
|
|
|
termux_step_create_debscripts() { |
|
|
@ -1032,7 +1030,7 @@ termux_step_create_debfile() { |
|
|
|
termux_step_create_debscripts |
|
|
|
|
|
|
|
# Create control.tar.xz |
|
|
|
$TERMUX_TAR -cJf "$TERMUX_PKG_PACKAGEDIR/control.tar.xz" . |
|
|
|
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 |
|
|
|