Update packages file for version 21180

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

Makefile.common

@@ -19,7 +19,12 @@ RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
 
-MOCK     ?= $(WITH_SUDO) /usr/bin/mock -r clear
+ifeq ($(wildcard $(TOPLVL)/repo/clear.cfg),)
+MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONF)
+else
+MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(TOPLVL)/repo/clear.cfg
+USE_LOCAL_REPO = 1
+endif
 
 ifneq ($(wildcard upstream),)
 __allsources := $(notdir $(strip $(shell cat upstream)))
@@ -115,6 +120,13 @@ shell:
 .PHONY: $(SRPMFILE)
 $(SRPMFILE): $(SPECFILE) $(__allsources)
 	@$(MAKE) spdxcheck
+	@if [ -n "${USE_LOCAL_REPO}" ]; then \
+		printf '\n\n** NOTICE: Using local repo for the build. Continuing after 3 seconds.\n'; \
+		printf '** If this is not desired, run `make repodisable`.\n'; \
+		printf '** The repo can be re-enabled later with `make repoenable`.\n'; \
+		printf '** Run `touch $(TOPLVL)/repo/opt-in-build` to prevent the 3 second delay.\n\n\n'; \
+		[ -f $(TOPLVL)/repo/opt-in-build ] || sleep 3; \
+	fi >&2
 	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
 
 # Do a git fetch and a git rebase rather than a git pull so aborting
@@ -275,8 +287,11 @@ logcheck:
 $(TOPLVL)/repo:
 	@echo "Creating local RPM repository $(TOPLVL)/repo"
 	mkdir $(TOPLVL)/repo
+	$(MAKE) localrepocreate
 
-#help repoadd: Creates a local Yum repository in the $(TOPLVL)/repo directory.
+#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/build.log $(TOPLVL)/repo
 	@if [ -z "`grep '^Wrote: .*$(shell basename $(SRPMFILE))$$' results/build.log`" ]; then \
 		echo "You have not yet succesfully built this release yet"; exit 1; \
@@ -285,17 +300,16 @@ repoadd: results/build.log $(TOPLVL)/repo
 		echo "Cleaning old rpms:"; \
 		for r in `cat .repo-index`; do \
 			echo "-$$r"; \
-			rm $(TOPLVL)/repo/$$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
-	( cd $(TOPLVL)/repo ; if type createrepo_c 1>/dev/null 2>&1; then createrepo_c .; else createrepo .; fi );
-	@cp $(TOPLVL)/projects/common/image-creator/yum.conf $(TOPLVL)/repo/.yum.conf
-	@printf "\n\n[local]\nname=Local\nfailovermethod=priority\nenabled=1\ngpgcheck=0\n" >> $(TOPLVL)/repo/.yum.conf
-	@printf "baseurl=file://$$(realpath $(TOPLVL))/repo/\n\n" >> $(TOPLVL)/repo/.yum.conf
+	$(MAKE) localrepocreate
+	$(call localrepoenable,${PM_CONF},${MOCK_CONF})
 
-#help repodel: Removes package from local Yum repository.
+#help repodel: Removes RPMs from the local RPM repository that were
+#help previously added by 'make repoadd' for this package.
 repodel:
 	@if [ -f .repo-index ]; then \
 		echo "Cleaning old rpms:"; \
@@ -304,8 +318,19 @@ repodel:
 			rm -f $(TOPLVL)/repo/$$r; \
 		done; \
 		rm .repo-index; \
+		$(MAKE) localrepocreate; \
 	fi
 
+#help repoenable: Enables the local RPM repository for use with Yum/DNF and
+#help Mock. If this repository does not yet exist, it is created.
+repoenable: $(TOPLVL)/repo ; $(call localrepoenable,${PM_CONF},${MOCK_CONF})
+
+#help repodisable: Disables the local RPM repository.
+repodisable: localrepodisable ;
+
+#help repostatus: Summarizes the local RPM repository status.
+repostatus: localrepostatus ;
+
 loop-up:
 	$(loopup)
 

Makefile.config

@@ -54,6 +54,13 @@ AUTOSPEC_CONF = $(TOPLVL)/projects/common/autospec.conf
 # in "pkg-mapping" for cloning/pulling package repos.
 USE_PACKAGE_MAPPING = yes
 
