diff options
| author | Erich Eckner <git@eckner.net> | 2020-02-19 09:38:37 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-04-08 08:45:23 +0200 |
| commit | a347c0358bb7c9962750602ebe0b7311ee66fb4e (patch) | |
| tree | 1c33d2edddf7eaa01867749e05894d36fc0fb0b4 | |
| parent | aff81d34fd072e978925a0ad5d04ea0978ce42ed (diff) | |
| download | devtools-a347c0358bb7c9962750602ebe0b7311ee66fb4e.tar.xz | |
allow PKGEXT to be set from the environment
| -rw-r--r-- | archbuild.in | 2 | ||||
| -rw-r--r-- | makechrootpkg.in | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/archbuild.in b/archbuild.in index 5b98976..32f0d03 100644 --- a/archbuild.in +++ b/archbuild.in @@ -48,7 +48,7 @@ while getopts 'hcr:' arg; do esac done -check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME +check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME,PKGEXT # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") diff --git a/makechrootpkg.in b/makechrootpkg.in index bfa69be..39a6dc4 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -178,6 +178,9 @@ prepare_chroot() { grep -q "^$x" "$copydir/etc/makepkg.conf" && continue echo "$x" >>"$copydir/etc/makepkg.conf" done + if [ -n "${PKGEXT}" ]; then + sed -i 's/^PKGEXT=.*/PKGEXT='"'${PKGEXT}'"'/' "$copydir/etc/makepkg.conf" + fi cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF builduser ALL = NOPASSWD: /usr/bin/pacman @@ -323,6 +326,7 @@ done umask 0022 ORIG_HOME=$HOME +PKGEXT=$PKGEXT IFS=: read -r _ _ _ _ _ HOME _ < <(getent passwd "${SUDO_USER:-$USER}") load_makepkg_config HOME=$ORIG_HOME |