mirror of
https://github.com/clearlinux/common.git
synced 2026-06-16 11:06:15 +00:00
Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 clrbuilder
|
d6c8858c6e | ||
|
clrbuilder
|
9d5c67d124 | ||
|
Patrick McCarty
|
72406d0525 | ||
|
clrbuilder
|
1368df937f | ||
|
clrbuilder
|
4668b03fdd | ||
|
Patrick McCarty
|
d612ea1d6d | ||
|
Patrick McCarty
|
36d49108a6 | ||
|
clrbuilder
|
cbfa62d79e | ||
|
clrbuilder
|
312f6398a9 | ||
|
clrbuilder
|
ee431ed33f | ||
|
William Douglas
|
349d8c6645 | ||
|
William Douglas
|
1aecb3dcf5 | ||
|
clrbuilder
|
be88b856de | ||
|
William Douglas
|
e610c46517 | ||
|
Patrick McCarty
|
f78b8dad99 | ||
|
clrbuilder
|
19e7a08dee |
+58
-3
@@ -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,13 @@ 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; \
|
||||
msg="Bump for $(shell $(call queryspec,%{NAME} %{VERSION}\n,$(SPECFILE)))"; \
|
||||
for bump_dep in $$(cat bump.list); do \
|
||||
(cd ../"$$bump_dep" && $(MAKE) bump BUMP_MSG="$$msg" && $(MAKE) koji-nowait) \
|
||||
done \
|
||||
fi
|
||||
|
||||
#help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
|
||||
#help same tag.
|
||||
@@ -352,6 +369,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
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -1114,7 +1110,6 @@ automake
|
||||
autossh
|
||||
avahi
|
||||
awesome-wm
|
||||
aws-sam-translator
|
||||
awscli
|
||||
axel
|
||||
azure-configs
|
||||
@@ -1185,7 +1180,6 @@ byobu
|
||||
bz2file
|
||||
bzip2
|
||||
c-ares
|
||||
c-basic-meta
|
||||
cJSON
|
||||
c_rehash
|
||||
ca-certs
|
||||
@@ -1294,17 +1288,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
|
||||
@@ -1373,6 +1363,7 @@ diffutils
|
||||
digikam
|
||||
ding-libs
|
||||
dino
|
||||
directx-headers
|
||||
direwolf
|
||||
dist-pam-configs
|
||||
distro
|
||||
@@ -1407,6 +1398,7 @@ dropwatch
|
||||
dssi
|
||||
dstat
|
||||
dtc
|
||||
duktape
|
||||
dunst
|
||||
duperemove
|
||||
dvisvgm
|
||||
@@ -2325,6 +2317,7 @@ linux-lts2017
|
||||
linux-lts2018
|
||||
linux-lts2019
|
||||
linux-lts2020
|
||||
linux-lts2021
|
||||
linux-mainline
|
||||
linux-oracle
|
||||
linux-preempt-rt
|
||||
@@ -2406,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
|
||||
@@ -2446,7 +2444,6 @@ mosh
|
||||
mosquitto
|
||||
motd-update
|
||||
motif
|
||||
mozjs78
|
||||
mozjs91
|
||||
mpc
|
||||
mpfr
|
||||
@@ -2969,6 +2966,7 @@ perl-IO-All
|
||||
perl-IO-Async
|
||||
perl-IO-Capture
|
||||
perl-IO-CaptureOutput
|
||||
perl-IO-FDPass
|
||||
perl-IO-HTML
|
||||
perl-IO-Interactive
|
||||
perl-IO-Interactive-Tiny
|
||||
@@ -3039,6 +3037,8 @@ perl-Log-Message
|
||||
perl-Log-Message-Simple
|
||||
perl-Log-Trace
|
||||
perl-MARC-Record
|
||||
perl-MCE
|
||||
perl-MCE-Shared
|
||||
perl-MIME-Base32
|
||||
perl-MIME-Base64
|
||||
perl-MIME-Base64-URLSafe
|
||||
@@ -3640,14 +3640,15 @@ pypi-async_timeout
|
||||
pypi-asyncssh
|
||||
pypi-asynctest
|
||||
pypi-atomicwrites
|
||||
pypi-atomicwrites_homeassistant
|
||||
pypi-atpublic
|
||||
pypi-attrs
|
||||
pypi-automat
|
||||
pypi-awesomeversion
|
||||
pypi-awscrt
|
||||
pypi-awxkit
|
||||
pypi-azure_common
|
||||
pypi-azure_core
|
||||
pypi-azure_devops
|
||||
pypi-azure_mgmt_compute
|
||||
pypi-azure_mgmt_core
|
||||
pypi-azure_mgmt_netapp
|
||||
@@ -3729,6 +3730,7 @@ pypi-compreffor
|
||||
pypi-configargparse
|
||||
pypi-configparser
|
||||
pypi-cons
|
||||
pypi-constantly
|
||||
pypi-contextlib2
|
||||
pypi-contextvars
|
||||
pypi-cookiecutter
|
||||
@@ -3762,14 +3764,12 @@ pypi-diffoscope
|
||||
pypi-dill
|
||||
pypi-diskcache
|
||||
pypi-distlib
|
||||
pypi-distributed
|
||||
pypi-dj_database_url
|
||||
pypi-django
|
||||
pypi-django_appconf
|
||||
pypi-django_compressor
|
||||
pypi-django_discover_runner
|
||||
pypi-django_nose
|
||||
pypi-django_pyscss
|
||||
pypi-dnacentersdk
|
||||
pypi-dns_lexicon
|
||||
pypi-dnspython
|
||||
@@ -3864,10 +3864,10 @@ pypi-httpcore
|
||||
pypi-httplib2
|
||||
pypi-httpretty
|
||||
pypi-httpx
|
||||
pypi-hug
|
||||
pypi-humanfriendly
|
||||
pypi-humanize
|
||||
pypi-hyperframe
|
||||
pypi-hyperlink
|
||||
pypi-hypothesis
|
||||
pypi-icalendar
|
||||
pypi-identify
|
||||
@@ -3880,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
|
||||
@@ -3980,8 +3981,6 @@ pypi-mergedeep
|
||||
pypi-mido
|
||||
pypi-minikanren
|
||||
pypi-mistune
|
||||
pypi-mkdocs
|
||||
pypi-mkdocs_material
|
||||
pypi-mkdocs_material_extensions
|
||||
pypi-mock
|
||||
pypi-modulegraph
|
||||
@@ -4058,7 +4057,6 @@ pypi-pathtools
|
||||
pypi-patsy
|
||||
pypi-pbr
|
||||
pypi-pdm_pep517
|
||||
pypi-pdocs
|
||||
pypi-pecan
|
||||
pypi-ped
|
||||
pypi-pep517
|
||||
@@ -4086,7 +4084,6 @@ pypi-polib
|
||||
pypi-port_for
|
||||
pypi-portalocker
|
||||
pypi-portend
|
||||
pypi-portray
|
||||
pypi-posix_ipc
|
||||
pypi-poyo
|
||||
pypi-pre_commit
|
||||
@@ -4105,7 +4102,6 @@ pypi-purestorage
|
||||
pypi-purity_fb
|
||||
pypi-py
|
||||
pypi-py_cpuinfo
|
||||
pypi-py_pure_client
|
||||
pypi-pyaml
|
||||
pypi-pyasn1
|
||||
pypi-pyasn1_modules
|
||||
@@ -4148,6 +4144,7 @@ pypi-pyopenssl
|
||||
pypi-pyparsing
|
||||
pypi-pyperclip
|
||||
pypi-pyperf
|
||||
pypi-pyproject_metadata
|
||||
pypi-pyprojectx
|
||||
pypi-pypsrp
|
||||
pypi-pyqrcode
|
||||
@@ -4208,6 +4205,7 @@ pypi-pyu2f
|
||||
pypi-pyusb
|
||||
pypi-pywavelets
|
||||
pypi-pywbem
|
||||
pypi-pywinrm
|
||||
pypi-pyxattr
|
||||
pypi-pyxdameraulevenshtein
|
||||
pypi-pyxdg
|
||||
@@ -4291,7 +4289,6 @@ pypi-sphinx
|
||||
pypi-sphinx_ansible_theme
|
||||
pypi-sphinx_argparse
|
||||
pypi-sphinx_autobuild
|
||||
pypi-sphinx_book_theme
|
||||
pypi-sphinx_copybutton
|
||||
pypi-sphinx_design
|
||||
pypi-sphinx_feature_classification
|
||||
@@ -4300,7 +4297,6 @@ pypi-sphinx_issues
|
||||
pypi-sphinx_last_updated_by_git
|
||||
pypi-sphinx_notfound_page
|
||||
pypi-sphinx_rtd_theme
|
||||
pypi-sphinx_thebe
|
||||
pypi-sphinx_theme_builder
|
||||
pypi-sphinx_togglebutton
|
||||
pypi-sphinxcontrib_apidoc
|
||||
@@ -4363,6 +4359,7 @@ pypi-tox
|
||||
pypi-tqdm
|
||||
pypi-traitlets
|
||||
pypi-trampolim
|
||||
pypi-trimesh
|
||||
pypi-trio
|
||||
pypi-trio_websocket
|
||||
pypi-ttp
|
||||
@@ -4395,7 +4392,6 @@ pypi-uc_micro_py
|
||||
pypi-ufolib2
|
||||
pypi-uharfbuzz
|
||||
pypi-ujson
|
||||
pypi-uncertainpy
|
||||
pypi-unicodedata2
|
||||
pypi-unidecode
|
||||
pypi-unidiff
|
||||
@@ -4410,7 +4406,6 @@ pypi-virtualenv
|
||||
pypi-volatile
|
||||
pypi-voluptuous
|
||||
pypi-voluptuous_serialize
|
||||
pypi-vsts
|
||||
pypi-vsts_cd_manager
|
||||
pypi-waitress
|
||||
pypi-watchdog
|
||||
@@ -4609,6 +4604,7 @@ sddm-kcm
|
||||
seahorse
|
||||
seatd
|
||||
sed
|
||||
seer
|
||||
serf
|
||||
setserial
|
||||
setxkbmap
|
||||
@@ -4748,7 +4744,6 @@ trace-cmd
|
||||
traceroute
|
||||
tracker
|
||||
tracker-miners
|
||||
traefik
|
||||
tree
|
||||
tree-sitter
|
||||
tzdata
|
||||
@@ -4815,6 +4810,7 @@ which
|
||||
whois
|
||||
wine
|
||||
wireless-regdb-master
|
||||
wireplumber
|
||||
wireshark
|
||||
wlroots
|
||||
wmctrl
|
||||
|
||||
Reference in New Issue
Block a user