Update packages file for version 21220

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

Makefile.common

@@ -4,8 +4,8 @@ all: build
 
 TOPLVL = ../..
 
-include $(TOPLVL)/projects/common/Makefile.functions
 include $(TOPLVL)/projects/common/Makefile.config
+include $(TOPLVL)/projects/common/Makefile.shared
 
 SHELL  = /bin/bash
 
@@ -19,12 +19,9 @@ RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
 
-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
+# MOCK_CONFIG_VAL is set in Makefile.shared
+MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONFIG_VAL)
+
 
 ifneq ($(wildcard upstream),)
 __allsources := $(notdir $(strip $(shell cat upstream)))
@@ -118,15 +115,8 @@ shell:
 
 # Always rebuild the source rpm
 .PHONY: $(SRPMFILE)
-$(SRPMFILE): $(SPECFILE) $(__allsources)
+$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
 	@$(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
@@ -154,7 +144,7 @@ pullrebase:
 #help already a specfile, it will be overwritten. Several files used by
 #help autospec will be created in the process. For more information, see
 #help the project at https://github.com/clearlinux/autospec
-autospec: pullrebase
+autospec: pullrebase localreponotice
 	rm -f results/*src.rpm
 	@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
@@ -164,7 +154,8 @@ autospec: pullrebase
 	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --integrity \
 		${NON_INTERACTIVE} --config "$(AUTOSPEC_CONF)" ${SKIP_GIT} \
 		$(firstword $(NEWURL) $(URL)) --name $(PKG_NAME) ${CLEANUP} \
-		$${SETVERSION:+ -v $${SETVERSION}} -a $(ARCHIVES)
+		$${SETVERSION:+ -v $${SETVERSION}} -a $(ARCHIVES) \
+		-m $(MOCK_CONFIG_VAL)
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
 	@if [ -e update_changelog.sh ] && [ -z "$$SKIP_GIT" ] ; then \

Makefile.shared

@@ -119,6 +119,24 @@ localrepostatus:
 		fi; \
 	)
 
+# Detection of whether to use the local RPM repo occurs on-the-fly. Normally,
+# variable definitions appear in Makefile.config, but these variables are not
+# intended to be user-modifiable.
+ifeq ($(wildcard $(TOPLVL)/repo/clear.cfg),)
+MOCK_CONFIG_VAL = $(realpath $(MOCK_CONF))
+else
+MOCK_CONFIG_VAL = $(realpath $(TOPLVL)/repo/clear.cfg)
+USE_LOCAL_REPO = 1
+endif
+
+localreponotice:
+	@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
 
 .PHONY: help
 ##### Code

Makefile.toplevel

@@ -4,8 +4,8 @@ all: clone
 
 TOPLVL  = .
 
-include $(TOPLVL)/projects/common/Makefile.functions
 include $(TOPLVL)/projects/common/Makefile.config
+include $(TOPLVL)/projects/common/Makefile.shared
 
 SHELL   = /bin/bash
 
@@ -188,7 +188,7 @@ provides:
 #help autospecnew: Creates a new autospec package with for a given URL=$(URL)
 #help with NAME=$(NAME). Several files used by autospec will be created in the
 #help process. For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
-autospecnew:
+autospecnew: localreponotice
 	@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
 		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \
@@ -204,7 +204,7 @@ autospecnew:
 			$(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); \
+		python3 $(TOPLVL)/projects/autospec/autospec/autospec.py --integrity -t packages/$(NAME) --config $(AUTOSPEC_CONF) $(URL) --name $(NAME) -m $(MOCK_CONFIG_VAL); \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \

packages

@@ -182,6 +182,8 @@ accountsservice
 acl
 acme
 acpica-unix2
+acrn-devicemodel
+acrn-hypervisor
 adwaita-icon-theme
 aeon
 alabaster
@@ -273,6 +275,7 @@ cabextract
 cached-property
 cairo
 cairomm
+cantarell-fonts
 cargo
 caribou
 catch2
@@ -413,6 +416,7 @@ docbook-xml
 docker
 docker-py
 docutils
+dogtail
 dos2unix
 dosfstools
 double-conversion
@@ -477,6 +481,7 @@ flex
 flmsg
 flnet
 fltk
+folks
 font-adobe-100dpi
 font-adobe-75dpi
 font-bitstream-type1
@@ -514,6 +519,7 @@ geocode-glib
 gettext
 gevent
 gexiv2
+gfbgraph
 gflags
 ghostscript
 gimp
@@ -542,6 +548,7 @@ gnome-bluetooth
 gnome-calculator
 gnome-calendar
 gnome-characters
+gnome-color-manager
 gnome-common
 gnome-control-center
 gnome-desktop
@@ -550,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
@@ -558,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
@@ -568,6 +582,7 @@ gnutls
 go
 gobject-introspection
 golang-github-cpuguy83-go-md2man
+gom
 goocanvas
 google-api-python-client
 google-apitools
@@ -580,6 +595,7 @@ gpredict
 gptfdisk
 gradle
 gradle-dep
+graphene
 graphviz
 greenlet
 grep
@@ -590,6 +606,7 @@ groff
 grub
 gsettings-desktop-schemas
 gsl
+gsound
 gspell
 gst-plugins-bad
 gst-plugins-base
@@ -649,6 +666,7 @@ init-rdahead
 inotify-tools
 inputproto
 intltool
+invm-frameworks
 ioping
 iotop
 ipaddr
@@ -755,6 +773,7 @@ libcap
 libcap-ng
 libcdio
 libcgroup
+libchamplain
 libcomps
 libconfig
 libcroco
@@ -773,6 +792,7 @@ libgcrypt
 libgd
 libgdata
 libgee
+libgepub
 libgfortran-avx
 libgfortran-compat-soname3
 libgit2
@@ -1195,6 +1215,7 @@ pyOpenSSL
 pyaml
 pyasn1
 pyasn1-modules
+pyatspi
 pycairo
 pycodestyle
 pycparser
@@ -1320,6 +1341,7 @@ screen
 scripttest
 scrnsaverproto
 seaborn
+seahorse
 secretstorage
 sed
 setproctitle
@@ -1421,6 +1443,7 @@ tqdm
 traceback2
 traceroute
 tracker
+tracker-miners
 traitlets
 tree
 typed-ast
@@ -1452,6 +1475,7 @@ videoproto
 vim
 vim-go
 vinagre
+vino
 virt-manager
 virt-viewer
 virtualenv