From 5465f29528a32008678eb0b3e1a00d31193406be Mon Sep 17 00:00:00 2001 From: Ivan Max <60917834+Maxython@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:48:55 +0300 Subject: [PATCH] build-package.sh: introduce TERMUX_PKG_GROUPS for pacman packaging format (#7609) This metadata field allows to define groups to which the given packages belong. See https://wiki.archlinux.org/title/Pacman#Installing_package_groups --- scripts/build/termux_create_pacman_subpackages.sh | 4 ++++ scripts/build/termux_step_create_pacman_package.sh | 4 ++++ scripts/build/termux_step_setup_variables.sh | 1 + 3 files changed, 9 insertions(+) diff --git a/scripts/build/termux_create_pacman_subpackages.sh b/scripts/build/termux_create_pacman_subpackages.sh index dae6b7886..2e43f5ea2 100644 --- a/scripts/build/termux_create_pacman_subpackages.sh +++ b/scripts/build/termux_create_pacman_subpackages.sh @@ -107,6 +107,10 @@ termux_create_pacman_subpackages() { if [ -n "$TERMUX_SUBPKG_CONFFILES" ]; then tr ',' '\n' <<< "$TERMUX_SUBPKG_CONFFILES" | awk '{ printf "backup = '"${TERMUX_PREFIX:1}"'/%s\n", $1 }' fi + + if [ -n "$TERMUX_PKG_GROUPS" ]; then + tr ',' '\n' <<< "${TERMUX_PKG_GROUPS/#, /}" | awk '{ printf "group = %s\n", $1 }' + fi } > .PKGINFO # Build metadata. diff --git a/scripts/build/termux_step_create_pacman_package.sh b/scripts/build/termux_step_create_pacman_package.sh index 659c2f3fa..f291e7fe8 100644 --- a/scripts/build/termux_step_create_pacman_package.sh +++ b/scripts/build/termux_step_create_pacman_package.sh @@ -101,6 +101,10 @@ termux_step_create_pacman_package() { if [ -n "$TERMUX_PKG_CONFFILES" ]; then tr ',' '\n' <<< "$TERMUX_PKG_CONFFILES" | awk '{ printf "backup = '"${TERMUX_PREFIX:1}"'/%s\n", $1 }' fi + + if [ -n "$TERMUX_PKG_GROUPS" ]; then + tr ',' '\n' <<< "${TERMUX_PKG_GROUPS/#, /}" | awk '{ printf "group = %s\n", $1 }' + fi } > .PKGINFO # Build metadata. diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index 5bcc002b6..89036dea7 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -134,6 +134,7 @@ termux_step_setup_variables() { TERMUX_PKG_SUGGESTS="" TERMUX_PKG_TMPDIR=$TERMUX_TOPDIR/$TERMUX_PKG_NAME/tmp TERMUX_PKG_SERVICE_SCRIPT=() # Fill with entries like: ("daemon name" 'script to execute'). Script is echoed with -e so can contain \n for multiple lines + TERMUX_PKG_GROUPS="" # https://wiki.archlinux.org/title/Pacman#Installing_package_groups unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS }