archive repository

We support tag names like
${package}-${version}
${package}-v${version}
${version}
v${version}

Now add support for things like
${package}-foo-bar-${version}
foo-bar-${version}

for example:
vulkan-sdk-1.3.275.0 for SPIRV-Headers

Makefile.common

@@ -582,6 +582,78 @@ cloc: $(SRPMFILE)
 	@$(MOCK) --clean --scrub=chroot --uniqueext=$(PKG_NAME)
 	cat results/cloc.txt
 
+#help catchup: Backport the commits from the current version to the upstream HEAD (not release).
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup:
+	$(MAKE) catchup-HEAD
+
+#help catchup-<commit|tag>: Backport the commits from the current version to the specified commit or tag.
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup-%:
+	@target=$*; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	if ! git -C results/$(PKG_NAME) rev-parse --verify --quiet "$${target}" >/dev/null; then \
+		echo "Error: Target commit/tag $${target} not found"; \
+		exit 1; \
+	fi; \
+	version=$$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1); \
+	echo "Version: $${version}"; \
+	current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?(.+-|v)?$${version}$$") || { \
+		echo "Error: No tag found for current package version"; \
+		exit 1; \
+	}; \
+	echo "Catching up from $${current_tag} to $${target}"; \
+	for commit in $$(git -C results/$(PKG_NAME) log --reverse --pretty=oneline $${current_tag}..$${target} | cut -d' ' -f1); do \
+		$(MAKE) backport-$${commit}; \
+	done;
+
+
+#help backport-<commit>: Retrieve a commit from the upstream git repository and save it as a backport patch.
+#help The giturl is read from options.conf.
+backport-%:
+	@commit=$*; \
+	echo "Backporting commit: $${commit}"; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	full_commit=$$(git -C results/$(PKG_NAME) show --pretty=oneline $${commit} 2>/dev/null | head -1 | cut -d' ' -f 1); \
+	if [[ -z "$${full_commit}" ]]; then \
+		echo "Error: Commit for $${commit} not found"; \
+		exit 1; \
+	fi; \
+	patch=backport-$${full_commit}.patch; \
+	git -C results/$(PKG_NAME) format-patch -1 --stdout $${full_commit} > $${patch}; \
+	if [[ -s $${patch} ]]; then \
+		echo "$${patch} created"; \
+		grep -qE "^$${patch}$$" series 2>/dev/null || echo "$${patch}" >> series; \
+	else \
+		rm -f $${patch}; \
+		echo "Error: Failed to create backport patch"; \
+		exit 1; \
+	fi \
+
 .PHONY: whatrequires
 #help whatrequires: Output a list of packages that directly depend on this one,
 #help showing the subpackage-level breakdown. Each line of output has the format

README.md

@@ -1,3 +1,10 @@
+## DISCONTINUATION OF PROJECT. 
+
+This project will no longer be maintained by Intel. 
+
+Intel will not provide or guarantee development of or support for this project, including but not limited to, maintenance, bug fixes, new releases or updates. Patches to this project are no longer accepted by Intel. If you have an ongoing need to use this project, are interested in independently developing it, or would like to maintain patches for the community, please create your own fork of the project.
+
+Contact: webadmin@linux.intel.com  
 # Developer tooling framework for Clear Linux
 
 This repository includes scripts, configuration files, and makefiles that

packages

@@ -9,6 +9,7 @@ CopyQ
 DML
 Endeavour
 F-Engrave
+FreeCAD
 FreeRDP
 FreeRDP2
 GConf
@@ -49,6 +50,7 @@ PySocks
 PyYAML
 QAT-ZSTD-Plugin
 QAT_engine
+QGIS
 QR-Code-generator
 QXlsx
 R
@@ -180,6 +182,7 @@ R-Ryacas
 R-SGP
 R-SGPdata
 R-SQUAREM
+R-SimDesign
 R-Sleuth2
 R-SnowballC
 R-SparseM
@@ -232,6 +235,7 @@ R-bayesplot
 R-bazar
 R-bbmle
 R-bdsmatrix
