Compare commits

...

22 Commits

Author SHA1 Message Date
clrbuilder 1368df937f Update packages file for version 36680
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-07-27 13:20:49 -07:00
clrbuilder 4668b03fdd Update packages file for version 36650
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-07-26 04:29:52 -07:00
Patrick McCarty d612ea1d6d bumpnogit: revise docs to align with bump target
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2022-07-22 22:38:41 +00:00
Patrick McCarty 36d49108a6 bump: add custom commit summary support
To add a custom commit summary for a `make bump`, set the BUMP_MSG
variable to the desired summary.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2022-07-22 22:37:18 +00:00
clrbuilder cbfa62d79e Update packages file for version 36630
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-07-19 04:09:53 -07:00
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
clrbuilder 3a7b28e5fa Update packages file for version 36580
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-06-30 04:17:23 -07:00
clrbuilder 8997481daf Update packages file for version 36530
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-06-23 04:10:06 -07:00
clrbuilder 896832831f Update packages file for version 36510
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-06-17 09:40:52 -07:00
clrbuilder 1978d3268c Update packages file for version 36460
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-06-09 12:16:28 -07:00
clrbuilder 7d9588c779 Update packages file for version 36440
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-06-07 04:10:08 -07:00
clrbuilder 7794fa715c Update packages file for version 36420
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-05-31 04:09:27 -07:00
clrbuilder 1c79b04db3 Update packages file for version 36400
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-05-24 13:30:28 -07:00
clrbuilder b52570a7ad Update packages file for version 36390
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-05-24 04:09:27 -07:00
clrbuilder 1a0e21943f Update packages file for version 36380
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-05-23 06:36:33 -07:00
2 changed files with 100 additions and 23 deletions
+57 -3
View File
@@ -217,14 +217,24 @@ autospecnostate:
scanlicense:
python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --config $(AUTOSPEC_CONF) --license-only $(firstword $(NEWURL) $(URL)) --name $(PKG_NAME)
#help bump: Increments the release file by one.
#help bump: Increments the package release number by one and commits the result. If
#help the variable BUMP_MSG is set, its value is used as the commit summary.
#help Otherwise a generic commit summary is used.
bump:
git pull --rebase
$(MAKE) bumpnogit
git add $(SPECFILE) release
git commit -a -m "version bump from $(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))) to `$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`"
fromver=$(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))); \
tover=`$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`; \
if [[ -n "$(BUMP_MSG)" ]]; then \
bumpmsg="$(BUMP_MSG)"; \
else \
bumpmsg="version bump from $$fromver to $$tover"; \
fi; \
git commit -a -m "$$bumpmsg"
#help bumpnogit: Increments the release file by one and does not commit changes.
#help bumpnogit: Increments the package release number by one and does not commit
#help changes.
bumpnogit:
@$(MAKE) spdxcheck
oldrel=$(shell $(call queryspec,%{RELEASE}\n,$(SPECFILE))); \
@@ -329,6 +339,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 +368,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
+43 -20
View File
@@ -56,7 +56,6 @@ R-BB
R-BBmisc
R-BH
R-BMA
R-BMS
R-BatchJobs
R-BayesFactor
R-BiasedUrn
@@ -166,6 +165,7 @@ R-Rserve
R-Rsolnp
R-Rtsne
R-Rvmmin
R-Ryacas
R-SDMTools
R-SGP
R-SGPdata
@@ -287,7 +287,6 @@ R-config
R-conflicted
R-conquer
R-contfrac
R-conting
R-corpcor
R-corrgram
R-corrplot
@@ -371,18 +370,15 @@ R-evd
R-expint
R-expm
R-expsmooth
R-fAsianOptions
R-fAssets
R-fBasics
R-fBonds
R-fCopulae
R-fExoticOptions
R-fExtremes
R-fGarch
R-fImport
R-fMultivar
R-fNonlinear
R-fOptions
R-fRegression
R-fTrading
R-fUnitRoots
@@ -508,6 +504,7 @@ R-influenceR
R-ini
R-inline
R-insight
R-interp
R-inum
R-invgamma
R-ipred
@@ -644,7 +641,6 @@ R-nnls
R-nortest
R-npsurv
R-numDeriv
R-nws
R-nycflights13
R-officer
R-openssl
@@ -719,9 +715,9 @@ R-princurve
R-processx
R-procmaps
R-prodlim
R-profdpm
R-profileModel
R-profmem
R-profvis
R-progress
R-progressr
R-projpred
@@ -836,7 +832,6 @@ R-runjags
R-rversions
R-rvest
R-s2
R-sROC
R-sampling
R-sandwich
R-sass
@@ -958,6 +953,7 @@ R-unbalanced
R-units
R-unix
R-urca
R-urlchecker
R-urltools
R-uroot
R-usethis
@@ -1069,7 +1065,6 @@ ansible
ansible-core
antlr4-python3-runtime
apache-ant
applaunchservices
appstream
appstream-glib
apr
@@ -1186,7 +1181,6 @@ byobu
bz2file
bzip2
c-ares
c-basic-meta
cJSON
c_rehash
ca-certs
@@ -1295,17 +1289,13 @@ compat-libpng-soname12
compat-libsigc++-soname20
compat-libsoup-soname-24
compat-libva-soname1
compat-libvpx-soname6
compat-lua-52
compat-lua-53
compat-nettle-soname7
compat-pangomm-soname14
compat-poppler-soname112
compat-poppler-soname117
compat-protobuf-soname23
compat-readline-soname5
compat-rest-soname07
compat-tbb-soname12
compat-tracker-soname2.0
compat-webkitgtk-soname40
component
@@ -1374,6 +1364,7 @@ diffutils
digikam
ding-libs
dino
directx-headers
direwolf
dist-pam-configs
distro
@@ -1393,7 +1384,6 @@ docbook2X
docker
docker-cli
dockerpty
docutils
dolphin
dolphin-plugins
dos2unix
@@ -1409,6 +1399,7 @@ dropwatch
dssi
dstat
dtc
duktape
dunst
duperemove
dvisvgm
@@ -2408,6 +2399,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
@@ -2448,7 +2444,6 @@ mosh
mosquitto
motd-update
motif
mozjs78
mozjs91
mpc
mpfr
@@ -2617,6 +2612,7 @@ pbzip2
pciutils
pcmanfm
pcmanfm-qt
pcp
pcre
pcre2
pcs
@@ -3071,6 +3067,7 @@ perl-Metrics-Any
perl-Minion
perl-Mixin-Linewise
perl-Mock-Config
perl-Mock-Sub
perl-Modern-Perl
perl-Module-Build
perl-Module-Build-Tiny
@@ -3621,10 +3618,11 @@ pypi-apacheconfig
pypi-apipkg
pypi-appdirs
pypi-applicationinsights
pypi-appnope
pypi-argcomplete
pypi-argh
pypi-argon2_cffi
pypi-argon2_cffi_bindings
pypi-argparse
pypi-arrow
pypi-asgiref
pypi-asn1crypto
@@ -3636,10 +3634,13 @@ pypi-astunparse
pypi-asv
pypi-async_generator
pypi-async_timeout
pypi-asyncssh
pypi-asynctest
pypi-atomicwrites
pypi-atomicwrites_homeassistant
pypi-atpublic
pypi-attrs
pypi-automat
pypi-awesomeversion
pypi-awscrt
pypi-awxkit
@@ -3724,10 +3725,10 @@ pypi-columnize
pypi-commonmark
pypi-complete
pypi-compreffor
pypi-comtypes
pypi-configargparse
pypi-configparser
pypi-cons
pypi-constantly
pypi-contextlib2
pypi-contextvars
pypi-cookiecutter
@@ -3768,7 +3769,7 @@ pypi-django_appconf
pypi-django_compressor
pypi-django_discover_runner
pypi-django_nose
pypi-django_pyscss
pypi-dnacentersdk
pypi-dns_lexicon
pypi-dnspython
pypi-docker
@@ -3785,6 +3786,7 @@ pypi-enrich
pypi-entrypoints
pypi-envs
pypi-eternalegypt
pypi-etils
pypi-etuples
pypi-evdev
pypi-exceptiongroup
@@ -3805,6 +3807,7 @@ pypi-flake8_blind_except
pypi-flake8_class_newline
pypi-flake8_docstrings
pypi-flake8_import_order
pypi-flaky
pypi-flask
pypi-flatten_json
pypi-flit
@@ -3814,6 +3817,7 @@ pypi-fontmath
pypi-freezegun
pypi-frozenlist
pypi-fsspec
pypi-ftfy
pypi-funcparserlib
pypi-future
pypi-gast
@@ -3863,6 +3867,7 @@ pypi-hug
pypi-humanfriendly
pypi-humanize
pypi-hyperframe
pypi-hyperlink
pypi-hypothesis
pypi-icalendar
pypi-identify
@@ -3875,6 +3880,7 @@ pypi-imagesize
pypi-immutables
pypi-importlib_metadata
pypi-importlib_resources
pypi-incremental
pypi-infi.dtypes.iqn
pypi-infi.dtypes.wwn
pypi-inflect
@@ -3884,6 +3890,7 @@ pypi-iniconfig
pypi-inspursmsdk
pypi-intervaltree
pypi-invoke
pypi-iocapture
pypi-ipaddress
pypi-ipdb
pypi-ipdbplugin
@@ -3946,6 +3953,7 @@ pypi-khal
pypi-kiwisolver
pypi-krb5
pypi-kubernetes
pypi-langcodes
pypi-lark_parser
pypi-latexcodec
pypi-lazy_object_proxy
@@ -3959,6 +3967,7 @@ pypi-logical_unification
pypi-logilab_common
pypi-lxml
pypi-lz4
pypi-m2r
pypi-macholib
pypi-mako
pypi-markdown
@@ -4031,11 +4040,13 @@ pypi-openshift
pypi-opt_einsum
pypi-ouimeaux
pypi-outcome
pypi-ovirt_imageio
pypi-packaging
pypi-paho_mqtt
pypi-pandocfilters
pypi-paramiko
pypi-parse
pypi-parse_type
pypi-parsedatetime
pypi-parso
pypi-partd
@@ -4044,6 +4055,7 @@ pypi-pastedeploy
pypi-pastel
pypi-pathlib
pypi-pathspec
pypi-pathtools
pypi-patsy
pypi-pbr
pypi-pdm_pep517
@@ -4061,6 +4073,7 @@ pypi-pickleshare
pypi-pid
pypi-pillow
pypi-pip
pypi-pip_tools
pypi-pkgconfig
pypi-pkginfo
pypi-platformdirs
@@ -4071,6 +4084,7 @@ pypi-pockets
pypi-poetry
pypi-poetry_core
pypi-polib
pypi-port_for
pypi-portalocker
pypi-portend
pypi-portray
@@ -4135,6 +4149,7 @@ pypi-pyopenssl
pypi-pyparsing
pypi-pyperclip
pypi-pyperf
pypi-pyproject_metadata
pypi-pyprojectx
pypi-pypsrp
pypi-pyqrcode
@@ -4188,12 +4203,14 @@ pypi-python_slugify
pypi-python_string_utils
pypi-python_xlib
pypi-pythran
pypi-pytoolconfig
pypi-pytz
pypi-pytz_deprecation_shim
pypi-pyu2f
pypi-pyusb
pypi-pywavelets
pypi-pywbem
pypi-pywinrm
pypi-pyxattr
pypi-pyxdameraulevenshtein
pypi-pyxdg
@@ -4300,9 +4317,11 @@ pypi-sphinxcontrib_httpdomain
pypi-sphinxcontrib_jsmath
pypi-sphinxcontrib_napoleon
pypi-sphinxcontrib_newsfeed
pypi-sphinxcontrib_openapi
pypi-sphinxcontrib_plantuml
pypi-sphinxcontrib_programoutput
pypi-sphinxcontrib_qthelp
pypi-sphinxcontrib_redoc
pypi-sphinxcontrib_seqdiag
pypi-sphinxcontrib_serializinghtml
pypi-sphinxcontrib_svg2pdfconverter
@@ -4342,10 +4361,12 @@ pypi-tomli_w
pypi-tomlkit
pypi-toolz
pypi-tornado
pypi-tornado_xstatic
pypi-tox
pypi-tqdm
pypi-traitlets
pypi-trampolim
pypi-trimesh
pypi-trio
pypi-trio_websocket
pypi-ttp
@@ -4408,6 +4429,7 @@ pypi-werkzeug
pypi-wheel
pypi-widgetsnbextension
pypi-wikipedia
pypi-wordfreq
pypi-wrapt
pypi-wsgiproxy2
pypi-wsproto
@@ -4591,6 +4613,7 @@ sddm-kcm
seahorse
seatd
sed
seer
serf
setserial
setxkbmap
@@ -4730,7 +4753,6 @@ trace-cmd
traceroute
tracker
tracker-miners
traefik
tree
tree-sitter
tzdata
@@ -4797,6 +4819,7 @@ which
whois
wine
wireless-regdb-master
wireplumber
wireshark
wlroots
wmctrl