Update packages file for version 24310

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile.common

@@ -12,9 +12,9 @@ SHELL  = /bin/bash
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 
 SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || rpmspec -D '_vendor clr' --srpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' $(SPECFILE))
-SRPMFILE = results/srpm/$(SRPMVERS).src.rpm
+SRPMFILE = results/$(SRPMVERS).src.rpm
 
-LATEST_RPMS = $(shell [ ! -s results/logs/build.log ] || for r in `egrep 'Wrote.*/RPMS/.*.rpm' results/logs/build.log |  sed 's/.*\///;s/.*debuginfo/debuginfo\/&/'` ; do echo "results/$$r"; done)
+LATEST_RPMS = $(wildcard rpms/*.rpm)
 RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
@@ -28,16 +28,18 @@ __missingsources := $(filter-out $(wildcard ${__allsources}), ${__allsources})
 endif
 
 $(SPECFILE):
-	@echo Error: $(SPECFILE) is missing. Please run \`make autospec\` to try and auto
-	@echo Error: generate one for you.
-	@exit 1
+	@[[ -f "$@" ]] || (\
+	  echo Error: $@ is missing. Please run \`make autospec\` to try and auto;\
+	  echo Error: generate one for you.;\
+	  exit 1 )
 
 upstream:
-	@echo Error: The \"upstream\" file is missing. Try running \`make autospec\` to
-	@echo Error: auto generate one for you. If you are not using autospec to
-	@echo Error: generate a spec file, specify the proper "Source*" entries in the
-	@echo Error: spec header, and try running \`make generateupstream\`.
-	@exit 1
+	@[[ -f "$@" ]] || (\
+	  echo Error: The \"$@\" file is missing. Try running \`make autospec\` to;\
+	  echo Error: auto generate one for you. If you are not using autospec to;\
+	  echo Error: generate a spec file, specify the proper "Source*" entries in the;\
+	  echo Error: spec header, and try running \`make generateupstream\`.;\
+	  exit 1 )
 
 #help spdxcheck: Checks that the package license is a valid SPDX license,
 #help or that it is in the exceptions list.
@@ -91,24 +93,20 @@ prebuild-checks:
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options.
 build: prebuild-checks configemail $(SPECFILE) upstream $(SRPMFILE)
 	$(MOCK) $(SRPMFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
-	mkdir -p results/logs results/debuginfo
-	mv results/*.log results/logs
-	-mv results/*-debuginfo*.rpm results/debuginfo/
-	@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
-	@perl $(TOPLVL)/projects/common/count.pl results/logs/build.log &> testresults
+	$(MAKE) link-new-rpms PKG_REPO_DIR="."
+	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
+	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
 	@$(MAKE) checkblacklist
 
 #help build-nocheck: Same as 'make build', but do not run the package's test suite.
 build-nocheck: configemail $(SPECFILE) upstream $(SRPMFILE)
 	$(MOCK) $(SRPMFILE) --nocheck --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
-	mkdir -p results/logs results/debuginfo
-	mv results/*.log results/logs
-	-mv results/*-debuginfo*.rpm results/debuginfo/
-	@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
-	@perl $(TOPLVL)/projects/common/count.pl results/logs/build.log &> testresults
+	$(MAKE) link-new-rpms PKG_REPO_DIR="."
+	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
+	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
 	@$(MAKE) checkblacklist
 
-fmvpatches: results/logs/build.log
+fmvpatches: results/build.log
 	@perl $(TOPLVL)/projects/common/fmvpatches.pl $(PKG_NAME)
 
 #help rootshell: Puts you in a root shell at the top of your build root.
@@ -121,9 +119,11 @@ shell:
 
 # Always rebuild the source rpm
 .PHONY: $(SRPMFILE)
-$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
+$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice clean-old-content
 	@$(MAKE) spdxcheck
-	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/srpm/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	mv results/root.log results/srpm-root.log
+	mv results/build.log results/srpm-build.log
 
 # Do a git fetch and a git rebase to apply local commits on top of latest
 # commits from the remote. A git fetch/rebase is used rather than a git pull so
@@ -160,8 +160,7 @@ pullrebase:
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options
 #help to autospec.
 #help For more information, see the project at https://github.com/clearlinux/autospec
-autospec: pullrebase localreponotice
-	rm -f results/srpm/*src.rpm
+autospec: pullrebase localreponotice clean-old-content
 	@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; \
@@ -178,6 +177,7 @@ autospec: pullrebase localreponotice
 		$${SETVERSION:+ --version $${SETVERSION}} \
 		${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
 		$(firstword $(NEWURL) $(URL));
+	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
 	@if [ -e update_changelog.sh ] && [ -z "$$SKIP_GIT" ] ; then \
@@ -327,7 +327,7 @@ rekoji-nowait:
 	$(MAKE) KOJI_NOWAIT="--nowait --background" rekoji
 
 logcheck:
-	@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
+	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 
 $(TOPLVL)/repo:
 	@echo "Creating local RPM repository $(TOPLVL)/repo"
@@ -337,19 +337,24 @@ $(TOPLVL)/repo:
 #help repoadd: Adds locally-built RPMs for this package to the local RPM
 #help repository. If this repository does not yet exist, it is created and
 #help enabled.
-repoadd: results/logs/build.log $(TOPLVL)/repo
-	@if [ -z "`grep '^Wrote: .*$(shell basename $(SRPMFILE))$$' results/logs/build.log`" ]; then \
-		echo "You have not yet succesfully built this release yet"; exit 1; \
-	fi
-	@if [ -f .repo-index ]; then \
+repoadd: $(TOPLVL)/repo
+	@if [ -z "${LATEST_RPMS}" ]; then \
+		echo "No rpms found in rpms/ directory."; \
+		exit 1; \
+	fi; \
+	if [ -f .repo-index ]; then \
 		echo "Cleaning old rpms:"; \
 		for r in `cat .repo-index`; do \
 			echo "-$$r"; \
 			rm -f $(TOPLVL)/repo/$$r; \
 		done; \
 		rm .repo-index; \
-	fi
-	for r in $(LATEST_RPMS); do echo "+$$r"; echo $$(basename $$r) >> .repo-index; cp $$r $(TOPLVL)/repo; done
+	fi; \
+	for r in ${LATEST_RPMS}; do \
+		echo "+$$r"; \
+		echo $$(basename $$r) >> .repo-index; \
+		ln -f $$r $(TOPLVL)/repo/; \
+	done
 	$(MAKE) localrepocreate
 	$(call localrepoenable,${PM_CONF},${MOCK_CONF})
 

Makefile.shared

@@ -138,6 +138,30 @@ localreponotice:
 		[ -f $(TOPLVL)/repo/opt-in-build ] || sleep 3; \
 	fi >&2
 
+.PHONY: clean-old-rpms clean-old-logs clean-old-content
+clean-old-rpms:
+	rm -rf ./rpms
+	rm -f ./results/*.rpm
+
+clean-old-logs:
+	rm -f ./results/*.log
+
+clean-old-content: clean-old-rpms clean-old-logs
+
+.PHONY: require-pkg-repo-dir link-new-rpms
+require-pkg-repo-dir:
+	@if [ -z ${PKG_REPO_DIR} ]; then \
+		echo "Please specify PKG_REPO_DIR to indicate package repo location."; \
+		exit 1; \
+	fi
+
+link-new-rpms: require-pkg-repo-dir
+	mkdir -p ${PKG_REPO_DIR}/rpms
+	rm -f ${PKG_REPO_DIR}/rpms/*.rpm
+	find ${PKG_REPO_DIR}/results -maxdepth 1 -name '*.rpm' -exec ln {} ${PKG_REPO_DIR}/rpms/ \;
+	rm -f ${PKG_REPO_DIR}/rpms/*.src.rpm
+
+
 .PHONY: help
 ##### Code
 # Make sure that HELPSPACE has exactly HELPLEN spaces in it

Makefile.toplevel

@@ -224,6 +224,7 @@ autospecnew: localreponotice
 			$${SETVERSION:+ --version $${SETVERSION}} \
 			${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
 			$(URL); \
+		[ $$? -eq 0 ] && $(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \

conf/clear.cfg

@@ -6,6 +6,8 @@ config_opts['dist'] = 'clear'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s  %(user)s'
 config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['root_cache_opts']['compress_program'] = 'zstd -5'
+config_opts['plugin_conf']['root_cache_opts']['extension'] = '.zst'
 config_opts['releasever'] = 'clear'
 config_opts['package_manager'] = 'dnf'
 config_opts['chrootgroup'] = 'mockbuild'

packages

@@ -36,6 +36,7 @@ PyMySQL
 PyWavelets
 PyYAML
 Pygments
+Pyro4
 QtAwesome
 QtPy
 R
@@ -418,6 +419,7 @@ R-lfe
 R-lhs
 R-libcoin
 R-listenv
+R-listviewer
 R-lle
 R-lme4
 R-lmerTest
@@ -444,6 +446,7 @@ R-maxLik
 R-mclust
 R-mcmc
 R-mda
+R-measures
 R-memisc
 R-memoise
 R-mi
@@ -509,7 +512,9 @@ R-phylobase
 R-phylogram
 R-pillar
 R-pkgKitten
+R-pkgbuild
 R-pkgconfig
+R-pkgload
 R-pkgmaker
 R-plm
 R-plogr
@@ -563,6 +568,7 @@ R-randtoolbox
 R-ranger
 R-raster
 R-rasterVis
+R-reactR
 R-readr
 R-readstata13
 R-readxl
@@ -700,6 +706,7 @@ R-urltools
 R-uroot
 R-utf8
 R-uuid
+R-varImp
 R-vcd
 R-vcdExtra
 R-vcr
@@ -755,6 +762,7 @@ WebOb
 WebTest
 Werkzeug
 Whoosh
+WireGuard
 XStatic
 XStatic-Angular
 XStatic-Angular-Bootstrap
@@ -812,6 +820,7 @@ apr
 apr-util
 arc-theme
 argcomplete
+argon2
 argparse
 ark
 asciidoc
@@ -845,6 +854,7 @@ autogen
 automake
 automaton
 awscli
+axel
 azure-configs
 babeltrace
 babl
@@ -967,6 +977,7 @@ clr-init
 clr-man-pages
 clr-power-tweaks
 clr-python-timestamp
+clr-pyversion-strip
 clr-rpm-config
 clr-service-restart
 clr-systemd-config
@@ -979,11 +990,32 @@ clutter-gst
 clutter-gtk
 cmake
 cmd2
+cmocka
 cmrt
 cni
 cni-plugins
 cockpit
 cogl
+coinmp
+colcon-bash
+colcon-cmake
+colcon-common-extensions
+colcon-core
+colcon-defaults
+colcon-devtools
+colcon-library-path
+colcon-metadata
+colcon-output
+colcon-package-information
+colcon-package-selection
+colcon-parallel-executor
+colcon-pkg-config
+colcon-powershell
+colcon-python-setup-py
+colcon-recursive-crawl
+colcon-ros
+colcon-test-result
+colcon-zsh
 collectl
 colorama
 colord
@@ -1010,7 +1042,6 @@ compat-opencv-soname32
 compat-opencv-soname33
 compat-protobuf-soname14
 compat-protobuf-soname15
-compat-python36
 compat-readline
 component
 compute-image-packages
@@ -1065,6 +1096,7 @@ debugedit
 decorator
 defusedxml
 dejagnu
+deprecation
 desktop-file-utils
 dfc
 dfu-util
@@ -1148,6 +1180,7 @@ fann
 farstream
 fasteners
 fcgi
+feh
 fftw
 file
 file-roller
@@ -1159,7 +1192,13 @@ fish
 fixtures
 flac
 flake8
+flake8-blind-except
+flake8-builtins
+flake8-class-newline
+flake8-comprehensions
+flake8-deprecated
 flake8-docstrings
+flake8-import-order
 flake8-polyfill
 flatpak
 fldigi
@@ -1214,6 +1253,7 @@ gftp
 ghostscript
 gimp
 git
+gitdb2
 gitolite
 gjs
 glance
@@ -1224,6 +1264,7 @@ glib
 glib-networking
 glibc
 glibmm
+glm
 glmark2
 global
 glog
@@ -1275,6 +1316,7 @@ gnupg
 gnuplot
 gnutls
 go
+goaccess
 gobject-introspection
 golang-github-cpuguy83-go-md2man
 gom
@@ -1291,6 +1333,7 @@ gptfdisk
 gradle
 gradle-dep
 graphene
+graphite
 graphviz
 greenlet
 grep
@@ -1351,6 +1394,7 @@ hunspell
 hwloc
 hyperscan
 hyperstart
+hyphen
 hypothesis
 i2c-tools
 i3
@@ -1364,6 +1408,7 @@ iceauth
 icon-naming-utils
 icu4c
 idna
+iftop
 imagesize
 imapfilter
 imlib2
@@ -1377,6 +1422,7 @@ intel-gpu-tools
 intel-hybrid-driver
 intltool
 invm-frameworks
+ioc-cbc-tools
 ioping
 iotop
 ipaddr
@@ -1461,7 +1507,10 @@ kdesignerplugin
 kdesu
 kdnssd
 kdoctools
+keepassxc
 kemoticons
+kernel-config
+kernel-config-checker
 kernel-install
 kexec-tools
 keychain
@@ -1475,6 +1524,7 @@ kglobalaccel
 kguiaddons
 khal
 kholidays
+khtml
 ki18n
 kiconthemes
 kidletime
@@ -1488,6 +1538,7 @@ kiwisolver
 kjobwidgets
 kjs
 kjsembed
+kmime
 kmod
 knewstuff
 knotifications
@@ -1526,6 +1577,7 @@ libSM
 libX11
 libXScrnSaver
 libXau
+libXaw
 libXcomposite
 libXcursor
 libXdamage
@@ -1550,6 +1602,7 @@ libXvMC
 libXxf86dga
 libXxf86misc
 libXxf86vm
+libabigail
 libaio
 libarchive
 libarchive-c
@@ -1650,6 +1703,7 @@ libsigc++
 libsmbios
 libsmi
 libsndfile
+libsodium
 libsolv
 libsoup
 libspectre
@@ -1791,12 +1845,14 @@ mstflint
 mtdev
 multimon-ng
 multipath-tools
+munch
 murrine
 musl
 mutt
 mutter
 mypaint-brushes
 mypy
+mythes
 nagios-plugins
 nano
 nasm
@@ -1828,11 +1884,13 @@ nginx
 nicstat
 ninja
 nlopt
+nltk
 nodejs
 nose
 nose-cov
 nose-cover3
 nose-parameterized
+nosexcover
 nosync
 notebook
 notmuch
@@ -1856,14 +1914,17 @@ oauth2client
 oauthlib
 ocaml
 ocl-icd
+octave
 offlineimap
 olefile
 onig
+onnx
 opa-psm2
 open-iscsi
 open-isns
 open-lldp
 open-vm-tools
+openQA
 openal-soft
 openblas
 openconnect
@@ -1885,10 +1946,14 @@ opusfile
 orc
 orca
 ordereddict
+os-api-ref
+os-autoinst
 os-brick
 os-client-config
+os-service-types
 os-testr
 os-win
+os-xenapi
 osc-lib
 osinfo-db-tools
 oslo.cache
@@ -1901,6 +1966,7 @@ oslo.log
 oslo.messaging
 oslo.middleware
 oslo.policy
+oslo.privsep
 oslo.reports
 oslo.rootwrap
 oslo.serialization
@@ -1942,6 +2008,7 @@ pcre
 pcre2
 pecan
 pep8
+performance
 perftest
 perl
 perl-Acme-Damn
@@ -2071,6 +2138,7 @@ perl-Devel-Refactor
 perl-Devel-Size
 perl-Devel-StackTrace
 perl-Devel-StackTrace-AsHTML
+perl-Devel-Symdump
 perl-Digest-CRC
 perl-Digest-HMAC
 perl-Digest-JHash
@@ -2204,6 +2272,7 @@ perl-Image-Size
 perl-Import-Into
 perl-Importer
 perl-Inline
+perl-JSON
 perl-JSON-MaybeXS
 perl-JSON-RPC
 perl-JavaScript-Minifier-XS
@@ -2273,6 +2342,8 @@ perl-Module-ScanDeps
 perl-Module-Starter
 perl-Module-Util
 perl-Module-Versions-Report
+perl-Mojolicious
+perl-Mojolicious-Plugin-AssetPack
 perl-Mozilla-CA
 perl-Net-CIDR-Lite
 perl-Net-DNS
@@ -2325,6 +2396,7 @@ perl-PerlIO-gzip
 perl-PerlIO-utf8_strict
 perl-PerlIO-via-Timeout
 perl-Pod-Constants
+perl-Pod-Coverage
 perl-Pod-LaTeX
 perl-Pod-Plainer
 perl-Pod-Spell
@@ -2352,6 +2424,7 @@ perl-Scope-Upper
 perl-Set-Object
 perl-Set-Scalar
 perl-Smart-Comments
+perl-Socket-MsgHdr
 perl-Socket6
 perl-Sort-Key
 perl-Sort-Naturally
@@ -2394,6 +2467,7 @@ perl-Term-Table
 perl-Term-UI
 perl-TermReadKey
 perl-Test-Assertions
+perl-Test-Compile
 perl-Test-Deep
 perl-Test-Exception
 perl-Test-FailWarnings
@@ -2549,6 +2623,7 @@ prettytable
 proc-macro2
 processor-trace
 procps-ng
+prometheus_client
 prompt_toolkit
 protobuf
 protobuf-c
@@ -2564,6 +2639,7 @@ pwgen
 py
 pyOpenSSL
 pyScss
+pyaes
 pyaml
 pyasn1
 pyasn1-modules
@@ -2578,6 +2654,7 @@ pydocstyle
 pydot
 pydot_ng
 pydotplus
+pyemd
 pyflakes
 pygobject
 pyinotify
@@ -2588,6 +2665,7 @@ pymongo
 pynacl
 pypandoc
 pyparsing
+pyperclip
 pyquery
 pyrfc3339
 pyrsistent
@@ -2596,6 +2674,9 @@ pyserial
 pysnmp
 pytest
 pytest-cov
+pytest-forked
+pytest-repeat
+pytest-rerunfailures
 pytest-runner
 pytest-timeout
 pytest-xdist
@@ -2626,6 +2707,7 @@ python-multilib
 python-neutronclient
 python-novaclient
 python-openstackclient
+python-perf
 python-pkgconfig
 python-pocketlint
 python-polib
@@ -2681,6 +2763,7 @@ qttranslations
 qtvirtualkeyboard
 qtwayland
 qtwebchannel
+qtwebengine
 qtwebsockets
 qtx11extras
 qtxmlpatterns
@@ -2688,18 +2771,22 @@ quagga
 quilt
 rabbitmq-c
 ragel
+raptor2
+rasqal
 rcssmin
 rdma-core
 re2c
 readline
 redis
 redis-native
+redland
 redsocks
 reno
 repoze.lru
 repoze.who
 requests
 requests-mock
+requests-toolbelt
 requestsexceptions
 rest
 restructuredtext_lint
@@ -2710,6 +2797,8 @@ rfc3986
 rjsmin
 rng-tools
 rope
+rosdistro
+rospkg
 rpcbind
 rpm
 rr
@@ -2740,6 +2829,7 @@ scipy
 scons
 screen
 scripttest
+scrypt
 sddm
 seaborn
 seahorse
@@ -2770,6 +2860,7 @@ slang
 smart_open
 smartcols
 smartmontools
+smmap2
 snappy
 snowballstemmer
 socat
@@ -2801,15 +2892,19 @@ squashfs-tools
 sshfs
 stack
 startup-notification
+statsd
 statsmodels
+stestr
 stevedore
 stow
 strace
 stress-ng
 subunit
+subunit2sql
 subversion
 sudo
 suds-jurko
+sundials
 sure
 suricata
 swift
@@ -2853,6 +2948,7 @@ testscenarios
 testtools
 texinfo
 texlive
+text-unidecode
 tflearn
 thermal_daemon
 thin-provisioning-tools
@@ -2864,11 +2960,11 @@ tiff
 tig
 tigervnc
 time
+tinyxml2
 tiptop
 tk
 tmux
 tokyocabinet
-toolbelt
 tooz
 tornado
 totem
@@ -2894,6 +2990,7 @@ unicodecsv
 unifdef
 unison
 unittest2
+unixODBC
 unzip
 upower
 uritemplate
@@ -2910,6 +3007,7 @@ uwsgi
 v4l-utils
 vala
 valgrind
+vcstool
 vcversioner
 vim
 vim-go