+R-beepr
 R-beeswarm
 R-bench
 R-benchr
@@ -584,6 +588,7 @@ R-linprog
 R-lintr
 R-listenv
 R-listviewer
+R-litedown
 R-lle
 R-lme4
 R-lmerTest
@@ -809,6 +814,7 @@ R-readr
 R-readstata13
 R-readxl
 R-recipes
+R-reformulas
 R-registry
 R-relimp
 R-rematch
@@ -824,7 +830,6 @@ R-reshape
 R-reshape2
 R-reticulate
 R-rex
-R-rgdal
 R-rgenoud
 R-rgeos
 R-rgl
@@ -871,6 +876,7 @@ R-rsvg
 R-runjags
 R-rversions
 R-rvest
+R-rworldmap
 R-s2
 R-sampling
 R-sandwich
@@ -916,6 +922,7 @@ R-sp
 R-spData
 R-spam
 R-sparkline
+R-sparsevctrs
 R-spatstat
 R-spatstat.core
 R-spatstat.data
@@ -1056,6 +1063,7 @@ SDL2_image
 SDL2_mixer
 SDL2_net
 SDL2_ttf
+SDL3
 SDL_gfx
 SDL_image
 SDL_mixer
@@ -1093,6 +1101,7 @@ accountsservice
 acl
 acpica-unix2
 ade
+adwaita-fonts
 adwaita-icon-theme
 akonadi
 akonadi-calendar
@@ -1123,6 +1132,7 @@ appstream-glib
 apr
 apr-util
 arandr
+ardopcf
 argon2
 aria2
 ark
@@ -1204,10 +1214,10 @@ boost
 borgbackup
 boto3
 botocore
+bottom
 bovo
 box2d
 bpftool
-bpftrace
 breeze
 breeze-gtk
 breeze-icons
@@ -1234,10 +1244,12 @@ buildreq-qmake
 buildreq-qt6
 buildreq-scons
 buildx
+bwidget
 byobu
 bz2file
 bzip2
 c-ares
+c-blosc
 c-blosc2
 cJSON
 c_rehash
@@ -1339,6 +1351,7 @@ compat-cairomm-soname10
 compat-codec2-soname1
 compat-enchant-soname1
 compat-ffmpeg-4.4
+compat-ffmpeg-6
 compat-fuse-soname2
 compat-gcc-10
 compat-gcr-soname1
@@ -1357,15 +1370,19 @@ compat-libsoup-soname-24
 compat-libva-soname1
 compat-libvpx-soname7
 compat-libvpx-soname8
+compat-libvpx-soname9
+compat-libxml2-soname2
 compat-pangomm-soname14
 compat-protobuf-soname29
 compat-protobuf-soname32
+compat-python3-rolling
 compat-re2-soname10
 compat-readline-soname5
 compat-taglib-soname1
 compat-tbb-soname2
 compat-tiff-soname5
 compat-wlroots-soname11
+compat-yaml-cpp-soname6
 component
 compose
 configobj
@@ -1381,6 +1398,7 @@ coreutils
 corosync
 coturn
 cov-core
+cpdb-libs
 cpio
 cppcheck
 cppunit
@@ -1401,6 +1419,7 @@ cups-filters
 cups-pk-helper
 curl
 cycler
+cyme
 cyrus-sasl
 dapl
 darktable
@@ -1434,6 +1453,8 @@ dino
 directx-headers
 direwolf
 dist-pam-configs
+distrobox
+dive
 dkms
 dlib
 dlt-daemon
@@ -1522,6 +1543,7 @@ fakeroot
 falcosecurity-libs
 fann
 farstream
+fast_float
 fastfetch
 faultstat
 fcgi
@@ -1579,6 +1601,7 @@ fsearch
 fuse
 fwupd
 fwupd-efi
+game-music-emu
 garcon
 gawk
 gbinder-python
@@ -1589,6 +1612,7 @@ gcc11
 gcc7
 gcc8
 gcc9
+gccmakedep
 gcompris-qt
 gcr
 gdal
@@ -1617,6 +1641,7 @@ gi-docgen
 giflib
 gifsicle
 gimp
