Update repo

This commit is contained in:
termux-pacman-bot
2022-10-10 09:15:33 +00:00
parent 7355cc8341
commit f3ef7b5cdf
5 changed files with 207 additions and 39 deletions

View File

@@ -15,9 +15,11 @@
## limitations under the License.
##
echo "WARNING: interface to this script has been changed. Run without any arguments to see the help message"
if [ "${#}" = "0" ]; then
echo
echo "Usage: revbump [package name] ..."
echo "Usage: revbump [reason for rebuild] [package names] ..."
echo
echo "Add or increment TERMUX_PKG_REVISION of package."
echo
@@ -31,11 +33,13 @@ if git status >/dev/null 2>&1; then
IS_GIT_REPOSITORY=true
fi
for package in "${@}"; do
for package in "${@:2}"; do
package="${package%%/}"
buildsh_path=
for repo in $(jq --raw-output 'keys | .[]' ${REPO_ROOT}/repo.json); do
_buildsh_path="${REPO_ROOT}/${repo}/${package}/build.sh"
repo=
for repo_path in $(jq --raw-output 'keys | .[]' ${REPO_ROOT}/repo.json); do
_buildsh_path="${REPO_ROOT}/${repo_path}/${package}/build.sh"
repo=$(jq --raw-output ".[\"${repo_path}\"].repo" ${REPO_ROOT}/repo.json)
echo $_buildsh_path
if [ -f "${_buildsh_path}" ]; then
@@ -76,13 +80,13 @@ for package in "${@}"; do
git --no-pager diff --patch "${buildsh_path}"
echo "--------------------"
echo
echo "${package}: bump revision"
echo "rebuild(${repo}/${package}): $1"
echo
read -re -p "Do you want to commit these changes ? (y/n) " CHOICE
echo
if [[ ${CHOICE} =~ (Y|y) ]]; then
git add "${buildsh_path}"
git commit -m "${package}: bump revision"
git commit -m "rebuild(${repo}/${package}): $1"
else
echo "Not committing to Git!"
fi

View File

