update packages file

Cleanup parsing of version from specfile in catchup targets
2026-06-16 11:06:15 +00:00 · 2025-01-09 19:17:51 +00:00 · 2024-12-19 06:03:26 +00:00 · 2024-12-05 17:11:40 -08:00 · 2024-12-05 16:00:31 -08:00 · 2024-12-05 19:57:20 +00:00
4 changed files with 179 additions and 44 deletions
@@ -223,6 +223,7 @@ scanlicense:
 #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 stash
 	git pull --rebase
 	$(MAKE) bumpnogit
 	git add $(SPECFILE) release
@@ -581,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
@@ -5,3 +5,4 @@ GFDL-1.3+
 MIT-Opengroup
 WXwindows
 w3c
+libpng-2.0
@@ -63,6 +63,8 @@ R-BMA
 R-BatchJobs
 R-BayesFactor
 R-BiasedUrn
+R-Biobase
+R-BiocGenerics
 R-BiocManager
 R-BoolNet
 R-BradleyTerry2
@@ -178,6 +180,7 @@ R-Ryacas
 R-SGP
 R-SGPdata
 R-SQUAREM
+R-SimDesign
 R-Sleuth2
 R-SnowballC
 R-SparseM
@@ -230,6 +233,7 @@ R-bayesplot
 R-bazar
 R-bbmle
 R-bdsmatrix
+R-beepr
 R-beeswarm
 R-bench
 R-benchr
@@ -267,6 +271,7 @@ R-calibrator
 R-callr
 R-car
 R-carData
+R-cards
 R-caret
 R-cclust
 R-cellranger
@@ -868,6 +873,7 @@ R-rsvg
 R-runjags
 R-rversions
 R-rvest
+R-rworldmap
 R-s2
 R-sampling
 R-sandwich
@@ -1114,6 +1120,7 @@ ansible
 ansible-core
 antlr4-python3-runtime
 apache-ant
+apache-arrow
 appstream
 appstream-glib
 apr
@@ -1160,7 +1167,10 @@ avahi
 awesome-wm
 awscli
 axel
+azure-c-logging
 azure-configs
+azure-macro-utils-c
+azure-umock-c
 babeltrace
 babl
 baloo
@@ -1197,6 +1207,7 @@ boost
 borgbackup
 boto3
 botocore
+bottom
 bovo
 box2d
 bpftool
@@ -1227,10 +1238,12 @@ buildreq-qmake
 buildreq-qt6
 buildreq-scons
 buildx
+bwidget
 byobu
 bz2file
 bzip2
 c-ares
+c-blosc
 c-blosc2
 cJSON
 c_rehash
@@ -1325,19 +1338,23 @@ colord-kde
 colordiff
 columbiad
 compat-Botan-soname2
+compat-abseil-cpp-rolling
 compat-atkmm-soname16
 compat-babeltrace-one
 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
 compat-glibmm-soname24
 compat-gnome-bluetooth-soname-13
+compat-grpc-soname66
 compat-gsl-soname27
 compat-gtksourceview-soname3
+compat-icu4c-rolling
 compat-json-c-soname4
 compat-libffi-soname6
 compat-libffi-soname7
@@ -1350,6 +1367,7 @@ compat-libvpx-soname8
 compat-pangomm-soname14
 compat-protobuf-soname29
 compat-protobuf-soname32
+compat-python3-rolling
 compat-re2-soname10
 compat-readline-soname5
 compat-taglib-soname1
@@ -1391,6 +1409,7 @@ cups-filters
 cups-pk-helper
 curl
 cycler
+cyme
 cyrus-sasl
 dapl
 darktable
@@ -1569,6 +1588,7 @@ fsearch
 fuse
 fwupd
 fwupd-efi
+game-music-emu
 garcon
 gawk
 gbinder-python
@@ -1688,6 +1708,9 @@ goaccess
 gobject-introspection
 golang-github-cpuguy83-go-md2man
 goocanvas
+google-benchmark
+google-cloud-cpp
+google-crc32c
 googletest
 gparted
 gpaste
@@ -1751,6 +1774,7 @@ gzip
 hamlib
 haproxy
 hardinfo
+hardinfo2
 harfbuzz
 haveged
 hdf5
@@ -1761,6 +1785,7 @@ help2man
 hexchat
 hexedit
 hicolor-icon-theme
+highway
 hiredis-c
 hostname
 howdy