+gimp-xsanecli
 girara
 git
 git-gui
@@ -1745,6 +1770,7 @@ gstreamer-vaapi
 gtk+
 gtk-doc
 gtk-frdp
+gtk-layer-shell
 gtk-vnc
 gtk-xfce-engine
 gtk3
@@ -1838,6 +1864,7 @@ ipe
 iperf
 ipmitool
 ipp-crypto
+ipp-usb
 iproute2
 ipset
 iptables
@@ -1850,6 +1877,7 @@ irrlicht
 irrlichtmt
 irssi
 isa-l
+isl
 iso-codes
 isodate
 isomd5sum
@@ -2256,6 +2284,7 @@ libmbim
 libmediaart
 libmemcached
 libmicrohttpd
+libmikmod
 libmnl
 libmodbus
 libmodplug
@@ -2292,6 +2321,7 @@ libopenzwave
 libopusenc
 liborcus
 libosinfo
+libp11
 libpagemaker
 libpanel
 libpcap
@@ -2376,6 +2406,7 @@ libva
 libva-intel-driver
 libva-utils
 libvdpau
+libversion
 libvirt
 libvirt-dbus
 libvirt-glib
@@ -2429,8 +2460,10 @@ linux-ltscurrent
 linux-ltsprev
 linux-preempt-rt
 linux-tools
+linuxcnc
 linuxptp
 lksctp-tools
+llama.cpp
 lldpd
 llvm
 llvm14
@@ -2438,6 +2471,7 @@ llvm15
 llvm16
 llvm17
 llvm18
+llvm19
 lm-sensors
 lmdb
 logrotate
@@ -2455,6 +2489,7 @@ lttng-ust
 lua
 lua-nginx-module
 lualgi
+luanti
 luarocks
 lutris
 luv
@@ -2470,6 +2505,7 @@ m4
 mailcommon
 mailimporter
 make
+makedepend
 man-db
 man-pages
 man-pages-posix
@@ -2493,10 +2529,10 @@ memtier_benchmark
 menu-cache
 mercurial
 mesa
+mesa-clc
 mesa-demos
 meson
 messagelib
-meta-c-basic
 meta-desktop-gnome
 meta-os-core
 meta-os-core-plus
@@ -2504,6 +2540,7 @@ metacity
 metee
 metis
 metrics-discovery
+metrics-library
 micro-config-drive
 micro-config-drive-aliyun
 micro-config-drive-aws
@@ -2512,13 +2549,13 @@ micro-config-drive-oci
 milou
 mimalloc
 mimetreeparser
-minetest
 minetest_game
 mingw-binutils
 mingw-crt
 mingw-gcc
 minicom
 minimodem
+minizip-ng
 minuet
 mixer-tools
 mkfontdir
@@ -2564,7 +2601,6 @@ mtools
 mtr
 multimon-ng
 multipath-tools
-multiprocess
 mumble
 munge
 muparser
@@ -2622,6 +2658,7 @@ nload
 nlohmann_json
 nlopt
 nmap
+nng
 node-addon-api
 nodejs
 nose-parameterized
@@ -2644,6 +2681,7 @@ numactl
 numatop
 numlockx
 numpy-stl
+nushell
 nut
 nv-codec-headers
 nvme-cli
@@ -2655,6 +2693,7 @@ ocl-icd
 octave
 oiio
 okular
+ollama
 oneDPL
 oneVPL
 onig
@@ -2708,6 +2747,7 @@ paho.mqtt.c
 paho.mqtt.cpp
 palapeli
 pam-python
+pam_u2f
 pam_wrapper
 pandas
 pandoc
@@ -3582,7 +3622,6 @@ perl-prefork
 perl-strictures
 pesign
 phonon
-phonon-vlc
 phoronix-test-suite
 php
 php-APCu
@@ -3642,7 +3681,6 @@ php-zmq
 picmi
 picocom
 pidgin
-pidgin-sipe
 pigeonhole
 pigz
 pim-data-exporter
@@ -3730,6 +3768,7 @@ pynvim
 pyotherside
 pyotp
 pyparted
