From 16f813a390e1eca20b603f4528dad630a4ed02ca Mon Sep 17 00:00:00 2001 From: William Douglas Date: Wed, 3 Jul 2024 14:01:16 -0700 Subject: [PATCH] Add support for update.first Add additional capability for update target to read a package's update.first file that will run make update on each of the packages included in that file. The intended usage model is for packages that need to be updated in order to specify that order via the update.first (the packages are updated in the order specified unless a package in the list also has an update.first file). As part of this change, force the update target to always build in koji synchronously to avoid issues where the update being depended on isn't finished in koji. Loops are not supported and will cause problems. Signed-off-by: William Douglas --- Makefile.common | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.common b/Makefile.common index 862af54..0f07858 100644 --- a/Makefile.common +++ b/Makefile.common @@ -407,16 +407,18 @@ update-versions: #help If no update.sh exists, update the version, autospec and push the #help update to koji (bumping the bump.list if found). update: + @if [ -f update.first ]; then \ + for pkg in $$(< update.first); do \ + (cd "../$${pkg}" || exit 1; $(MAKE) update-versions || exit 0; $(MAKE) update) || exit; \ + done; \ + fi @if [ -f update.sh ]; then \ ./update.sh; \ else \ $(MAKE) -s update-versions && \ $(MAKE) autospec CLEANUP=1 && \ - if [ -f bump.list ]; then \ - $(MAKE) -s koji; \ - else \ - $(MAKE) -s koji-nowait; \ - fi \ + $(MAKE) -s koji && \ + $(MAKE) koji-waitrepo; \ fi \ logcheck: