[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-99-g238fa4af
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 238fa4af4507c573ae4d478d1d7e176429d2c5c5 (commit) via 268b0255fa2dd6ccef2e4fa08859c7966002e15a (commit) via c5c7fc7f4a361a9a347845b930030077898cd83f (commit) via 2f15921230a424c57c13dc0ba0776d87c2f590c4 (commit) via 7c5958e0eb8f77feab743adcce05b8bfa600b69e (commit) from e1fc2f901ea7d70787d803ffb5c39fe7ad8bb92e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 238fa4af4507c573ae4d478d1d7e176429d2c5c5 Author: Eli Schwartz <eschwartz@archlinux.org> Date: Fri Jan 4 00:26:28 2019 -0500 makepkg: fix broken check for the fakeroot binary In commit d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 we made use of fakeroot absolutely mandatory, and disabled a lot of the code which checked to see if this now-defunct BUILDENV option was set, before setting up the environment to use fakeroot. Unfortunately, we missed one spot. The check_software routine still checked to see if fakeroot was enabled, but due to the option being removed, thought that it was in fact disabled, and as a result this check would never run. Fix by checking to see if we are trying to build either a package or a source package, and if so, checking for fakeroot. These are the only two situations where fakeroot is needed. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> commit 268b0255fa2dd6ccef2e4fa08859c7966002e15a Author: Eli Schwartz <eschwartz@archlinux.org> Date: Fri Jan 4 00:32:09 2019 -0500 makepkg: add internal variable to track when we're building a package There are state variables for everything else, and we use them to do conditional checks on things, but it's currently a bit difficult to test whether a package is being built, as it's the default action if *no* options are specified. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> commit c5c7fc7f4a361a9a347845b930030077898cd83f Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> Date: Fri Jan 4 13:13:16 2019 +1000 makepkg: Make pkgdir a local Causes it to be reset (to $pkgdirbase/$pkgbase) between subpackages. This shouldn't be visible. Signed-off-by: Allan McRae <allan@archlinux.org> commit 2f15921230a424c57c13dc0ba0776d87c2f590c4 Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> Date: Fri Jan 4 13:09:38 2019 +1000 makepkg: Create a single-package packaging function Merge the similar code handling unsplit PKGBUILDs and individual packages in a split PKGBUILD and make it a new function. Signed-off-by: Allan McRae <allan@archlinux.org> commit 7c5958e0eb8f77feab743adcce05b8bfa600b69e Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> Date: Fri Jan 4 12:57:22 2019 +1000 makepkg: Only backup package variables once We don't need to re-backup the variables we restored on the previous iteration. Signed-off-by: Allan McRae <allan@archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/makepkg.sh.in | 50 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) hooks/post-receive -- The official pacman repository
participants (1)
-
Allan McRae