+pypi-Yapps
 pypi-absl_py
 pypi-abydos
 pypi-accelerate
@@ -3747,7 +3786,6 @@ pypi-alabaster
 pypi-altair
 pypi-altgraph
 pypi-amqp
-pypi-aniso8601
 pypi-annotated_types
 pypi-ansi2html
 pypi-ansible_builder
@@ -3783,7 +3821,6 @@ pypi-atpublic
 pypi-attr
 pypi-attrdict
 pypi-attrs
-pypi-autocommand
 pypi-automat
 pypi-awesomeversion
 pypi-awscrt
@@ -3801,7 +3838,6 @@ pypi-babel
 pypi-backcall
 pypi-backoff
 pypi-backports.ssl_match_hostname
-pypi-bash_kernel
 pypi-bashlex
 pypi-bcrypt
 pypi-beartype
@@ -3818,6 +3854,8 @@ pypi-blessed
 pypi-blinker
 pypi-blivet
 pypi-blockdiag
+pypi-blosc
+pypi-blosc2
 pypi-bokeh
 pypi-boolean.py
 pypi-booleanoperations
@@ -3838,14 +3876,12 @@ pypi-cachy
 pypi-cairocffi
 pypi-cairosvg
 pypi-calver
-pypi-capturer
 pypi-cattrs
 pypi-cerberus
 pypi-certbot
 pypi-certbot_dns_google
 pypi-certifi
 pypi-cffi
-pypi-cffsubr
 pypi-cfgv
 pypi-chai
 pypi-chaospy
@@ -3855,7 +3891,6 @@ pypi-check_jsonschema
 pypi-check_manifest
 pypi-cheetah3
 pypi-cheroot
-pypi-cherrypy
 pypi-cibuildwheel
 pypi-ciscoisesdk
 pypi-ciso8601
@@ -3867,11 +3902,11 @@ pypi-click_log
 pypi-clikit
 pypi-cloudevents
 pypi-cloudflare
+pypi-clr_artifact
 pypi-cmarkgfm
 pypi-cmd2
 pypi-codecov
 pypi-colorama
-pypi-coloredlogs
 pypi-colorlog
 pypi-columnize
 pypi-comm
@@ -3892,6 +3927,7 @@ pypi-coveralls
 pypi-cppy
 pypi-crashtest
 pypi-crcmod
+pypi-crypt_r
 pypi-cryptography
 pypi-cryptography_vectors
 pypi-cs
@@ -3914,6 +3950,7 @@ pypi-decorator
 pypi-deepmerge
 pypi-deepspeed
 pypi-dep_logic
+pypi-dependency_groups
 pypi-deprecated
 pypi-deprecation
 pypi-devpi_client
@@ -3976,6 +4013,7 @@ pypi-falcon
 pypi-fasteners
 pypi-fastimport
 pypi-fastjsonschema
+pypi-fido2
 pypi-filecache
 pypi-filelock
 pypi-findpython
@@ -4054,6 +4092,7 @@ pypi-hatch_requirements_txt
 pypi-hatch_vcs
 pypi-hatchling
 pypi-heapdict
+pypi-hf_xet
 pypi-hishel
 pypi-hjson
 pypi-hkp4py
@@ -4074,6 +4113,7 @@ pypi-hyperlink
 pypi-hypothesis
 pypi-icalendar
 pypi-icecream
+pypi-id
 pypi-identify
 pypi-idna
 pypi-idna_ssl
@@ -4098,8 +4138,8 @@ pypi-iocapture
 pypi-ipaddress
 pypi-ipdb
 pypi-ipykernel
-pypi-ipyparallel
 pypi-ipython
+pypi-ipython-pygments-lexers
 pypi-ipython_genutils
 pypi-ipython_sql
 pypi-ipywidgets
@@ -4108,10 +4148,8 @@ pypi-isort
 pypi-itsdangerous
 pypi-janus
 pypi-jaraco.classes
-pypi-jaraco.collections
 pypi-jaraco.context
 pypi-jaraco.functools
