build-bootstraps: only include compatible packages
* fix extract_debs to only extract compatible packages for targeted architecture
This commit is contained in:
parent
8d6cac83ff
commit
763d9d4993
|
@ -96,6 +96,7 @@ build_package() {
|
|||
# Extract *.deb files to the bootstrap root.
|
||||
extract_debs() {
|
||||
|
||||
local package_arch="$1"
|
||||
local current_package_name
|
||||
local data_archive
|
||||
local control_archive
|
||||
|
@ -118,7 +119,14 @@ extract_debs() {
|
|||
for deb in *.deb; do
|
||||
|
||||
current_package_name="$(echo "$deb" | sed -E 's/^([^_]+).*/\1/' )"
|
||||
current_package_arch="$(echo "$deb" | sed -E 's/.*_(.*).deb$/\1/' )"
|
||||
echo "current_package_name: '$current_package_name'"
|
||||
echo "current_package_arch: '$current_package_arch'"
|
||||
|
||||
if [[ "$current_package_arch" != "$package_arch" ]] && [[ "$current_package_arch" != "all" ]]; then
|
||||
echo "[*] Skipping incompatible package '$deb' for target '$package_arch'..."
|
||||
continue
|
||||
fi
|
||||
|
||||
if [[ "$current_package_name" == *"-static" ]]; then
|
||||
echo "[*] Skipping static package '$deb'..."
|
||||
|
@ -440,7 +448,7 @@ main() {
|
|||
done
|
||||
|
||||
# Extract all debs.
|
||||
extract_debs || return $?
|
||||
extract_debs "$TERMUX_ARCH" || return $?
|
||||
|
||||
# Create bootstrap archive.
|
||||
create_bootstrap_archive "$TERMUX_ARCH" || return $?
|
||||
|
|
Loading…
Reference in New Issue