+# Package manager config file. Default to the in-tree copy.
+PM_CONF = $(TOPLVL)/projects/common/image-creator/yum.conf
+
+# Mock configuration file. Default to the in-tree copy.
+MOCK_CONF = $(TOPLVL)/projects/common/koji-client-files/clear.cfg
+
+
 # Include any site local configuration variables. These variables may override
 # the definitions given above.
 -include $(TOPLVL)/projects/common/Makefile.config.site_local

Makefile.functions

@@ -62,6 +62,64 @@ define remotepkgname
 $(if $(USE_PACKAGE_MAPPING),$$(awk -v P="$(1)" '$$1 == P { res=$$2 } END { print res ? res : P }' $(TOPLVL)/projects/common/pkg-mapping),$(1))
 endef
 
+# Enables the local RPM repo by installing package manager and Mock configs.
+# First argument is the path to the package manager config, and the second
+# argument is the path to the mock config. Each of these config files is
+# augmented for local repo support.
+define localrepoenable
+	@cp $(1) $(TOPLVL)/repo/yum.conf
+	@printf "\n\n[local]\nname=Local\nfailovermethod=priority\nenabled=1\ngpgcheck=0\n" >> $(TOPLVL)/repo/yum.conf
+	@printf "baseurl=file://$$(realpath $(TOPLVL))/repo/\n\n" >> $(TOPLVL)/repo/yum.conf
+	@cp $(2) $(TOPLVL)/repo/clear.cfg
+	@printf "\n\n[localrepo]\nname=Local repo\nfailovermethod=priority\nenabled=1\ngpgcheck=0\n" >> $(TOPLVL)/repo/clear.cfg
+	@printf "baseurl=file://$$(realpath $(TOPLVL))/repo/\n\n" >> $(TOPLVL)/repo/clear.cfg
+	@sed -i '/^"""/d; $$a"""' $(TOPLVL)/repo/clear.cfg
+endef
+
+# Disables the local RPM repo by removing the installed package manager and
+# Mock configuration files.
+localrepodisable:
+	@rm -f $(TOPLVL)/repo/yum.conf
+	@rm -f $(TOPLVL)/repo/clear.cfg
+
+# Runs createrepo_c (or createrepo) for the local RPM repo
+localrepocreate:
+	( cd $(TOPLVL)/repo ; if type createrepo_c 1>/dev/null 2>&1; then createrepo_c .; else createrepo .; fi );
+
+# Remove all RPMs from the local RPM repo
+localrepoclean:
+	@find $(TOPLVL)/repo -maxdepth 1 -name '*.rpm' -delete
+
+# Summarizes the local RPM repo status
+localrepostatus:
+	@if [ ! -d $(TOPLVL)/repo ]; then \
+		echo '** Local repo not found'; \
+		exit 0; \
+	fi; \
+	if [ -f $(TOPLVL)/repo/yum.conf ]; then \
+		echo '** Local repo enabled for Yum/DNF.'; \
+	else \
+		echo '** Local repo not enabled for Yum/DNF.'; \
+	fi; \
+	if [ -f $(TOPLVL)/repo/clear.cfg ]; then \
+		echo '** Local repo enabled for Mock.'; \
+	else \
+		echo '** Local repo not enabled for Mock.'; \
+	fi; \
+	echo -n '** Local repo package list: '; \
+	( \
+		cd "$(TOPLVL)/repo"; \
+		LC_COLLATE="C"; \
+		shopt -s nullglob; \
+		set -- *.rpm; \
+		if [ -n "$$1" ]; then \
+			printf '\n'; printf '%q\n' "$$@"; \
+		else \
+			printf 'none found\n'; \
+		fi; \
+	)
+
+
 .PHONY: help
 ##### Code
 # Make sure that HELPSPACE has exactly HELPLEN spaces in it

Makefile.toplevel

@@ -148,6 +148,7 @@ proper: $(proper_PKGS)
 .PHONY: $(proper_PKGS)
 
 $(clean_PKGS):
+	@echo "cleaning $(patsubst clean_%,%,$@)"
 	-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
 
 $(proper_PKGS):
@@ -157,7 +158,7 @@ $(proper_PKGS):
 #help and unstaged files in addition to staged files.
 status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
 	@for p in projects/common $(addprefix packages/,$(PKGS)); do \
-		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in $$p:"; git status)) ;\
+	if [ -d "$$p/.git" ] &&  [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
 	done
 
 #help diff: Runs git diff for all package repos and displays the output using
@@ -192,10 +193,16 @@ autospecnew:
 		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \
 	fi
-	@git clone $(PKG_BASE_URL)/$(NAME) $(TOPLVL)/packages/$(NAME) &> /dev/null || true
 	@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
 		echo "no remote repository found, creating new package repository and running autospec"; \
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
+		( \
+			cd $(TOPLVL)/packages/$(NAME); \
+			git init; \
+			git remote add origin $(PKG_BASE_URL)/$(NAME); \
+			$(call gitoliteurl,packages/$(NAME)); \
+			$(call subjectprefix,$(NAME)); \
+		); \
 		printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' '$(value ARCHIVES)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
 		python3 $(TOPLVL)/projects/autospec/autospec/autospec.py --integrity -t packages/$(NAME) --config $(AUTOSPEC_CONF) $(URL) --name $(NAME); \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
@@ -204,5 +211,24 @@ autospecnew:
 		exit 1; \
 	fi
 
+$(TOPLVL)/repo:
+	@echo "Creating local RPM repository $(TOPLVL)/repo"
+	mkdir $(TOPLVL)/repo
+	$(MAKE) localrepocreate
+
+#help repoenable: Enables the local RPM repository for use with Yum/DNF and
+#help Mock. If this repository does not yet exist, it is created.
+repoenable: $(TOPLVL)/repo ; $(call localrepoenable,${PM_CONF},${MOCK_CONF})
+
+#help repodisable: Disables the local RPM repository.
+repodisable: localrepodisable ;
+
+#help repoclean: Removes all RPMs from the local RPM repository.
+repoclean: localrepoclean localrepocreate ;
+
+#help repostatus: Summarizes the local RPM repository status.
+repostatus: localrepostatus ;
+
+
 # Define site local toplevel targets in a separate makefile
 -include $(TOPLVL)/projects/common/Makefile.toplevel.site_local

README.md

@@ -20,8 +20,16 @@ building Clear Linux packages.
 ### Automated setup
 
 Download the [user setup](user-setup.sh) script and run it on your Clear Linux
-system as an unprivileged user. After the script completes, make sure to logout
-and login again to complete the setup process.
+system as an unprivileged user.
+
+```
+$ curl -O https://raw.githubusercontent.com/clearlinux/common/master/user-setup.sh
+$ chmod +x user-setup.sh
+$ ./user-setup.sh
+```
+
+After the script completes, make sure to logout and login again to complete the
+setup process.
 
 The script either accepts no options, or all (3) options in case you are
 configuring the Koji CLI for remote building on a Koji server. The options are

autospec.conf

@@ -13,3 +13,11 @@
 
 # String to replace with "localhost" in upstream tarball URLs
 #urlban =
+
+# Path to packages file, a list of current packages in Clear Linux. It can be
+# an absolute path or a path relative to this autospec.conf.
+#packages_file =
+
+# Path to yum config, used for generating whatrequires. It can be an absolute
+# path or a path relative to this autospec.conf.
+#yum_conf =

koji-client-files/clear.cfg