-pypi-jaraco.text
 pypi-jarn.viewdoc
 pypi-javaproperties
 pypi-jedi
@@ -4124,7 +4162,6 @@ pypi-jinxed
 pypi-jmespath
 pypi-joblib
 pypi-josepy
-pypi-jsmin
 pypi-json5
 pypi-jsondiff
 pypi-jsonlines
@@ -4154,7 +4191,6 @@ pypi-jupyterlab_server
 pypi-jupyterlab_widgets
 pypi-jupyterlite_core
 pypi-jupyterlite_pyodide_kernel
-pypi-jupyterlite_sphinx
 pypi-jxmlease
 pypi-kcc
 pypi-kerberos
@@ -4172,6 +4208,7 @@ pypi-lazy
 pypi-lazy_loader
 pypi-lazy_object_proxy
 pypi-ldap3
+pypi-legacy_cgi
 pypi-levenshtein
 pypi-libarchive_c
 pypi-libevdev
@@ -4231,6 +4268,7 @@ pypi-msrest
 pypi-msrestazure
 pypi-multidict
 pypi-multipledispatch
+pypi-multiprocess
 pypi-munch
 pypi-munkres
 pypi-mutagen
@@ -4246,6 +4284,7 @@ pypi-nbformat
 pypi-nbsphinx
 pypi-nbval
 pypi-ndg_httpsclient
+pypi-ndindex
 pypi-neat_python
 pypi-nest_asyncio
 pypi-netapp_lib
@@ -4268,6 +4307,7 @@ pypi-nvidia_ml_py
 pypi-oauth2client
 pypi-oauthlib
 pypi-olefile
+pypi-ollama
 pypi-onnx
 pypi-opcodes
 pypi-openshift
@@ -4355,6 +4395,7 @@ pypi-progress
 pypi-progressbar
 pypi-prometheus_client
 pypi-prompt_toolkit
+pypi-propcache
 pypi-proto_plus
 pypi-protobuf
 pypi-psautohint
@@ -4410,7 +4451,6 @@ pypi-pylint
 pypi-pymdown_extensions
 pypi-pynacl
 pypi-pynetbox
-pypi-pynsist
 pypi-pynvml
 pypi-pyomo
 pypi-pyopengl
@@ -4445,6 +4485,7 @@ pypi-pyroute2.nftables
 pypi-pyroute2.nslink
 pypi-pyrsistent
 pypi-pysaml2
+pypi-pyscard
 pypi-pyscss
 pypi-pyserial
 pypi-pysnow
@@ -4471,7 +4512,6 @@ pypi-python_debian
 pypi-python_dotenv
 pypi-python_install
 pypi-python_json_logger
-pypi-python_lsp_black
 pypi-python_lsp_jsonrpc
 pypi-python_lsp_server
 pypi-python_multilib
@@ -4500,6 +4540,7 @@ pypi-rapidfuzz
 pypi-rapidfuzz_capi
 pypi-rcssmin
 pypi-rdflib
+pypi-re2
 pypi-readme_renderer
 pypi-readtime
 pypi-recommonmark
@@ -4509,7 +4550,6 @@ pypi-regress
 pypi-reportlab
 pypi-repoze.lru
 pypi-requests
-pypi-requests_download
 pypi-requests_file
 pypi-requests_gssapi
 pypi-requests_kerberos
@@ -4521,18 +4561,18 @@ pypi-requirements_parser
 pypi-resolvelib
 pypi-responses
 pypi-restructuredtext_lint
-pypi-retrolab
 pypi-retry
 pypi-retry_decorator
 pypi-retryz
-pypi-retype
 pypi-rfc3339_validator
 pypi-rfc3986
 pypi-rfc3986_validator
 pypi-rfc3987
 pypi-rich
+pypi-rich_argparse
 pypi-rjsmin
 pypi-rlpycairo
+pypi-roman_numerals_py
 pypi-rope
 pypi-routes
 pypi-rpds_py
@@ -4634,6 +4674,7 @@ pypi-subprocess_tee
 pypi-suds
 pypi-sure
 pypi-svg.path
