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>
Always remove the pumpAutospec file
2026-06-17 03:26:29 +00:00 · 2024-07-25 12:45:07 -07:00 · 2024-07-24 15:36:47 -07:00 · 2024-07-22 16:38:33 -07:00 · 2024-07-22 23:22:51 +00:00 · 2024-07-22 16:20:55 -07:00
3 changed files with 16 additions and 1 deletions
@@ -166,6 +166,7 @@ preautospec-checks:
 #help to autospec.
 #help For more information, see the project at https://github.com/clearlinux/autospec
 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 \
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
 		exit 1; \
@@ -406,6 +407,7 @@ update-versions:
 #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: export AUTOSPEC_UPDATE=1
 update:
 	@if [ -f update.first ]; then \
 		for pkg in $$(< update.first); do \
@@ -121,6 +121,7 @@ R-MNP
 R-MatchIt
 R-Matching
 R-MatrixModels
+R-MetricsWeighted
 R-ModelMetrics
 R-NADA
 R-NLP
@@ -148,6 +149,7 @@ R-RNetCDF
 R-ROCR
 R-ROSE
 R-RProtoBuf
+R-RPushbullet
 R-RSQLite
 R-RSclient
 R-RUnit
@@ -216,6 +218,7 @@ R-arules
 R-ash
 R-askpass
 R-assertthat
+R-audio
 R-backports
 R-base64enc
 R-base64url
@@ -915,6 +918,7 @@ R-spatstat.linnet
 R-spatstat.model
 R-spatstat.random
 R-spatstat.sparse
+R-spatstat.univar
 R-spatstat.utils
 R-spc
 R-spdep
@@ -964,6 +968,7 @@ R-tibble
 R-tidyr
 R-tidyrules
 R-tidyselect
+R-tidytable
 R-tidyverse
 R-tikzDevice
 R-timeDate
@@ -1507,6 +1512,7 @@ farstream
 fastfetch
 faultstat
 fcgi
+fd
 fdk-aac
 fdupes
 feh
@@ -2352,6 +2358,7 @@ libva-intel-driver
 libva-utils
 libvdpau
 libvirt
+libvirt-dbus
 libvirt-glib
 libvirt-python
 libvisio
@@ -3867,6 +3874,7 @@ pypi-cu2qu
 pypi-curio
 pypi-cvss
 pypi-cxxfilt
+pypi-cysystemd
 pypi-cython
 pypi-cytoolz
 pypi-dacite
@@ -3949,6 +3957,7 @@ pypi-flaky
 pypi-flask
 pypi-flatbuffers
 pypi-flatten_json
+pypi-flexcache
 pypi-flexparser
 pypi-flit
 pypi-flit_core
@@ -4216,6 +4225,7 @@ pypi-numexpr
 pypi-numpoly
 pypi-numpy
 pypi-numpydoc
+pypi-nvidia_ml_py
 pypi-oauth2client
 pypi-oauthlib
 pypi-olefile
@@ -4225,6 +4235,7 @@ pypi-openshift
 pypi-openstep_plist
 pypi-opt_einsum
 pypi-ordered_set
+pypi-orjson
 pypi-ouimeaux
 pypi-outcome
 pypi-overrides
@@ -4369,7 +4380,6 @@ pypi-pypresence
 pypi-pyproject_api
 pypi-pyproject_hooks
 pypi-pyproject_metadata
-pypi-pyprojectx
 pypi-pypsrp
 pypi-pyqrcode
 pypi-pyqt5_sip
@@ -4963,6 +4973,7 @@ slurm
 smartmontools
 smemstat
 snappy
+snapshot
 sndio
 socat
 socket.io-client-cpp
@@ -76,6 +76,8 @@ def update_cargo_vendor(path, name, git):
    cargo_vendors = subprocess.run('cargo vendor', cwd=path, shell=True,
                                   check=True, stdout=subprocess.PIPE,
                                   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,
                   shell=True, check=True, stdout=subprocess.DEVNULL)
    repo = Repo(vendor_path)
Author	SHA1	Message	Date
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