@@ -4,8 +4,10 @@ config_opts['legal_host_arches'] = ('x86_64',)
 config_opts['chroot_setup_cmd'] = 'groupinstall build srpm-build'
 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['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['releasever'] = 'clear'
+config_opts['package_manager'] = 'dnf'
 
 
 config_opts['yum.conf'] = """

packages

@@ -9,6 +9,7 @@ Jinja2
 Keras
 LS_COLORS
 LVM2
+LibRaw
 LibVNCServer
 Linux-PAM
 LuaJIT
@@ -24,7 +25,6 @@ OpenSP
 Paste
 PasteDeploy
 Pillow
-PyQt5
 PyWavelets
 PyYAML
 Pygments
@@ -162,6 +162,7 @@ SDL_mixer
 SDL_net
 SDL_ttf
 SQLAlchemy
+Send2Trash
 SocksiPy-branch
 Sphinx
 SuiteSparse
@@ -176,10 +177,13 @@ WebTest
 Werkzeug
 Whoosh
 abireport
+absl-py
 accountsservice
 acl
 acme
 acpica-unix2
+acrn-devicemodel
+acrn-hypervisor
 adwaita-icon-theme
 aeon
 alabaster
@@ -226,6 +230,7 @@ autogen
 automake
 awscli
 azure-configs
+babeltrace
 babl
 backports.functools_lru_cache
 backports.ssl_match_hostname
@@ -252,6 +257,7 @@ bluez
 bndl-lamp-basic
 bokeh
 boost
+borgbackup
 boto
 boto3
 botocore
@@ -266,8 +272,10 @@ c_rehash
 ca-certs
 ca-certs-static
 cabextract
+cached-property
 cairo
 cairomm
+cantarell-fonts
 cargo
 caribou
 catch2
@@ -285,8 +293,10 @@ chardet
 check
 cheese
 chrome-gnome-shell
+chrony
 chrpath
 cifs-utils
+clamav
 clear-config-management
 clear-containers-agent
 clear-containers-image
@@ -329,7 +339,7 @@ comedilib
 compat-SDL2-soname1
 compat-efivar-soname0
 compat-fuse-soname2
-compat-gc-soname1
+compat-gegl
 compat-glew-soname1
 compat-guile-soname20
 compat-libical-soname2
@@ -385,6 +395,7 @@ dbus-glib
 dconf
 deap
 decorator
+defusedxml
 dejagnu
 desktop-file-utils
 dfc
@@ -405,6 +416,7 @@ docbook-xml
 docker
 docker-py
 docutils
+dogtail
 dos2unix
 dosfstools
 double-conversion
@@ -420,6 +432,7 @@ ecdsa
 ed
 edk2
 efibootmgr
+efitools
 efivar
 eigen
 elasticsearch
@@ -448,6 +461,7 @@ extras
 faba-icon-theme
 fann
 farstream
+fasteners
 fcgi
 fftw
 file
@@ -467,6 +481,7 @@ flex
 flmsg
 flnet
 fltk
+folks
 font-adobe-100dpi
 font-adobe-75dpi
 font-bitstream-type1
@@ -503,6 +518,8 @@ geoclue
 geocode-glib
 gettext
 gevent
+gexiv2
+gfbgraph
 gflags
 ghostscript
 gimp
@@ -531,6 +548,7 @@ gnome-bluetooth
 gnome-calculator
 gnome-calendar
 gnome-characters
+gnome-color-manager
 gnome-common
 gnome-control-center
 gnome-desktop
@@ -539,7 +557,10 @@ gnome-font-viewer
 gnome-icon-theme
 gnome-initial-setup
 gnome-keyring
+gnome-logs
+gnome-maps
 gnome-menus
+gnome-music
 gnome-online-accounts
 gnome-panel
 gnome-screenshot
@@ -547,9 +568,13 @@ gnome-session
 gnome-settings-daemon
 gnome-shell
 gnome-shell-extensions
+gnome-system-monitor
 gnome-terminal
 gnome-themes-standard
+gnome-todo
 gnome-tweak-tool
+gnome-user-docs
+gnome-video-effects
 gnu-efi
 gnupg
 gnuplot
@@ -557,6 +582,7 @@ gnutls
 go
 gobject-introspection
 golang-github-cpuguy83-go-md2man
+gom
 goocanvas
 google-api-python-client
 google-apitools
@@ -569,6 +595,7 @@ gpredict
 gptfdisk
 gradle
 gradle-dep
+graphene
 graphviz
 greenlet
 grep
@@ -579,6 +606,7 @@ groff
 grub
 gsettings-desktop-schemas
 gsl
+gsound
 gspell
 gst-plugins-bad
 gst-plugins-base
@@ -661,11 +689,12 @@ irssi
 isa-l
 iso-codes
 iso8601
+isodate
 isort
 ister
 itstool
 iw
-javapackages-tools
+ixpdimm_sw
 jedi
 jedi-vim
 jemalloc
@@ -743,6 +772,7 @@ libcap
 libcap-ng
 libcdio
 libcgroup
+libchamplain
 libcomps
 libconfig
 libcroco
@@ -761,6 +791,7 @@ libgcrypt
 libgd
 libgdata
 libgee
+libgepub
 libgfortran-avx
 libgfortran-compat-soname3
 libgit2
@@ -848,8 +879,10 @@ libxkbcommon
 libxkbfile
 libxklavier
 libxml2
+libxml2-legacy
 libxshmfence
 libxslt
+libyami
 libzip
 linecache2
 links
@@ -864,6 +897,7 @@ linux-hyperv-mini
 linux-kvm
 linux-libc-headers
 linux-lts
+linux-pk414
 linux-steam-integration
 linux-tools
 llvm
@@ -908,6 +942,7 @@ mistune
 mixer-tools
 mkfontdir
 mkfontscale
+mkosi
 mock
 mod_wsgi
 moka-icon-theme
@@ -919,11 +954,13 @@ mozjs38
 mpc
 mpfr
 mpg123
+msgpack-python
 msmtp
 msr-tools
 mstflint
 mtdev
 multimon-ng
+multipath-tools
 murrine
 musl
 mutt
@@ -935,10 +972,12 @@ nasm
 nautilus
 nbconvert
 nbformat
+nbsphinx
 ncurses
 ncurses-compat
 ndctl
 ndg_httpsclient
+neofetch
 neon
 net-snmp
 net-tools
@@ -993,6 +1032,7 @@ openconnect
 opencv
 openjade
 openjdk
+openjdk9
 openldap
 openmpi
 opensm
@@ -1005,6 +1045,7 @@ opusfile
 orc
 ordereddict
 ostree
+ovirt-guest-agent
 p11-kit
 p7zip
 packaging
@@ -1054,6 +1095,7 @@ perl-Eval-Closure
 perl-Exception-Class
 perl-Exporter-Tiny
 perl-File-Listing
+perl-File-Slurp
 perl-HTML-Parser
 perl-HTML-Tagset
 perl-HTTP-Cookies
@@ -1168,11 +1210,12 @@ ptyprocess
 pugixml
 pulseaudio
 py
-py2cairo
 pyOpenSSL
 pyaml
 pyasn1
 pyasn1-modules
+pyatspi
+pycairo
 pycodestyle
 pycparser
 pycrypto
@@ -1187,7 +1230,6 @@ pylint
 pynacl
 pypandoc
 pyparsing
-pypy
 pyquery
 pyrfc3339
 pyserial
@@ -1217,6 +1259,7 @@ python-systemd
 python-tappy
 python-toml
 python-urwid
+python-zeep
 python3
 pytz
 pyudev
@@ -1226,8 +1269,33 @@ pyzmq
 qemu
 qemu-lite
 qpdf
-qt-everywhere-opensource-src
+qt3d
+qtbase
+qtcanvas3d
+qtcharts
+qtconnectivity
 qtconsole
+qtdeclarative
+qtgraphicaleffects
+qtimageformats
+qtlocation
+qtmultimedia
+qtquickcontrols
+qtquickcontrols2
+qtremoteobjects
+qtscript
+qtscxml
+qtsensors
+qtserialbus
+qtserialport
+qtsvg
+qttools
+qttranslations
+qtvirtualkeyboard
+qtwebchannel
+qtwebsockets
+qtx11extras
+qtxmlpatterns
 quagga
 quilt
 randrproto
@@ -1272,6 +1340,7 @@ screen
 scripttest
 scrnsaverproto
 seaborn
+seahorse
 secretstorage
 sed
 setproctitle
@@ -1301,13 +1370,13 @@ sox
 spark-dep
 speex
 speexdsp
+sphinx_rtd_theme
 sphinxcontrib-newsfeed
 sphinxcontrib-websupport
 spi-tools
 spice
 spice-gtk
 spice-protocol
-spyder
 spyder-notebook
 sqlite-autoconf
 sqlparse
@@ -1364,6 +1433,7 @@ tiptop
 tk
 tmux
 tokyocabinet
+toolbelt
 tornado
 totem
 totem-pl-parser
@@ -1372,6 +1442,7 @@ tqdm
 traceback2
 traceroute
 tracker
+tracker-miners
 traitlets
 tree
 typed-ast
@@ -1403,6 +1474,7 @@ videoproto
 vim
 vim-go
 vinagre
+vino
 virt-manager
 virt-viewer
 virtualenv
@@ -1436,7 +1508,9 @@ xauth
 xbitmaps
 xcb-proto
 xcb-util
+xcb-util-image
 xcb-util-keysyms
+xcb-util-wm
 xclip
 xcmiscproto
 xcursor-themes
@@ -1481,6 +1555,7 @@ xkbcomp
 xkeyboard-config
 xlog
 xmlsec1
+xmlstarlet
 xmlto
 xorg-server
 xorriso