+pypi-tables
 pypi-tabulate
 pypi-tap.py
 pypi-tblib
@@ -4668,7 +4709,6 @@ pypi-tornado_xstatic
 pypi-tox
 pypi-tqdm
 pypi-traitlets
-pypi-trampolim
 pypi-transformers
 pypi-translationstring
 pypi-trimesh
@@ -4678,7 +4718,6 @@ pypi-trove_classifiers
 pypi-truststore
 pypi-ttp
 pypi-twine
-pypi-typed_ast
 pypi-typeguard
 pypi-types_cffi
 pypi-types_colorama
@@ -4704,12 +4743,13 @@ pypi-types_toml
 pypi-types_typed_ast
 pypi-types_urllib3
 pypi-typing_extensions
+pypi-typing_inspection
 pypi-typogrify
 pypi-tzdata
 pypi-tzlocal
 pypi-ua_parser
+pypi-ua_parser_builtins
 pypi-uc_micro_py
-pypi-ufo2ft
 pypi-ufolib2
 pypi-uharfbuzz
 pypi-ujson
@@ -4729,6 +4769,7 @@ pypi-uvloop
 pypi-venusian
 pypi-verboselogs
 pypi-versioneer
+pypi-versioningit
 pypi-vine
 pypi-virtualenv
 pypi-volatile
@@ -4760,7 +4801,6 @@ pypi-wsproto
 pypi-wurlitzer
 pypi-wxPython
 pypi-xcffib
-pypi-xgboost
 pypi-xmldiff
 pypi-xmljson
 pypi-xmlschema
@@ -4779,6 +4819,7 @@ pypi-xstatic_jsencrypt
 pypi-xstatic_objectpath
 pypi-xstatic_roboto_fontface
 pypi-xvfbwrapper
+pypi-xxhash
 pypi-xyzservices
 pypi-y_py
 pypi-yamllint
@@ -4788,6 +4829,7 @@ pypi-yarg
 pypi-yarl
 pypi-yattag
 pypi-ypy_websocket
+pypi-yubikey_manager
 pypi-zabbix_api
 pypi-zc.lockfile
 pypi-zeroconf
@@ -4809,7 +4851,7 @@ pypi-zope.security
 pypi-zope.testing
 pypi-zope.testrunner
 pypi-zopfli
-python
+pystring
 python-digitalocean
 python-distutils-extra
 python-gflags
@@ -4890,7 +4932,6 @@ qt6webengine
 qt6websockets
 qt6webview
 qtbase
-qtcanvas3d
 qtcharts
 qtconnectivity
 qtdatavis3d
@@ -4900,7 +4941,6 @@ qtgraphicaleffects
 qtimageformats
 qtkeychain
 qtlocation
-qtmqtt
 qtmultimedia
 qtnetworkauth
 qtquickcontrols
@@ -4933,6 +4973,7 @@ rage
 ragel
 rapidjson
 raptor2
+rasdaemon
 rasqal
 rclone
 rdfind
@@ -4945,6 +4986,7 @@ recode
 redis2-nginx-module
 redland
 redsocks
+redumper
 requests-ntlm
 rest
 restic
@@ -4975,9 +5017,11 @@ rustc
 rxvt-unicode
 s2tc
 s3fs-fuse
+s5cmd
 salt
 samba
 samtools
+sane-airscan
 sane-backends
 sassc
 sbc
@@ -4990,6 +5034,7 @@ scour
 scowl
 screen
 scummvm
+scx
 sddm
 sddm-kcm
 seahorse
@@ -5101,7 +5146,9 @@ tallow
 tar
 taskwarrior
 tbb
+tbtools
 tcl
+tclx
 tcpdump
 tdb
 tecla
@@ -5156,13 +5203,16 @@ udisks2
 udunits
 uget
 uhttpmock
+uhubctl
 umockdev
 unbundle
 unibilium
 unifdef
+unified-memory-framework
 unison
 unit
 unixODBC
+unsloth
 unzip
 upower
 usb-modeswitch
@@ -5170,7 +5220,6 @@ usb-modeswitch-data
 usbredir
 usbutils
 userspace-rcu
