Compare commits

..

3 Commits

Author SHA1 Message Date
clrbuilder be88b856de Update packages file for version 36600
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-07-07 04:10:52 -07:00
William Douglas e610c46517 Makefile.common: Add bump.list to make koji
Add the ability for make koji to look a bump.list file in the package
directory and make and koji all the packages listed in that file.

This is useful for package's that depend on the updated package and
should be rebuilt after the original package is.

If for some reason this functionality isn't desired make koji-nowait
will not look at the bump.list.

Signed-off-by: William Douglas <william.douglas@intel.com>
2022-07-05 12:01:09 -07:00
Patrick McCarty f78b8dad99 common: add new koji-waitrepo command
This command wraps `koji wait-repo` for convenient use within the common
tooling.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2022-07-05 18:21:59 +00:00
2 changed files with 27 additions and 0 deletions
+23
View File
@@ -329,6 +329,12 @@ koji: prekoji-checks kojidef
git tag $(SRPMVERS)
git push origin $(CURRENT_BRANCH):main refs/tags/$(SRPMVERS)
$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
@if [ -f bump.list ]; then \
$(MAKE) koji-waitrepo; \
for bump_dep in $$(cat bump.list); do \
(cd ../"$$bump_dep" && $(MAKE) bump && $(MAKE) koji-nowait) \
done \
fi
#help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
#help same tag.
@@ -352,6 +358,23 @@ koji-nowait:
rekoji-nowait:
$(MAKE) KOJI_NOWAIT="--nowait --background" rekoji
#help koji-waitrepo: Wait for current package changes to become available in the
#help koji repo. If PKG_NAME is overridden on the command line, wait on changes for
#help that package instead. This capability allows the developer to "chain" builds
#help for submission to koji according to the state of the package repos on their
#help system. Additional options for `koji wait-repo` can be specified via the
#help WAIT_OPTS variable.
koji-waitrepo: kojidef
@if [[ ! "${PKG_NAME}" =~ ^[A-Za-z0-9._+-]+$$ ]]; then \
echo "[ERROR] Invalid package name \"${PKG_NAME}\""; \
exit 1; \
fi; \
if [[ "${PKG_NAME}" != "$(notdir ${CURDIR})" ]]; then \
$(MAKE) -s -C ../${PKG_NAME} koji-waitrepo; \
else \
koji wait-repo --build=${SRPMVERS} ${WAIT_OPTS} ${KOJI_TAG}-build; \
fi
logcheck:
@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
+4
View File
@@ -508,6 +508,7 @@ R-influenceR
R-ini
R-inline
R-insight
R-interp
R-inum
R-invgamma
R-ipred
@@ -1372,6 +1373,7 @@ diffutils
digikam
ding-libs
dino
directx-headers
direwolf
dist-pam-configs
distro
@@ -2406,6 +2408,7 @@ mesa-demos
meson
messagelib
meta-c-basic
meta-desktop-gnome
meta-desktop-kde
metacity
metis
@@ -4614,6 +4617,7 @@ sddm-kcm
seahorse
seatd
sed
seer
serf
setserial
setxkbmap