packages update

Rework vendoring support
Changes vendor from a target (it could still have a stand-alone target but it wouldn't be used by the autospec target). This change is needed because the Makefile is rewritten in the autospec target but the ARCHIVES make variable is going to use the value when make is executed. The common change causes the ARCHIVES value to be eval'd during the autospec target execution in order for the update from the vendor script to be seen by make. The vendor script changes fix bugs in updating the options.conf and Makefile. It also now handles returning the original ARCHIVES value as well as prevent subshell scripts from outputting and adding badness into the eval'd ARCHIVES variable. Signed-off-by: William Douglas <william.douglas@intel.com>
2026-06-16 19:16:00 +00:00 · 2024-05-27 15:34:45 +00:00 · 2024-05-22 12:26:37 -07:00 · 2024-04-29 12:39:38 -07:00 · 2024-04-24 10:59:16 -07:00 · 2024-04-18 13:55:36 -07:00
5 changed files with 171 additions and 64 deletions
@@ -157,10 +157,6 @@ pullrebase:
 		fi \
 	fi

-# help vendor: Attempt to create an updated vendor tar archive if needed
-vendor: preautospec-checks pullrebase clean-old-content
-	@ $(TOPLVL)/projects/common/vendor.py $(firstword $(NEWURL) $(URL)) $(PKG_NAME) $(VND_BASE_URL)
-
 preautospec-checks:

 #help autospec: automatically generates a specfile. If there is
@@ -174,8 +170,8 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
 		exit 1; \
 	fi
+	$(eval ARCHIVES = $(shell $(TOPLVL)/projects/common/vendor.py '$(value ARCHIVES)' $(firstword $(NEWURL) $(URL)) $(PKG_NAME) $(VND_BASE_URL)))
 	@printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' '$(value ARCHIVES)' > Makefile
-	@$(MAKE) vendor
 	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py \
 		--target . \
 		--integrity \
@@ -391,6 +387,17 @@ koji-waitrepo: kojidef
 		koji wait-repo --build=${SRPMVERS} ${WAIT_OPTS} ${KOJI_TAG}-build; \
 	fi

+.PHONY: koji-tag
+#help koji-tag: runs koji tag-pkg on what's in the current specfile's nvr
+koji-tag:
+	koji tag-pkg dist-clear $(SRPMVERS)
+
+.PHONY: koji-untag
+#help koji-untag: runs koji untag-pkg on what's in the current specfile's nvr
+koji-untag:
+	koji untag-pkg dist-clear $(SRPMVERS)
+
+
 update-versions:

 .PHONY: update
@@ -2,4 +2,3 @@
 /usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service
 /usr/lib/systemd/system/sysinit.target.wants/systemd-hwdb-update.service
 /usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service
-/usr/lib/systemd/system/update-triggers.target.wants
@@ -10,6 +10,7 @@ DML
 Endeavour
 F-Engrave
 FreeRDP
+FreeRDP2
 GConf
 Gradio
 ImageMagick
@@ -42,6 +43,7 @@ OpenSP
 PDAL
 PyMySQL
 PyQt5
+PyQt6
 PySocks
 PyYAML
 QAT-ZSTD-Plugin
@@ -108,6 +110,7 @@ R-ISOcodes
 R-ISwR
 R-Iso
 R-JM
+R-KMsurv
 R-Lahman
 R-LearnBayes
 R-Luminescence
@@ -374,6 +377,7 @@ R-estimability
 R-etm
 R-evaluate
 R-evd
+R-exactRankTests
 R-expint
 R-expm
 R-expsmooth
@@ -412,6 +416,7 @@ R-fixest
 R-flashClust
 R-flexmix
 R-flexsurv
+R-flexsurvcure
 R-flextable
 R-float
 R-fontBitstreamVera
@@ -459,9 +464,13 @@ R-ggfortify
 R-ggjoy
 R-ggplot2
 R-ggplot2movies
+R-ggpubr
 R-ggrepel
 R-ggridges
+R-ggsci
+R-ggsignif
 R-ggstats
+R-ggtext
 R-ggvis
 R-gh
 R-git2r
@@ -481,6 +490,7 @@ R-gower
 R-gplots
 R-gridBase
 R-gridExtra
+R-gridtext
 R-gsl
 R-gss
 R-gtable
@@ -535,6 +545,7 @@ R-kernlab
 R-kimisc
 R-kit
 R-klaR
+R-km.ci
 R-kmi
 R-knitr
 R-ks
@@ -595,6 +606,7 @@ R-mathjaxr
 R-matrixStats
 R-matrixcalc
 R-maxLik
+R-maxstat
 R-mclogit
 R-mclust
 R-mcmc
@@ -841,6 +853,7 @@ R-rsdmx
 R-rstan
 R-rstanarm
 R-rstantools
+R-rstatix
 R-rstpm2
 R-rstudioapi
 R-rsvg
@@ -921,7 +934,9 @@ R-styler
 R-subplex
 R-subselect
 R-superpc
+R-survMisc
 R-survey
+R-survminer
 R-svUnit
 R-svglite
 R-sys
@@ -1045,6 +1060,7 @@ SuiteSparse
 TLP
 Thunar
 UCD
+UxPlay
 VTK
 Vc
 Vulkan-Headers
@@ -1098,8 +1114,8 @@ ark
 armadillo
 arp-scan
 arpack-ng
-artikulate
 asciidoc
+asciidoctor
 asciinema
 asio
 aspell
@@ -1172,6 +1188,7 @@ boto3
 botocore
 bovo
 box2d
+bpftool
 bpftrace
 breeze
 breeze-gtk
@@ -1215,7 +1232,6 @@ calendarsupport
 can-utils
 cantarell-fonts
 cantata
-cantor
 capnproto
 capslock
 capstone
@@ -1292,8 +1308,10 @@ collectl
 colm
 colord
 colord-gtk
+colord-kde
 colordiff
 columbiad
+compat-Botan-soname2
 compat-atkmm-soname16
 compat-babeltrace-one
 compat-cairomm-soname10
@@ -1308,18 +1326,23 @@ compat-gnome-bluetooth-soname-13
 compat-gtksourceview-soname3
 compat-json-c-soname4
 compat-libffi-soname6
+compat-libffi-soname7
 compat-libpng-soname12
 compat-libsigc++-soname20
 compat-libsoup-soname-24
 compat-libva-soname1
 compat-libvpx-soname7
+compat-libvpx-soname8
 compat-pangomm-soname14
 compat-protobuf-soname29
 compat-re2-soname10
 compat-readline-soname5
+compat-taglib-soname1
 compat-tbb-soname2
 compat-tiff-soname5
+compat-wlroots-soname11
 component
+compose
 configobj
 confuse
 conky
@@ -1386,6 +1409,7 @@ directx-headers
 direwolf
 dist-pam-configs
 dkms
+dlib
 dlt-daemon
 dmap2gcode
 dmenu
@@ -1417,13 +1441,13 @@ dragonbox
 drkonqi
 dropwatch
 dssi
-dstat
 dtc
 duktape
 dunst
 duperemove
 dvisvgm
 dwarves
+dymo-cups-drivers
 dyskctl
 e2fsprogs
 earlyoom
@@ -1460,7 +1484,7 @@ evolution-data-server
 evolution-ews
 evtest
 exempi
-exfat-utils
+exfatprogs
 exiv2
 exo
 expat
@@ -1474,9 +1498,11 @@ fann
 farstream
 faultstat
 fcgi
+fdk-aac
 fdupes
 feh
 fetchmail
+ffmpegthumbs
 fftw
 file
 file-roller
@@ -1490,6 +1516,7 @@ fish
 flac
 flare-engine
 flare-game
+flatpack-kcm
 flatpak
 flatpak-builder
 fldigi
@@ -1567,6 +1594,7 @@ gimp
 girara
 git
 git-gui
+git-lfs
 gitg
 gitolite
 gjs
@@ -1694,6 +1722,7 @@ gtk3
 gtk4
 gtkmm2
 gtkmm3
+gtkmm4
 gtksourceview
 gtksourceview4
 gtkspell3
@@ -1702,7 +1731,6 @@ guile
 gutenprint
 gvfs
 gvim
-gwenview
 gzip
 hamlib
 haproxy
@@ -1719,6 +1747,7 @@ hexedit
 hicolor-icon-theme
 hiredis-c
 hostname
+howdy
 hplip
 htop
 htslib
@@ -1762,6 +1791,7 @@ inkscape
 innoextract
 inotify-tools
 input-leap
+input-remapper
 intel-cmt-cat
 intel-gmmlib
 intel-hybrid-driver
@@ -1812,10 +1842,9 @@ json-glib
 jsoncpp
 juk
 kaccounts-integration
-kactivities
-kactivities-stats
 kactivitymanagerd
 kalarm
+kalgebra
 kamera
 kanagram
 kapidox
@@ -1829,7 +1858,6 @@ kbackup
 kbd
 kblackbox
 kblocks
-kblog
 kbookmarks
 kbounce
 kbreakout
@@ -1843,6 +1871,7 @@ kcmutils
 kcodecs
 kcolorchooser
 kcolorpicker
+kcolorscheme
 kcompletion
 kconfig
 kconfigwidgets
@@ -1864,27 +1893,24 @@ kded
 kdeedu-data
 kdegraphics-mobipocket
 kdegraphics-thumbnailers
-kdelibs4support
 kdenetwork-filesharing
 kdenlive
 kdepim-runtime
 kdeplasma-addons
-kdesdk-kioslaves
+kdesdk-kio
 kdesdk-thumbnailers
-kdesignerplugin
 kdesu
 kdf
 kdiagram
 kdialog
 kdiamond
-kdiff3
 kdnssd
 kdoctools
 kdsoap
+kdsoap-ws-discovery-client
 keditbookmarks
 keepalived
 keepassxc
-kemoticons
 kernel-config
 kernel-install
 kexec-tools
@@ -1892,24 +1918,24 @@ keychain
 keyutils
 kfilemetadata
 kfind
-kfloppy
 kfourinline
-kgamma5
+kgamma
 kgeography
 kget
 kglobalaccel
+kglobalacceld
 kgoldrunner
+kgpg
 kguiaddons
 khangman
 khelpcenter
 kholidays
-khotkeys
-khtml
 ki18n
+kicad
+kicad-packages3D
 kiconthemes
 kidentitymanagement
 kidletime
-kig
 kigo
 killbots
 kimageannotator
@@ -1917,19 +1943,21 @@ kimageformats
 kimagemapeditor
 kimap
 kinfocenter
-kinit
 kio
 kio-admin
 kio-extras
+kio-zeroconf
+kirigami
 kirigami-addons
+kirigami-gallery
 kirigami2
+kiriki
 kitemmodels
 kitemviews
 kiten
 kitinerary
 kjobwidgets
 kjs
-kjsembed
 kjumpingcube
 kldap
 kleopatra
@@ -1942,7 +1970,6 @@ kmail
 kmail-account-wizard
 kmailtransport
 kmbox
-kmediaplayer
 kmenuedit
 kmime
 kmines
@@ -1954,6 +1981,7 @@ knack
 knavalbattle
 knetwalk
 knewstuff
+knights
 knotes
 knotifications
 knotifyconfig
@@ -1961,6 +1989,7 @@ koji
 kolf
 kollision
 kolourpaint
+kompare
 konqueror
 konquest
 konsole
@@ -1981,10 +2010,8 @@ krb5
 krdc
 kreversi
 kronosnet
-kross
 kruler
 krunner
-krusader
 ksanecore
 kscreen
 kscreenlocker
@@ -1997,18 +2024,18 @@ ksnakeduel
 kspaceduel
 ksquares
 ksshaskpass
-kstars
+kstatusnotifieritem
 ksudoku
-ksysguard
+ksvg
 ksystemlog
 ksystemstats
 kteatime
 ktextaddons
 ktexteditor
+ktexttemplate
 ktextwidgets
 ktimer
 ktnef
-ktp-desktop-applets
 ktuberling
 kturtle
 kubernetes
@@ -2019,7 +2046,6 @@ kwallet
 kwallet-pam
 kwalletmanager
 kwayland
-kwayland-integration
 kwayland-server
 kwidgetsaddons
 kwin
@@ -2027,11 +2053,9 @@ kwindowsystem
 kwordquiz
 kwrited
 kxmlgui
-kxmlrpcclient
 kyotocabinet
 ladspa_sdk
 latencytop
-latte-dock
 layer-shell-qt
 lcms2
 lcov
@@ -2078,6 +2102,7 @@ libatomic_ops
 libavif
 libavtp
 libb64
+libbacktrace
 libblockdev
 libbpf
 libbsd
@@ -2182,7 +2207,6 @@ libkdepim
 libkeduvocdocument
 libkexiv2
 libkgapi
-libkipi
 libkleo
 libkmahjongg
 libkomparediff2
@@ -2205,6 +2229,7 @@ libmodplug
 libmodulemd
 libmpack
 libmpack-lua
+libmsgraph
 libmspack
 libmspub
 libmtp
@@ -2241,12 +2266,15 @@ libpeas
 libpinyin
 libpipeline
 libplacebo
+libplasma
+libplist
 libpng
 libportal
 libproxy
 libpsl
 libpthread-stubs
 libpwquality
+libqaccessibilityclient
 libqalculate
 libqb
 libqmi
@@ -2281,6 +2309,7 @@ libspatialite
 libspectre
 libspiro
 libspnav
+libspng
 libsrtp
 libssh
 libssh2
@@ -2327,6 +2356,7 @@ libwpd
 libwpe
 libwpg
 libwps
+libxcrypt
 libxcvt
 libxdg-basedir
 libxfce4ui
@@ -2373,7 +2403,6 @@ lm-sensors
 lmdb
 logrotate
 logutils
-lokalize
 lpeg
 lsacpi
 lshw
@@ -2429,7 +2458,6 @@ meson
 messagelib
 meta-c-basic
 meta-desktop-gnome
-meta-desktop-kde
 meta-os-core
 meta-os-core-plus
 metacity
@@ -2442,6 +2470,7 @@ micro-config-drive-aws
 micro-config-drive-equinix
 micro-config-drive-oci
 milou
+mimetreeparser
 minetest
 minetest_game
 mingw-binutils
@@ -2519,6 +2548,7 @@ net-tools
 netaddr
 netbase
 netcdf
+netcdf-fortran
 netdata
 nethogs
 netplan
@@ -2576,8 +2606,8 @@ ocamlbuild
 ocl-icd
 octave
 oiio
-okteta
 okular
+oneDPL
 oneVPL
 onig
 opa-fm
@@ -2589,6 +2619,7 @@ open-vm-tools
 openal-soft
 openblas
 openbox
+opencl-clang
 opencl-headers
 openconnect
 openct
@@ -2618,7 +2649,7 @@ osm-gps-map
 ostree
 otp
 oxygen
-oxygen-icons5
+oxygen-icons
 oxygen-sounds
 p11-kit
 p7zip
@@ -2627,6 +2658,7 @@ pagemon
 paho.mqtt.c
 paho.mqtt.cpp
 palapeli
+pam-python
 pam_wrapper
 pandas
 pandoc
@@ -3224,6 +3256,7 @@ perl-Plack
 perl-Pod-Constants
 perl-Pod-Coverage
 perl-Pod-LaTeX
+perl-Pod-Markdown
 perl-Pod-POM
 perl-Pod-Parser
 perl-Pod-Plainer
@@ -3339,6 +3372,7 @@ perl-Test-File-ShareDir-Dist
 perl-Test-Fork
 perl-Test-Future-IO-Impl
 perl-Test-Identity
+perl-Test-InDistDir
 perl-Test-Inter
 perl-Test-LWP-UserAgent
 perl-Test-LeakTrace
@@ -3407,6 +3441,8 @@ perl-Text-Trim
 perl-Text-Unidecode
 perl-Text-WrapI18N
 perl-Text-Wrapper
+perl-Throwable
+perl-Throwable-SugarFactory
 perl-Tie-Cycle
 perl-Tie-IxHash
 perl-Tie-Simple
@@ -3567,18 +3603,23 @@ pipewire
 pixman
 pkcs11-helper
 pkg-config
+plasma-activities
+plasma-activities-stats
 plasma-browser-integration
 plasma-desktop
 plasma-discover
-plasma-framework
+plasma-disks
+plasma-firewall
 plasma-integration
 plasma-nm
 plasma-pa
 plasma-systemmonitor
 plasma-vault
 plasma-wayland-protocols
+plasma-welcome
 plasma-workspace
 plasma-workspace-wallpapers
+plasma5support
 plzip
 pm-graph
 pmdk
@@ -3590,6 +3631,7 @@ podman
 polkit
 polkit-kde-agent
 polkit-qt
+polkit-qt6
 poppler
 poppler-data-clr-rename
 popt
@@ -3623,7 +3665,9 @@ psstop
 pth
 pugixml
 pulseaudio
+pulseaudio-qt
 purpose
+puzzles
 pv
 pwgen
 pyatspi
@@ -3750,6 +3794,7 @@ pypi-certifi
 pypi-cffi
 pypi-cffsubr
 pypi-cfgv
+pypi-chai
 pypi-chaospy
 pypi-chardet
 pypi-charset_normalizer
@@ -3807,6 +3852,7 @@ pypi-cython
 pypi-cytoolz
 pypi-dacite
 pypi-dask
+pypi-dateparser
 pypi-datetime
 pypi-debugpy
 pypi-decorator
@@ -3838,12 +3884,13 @@ pypi-dnacentersdk
 pypi-dns_lexicon
 pypi-dnspython
 pypi-docker
-pypi-docker_compose
 pypi-docker_pycreds
 pypi-docopt
 pypi-docstring_parser
 pypi-docstring_to_markdown
 pypi-docutils
+pypi-doxypypy
+pypi-doxyqml
 pypi-dpcontracts
 pypi-dulwich
 pypi-ecdsa
@@ -3944,6 +3991,7 @@ pypi-hatch_requirements_txt
 pypi-hatch_vcs
 pypi-hatchling
 pypi-heapdict
+pypi-hishel
 pypi-hjson
 pypi-hkp4py
 pypi-home_assistant_frontend
@@ -4051,6 +4099,7 @@ pypi-kiwisolver
 pypi-krb5
 pypi-kubernetes
 pypi-langcodes
+pypi-language_data
 pypi-lark_parser
 pypi-latexcodec
 pypi-lavacli
@@ -4076,6 +4125,7 @@ pypi-lxml
 pypi-lz4
 pypi-macholib
 pypi-mako
+pypi-marisa_trie
 pypi-markdown
 pypi-markdown2
 pypi-markdown_exec
@@ -4095,6 +4145,7 @@ pypi-mkdocs
 pypi-mkdocs_autorefs
 pypi-mkdocs_exclude
 pypi-mkdocs_gen_files
+pypi-mkdocs_get_deps
 pypi-mkdocs_htmlproofer_plugin
 pypi-mkdocs_material_extensions
 pypi-mkdocs_monorepo_plugin
@@ -4142,6 +4193,7 @@ pypi-nocasedict
 pypi-nocaselist
 pypi-nodeenv
 pypi-notebook_shim
+pypi-numexpr
 pypi-numpoly
 pypi-numpy
 pypi-numpydoc
@@ -4159,6 +4211,7 @@ pypi-outcome
 pypi-overrides
 pypi-ovirt_imageio
 pypi-packaging
+pypi-packaging_legacy
 pypi-paginate
 pypi-paho_mqtt
 pypi-pandocfilters
@@ -4179,6 +4232,7 @@ pypi-pathlib2
 pypi-pathspec
 pypi-patsy
 pypi-pbr
+pypi-pbs_installer
 pypi-pdfminer.six
 pypi-pdm
 pypi-pdm_backend
@@ -4223,6 +4277,7 @@ pypi-portend
 pypi-posix_ipc
 pypi-poyo
 pypi-pre_commit
+pypi-pretty_errors
 pypi-prettytable
 pypi-probed
 pypi-progress
@@ -4261,6 +4316,7 @@ pypi-pycups
 pypi-pycurl
 pypi-pydantic
 pypi-pydantic_core
+pypi-pydbus
 pypi-pydispatcher
 pypi-pydocstyle
 pypi-pydot
@@ -4269,6 +4325,7 @@ pypi-pyelftools
 pypi-pyfakefs
 pypi-pyflakes
 pypi-pygame
+pypi-pygdbmi
 pypi-pygithub
 pypi-pygments
 pypi-pyicu
@@ -4416,6 +4473,7 @@ pypi-safetensors
 pypi-salib
 pypi-sanic_routing
 pypi-scikit_build
+pypi-scikit_build_core
 pypi-scikit_image
 pypi-scikit_learn
 pypi-scp
@@ -4441,6 +4499,7 @@ pypi-setuptools_scm
 pypi-sh
 pypi-shapely
 pypi-shellingham
+pypi-shelved_cache
 pypi-simplegeneric
 pypi-six
 pypi-slugify
@@ -4494,6 +4553,7 @@ pypi-sqlalchemy
 pypi-sqlparse
 pypi-sshtunnel
 pypi-stack_data
+pypi-starlette
 pypi-storops
 pypi-strictyaml
 pypi-subprocess_tee
@@ -4519,6 +4579,7 @@ pypi-three_merge
 pypi-tifffile
 pypi-tinycss2
 pypi-tldextract
+pypi-tokenizers
 pypi-toml
 pypi-tomli
 pypi-tomli_w
@@ -4531,6 +4592,7 @@ pypi-tox
 pypi-tqdm
 pypi-traitlets
 pypi-trampolim
+pypi-transformers
 pypi-translationstring
 pypi-trimesh
 pypi-trio
@@ -4541,6 +4603,7 @@ pypi-ttp
 pypi-twine
 pypi-typed_ast
 pypi-typeguard
+pypi-types_cffi
 pypi-types_colorama
 pypi-types_cryptography
 pypi-types_dataclasses
@@ -4584,6 +4647,7 @@ pypi-urlobject
 pypi-urwid
 pypi-user_agents
 pypi-userpath
+pypi-uvicorn
 pypi-uvloop
 pypi-venusian
 pypi-verboselogs
@@ -4597,6 +4661,7 @@ pypi-vsts_cd_manager
 pypi-waitress
 pypi-warlock
 pypi-watchdog
+pypi-watchfiles
 pypi-wbdata
 pypi-wcmatch
 pypi-wcwidth
@@ -4693,6 +4758,7 @@ qbittorrent
 qca
 qca-qt5
 qcoro
+qcoro6
 qemu
 qemu-guest-additions
 qgit
@@ -4810,7 +4876,6 @@ rlwrap
 rng-tools
 robin-map
 roboto
-rocs
 rofi
 rpcbind
 rpcsvc-proto
@@ -4825,6 +4890,7 @@ rtmpdump
 rttr
 ruby
 runc
+rust-bindgen
 rustc
 rxvt-unicode
 s2tc
@@ -4855,6 +4921,7 @@ serf
 setserial
 setxkbmap
 sg3_utils
+shaderc
 shadow
 shapelib
 shared-mime-info
@@ -5020,10 +5087,8 @@ usb-modeswitch
 usb-modeswitch-data
 usbredir
 usbutils
-user-manager
 userspace-rcu
 usrbinjava
-usrbinpython
 usrbinvi
 utf8proc
 utfcpp
@@ -5187,7 +5252,6 @@ zabbix
 zathura
 zathura-pdf-poppler
 zenity
-zeroconf-ioslave
 zimg
 zip
 zlib
@@ -5196,4 +5260,5 @@ zopfli
 zsh
 zstd
 zstd-bin
+zxcvbn-c
 zxing
@@ -98,9 +98,13 @@ def zap_entire_file_end(filename):
    global files
    global files_chunks
    global files_header
+    files_to_remove = list()
    for file in files:
        if file.endswith(filename):
-            files.remove(file)                
+            # Don't modify the original list while iterating over it
+            files_to_remove.append(file)
+    for file in files_to_remove:
+        files.remove(file)                
            
 def zap_line_in_file_substring(filename, match):
    global header
@@ -186,7 +190,7 @@ def zap_empty_chunks():
    files_to_remove = list()
    for file in files:
        if file not in files_chunks:
-            files.remove(file)
+            files_to_remove.append(file)
            continue
        to_remove = list()
        for chunk in files_chunks[file]:
@@ -30,6 +30,7 @@ def vendor_check():

 def get_args():
    parser = argparse.ArgumentParser()
+    parser.add_argument('archives')
    parser.add_argument('url')
    parser.add_argument('name')
    parser.add_argument('git')
@@ -44,7 +45,7 @@ def setup_content(url):
    with open(outfile, 'wb') as cfile:
        cfile.write(response.content)

-    subprocess.run(f"tar xf {outfile}", shell=True, cwd=tdir, check=True)
+    subprocess.run(f"tar xf {outfile}", shell=True, cwd=tdir, check=True, stdout=subprocess.DEVNULL)
    os.remove(outfile)
    return tdir

@@ -60,61 +61,88 @@ def setup_cargo_vendor(path):
 def update_cargo_vendor(path, name, git):
    git_uri = os.path.join(git, name)
    vendor_path = os.path.join(path, 'vendor')
-    subprocess.run(f"git clone {git_uri} {vendor_path}", shell=True, check=True)
+    subprocess.run(f"git clone {git_uri} {vendor_path}", shell=True, check=True,
+                   stdout=subprocess.DEVNULL)
    vendor_git = os.path.join(vendor_path, '.git')
    if not os.path.isdir(vendor_git):
        # initialize a git repo
-        subprocess.run('git init .', cwd=vendor_path, shell=True, check=True)
+        subprocess.run('git init .', cwd=vendor_path, shell=True, check=True,
+                       stdout=subprocess.DEVNULL)
        subprocess.run(f"git remote add origin {git_uri}", cwd=vendor_path,
-                       shell=True, check=True)
+                       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,
-                   shell=True, check=True)
+                   shell=True, check=True, stdout=subprocess.DEVNULL)
    shutil.rmtree(vendor_path)