-usrbinjava
 usrbinvi
 usrsctp
 utf8proc
@@ -5186,7 +5235,9 @@ valijson
 valkey
 vapoursynth
 vbox-integration
+vc-intrinsics
 vectorscan
+verilator
 vid.stab
 vifm
 vim
@@ -5198,7 +5249,6 @@ virglrenderer
 virt-manager
 virt-viewer
 vkd3d
-vlc
 volk
 volume_key
 vpnc
@@ -5230,6 +5280,7 @@ wlroots
 wmctrl
 woff2
 wol
+wolfssl
 wpa_supplicant
 wsjtx
 wslu
@@ -5312,10 +5363,13 @@ xorg-server
 xorgproto
 xorriso
 xprop
+xpumanager
 xrandr
 xrdb
 xrdp
 xrestop
+xsane
+xscorch
 xscreensaver
 xsel
 xset
@@ -5340,8 +5394,10 @@ yasm
 yelp
 yelp-tools
 yelp-xsl
+yosys
 yq
 ytnef
+yyjson
 zabbix
 zathura
 zathura-pdf-poppler
@@ -5349,6 +5405,7 @@ zenity
 zimg
 zip
 zlib
+zlib-ng
 znc
 zopfli
 zsh

vendor.py

@@ -50,16 +50,17 @@ def setup_content(url):
 
 
 def setup_cargo_vendor(path):
+    cargo_paths = []
     for dirpath, _, files in os.walk(path):
         for fname in files:
             if fname == "Cargo.toml":
-                return dirpath
-    return False
+                cargo_paths.append(os.path.join(dirpath, fname))
+    return cargo_paths
 
 
-def update_cargo_vendor(path, name, git):
+def update_cargo_vendor(tmpdir, cargo_paths, name, git):
     git_uri = os.path.join(git, name)
-    vendor_path = os.path.join(path, 'vendor')
+    vendor_path = os.path.join(tmpdir, 'vendor')
     subprocess.run(f"git clone {git_uri} {vendor_path}", shell=True, check=True,
                    stdout=subprocess.DEVNULL)
     vendor_git = os.path.join(vendor_path, '.git')
@@ -69,16 +70,18 @@ def update_cargo_vendor(path, name, git):
                        stdout=subprocess.DEVNULL)
         subprocess.run(f"git remote add origin {git_uri}", cwd=vendor_path,
                        shell=True, check=True, stdout=subprocess.DEVNULL)
-    backup_vendor_git = os.path.join(path, 'clear-linux-vendor-git')
-    subprocess.run(f"cp -a {vendor_git} {backup_vendor_git}", cwd=path,
+    backup_vendor_git = os.path.join(tmpdir, 'clear-linux-vendor-git')
+    subprocess.run(f"cp -a {vendor_git} {backup_vendor_git}", cwd=tmpdir,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     shutil.rmtree(vendor_path)
-    cargo_vendors = subprocess.run('cargo vendor', cwd=path, shell=True,
+    vendor_cmd = 'cargo vendor ' + ' '.join([f"-s {x}" for x in cargo_paths[:-1]])
+    vendor_cmd += f" --manifest-path {cargo_paths[-1]}"
+    cargo_vendors = subprocess.run(vendor_cmd, cwd=tmpdir, 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,
+    subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=tmpdir,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     repo = Repo(vendor_path)
     if not (len(repo.untracked_files) > 0 or repo.is_dirty()):
@@ -152,11 +155,11 @@ def main():
 
     tdir = setup_content(args.url)
     if vtype == 'cargo':
-        vdir = setup_cargo_vendor(tdir)
-        if not vdir:
+        cargo_paths = setup_cargo_vendor(tdir)
+        if len(cargo_paths) == 0:
             print(args.archives)
         else:
-            tag, cargo_vendors = update_cargo_vendor(vdir, args.name, args.git)
+            tag, cargo_vendors = update_cargo_vendor(tdir, cargo_paths, args.name, args.git)
             update_cargo_sources(args.name, tag, cargo_vendors)
     shutil.rmtree(tdir)