DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2026-01-04 01:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update package debootstrap

Browse Source
This commit is contained in:
Maxython
2021-11-09 10:11:43 +03:00
parent bf5dd7f453
commit b22d189fe4
2 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/debootstrap/build.sh
View File

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://wiki.debian.org/Debootstrap
TERMUX_PKG_DESCRIPTION="Bootstrap a basic Debian system"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.0.124
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=1.0.125
TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=7700e9864b29f166b26c54153ed8c275b46f4b9a60468bb607e019a64c16cd8f
TERMUX_PKG_SHA256=9c4c7ca8f3f6653e7eca65aae77bbf7f723d7395fb48403bbc2256ce8b24ec1a
TERMUX_PKG_DEPENDS="perl, proot, wget"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_PLATFORM_INDEPENDENT=true

39
packages/debootstrap/functions.patch
View File

@@ -1,26 +1,17 @@
diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
--- debootstrap-1.0.120/functions 2020-03-07 19:01:59.000000000 +0200
+++ debootstrap-1.0.120.mod/functions 2020-03-08 19:42:15.194564546 +0200
@@ -230,17 +230,7 @@
diff -uNr debootstrap/functions debootstrap.mod/functions
--- debootstrap/functions 2021-08-19 14:49:19.000000000 +0300
+++ debootstrap.mod/functions 2021-11-06 20:56:36.542688226 +0200
@@ -231,6 +231,9 @@
}
detect_container () {
- if [ "$container" = lxc ]; then
- CONTAINER="lxc"
- elif grep -qs container=lxc-libvirt /proc/1/environ; then
- CONTAINER="lxc-libvirt"
- elif grep -qs ^systemd-nspawn$ /run/systemd/container || grep -qs systemd-nspawn /proc/1/environ || [ "$container" = "systemd-nspawn" ]; then
- CONTAINER="systemd-nspawn"
- elif grep -qs '[[:space:]]/docker/.*/sys/fs/cgroup' /proc/1/mountinfo; then
- CONTAINER="docker"
- else
- CONTAINER=""
- fi
+ CONTAINER=""
}
########################################################## variant handling
@@ -965,7 +955,7 @@
+ #termux
+ return
+
if [ "$container" = lxc ]; then
CONTAINER="lxc"
elif grep -qs container=lxc-libvirt /proc/1/environ; then
@@ -974,7 +977,7 @@
extract_dpkg_deb_data () {
local pkg="$1"
@@ -29,7 +20,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
}
# Raw .deb extractors
@@ -1005,7 +995,7 @@
@@ -1016,7 +1019,7 @@
esac
if in_path "$cat_cmd"; then
@@ -38,7 +29,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
else
error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd"
fi
@@ -1061,7 +1051,7 @@
@@ -1073,7 +1076,7 @@
); }
in_target_nofail () {
@@ -47,7 +38,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
true
fi
return 0
@@ -1073,7 +1063,7 @@
@@ -1085,7 +1088,7 @@
msg="$2"
arg="$3"
shift; shift; shift
@@ -56,7 +47,7 @@ diff -uNr debootstrap-1.0.120/functions debootstrap-1.0.120.mod/functions
warning "$code" "$msg" "$arg"
# Try to point user at actual failing package.
msg="See %s for details"
@@ -1250,7 +1240,6 @@
@@ -1249,7 +1252,6 @@
return 0
fi