Compare commits

...

8 Commits

Author SHA1 Message Date
clrbuilder 312f6398a9 Update packages file for version 36620
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-07-14 04:10:43 -07:00
clrbuilder ee431ed33f Update packages file for version 36610
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-07-12 04:11:32 -07:00
William Douglas 349d8c6645 Add CLEANUP=1 for when update runs autospec 2022-07-08 08:17:29 -07:00
William Douglas 1aecb3dcf5 Add an update target to common
Add an update target to common whose purpose is to be able to check if
a new version exists, update to the new version and push the updated
version to koji.

This target will cause bump.list content to be rebuilt as well.

Signed-off-by: William Douglas <william.douglas@intel.com>
2022-07-08 08:03:07 -07:00
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
clrbuilder 19e7a08dee Update packages file for version 36590
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-07-05 04:11:08 -07:00
2 changed files with 62 additions and 3 deletions
+44
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,44 @@ 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
update-versions:
.PHONY: update
#help update: Tries to run update.sh if it exists. update.sh is expected
#help to check for version updates, exit (successfully) if none are found
#help or update the package and push the update to koji.
#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.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 \
fi \
logcheck:
@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
+18 -3
View File
@@ -166,6 +166,7 @@ R-Rserve
R-Rsolnp
R-Rtsne
R-Rvmmin
R-Ryacas
R-SDMTools
R-SGP
R-SGPdata
@@ -508,6 +509,7 @@ R-influenceR
R-ini
R-inline
R-insight
R-interp
R-inum
R-invgamma
R-ipred
@@ -1185,7 +1187,6 @@ byobu
bz2file
bzip2
c-ares
c-basic-meta
cJSON
c_rehash
ca-certs
@@ -1373,6 +1374,7 @@ diffutils
digikam
ding-libs
dino
directx-headers
direwolf
dist-pam-configs
distro
@@ -1407,6 +1409,7 @@ dropwatch
dssi
dstat
dtc
duktape
dunst
duperemove
dvisvgm
@@ -2406,6 +2409,11 @@ mesa
mesa-demos
meson
messagelib
meta-c-basic
meta-desktop-gnome
meta-desktop-kde
meta-os-core
meta-os-core-plus
metacity
metis
metrics-discovery
@@ -2446,7 +2454,6 @@ mosh
mosquitto
motd-update
motif
mozjs78
mozjs91
mpc
mpfr
@@ -3640,8 +3647,10 @@ pypi-async_timeout
pypi-asyncssh
pypi-asynctest
pypi-atomicwrites
pypi-atomicwrites_homeassistant
pypi-atpublic
pypi-attrs
pypi-automat
pypi-awesomeversion
pypi-awscrt
pypi-awxkit
@@ -3729,6 +3738,7 @@ pypi-compreffor
pypi-configargparse
pypi-configparser
pypi-cons
pypi-constantly
pypi-contextlib2
pypi-contextvars
pypi-cookiecutter
@@ -3868,6 +3878,7 @@ pypi-hug
pypi-humanfriendly
pypi-humanize
pypi-hyperframe
pypi-hyperlink
pypi-hypothesis
pypi-icalendar
pypi-identify
@@ -3880,6 +3891,7 @@ pypi-imagesize
pypi-immutables
pypi-importlib_metadata
pypi-importlib_resources
pypi-incremental
pypi-infi.dtypes.iqn
pypi-infi.dtypes.wwn
pypi-inflect
@@ -4208,6 +4220,7 @@ pypi-pyu2f
pypi-pyusb
pypi-pywavelets
pypi-pywbem
pypi-pywinrm
pypi-pyxattr
pypi-pyxdameraulevenshtein
pypi-pyxdg
@@ -4363,6 +4376,7 @@ pypi-tox
pypi-tqdm
pypi-traitlets
pypi-trampolim
pypi-trimesh
pypi-trio
pypi-trio_websocket
pypi-ttp
@@ -4609,6 +4623,7 @@ sddm-kcm
seahorse
seatd
sed
seer
serf
setserial
setxkbmap
@@ -4748,7 +4763,6 @@ trace-cmd
traceroute
tracker
tracker-miners
traefik
tree
tree-sitter
tzdata
@@ -4815,6 +4829,7 @@ which
whois
wine
wireless-regdb-master
wireplumber
wireshark
wlroots
wmctrl