@@ -35,12 +35,15 @@ fi
for package in "${@}"; do
buildsh_path=
repo=
if [ -d "${package}" ] && [ -f "${package}/build.sh" ]; then
buildsh_path="${package}/build.sh"
package=$(basename ${package})
else
for repo_path in $(jq --raw-output 'keys | .[]' $REPO_ROOT/repo.json); do
if [ -d "${repo_path}/${package}" ] && [ -f "${repo_path}/${package}/build.sh" ]; then
repo=$(jq --raw-output '.["'$repo_path'"].name' $REPO_ROOT/repo.json)
repo=${repo#"termux-"}
buildsh_path="${repo_path}/${package}/build.sh"
package=$(basename ${package})
fi
@@ -90,13 +93,13 @@ for package in "${@}"; do
git --no-pager diff --patch "${buildsh_path}"
echo "--------------------"
echo
echo "${package}: update to $(. "${buildsh_path}"; echo "${TERMUX_PKG_VERSION}" | cut -d: -f2-)"
echo "upgpkg(${repo}/${package}): update to $(. "${buildsh_path}"; echo "${TERMUX_PKG_VERSION}" | cut -d: -f2-)"
echo
read -re -p "Do you want to commit changes ? (y/n) " CHOICE
echo
if [[ ${CHOICE} =~ (Y|y) ]]; then
git add "${buildsh_path}"
git commit -m "${package}: update to $(. "${buildsh_path}"; echo "${TERMUX_PKG_VERSION}" | cut -d: -f2-)"
git commit -m "upgpkg(${repo}/${package}): update to $(. "${buildsh_path}"; echo "${TERMUX_PKG_VERSION}" | cut -d: -f2-)"
else
echo "Not committing to Git!"
fi

View File

@@ -14,11 +14,18 @@ fi
export TERMUX_SCRIPTDIR="$(dirname "$(readlink -f "$0")")/../"
mkdir -p "$TERMUX_SCRIPTDIR"/build-tools
. "$TERMUX_SCRIPTDIR"/scripts/properties.sh
: "${TERMUX_MAKE_PROCESSES:="$(nproc)"}"
export TERMUX_MAKE_PROCESSES
export TERMUX_PACKAGES_OFFLINE=true
export TERMUX_ARCH=aarch64
export TERMUX_ON_DEVICE_BUILD=false
export TERMUX_PKG_TMPDIR=$TERMUX_SCRIPTDIR/build-tools/_tmp
export TERMUX_COMMON_CACHEDIR=$TERMUX_PKG_TMPDIR
export TERMUX_PKG_TMPDIR="$TERMUX_SCRIPTDIR/build-tools/_tmp"
export TERMUX_COMMON_CACHEDIR="$TERMUX_PKG_TMPDIR"
export TERMUX_HOST_PLATFORM=aarch64-linux-android
export TERMUX_ARCH_BITS=64
export TERMUX_BUILD_TUPLE=x86_64-pc-linux-gnu
export TERMUX_PKG_API_LEVEL=24
export CC=gcc CXX=g++ LD=ld AR=ar STRIP=strip PKG_CONFIG=pkg-config
export CPPFLAGS="" CFLAGS="" CXXFLAGS="" LDFLAGS=""
mkdir -p "$TERMUX_PKG_TMPDIR"
@@ -65,42 +72,38 @@ rm -rf "${TERMUX_PKG_TMPDIR}"
for repo_path in $(jq --raw-output 'keys | .[]' $TERMUX_SCRIPTDIR/repo.json); do
for p in "$TERMUX_SCRIPTDIR"/$repo_path/*; do
(
. "$TERMUX_SCRIPTDIR"/scripts/properties.sh
. "$TERMUX_SCRIPTDIR"/scripts/build/get_source/termux_step_get_source.sh
. "$TERMUX_SCRIPTDIR"/scripts/build/get_source/termux_git_clone_src.sh
. "$TERMUX_SCRIPTDIR"/scripts/build/get_source/termux_download_src_archive.sh
. "$TERMUX_SCRIPTDIR"/scripts/build/get_source/termux_unpack_src_archive.sh
# Disable archive extraction in termux_step_get_source.sh.
termux_extract_src_archive() {
:
}
TERMUX_PKG_NAME=$(basename "$p")
TERMUX_PKG_BUILDER_DIR="${p}"
TERMUX_PKG_CACHEDIR="${p}/cache"
TERMUX_PKG_METAPACKAGE=false
# Set some variables to dummy values to avoid errors.
TERMUX_PKG_TMPDIR="${TERMUX_PKG_CACHEDIR}/.tmp"
TERMUX_PKG_SRCDIR="${TERMUX_PKG_CACHEDIR}/.src"
TERMUX_PKG_BUILDDIR="$TERMUX_PKG_SRCDIR"
TERMUX_PKG_HOSTBUILD_DIR=$TERMUX_PKG_TMPDIR
TERMUX_HOST_PLATFORM=aarch64-linux-android
TERMUX_ARCH_BITS=64
TERMUX_BUILD_TUPLE=x86_64-pc-linux-gnu
TERMUX_PKG_HOSTBUILD_DIR="$TERMUX_PKG_TMPDIR"
TERMUX_PKG_GIT_BRANCH=""
TERMUX_DEBUG_BUILD=false
TERMUX_MAKE_PROCESSES=1
mkdir -p "$TERMUX_PKG_CACHEDIR" "$TERMUX_PKG_TMPDIR" "$TERMUX_PKG_SRCDIR"
cd "$TERMUX_PKG_CACHEDIR"
. "${p}"/build.sh || true
if ! ${TERMUX_PKG_METAPACKAGE}; then
echo "Downloading sources for '$TERMUX_PKG_NAME'..."
termux_step_get_source
# Delete dummy src and tmp directories.
rm -rf "$TERMUX_PKG_TMPDIR" "$TERMUX_PKG_SRCDIR"
fi

View File

@@ -63,12 +63,13 @@ termux_pkg_upgrade_version() {
fi
echo "INFO: Trying to build package."
repo=$(jq --raw-output $(basename $(dirname ${TERMUX_SCRIPTDIR}/*packages/${TERMUX_PKG_NAME})) ${TERMUX_SCRIPTDIR}/repo.json)
if "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./build-package.sh -a "${TERMUX_ARCH}" -I "${TERMUX_PKG_NAME}"; then
if [[ "${GIT_COMMIT_PACKAGES}" == "true" ]]; then
echo "INFO: Committing package."
stderr="$(
git add "${TERMUX_PKG_BUILDER_DIR}" 2>&1 >/dev/null
git commit -m "${TERMUX_PKG_NAME}: update to ${LATEST_VERSION}" \
git commit -m "upgpkg(${repo}/${TERMUX_PKG_NAME}): update to ${LATEST_VERSION}" \
-m "This commit has been automatically submitted by Github Actions." 2>&1 >/dev/null
)" || {
termux_error_exit <<-EndOfError