@@ -1772,7 +1797,6 @@ hub
 hugo
 hunspell
 hwloc
-hyperscan
 hyphen
 i2c-tools
 i3
@@ -1824,6 +1848,7 @@ ipe
 iperf
 ipmitool
 ipp-crypto
+ipp-usb
 iproute2
 ipset
 iptables
@@ -1836,6 +1861,7 @@ irrlicht
 irrlichtmt
 irssi
 isa-l
+isl
 iso-codes
 isodate
 isomd5sum
@@ -2242,6 +2268,7 @@ libmbim
 libmediaart
 libmemcached
 libmicrohttpd
+libmikmod
 libmnl
 libmodbus
 libmodplug
@@ -2275,6 +2302,7 @@ libodfgen
 libogg
 libopenmpt
 libopenzwave
+libopusenc
 liborcus
 libosinfo
 libpagemaker
@@ -2327,6 +2355,7 @@ libsoup
 libspatialindex
 libspatialite
 libspectre
+libspelling
 libspiro
 libspnav
 libspng
@@ -2360,6 +2389,7 @@ libva
 libva-intel-driver
 libva-utils
 libvdpau
+libversion
 libvirt
 libvirt-dbus
 libvirt-glib
@@ -2420,6 +2450,8 @@ llvm
 llvm14
 llvm15
 llvm16
+llvm17
+llvm18
 lm-sensors
 lmdb
 logrotate
@@ -2492,6 +2524,7 @@ micro-config-drive-aws
 micro-config-drive-equinix
 micro-config-drive-oci
 milou
+mimalloc
 mimetreeparser
 minetest
 minetest_game
@@ -2528,6 +2561,7 @@ motd-update
 motif
 mozjs102
 mozjs115
+mozjs128
 mozjs91
 mpc
 mpfr
@@ -2580,6 +2614,7 @@ nettle
 network-manager-applet
 networkmanager-qt
 newt
+nextcloud-desktop
 nfs-utils
 nftables
 nghttp2
@@ -3091,6 +3126,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
@@ -3708,6 +3744,7 @@ pynvim
 pyotherside
 pyotp
 pyparted
+pypi-Yapps
 pypi-absl_py
 pypi-abydos
 pypi-accelerate
@@ -3722,9 +3759,9 @@ pypi-aiosignal
 pypi-aiosmtpd
 pypi-aiosqlite
 pypi-alabaster
+pypi-altair
 pypi-altgraph
 pypi-amqp
-pypi-aniso8601
 pypi-annotated_types
 pypi-ansi2html
 pypi-ansible_builder
@@ -3760,7 +3797,6 @@ pypi-atpublic
 pypi-attr
 pypi-attrdict
 pypi-attrs
-pypi-autocommand
 pypi-automat
 pypi-awesomeversion
 pypi-awscrt
@@ -3778,7 +3814,6 @@ pypi-babel
 pypi-backcall
 pypi-backoff
 pypi-backports.ssl_match_hostname
-pypi-bash_kernel
 pypi-bashlex
 pypi-bcrypt
 pypi-beartype
@@ -3795,6 +3830,8 @@ pypi-blessed
 pypi-blinker
 pypi-blivet
 pypi-blockdiag
+pypi-blosc
+pypi-blosc2
 pypi-bokeh
 pypi-boolean.py
 pypi-booleanoperations
@@ -3815,14 +3852,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
@@ -3832,7 +3867,6 @@ pypi-check_jsonschema
 pypi-check_manifest
 pypi-cheetah3
 pypi-cheroot
-pypi-cherrypy
 pypi-cibuildwheel
 pypi-ciscoisesdk
 pypi-ciso8601
@@ -3844,11 +3878,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
@@ -3861,6 +3895,7 @@ pypi-cons
 pypi-contextlib2
 pypi-contextvars
 pypi-contourpy
+pypi-controlnet_aux
 pypi-cookiecutter
 pypi-coverage
 pypi-coverage_enable_subprocess
@@ -3868,6 +3903,7 @@ pypi-coveralls
 pypi-cppy
 pypi-crashtest
 pypi-crcmod
+pypi-crypt_r
 pypi-cryptography
 pypi-cryptography_vectors
 pypi-cs
@@ -3890,6 +3926,7 @@ pypi-decorator
 pypi-deepmerge
 pypi-deepspeed
 pypi-dep_logic
+pypi-dependency_groups
 pypi-deprecated
 pypi-deprecation
 pypi-devpi_client
@@ -3925,8 +3962,12 @@ pypi-doxypypy
 pypi-doxyqml
 pypi-dpcontracts
 pypi-dulwich
+pypi-durationpy
 pypi-ecdsa
 pypi-editables
+pypi-editdistance
+pypi-edlib
+pypi-einops
 pypi-elementpath
 pypi-enrich
 pypi-entrypoints
@@ -3977,6 +4018,7 @@ pypi-ftfy
 pypi-funcparserlib
 pypi-future
 pypi-gast
+pypi-gdown
 pypi-gevent
 pypi-geventhttpclient
 pypi-ghp_import
@@ -4079,10 +4121,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
@@ -4095,7 +4135,6 @@ pypi-jinxed
 pypi-jmespath
 pypi-joblib
 pypi-josepy
-pypi-jsmin
 pypi-json5
 pypi-jsondiff
 pypi-jsonlines
@@ -4143,6 +4182,7 @@ pypi-lazy
 pypi-lazy_loader
 pypi-lazy_object_proxy
 pypi-ldap3
+pypi-legacy_cgi
 pypi-levenshtein
 pypi-libarchive_c
 pypi-libevdev
@@ -4208,6 +4248,7 @@ pypi-mutagen
 pypi-mypy_extensions
 pypi-myst_nb
 pypi-myst_parser
+pypi-narwhals
 pypi-natsort
 pypi-nbclassic
 pypi-nbclient
@@ -4216,12 +4257,14 @@ pypi-nbformat
 pypi-nbsphinx
 pypi-nbval
 pypi-ndg_httpsclient
+pypi-ndindex
 pypi-neat_python
 pypi-nest_asyncio
 pypi-netapp_lib
 pypi-netdisco
 pypi-netifaces
 pypi-networkx
+pypi-nftables
 pypi-nh3
 pypi-nibabel
 pypi-nltk
@@ -4310,6 +4353,7 @@ pypi-poetry
 pypi-poetry_core
 pypi-poetry_plugin_export
 pypi-polib
+pypi-polyleven
 pypi-port_for
 pypi-portalocker
 pypi-portend
@@ -4323,6 +4367,7 @@ pypi-progress
 pypi-progressbar
 pypi-prometheus_client
 pypi-prompt_toolkit
+pypi-propcache
 pypi-proto_plus
 pypi-protobuf
 pypi-psautohint
@@ -4351,6 +4396,7 @@ pypi-pycollada
 pypi-pycosat
 pypi-pycountry
 pypi-pycparser
+pypi-pycrdt
 pypi-pycryptodome
 pypi-pycryptodomex
 pypi-pycups
@@ -4376,7 +4422,6 @@ pypi-pylint
 pypi-pymdown_extensions
 pypi-pynacl
 pypi-pynetbox
-pypi-pynsist
 pypi-pynvml
 pypi-pyomo
 pypi-pyopengl
@@ -4466,6 +4511,7 @@ pypi-rapidfuzz
 pypi-rapidfuzz_capi
 pypi-rcssmin
 pypi-rdflib
+pypi-re2
 pypi-readme_renderer
 pypi-readtime
 pypi-recommonmark
@@ -4475,7 +4521,6 @@ pypi-regress
 pypi-reportlab
 pypi-repoze.lru
 pypi-requests
-pypi-requests_download
 pypi-requests_file
 pypi-requests_gssapi
 pypi-requests_kerberos
@@ -4491,7 +4536,6 @@ pypi-retrolab
 pypi-retry
 pypi-retry_decorator
 pypi-retryz
-pypi-retype
 pypi-rfc3339_validator
 pypi-rfc3986
 pypi-rfc3986_validator
@@ -4600,6 +4644,7 @@ pypi-subprocess_tee
 pypi-suds
 pypi-sure
 pypi-svg.path
+pypi-tables
 pypi-tabulate
 pypi-tap.py
 pypi-tblib
@@ -4614,9 +4659,11 @@ pypi-text_unidecode
 pypi-textdistance
 pypi-textfsm
 pypi-texttable
+pypi-thefuzz
 pypi-threadpoolctl
 pypi-three_merge
 pypi-tifffile
+pypi-timm
 pypi-tinycss2
 pypi-tldextract
 pypi-tokenizers
@@ -4626,12 +4673,12 @@ pypi-tomli_w
 pypi-tomlkit
 pypi-toolz
 pypi-torchmetrics
+pypi-torchvision
 pypi-tornado
 pypi-tornado_xstatic
 pypi-tox
 pypi-tqdm
 pypi-traitlets
-pypi-trampolim
 pypi-transformers
 pypi-translationstring
 pypi-trimesh
@@ -4641,7 +4688,6 @@ pypi-trove_classifiers
 pypi-truststore
 pypi-ttp
 pypi-twine
-pypi-typed_ast
 pypi-typeguard
 pypi-types_cffi
 pypi-types_colorama
@@ -4672,7 +4718,6 @@ pypi-tzdata
 pypi-tzlocal
 pypi-ua_parser
 pypi-uc_micro_py
-pypi-ufo2ft
 pypi-ufolib2
 pypi-uharfbuzz
 pypi-ujson
@@ -4807,6 +4852,7 @@ qhull
 qmapshack
 qml-box2d
 qpdf
+qpl
 qqc2-desktop-style
 qrencode
 qscintilla
@@ -4940,6 +4986,7 @@ s3fs-fuse
 salt
 samba
 samtools
+sane-airscan
 sane-backends
 sassc
 sbc
@@ -4952,6 +4999,7 @@ scour
 scowl
 screen
 scummvm
+scx
 sddm
 sddm-kcm
 seahorse
@@ -5063,7 +5111,9 @@ tallow
 tar
 taskwarrior
 tbb
+tbtools
 tcl
+tclx
 tcpdump
 tdb
 tecla
@@ -5094,6 +5144,7 @@ tig
 tigervnc
 time
 tini
+tinyxml2
 tiptop
 tk
 tmux
@@ -5131,7 +5182,6 @@ usb-modeswitch-data
 usbredir
 usbutils
 userspace-rcu
-usrbinjava
 usrbinvi
 usrsctp
 utf8proc
@@ -5145,7 +5195,9 @@ vala
 valgrind
 valijson
 valkey
+vapoursynth
 vbox-integration
+vectorscan
 vid.stab
 vifm
 vim
@@ -5179,10 +5231,12 @@ wget
 which
 whois
 wine
+winegui
 wireless-regdb-master
 wireplumber
 wireshark
 wl-clipboard
+wlrobs
 wlroots
 wmctrl
 woff2
@@ -5200,6 +5254,7 @@ xapian-core
 xastir
 xauth
 xbitmaps
+xboxdrv
 xcb-proto
 xcb-util-cursor
 xcb-util-xrm
@@ -5272,10 +5327,12 @@ xrandr
 xrdb
 xrdp
 xrestop
+xscorch
 xscreensaver
 xsel
 xset
 xsetroot
+xsimd
 xss-lock
 xterm
 xtrans
@@ -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,20 +70,26 @@ 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()):
-        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,
@@ -107,11 +114,11 @@ def update_cargo_sources(name, tag, cargo_vendors):
    with open('Makefile', encoding='utf8') as mfile:
        for line in mfile.readlines():
            if line.startswith('ARCHIVES'):
-                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
-                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz',
-                                          f"{archive_replace}-{tag}.tar.xz", line)
+                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz', line):
+                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz',
+                                          f"{archive_replace}-{tag}.tar.gz", line)
                else:
-                    new_archives = f"{line[:-1]} {archive_replace}-{tag}.tar.xz ./vendor\n"
+                    new_archives = f"{line[:-1]} {archive_replace}-{tag}.tar.gz ./vendor\n"
                print(new_archives.replace('ARCHIVES = ', '', 1))
                makefile.append(new_archives)
            else:
@@ -124,11 +131,11 @@ def update_cargo_sources(name, tag, cargo_vendors):
    with open('options.conf', encoding='utf8') as ofile:
        for line in ofile.readlines():
            if line.startswith('archives'):
-                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
-                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz',
-                                          f"{archive_match}-{tag}.tar.xz", line)
+                if re.search(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz', line):
+                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.gz',
+                                          f"{archive_match}-{tag}.tar.gz", line)
                else:
-                    new_archives = f"{line[:-1]} {archive_match}-{tag}.tar.xz ./vendor\n"
+                    new_archives = f"{line[:-1]} {archive_match}-{tag}.tar.gz ./vendor\n"
                options.append(new_archives)
            else:
                options.append(line)
