Update packages file for version 21310

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,7 +19,9 @@ 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
+# 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)))
@@ -113,7 +115,7 @@ shell:
 
 # Always rebuild the source rpm
 .PHONY: $(SRPMFILE)
-$(SRPMFILE): $(SPECFILE) $(__allsources)
+$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
 	@$(MAKE) spdxcheck
 	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
 
@@ -142,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."; \
@@ -152,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 \
@@ -275,8 +278,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 +291,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 );
+	$(MAKE) localrepocreate
-	@cp $(TOPLVL)/projects/common/image-creator/yum.conf $(TOPLVL)/repo/.yum.conf
+	$(call localrepoenable,${PM_CONF},${MOCK_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
 
-#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 +309,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.shared

@@ -62,6 +62,82 @@ 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; \
+	)
+
+# 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
 # Make sure that HELPSPACE has exactly HELPLEN spaces in it

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,22 +188,47 @@ 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; \
 	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); \
+		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)"; \
 		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

packages

@@ -9,6 +9,7 @@ Jinja2
 Keras
 LS_COLORS
 LVM2
+LibRaw
 LibVNCServer
 Linux-PAM
 LuaJIT
@@ -181,6 +182,8 @@ accountsservice
 acl
 acme
 acpica-unix2
+acrn-devicemodel
+acrn-hypervisor
 adwaita-icon-theme
 aeon
 alabaster
@@ -254,6 +257,7 @@ bluez
 bndl-lamp-basic
 bokeh
 boost
+borgbackup
 boto
 boto3
 botocore
@@ -268,8 +272,10 @@ c_rehash
 ca-certs
 ca-certs-static
 cabextract
+cached-property
 cairo
 cairomm
+cantarell-fonts
 cargo
 caribou
 catch2
@@ -333,6 +339,7 @@ comedilib
 compat-SDL2-soname1
 compat-efivar-soname0
 compat-fuse-soname2
+compat-gegl
 compat-glew-soname1
 compat-guile-soname20
 compat-libical-soname2
@@ -388,6 +395,7 @@ dbus-glib
 dconf
 deap
 decorator
+defusedxml
 dejagnu
 desktop-file-utils
 dfc
@@ -408,6 +416,7 @@ docbook-xml
 docker
 docker-py
 docutils
+dogtail
 dos2unix
 dosfstools
 double-conversion
@@ -472,6 +481,7 @@ flex
 flmsg
 flnet
 fltk
+folks
 font-adobe-100dpi
 font-adobe-75dpi
 font-bitstream-type1
@@ -508,6 +518,8 @@ geoclue
 geocode-glib
 gettext
 gevent
+gexiv2
+gfbgraph
 gflags
 ghostscript
 gimp
@@ -536,6 +548,7 @@ gnome-bluetooth
 gnome-calculator
 gnome-calendar
 gnome-characters
+gnome-color-manager
 gnome-common
 gnome-control-center
 gnome-desktop
@@ -544,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
@@ -552,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
@@ -562,6 +582,7 @@ gnutls
 go
 gobject-introspection
 golang-github-cpuguy83-go-md2man
+gom
 goocanvas
 google-api-python-client
 google-apitools
@@ -574,6 +595,7 @@ gpredict
 gptfdisk
 gradle
 gradle-dep
+graphene
 graphviz
 greenlet
 grep
@@ -584,6 +606,7 @@ groff
 grub
 gsettings-desktop-schemas
 gsl
+gsound
 gspell
 gst-plugins-bad
 gst-plugins-base
@@ -643,6 +666,7 @@ init-rdahead
 inotify-tools
 inputproto
 intltool
+invm-frameworks
 ioping
 iotop
 ipaddr
@@ -666,6 +690,7 @@ irssi
 isa-l
 iso-codes
 iso8601
+isodate
 isort
 ister
 itstool
@@ -748,6 +773,7 @@ libcap
 libcap-ng
 libcdio
 libcgroup
+libchamplain
 libcomps
 libconfig
 libcroco
@@ -766,6 +792,7 @@ libgcrypt
 libgd
 libgdata
 libgee
+libgepub
 libgfortran-avx
 libgfortran-compat-soname3
 libgit2
@@ -928,6 +955,7 @@ mozjs38
 mpc
 mpfr
 mpg123
+msgpack-python
 msmtp
 msr-tools
 mstflint
@@ -1187,6 +1215,7 @@ pyOpenSSL
 pyaml
 pyasn1
 pyasn1-modules
+pyatspi
 pycairo
 pycodestyle
 pycparser
@@ -1231,6 +1260,7 @@ python-systemd
 python-tappy
 python-toml
 python-urwid
+python-zeep
 python3
 pytz
 pyudev
@@ -1253,6 +1283,7 @@ qtlocation
 qtmultimedia
 qtquickcontrols
 qtquickcontrols2
+qtremoteobjects
 qtscript
 qtscxml
 qtsensors
@@ -1310,6 +1341,7 @@ screen
 scripttest
 scrnsaverproto
 seaborn
+seahorse
 secretstorage
 sed
 setproctitle
@@ -1402,6 +1434,7 @@ tiptop
 tk
 tmux
 tokyocabinet
+toolbelt
 tornado
 totem
 totem-pl-parser
@@ -1410,6 +1443,7 @@ tqdm
 traceback2
 traceroute
 tracker
+tracker-miners
 traitlets
 tree
 typed-ast
@@ -1441,6 +1475,7 @@ videoproto
 vim
 vim-go
 vinagre
+vino
 virt-manager
 virt-viewer
 virtualenv
@@ -1458,6 +1493,7 @@ webencodings
 webkitgtk
 websocket_client
 websockify
+weechat
 weston
 wget
 wheel
@@ -1521,6 +1557,7 @@ xkbcomp
 xkeyboard-config
 xlog
 xmlsec1
+xmlstarlet
 xmlto
 xorg-server
 xorriso