-    subprocess.run('cargo vendor', cwd=path, shell=True, check=True)
+    subprocess.run('cargo vendor', cwd=path, shell=True, check=True,
+                   stdout=subprocess.DEVNULL)
    subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=path,
-                   shell=True, check=True)
+                   shell=True, check=True, stdout=subprocess.DEVNULL)
    repo = Repo(vendor_path)
    if not (len(repo.untracked_files) > 0 or repo.is_dirty()):
        return False
-    subprocess.run('git add .', cwd=vendor_path, shell=True, check=True)
+    subprocess.run('git add .', cwd=vendor_path, shell=True, check=True,
+                   stdout=subprocess.DEVNULL)
    subprocess.run('git commit -m "vendor update"', cwd=vendor_path,
-                   shell=True, check=True)
+                   shell=True, check=True, stdout=subprocess.DEVNULL)
    gmt = time.gmtime()
    tag = f"{gmt.tm_year}-{gmt.tm_mon:02d}-{gmt.tm_mday:02d}-{gmt.tm_hour:02d}-{gmt.tm_min:02d}-{gmt.tm_sec:02d}"
    subprocess.run(f"git tag {tag}", cwd=vendor_path, shell=True,
-                   check=True)
+                   check=True, stdout=subprocess.DEVNULL)
    subprocess.run(f"git push origin main:main {tag}", cwd=vendor_path,
-                   shell=True, check=True)
+                   shell=True, check=True, stdout=subprocess.DEVNULL)
    time.sleep(30)
    return tag


 def update_cargo_sources(name, tag):
    makefile = []
-    archive_match = os.path.join('$(CGIT_BASE_URL)', 'vendor', name,
+    options = []
+    archive_match = os.path.join(r'\$\(CGIT_BASE_URL\)', 'vendor', name,
                                 'snapshot', name)
+    archive_replace = os.path.join('$(CGIT_BASE_URL)', 'vendor', name,
+                                   'snapshot', name)
    with open('Makefile', encoding='utf8') as mfile:
        for line in mfile.readlines():
            if line.startswith('ARCHIVES'):
-                if re.match(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
+                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\n", line)
+                                          f"{archive_replace}-{tag}.tar.xz", line)
                else:
-                    new_archives = f"ARCHIVES = {archive_match}-{tag}.tar.xz ./vendor\n"
+                    new_archives = f"{line[:-1]} {archive_replace}-{tag}.tar.xz ./vendor\n"
+                print(new_archives.replace('ARCHIVES = ', '', 1))
                makefile.append(new_archives)
            else:
                makefile.append(line)
    with open('Makefile', 'w', encoding='utf8') as mfile:
        mfile.writelines(makefile)

+    archive_match = os.path.join('http://localhost', 'cgit', 'vendor', name,
+                                 'snapshot', name)
+    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)
+                else:
+                    new_archives = f"{line[:-1]} {archive_match}-{tag}.tar.xz ./vendor\n"
+                options.append(new_archives)
+            else:
+                options.append(line)
+    with open('options.conf', 'w', encoding='utf8') as ofile:
+        ofile.writelines(options)
+

 def main():
+    updated = False
+    args = get_args()
+
    vtype = vendor_check()
    if not vtype:
+        print(args.archives)
        return

-    args = get_args()
    tdir = setup_content(args.url)
    if vtype == 'cargo':
        vdir = setup_cargo_vendor(tdir)
@@ -122,7 +150,11 @@ def main():
            tag = update_cargo_vendor(vdir, args.name, args.git)
            if tag:
                update_cargo_sources(args.name, tag)
+                updated = True
+    if not updated:
+        print(args.archives)
    shutil.rmtree(tdir)

+
 if __name__ == '__main__':
    main()
Author	SHA1	Message	Date
Arjan van de Ven	c1e426713a	packages update	2024-05-27 15:34:45 +00:00
William Douglas	d9e4f478eb	Rework vendoring support Changes vendor from a target (it could still have a stand-alone target but it wouldn't be used by the autospec target). This change is needed because the Makefile is rewritten in the autospec target but the ARCHIVES make variable is going to use the value when make is executed. The common change causes the ARCHIVES value to be eval'd during the autospec target execution in order for the update from the vendor script to be seen by make. The vendor script changes fix bugs in updating the options.conf and Makefile. It also now handles returning the original ARCHIVES value as well as prevent subshell scripts from outputting and adding badness into the eval'd ARCHIVES variable. Signed-off-by: William Douglas <william.douglas@intel.com>	2024-05-22 12:26:37 -07:00
William Douglas	96b366e71f	Don't blacklist the update target directory This is shipped by the filesystem package. Signed-off-by: William Douglas <william.douglas@intel.com>	2024-04-29 12:39:38 -07:00
Brett T. Warden	84097fd526	Don't alter a list we're iterating through Fix a couple of places where we're trying to remove files from the files list while we're iterating through it -- replicate the change elsewhere to keep a temporary list of the files to remove, then iterate through that list after iterating through the global files list.	2024-04-24 10:59:16 -07:00
William Douglas	c2cd51b5f2	Have vendor.py also update the options.conf file This file is used for spec and upstream content so updating it is important for improving the build automation. Signed-off-by: William Douglas <william.douglas@intel.com>	2024-04-18 13:55:36 -07:00
Arjan van de Ven	ed1ef58d9a	update packages	2024-04-17 01:23:14 +00:00
Arjan van de Ven	497f2a66f4	update packages	2024-03-15 20:03:14 +00:00
William Douglas	3b8d3c66ea	Remove echo on koji tag/untag Signed-off-by: William Douglas <william.douglas@intel.com>	2024-03-12 15:34:16 -07:00
William Douglas	373cbad44c	Add koji-tag and koji-untag targets Add koji-tag and koji-untag targets that can be used to tag and untag dist-clear on the current nvr build of the package in koji. Signed-off-by: William Douglas <william.douglas@intel.com>	2024-03-12 15:31:04 -07:00
clrbuilder	0fcc984675	Update packages file for version 40810 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-02-07 10:37:45 -08:00
clrbuilder	78023bd74a	Update packages file for version 40800 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-02-06 13:47:20 -08:00
clrbuilder	d2b5b72346	Update packages file for version 40770 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-02-06 00:07:38 -08:00
clrbuilder	4953d9e087	Update packages file for version 40760 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-02-02 00:19:19 -08:00
clrbuilder	ee37765ed2	Update packages file for version 40750 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-02-01 00:07:47 -08:00
clrbuilder	492abf6d32	Update packages file for version 40740 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-01-30 19:12:45 -08:00
clrbuilder	2562a8c7fb	Update packages file for version 40720 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-01-30 00:07:47 -08:00
clrbuilder	5fd02ece36	Update packages file for version 40700 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2024-01-23 00:07:31 -08:00