Compare commits

...

6 Commits

Author SHA1 Message Date
Arjan van de Ven 0fd1fc5a1d packages update 2024-07-30 16:29:55 +00:00
William Douglas 0e9a2b7e82 Force git attributes for vendor directories
Avoid cases where user git settings cause files to have different line
endings than the package and cause hash mismatches when building.

Signed-off-by: William Douglas <william.douglas@intel.com>
2024-07-25 12:45:07 -07:00
William Douglas 398fb69708 Always remove the pumpAutospec file
Remove pumpAutospec even if the package hasn't yet become a git repo
yet.

Signed-off-by: William Douglas <william.douglas@intel.com>
2024-07-24 15:36:47 -07:00
William Douglas cdcb8aa9d8 Switch to git rm for removing the autospec log file
Signed-off-by: William Douglas <william.douglas@intel.com>
2024-07-22 16:38:33 -07:00
Arjan van de Ven 3168ba058e update 2024-07-22 23:22:51 +00:00
William Douglas 76fef57d5b Add env var for autospec logging
Add environment variable that autospec uses to decide when to log
fatal errors to a special file used for the update process.

Also does the cleanup of the autospec created file for new autospec
runs.

Signed-off-by: William Douglas <william.douglas@intel.com>
2024-07-22 16:20:55 -07:00
3 changed files with 18 additions and 2 deletions
+2
View File
@@ -166,6 +166,7 @@ preautospec-checks:
#help to autospec. #help to autospec.
#help For more information, see the project at https://github.com/clearlinux/autospec #help For more information, see the project at https://github.com/clearlinux/autospec
autospec: preautospec-checks pullrebase localreponotice clean-old-content autospec: preautospec-checks pullrebase localreponotice clean-old-content
git rm --ignore-unmatch pumpAutospec || rm -f pumpAutospec
@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \ @if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
echo "Specfile already exists and was not created by autospec.py! Aborting."; \ echo "Specfile already exists and was not created by autospec.py! Aborting."; \
exit 1; \ exit 1; \
@@ -406,6 +407,7 @@ update-versions:
#help or update the package and push the update to koji. #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 If no update.sh exists, update the version, autospec and push the
#help update to koji (bumping the bump.list if found). #help update to koji (bumping the bump.list if found).
update: export AUTOSPEC_UPDATE=1
update: update:
@if [ -f update.first ]; then \ @if [ -f update.first ]; then \
for pkg in $$(< update.first); do \ for pkg in $$(< update.first); do \
+14 -2
View File
@@ -121,6 +121,7 @@ R-MNP
R-MatchIt R-MatchIt
R-Matching R-Matching
R-MatrixModels R-MatrixModels
R-MetricsWeighted
R-ModelMetrics R-ModelMetrics
R-NADA R-NADA
R-NLP R-NLP
@@ -148,6 +149,7 @@ R-RNetCDF
R-ROCR R-ROCR
R-ROSE R-ROSE
R-RProtoBuf R-RProtoBuf
R-RPushbullet
R-RSQLite R-RSQLite
R-RSclient R-RSclient
R-RUnit R-RUnit
@@ -216,6 +218,7 @@ R-arules
R-ash R-ash
R-askpass R-askpass
R-assertthat R-assertthat
R-audio
R-backports R-backports
R-base64enc R-base64enc
R-base64url R-base64url
@@ -352,6 +355,7 @@ R-drc
R-dreamerr R-dreamerr
R-dtplyr R-dtplyr
R-dtw R-dtw
R-duckdb
R-dygraphs R-dygraphs
R-dynamicTreeCut R-dynamicTreeCut
R-dynlm R-dynlm
@@ -657,6 +661,7 @@ R-mvnormtest
R-mvoutlier R-mvoutlier
R-mvtnorm R-mvtnorm
R-nanoarrow R-nanoarrow
R-nanoparquet
R-natserv R-natserv
R-ncbit R-ncbit
R-ncdf4 R-ncdf4
@@ -915,6 +920,7 @@ R-spatstat.linnet
R-spatstat.model R-spatstat.model
R-spatstat.random R-spatstat.random
R-spatstat.sparse R-spatstat.sparse
R-spatstat.univar
R-spatstat.utils R-spatstat.utils
R-spc R-spc
R-spdep R-spdep
@@ -964,6 +970,7 @@ R-tibble
R-tidyr R-tidyr
R-tidyrules R-tidyrules
R-tidyselect R-tidyselect
R-tidytable
R-tidyverse R-tidyverse
R-tikzDevice R-tikzDevice
R-timeDate R-timeDate
@@ -1302,7 +1309,6 @@ cmocka
cmrt cmrt
cmus cmus
cnf cnf
cni
cni-plugins cni-plugins
cockpit cockpit
codec2 codec2
@@ -1507,6 +1513,7 @@ farstream
fastfetch fastfetch
faultstat faultstat
fcgi fcgi
fd
fdk-aac fdk-aac
fdupes fdupes
feh feh
@@ -2352,6 +2359,7 @@ libva-intel-driver
libva-utils libva-utils
libvdpau libvdpau
libvirt libvirt
libvirt-dbus
libvirt-glib libvirt-glib
libvirt-python libvirt-python
libvisio libvisio
@@ -3867,6 +3875,7 @@ pypi-cu2qu
pypi-curio pypi-curio
pypi-cvss pypi-cvss
pypi-cxxfilt pypi-cxxfilt
pypi-cysystemd
pypi-cython pypi-cython
pypi-cytoolz pypi-cytoolz
pypi-dacite pypi-dacite
@@ -3949,6 +3958,7 @@ pypi-flaky
pypi-flask pypi-flask
pypi-flatbuffers pypi-flatbuffers
pypi-flatten_json pypi-flatten_json
pypi-flexcache
pypi-flexparser pypi-flexparser
pypi-flit pypi-flit
pypi-flit_core pypi-flit_core
@@ -4216,6 +4226,7 @@ pypi-numexpr
pypi-numpoly pypi-numpoly
pypi-numpy pypi-numpy
pypi-numpydoc pypi-numpydoc
pypi-nvidia_ml_py
pypi-oauth2client pypi-oauth2client
pypi-oauthlib pypi-oauthlib
pypi-olefile pypi-olefile
@@ -4225,6 +4236,7 @@ pypi-openshift
pypi-openstep_plist pypi-openstep_plist
pypi-opt_einsum pypi-opt_einsum
pypi-ordered_set pypi-ordered_set
pypi-orjson
pypi-ouimeaux pypi-ouimeaux
pypi-outcome pypi-outcome
pypi-overrides pypi-overrides
@@ -4369,7 +4381,6 @@ pypi-pypresence
pypi-pyproject_api pypi-pyproject_api
pypi-pyproject_hooks pypi-pyproject_hooks
pypi-pyproject_metadata pypi-pyproject_metadata
pypi-pyprojectx
pypi-pypsrp pypi-pypsrp
pypi-pyqrcode pypi-pyqrcode
pypi-pyqt5_sip pypi-pyqt5_sip
@@ -4963,6 +4974,7 @@ slurm
smartmontools smartmontools
smemstat smemstat
snappy snappy
snapshot
sndio sndio
socat socat
socket.io-client-cpp socket.io-client-cpp
+2
View File
@@ -76,6 +76,8 @@ def update_cargo_vendor(path, name, git):
cargo_vendors = subprocess.run('cargo vendor', cwd=path, shell=True, cargo_vendors = subprocess.run('cargo vendor', cwd=path, shell=True,
check=True, stdout=subprocess.PIPE, check=True, stdout=subprocess.PIPE,
universal_newlines=True).stdout universal_newlines=True).stdout
with open(os.path.join(vendor_path, ".gitattributes"), "w", encoding='utf8') as gafile:
gafile.write("* text=false\n")
subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=path, subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=path,
shell=True, check=True, stdout=subprocess.DEVNULL) shell=True, check=True, stdout=subprocess.DEVNULL)
repo = Repo(vendor_path) repo = Repo(vendor_path)