@@ -139,7 +146,6 @@ def update_cargo_sources(name, tag, cargo_vendors):


 def main():
-    updated = False
    args = get_args()

    vtype = vendor_check()
@@ -149,14 +155,12 @@ def main():

    tdir = setup_content(args.url)
    if vtype == 'cargo':
-        vdir = setup_cargo_vendor(tdir)
-        if vdir:
-            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)
+        cargo_paths = setup_cargo_vendor(tdir)
+        if len(cargo_paths) == 0:
+            print(args.archives)
+        else:
+            tag, cargo_vendors = update_cargo_vendor(tdir, cargo_paths, args.name, args.git)
+            update_cargo_sources(args.name, tag, cargo_vendors)
    shutil.rmtree(tdir)
Author	SHA1	Message	Date
Arjan van de Ven	c360ffe52c	update packages file	2025-01-09 19:17:51 +00:00
Arjan van de Ven	f092f66d8d	update packages file	2024-12-19 06:03:26 +00:00
Brett T. Warden	704e8c90b8	Cleanup parsing of version from specfile in catchup targets Make sure we only parse %{version} one time while doing a catchup.	2024-12-05 17:11:40 -08:00
Brett T. Warden	1ca80a16a3	Implement catchup targets Implement a new target 'catchup' that will backport upstream commits from the current package version to HEAD. Implement a new target 'catchup-<commit\|tag>' that will backport upstream commits up to the target, as resolvable by git. This powers 'catchup'. Rework the target 'backport-<commit>' to clone and use the upstream git repository instead of using GitHub URLs. This also simplifies the resolution of targets to full commit hashes, as needed to ensure unique patch names and entries in 'series'. 'make catchup' will backport all the patches to catch this package up to the upstream's HEAD 'make catchup-v5.0' will backport all the patches to catch this package up to tag "v5.0" upstream. 'make catchup-ffdcba' will backport all the patches between this package's current version and the upstream commit ffdcba. 'make backport-ffdcba' will backport ONLY upstream commit ffdcba. All targets will produce patches named "backport-<commit>.patch", where <commit> is the full SHA1 commit hash, regardless of whether you used an abbreviated hash (or a tag, for catchup-%). Patches are added to 'series' in chronological order, unless they're already anywhere in that file.	2024-12-05 16:00:31 -08:00
Arjan van de Ven	27e359bda0	update packages file	2024-12-05 19:57:20 +00:00
Brett T. Warden	3db02dd609	Implement backport-<commit> target For packages with a GitHub repo configured in options.conf, allow downloading and applying backport patches via the 'backport-<commit>' target. If given an abbreviated commit ID, it will still create a backport-<commit>.patch file with the full commit hash, plus add it (if it does not already exist) to the end of the series file. Because this handles a single commit at a time, this should be wrappable by a future Makefile target that applies individual commits to catch up to a target tag, for example.	2024-12-02 16:13:06 -08:00
Arjan van de Ven	5866d7afbf	update packages file	2024-11-25 21:15:54 +00:00
Arjan van de Ven	437d1ee01a	update packages file	2024-11-13 17:16:18 +00:00
Arjan van de Ven	cb5d78bb2f	update packages file	2024-11-05 04:43:02 +00:00
William Douglas	9bfaefc491	Add support for multiple Cargo.toml files Some projects store multiple Cargo.toml files, let vendor handle all of them (might be worth having some config for certain Cargo.toml paths to skip in the future though). Signed-off-by: William Douglas <william.douglas@intel.com>	2024-10-31 10:30:24 -07:00
Arjan van de Ven	64a20fa5c2	update packages file	2024-10-24 18:55:47 +00:00
Arjan van de Ven	e0b152250f	use gz not xz	2024-10-22 15:39:37 +00:00
Arjan van de Ven	70ca088ce6	update packages file	2024-10-18 19:19:02 +00:00
Arjan van de Ven	a3c7b734fa	packages update	2024-10-17 15:08:53 +00:00
Arjan van de Ven	7ff8c3a6d5	update packages file	2024-10-15 13:47:25 +00:00
William Douglas	bdac11063e	bump target: Stash repo first In order to prevent content that wasn't committed from working its way into a build, stash prior to doing the rest of the bump. Signed-off-by: William Douglas <william.douglas@intel.com>	2024-10-10 11:47:15 -07:00
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