Compare commits

...

13 Commits

Author SHA1 Message Date
Arjan van de Ven 52f73c1530 packages update 2024-09-20 15:00:40 +00:00
Arjan van de Ven 072d9b81a2 packages update 2024-09-11 17:01:52 +00:00
Brett T. Warden 85a3e1cd32 Add libpng-2.0 license 2024-09-11 08:38:47 -07:00
William Douglas 3bf41ad9c9 Update vendor script to always use the latest tag
Sometimes vendor repos get tagged but the package fails to update for
another reason. In this case the repo wouldn't have the new vendor
ARCHIVE set and new attempts to build would use the old vendor archive
causing failures. Force using the latest vendor tag as generally this
is what we want (if we get a bad vendor tag somehow, it should mean a
new tag needs to be created to replace it anyway).

Signed-off-by: William Douglas <william.douglas@intel.com>
2024-09-06 13:12:13 -07:00
Arjan van de Ven 92b3d682ec udpate 2024-08-22 18:35:05 +00:00
Arjan van de Ven ce873b4b19 packages update 2024-08-20 15:16:40 +00:00
Arjan van de Ven 463112629b packages update 2024-08-13 15:18:01 +00:00
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
4 changed files with 77 additions and 16 deletions
+2
View File
@@ -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 \
+1
View File
@@ -5,3 +5,4 @@ GFDL-1.3+
MIT-Opengroup
WXwindows
w3c
libpng-2.0
+63 -8
View File
@@ -26,6 +26,7 @@ LibreCAD
Linux-PAM
LuaJIT
LyX
MangoHud
MarkupSafe
ModemManager
MuseScore
@@ -62,6 +63,8 @@ R-BMA
R-BatchJobs
R-BayesFactor
R-BiasedUrn
R-Biobase
R-BiocGenerics
R-BiocManager
R-BoolNet
R-BradleyTerry2
@@ -121,6 +124,7 @@ R-MNP
R-MatchIt
R-Matching
R-MatrixModels
R-MetricsWeighted
R-ModelMetrics
R-NADA
R-NLP
@@ -148,6 +152,7 @@ R-RNetCDF
R-ROCR
R-ROSE
R-RProtoBuf
R-RPushbullet
R-RSQLite
R-RSclient
R-RUnit
@@ -216,6 +221,7 @@ R-arules
R-ash
R-askpass
R-assertthat
R-audio
R-backports
R-base64enc
R-base64url
@@ -263,6 +269,7 @@ R-calibrator
R-callr
R-car
R-carData
R-cards
R-caret
R-cclust
R-cellranger
@@ -352,6 +359,7 @@ R-drc
R-dreamerr
R-dtplyr
R-dtw
R-duckdb
R-dygraphs
R-dynamicTreeCut
R-dynlm
@@ -657,6 +665,7 @@ R-mvnormtest
R-mvoutlier
R-mvtnorm
R-nanoarrow
R-nanoparquet
R-natserv
R-ncbit
R-ncdf4
@@ -880,6 +889,7 @@ R-sessioninfo
R-setRNG
R-sets
R-sf
R-sfd
R-sfsmisc
R-sgeostat
R-shape
@@ -915,6 +925,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 +975,7 @@ R-tibble
R-tidyr
R-tidyrules
R-tidyselect
R-tidytable
R-tidyverse
R-tikzDevice
R-timeDate
@@ -1151,7 +1163,10 @@ avahi
awesome-wm
awscli
axel
azure-c-logging
azure-configs
azure-macro-utils-c
azure-umock-c
babeltrace
babl
baloo
@@ -1302,7 +1317,6 @@ cmocka
cmrt
cmus
cnf
cni
cni-plugins
cockpit
codec2
@@ -1330,6 +1344,7 @@ compat-glibmm-soname24
compat-gnome-bluetooth-soname-13
compat-gsl-soname27
compat-gtksourceview-soname3
compat-icu4c-rolling
compat-json-c-soname4
compat-libffi-soname6
compat-libffi-soname7
@@ -1507,6 +1522,7 @@ farstream
fastfetch
faultstat
fcgi
fd
fdk-aac
fdupes
feh
@@ -1553,7 +1569,6 @@ freeglut
freeipmi
freetype
fribidi
fritzing-app
frozen
fs
fsarchiver
@@ -1563,6 +1578,7 @@ fwupd
fwupd-efi
garcon
gawk
gbinder-python
gc
gcab
gcc
@@ -1582,8 +1598,6 @@ gdm
geany
geany-plugins
geary
gedit
gedit-plugins-gnome
geeqie
gegl
gengetopt
@@ -1681,6 +1695,9 @@ goaccess
gobject-introspection
golang-github-cpuguy83-go-md2man
goocanvas
google-benchmark
google-cloud-cpp
google-crc32c
googletest
gparted
gpaste
@@ -1744,6 +1761,7 @@ gzip
hamlib
haproxy
hardinfo
hardinfo2
harfbuzz
haveged
hdf5
@@ -1754,6 +1772,7 @@ help2man
hexchat
hexedit
hicolor-icon-theme
highway
hiredis-c
hostname
howdy
@@ -1765,7 +1784,6 @@ hub
hugo
hunspell
hwloc
hyperscan
hyphen
i2c-tools
i3
@@ -2174,6 +2192,7 @@ libfontenc
libfprint
libfreehand
libftdi1
libgbinder
libgcrypt
libgd
libgdata
@@ -2182,6 +2201,7 @@ libgee
libgeotiff
libgit2
libgit2-glib
libglibutil
libglvnd
libgnome-keyring
libgnomekbd
@@ -2266,6 +2286,7 @@ libodfgen
libogg
libopenmpt
libopenzwave
libopusenc
liborcus
libosinfo
libpagemaker
@@ -2352,6 +2373,7 @@ libva-intel-driver
libva-utils
libvdpau
libvirt
libvirt-dbus
libvirt-glib
libvirt-python
libvisio
@@ -2410,6 +2432,7 @@ llvm
llvm14
llvm15
llvm16
llvm17
lm-sensors
lmdb
logrotate
@@ -2431,6 +2454,7 @@ luarocks
lutris
luv
lv2
lxc
lynx
lz4
lzlib
@@ -2481,6 +2505,7 @@ micro-config-drive-aws
micro-config-drive-equinix
micro-config-drive-oci
milou
mimalloc
mimetreeparser
minetest
minetest_game
@@ -2517,6 +2542,7 @@ motd-update
motif
mozjs102
mozjs115
mozjs128
mozjs91
mpc
mpfr
@@ -3080,6 +3106,7 @@ perl-IPC-ShareLite
perl-IPC-Shareable
perl-IPC-System-Simple
perl-Image-Base
perl-Image-ExifTool
perl-Image-Info
perl-Image-Size
perl-Image-Xbm
@@ -3433,7 +3460,6 @@ perl-Test-Without-Module
perl-Test-YAML
perl-Test-utf8
perl-Test2-Plugin-NoWarnings
perl-Test2-Suite
perl-Text-Autoformat
perl-Text-Brew
perl-Text-CSV
@@ -3705,12 +3731,14 @@ pypi-acme
pypi-adal
pypi-aiodns
pypi-aiofiles
pypi-aiohappyeyeballs
pypi-aiohttp
pypi-aiohttp_cors
pypi-aiosignal
pypi-aiosmtpd
pypi-aiosqlite
pypi-alabaster
pypi-altair
pypi-altgraph
pypi-amqp
pypi-aniso8601
@@ -3850,6 +3878,7 @@ pypi-cons
pypi-contextlib2
pypi-contextvars
pypi-contourpy
pypi-controlnet_aux
pypi-cookiecutter
pypi-coverage
pypi-coverage_enable_subprocess
@@ -3867,6 +3896,7 @@ pypi-cu2qu
pypi-curio
pypi-cvss
pypi-cxxfilt
pypi-cysystemd
pypi-cython
pypi-cytoolz
pypi-dacite
@@ -3908,12 +3938,14 @@ pypi-docopt
pypi-docstring_parser
pypi-docstring_to_markdown
pypi-docutils
pypi-doit
pypi-doxypypy
pypi-doxyqml
pypi-dpcontracts
pypi-dulwich
pypi-ecdsa
pypi-editables
pypi-einops
pypi-elementpath
pypi-enrich
pypi-entrypoints
@@ -3949,6 +3981,7 @@ pypi-flaky
pypi-flask
pypi-flatbuffers
pypi-flatten_json
pypi-flexcache
pypi-flexparser
pypi-flit
pypi-flit_core
@@ -3963,6 +3996,7 @@ pypi-ftfy
pypi-funcparserlib
pypi-future
pypi-gast
pypi-gdown
pypi-gevent
pypi-geventhttpclient
pypi-ghp_import
@@ -4109,6 +4143,9 @@ pypi-jupyterlab_link_share
pypi-jupyterlab_pygments
pypi-jupyterlab_server
pypi-jupyterlab_widgets
pypi-jupyterlite_core
pypi-jupyterlite_pyodide_kernel
pypi-jupyterlite_sphinx
pypi-jxmlease
pypi-kcc
pypi-kerberos
@@ -4191,6 +4228,7 @@ pypi-mutagen
pypi-mypy_extensions
pypi-myst_nb
pypi-myst_parser
pypi-narwhals
pypi-natsort
pypi-nbclassic
pypi-nbclient
@@ -4216,6 +4254,7 @@ pypi-numexpr
pypi-numpoly
pypi-numpy
pypi-numpydoc
pypi-nvidia_ml_py
pypi-oauth2client
pypi-oauthlib
pypi-olefile
@@ -4225,6 +4264,7 @@ pypi-openshift
pypi-openstep_plist
pypi-opt_einsum
pypi-ordered_set
pypi-orjson
pypi-ouimeaux
pypi-outcome
pypi-overrides
@@ -4325,6 +4365,7 @@ pypi-pybind11
pypi-pybtex
pypi-pybtex_docutils
pypi-pycares
pypi-pyclip
pypi-pyclipper
pypi-pycodestyle
pypi-pycollada
@@ -4369,7 +4410,6 @@ pypi-pypresence
pypi-pyproject_api
pypi-pyproject_hooks
pypi-pyproject_metadata
pypi-pyprojectx
pypi-pypsrp
pypi-pyqrcode
pypi-pyqt5_sip
@@ -4598,6 +4638,7 @@ pypi-texttable
pypi-threadpoolctl
pypi-three_merge
pypi-tifffile
pypi-timm
pypi-tinycss2
pypi-tldextract
pypi-tokenizers
@@ -4607,6 +4648,7 @@ pypi-tomli_w
pypi-tomlkit
pypi-toolz
pypi-torchmetrics
pypi-torchvision
pypi-tornado
pypi-tornado_xstatic
pypi-tox
@@ -4785,8 +4827,10 @@ qemu
qemu-guest-additions
qgit
qhull
qmapshack
qml-box2d
qpdf
qpl
qqc2-desktop-style
qrencode
qscintilla
@@ -4884,7 +4928,6 @@ re2c
readline
rebootmgr
recode
redis-native
redis2-nginx-module
redland
redsocks
@@ -4899,6 +4942,7 @@ rng-tools
robin-map
roboto
rofi
routino
rpcbind
rpcsvc-proto
rpm
@@ -4963,6 +5007,7 @@ slurm
smartmontools
smemstat
snappy
snapshot
sndio
socat
socket.io-client-cpp
@@ -5073,6 +5118,7 @@ tig
tigervnc
time
tini
tinyxml2
tiptop
tk
tmux
@@ -5123,7 +5169,10 @@ v4l-utils
vala
valgrind
valijson
valkey
vapoursynth
vbox-integration
vectorscan
vid.stab
vifm
vim
@@ -5136,12 +5185,14 @@ virt-manager
virt-viewer
vkd3d
vlc
volk
volume_key
vpnc
vsqlite
vte
waffle
wavpack
waydroid
wayland
wayland-protocols
waypipe
@@ -5155,10 +5206,12 @@ wget
which
whois
wine
winegui
wireless-regdb-master
wireplumber
wireshark
wl-clipboard
wlrobs
wlroots
wmctrl
woff2
@@ -5176,6 +5229,7 @@ xapian-core
xastir
xauth
xbitmaps
xboxdrv
xcb-proto
xcb-util-cursor
xcb-util-xrm
@@ -5252,6 +5306,7 @@ xscreensaver
xsel
xset
xsetroot
xsimd
xss-lock
xterm
xtrans
+11 -8
View File
@@ -76,11 +76,17 @@ 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)
if not (len(repo.untracked_files) > 0 or repo.is_dirty()):
return False, ""
# Always use the newest tag as sometimes a new tag will
# be created but the package won't be updated to use it
# for a different failure reason.
tag = sorted(repo.tags, key=lambda x: x.name, reverse=True)[0]
return tag, cargo_vendors
subprocess.run('git add .', cwd=vendor_path, shell=True, check=True,
stdout=subprocess.DEVNULL)
subprocess.run('git commit -m "vendor update"', cwd=vendor_path,
@@ -137,7 +143,6 @@ def update_cargo_sources(name, tag, cargo_vendors):
def main():
updated = False
args = get_args()
vtype = vendor_check()
@@ -148,13 +153,11 @@ def main():
tdir = setup_content(args.url)
if vtype == 'cargo':
vdir = setup_cargo_vendor(tdir)
if vdir:
if not vdir:
print(args.archives)
else:
tag, cargo_vendors = update_cargo_vendor(vdir, args.name, args.git)
if tag:
update_cargo_sources(args.name, tag, cargo_vendors)
updated = True
if not updated:
print(args.archives)
update_cargo_sources(args.name, tag, cargo_vendors)
shutil.rmtree(tdir)