From aba865c6ec32b94d93b5a42f94bc0364c36825c6 Mon Sep 17 00:00:00 2001
From: Sylirre <sylirre@termux.dev>
Date: Wed, 6 Nov 2024 16:24:30 +0200
Subject: [PATCH 1/2] addpkg(main): termux-bootstrap

---
 packages/termux-bootstrap/build.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 packages/termux-bootstrap/build.sh

diff --git a/packages/termux-bootstrap/build.sh b/packages/termux-bootstrap/build.sh
new file mode 100644
index 00000000000000..90d7afb4d7867b
--- /dev/null
+++ b/packages/termux-bootstrap/build.sh
@@ -0,0 +1,11 @@
+TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-packages
+TERMUX_PKG_DESCRIPTION="A metapackage representing base Termux environment"
+TERMUX_PKG_LICENSE="Public Domain"
+TERMUX_PKG_MAINTAINER="@termux"
+TERMUX_PKG_VERSION=1.0
+TERMUX_PKG_AUTO_UPDATE=false
+TERMUX_PKG_DEPENDS="bash, bzip2, command-not-found, coreutils, curl, dash, debianutils, diffutils, dos2unix, ed, findutils, gawk, grep, gzip, inetutils, less, lsof, nano, net-tools, patch, procps, psmisc, sed, tar, termux-exec, termux-keyring, termux-tools, unzip, util-linux, xz-utils"
+TERMUX_PKG_ESSENTIAL=true
+TERMUX_PKG_PLATFORM_INDEPENDENT=true
+TERMUX_PKG_SKIP_SRC_EXTRACT=true
+TERMUX_PKG_METAPACKAGE=true

From 0a124b51254ec6901745b0df3742db804f633a2e Mon Sep 17 00:00:00 2001
From: Sylirre <sylirre@termux.dev>
Date: Wed, 6 Nov 2024 16:26:15 +0200
Subject: [PATCH 2/2] scripts(generate-bootstraps.sh): use metapackage for
 pulling base environment package set

---
 scripts/generate-bootstraps.sh | 38 ++--------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/scripts/generate-bootstraps.sh b/scripts/generate-bootstraps.sh
index 9675224a80779f..13224b55a09805 100755
--- a/scripts/generate-bootstraps.sh
+++ b/scripts/generate-bootstraps.sh
@@ -445,44 +445,10 @@ for package_arch in "${TERMUX_ARCHITECTURES[@]}"; do
 	fi
 
 	# Core utilities.
-	pull_package bash # Used by `termux-bootstrap-second-stage.sh`
-	pull_package bzip2
-	if ! ${BOOTSTRAP_ANDROID10_COMPATIBLE}; then
-		pull_package command-not-found
-	else
+	pull_package termux-bootstrap
+	if ${BOOTSTRAP_ANDROID10_COMPATIBLE}; then
 		pull_package proot
 	fi
-	pull_package coreutils
-	pull_package curl
-	pull_package dash
-	pull_package diffutils
-	pull_package findutils
-	pull_package gawk
-	pull_package grep
-	pull_package gzip
-	pull_package less
-	pull_package procps
-	pull_package psmisc
-	pull_package sed
-	pull_package tar
-	pull_package termux-exec
-	pull_package termux-keyring
-	pull_package termux-tools
-	pull_package util-linux
-	pull_package xz-utils
-
-	# Additional.
-	pull_package ed
-	if [ ${TERMUX_PACKAGE_MANAGER} = "apt" ]; then
-		pull_package debianutils
-	fi
-	pull_package dos2unix
-	pull_package inetutils
-	pull_package lsof
-	pull_package nano
-	pull_package net-tools
-	pull_package patch
-	pull_package unzip
 
 	# Handle additional packages.
 	for add_pkg in "${ADDITIONAL_PACKAGES[@]}"; do