Update packages file for version 22630

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

Makefile.common

@@ -286,8 +286,10 @@ koji: prekoji-checks kojidef
 	@if ! git branch | grep -q -E '^\* master'; then \
 		echo "Error: Must be on the master branch to submit to koji" >&2; \
 		exit 1; \
+	fi; \
+	if git rev-parse --verify --quiet origin/master > /dev/null; then \
+		git pull --rebase; \
 	fi
-	git pull --rebase
 	git tag $(SRPMVERS)
 	git push origin master refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)

README.md

@@ -114,6 +114,28 @@ $ make build
 
 ## Other topics
 
+### Customizing the mock config
+
+In the past, the various make commands that call `mock` required a mock config
+installed at `/etc/mock/clear.cfg`. However, at present, the commands will
+instead use the mock config within this repo (`koji-client-files/clear.cfg`).
+
+If you wish to use a custom mock config, you must override the `MOCK_CONF`
+variable to specify a different value to pass to mock's `-r` option. The value
+is either a full path that ends with `.cfg`, or a config NAME installed at
+`/etc/mock/<NAME>.cfg`. You can override the `MOCK_CONF` config variable by
+redefining it in `Makefile.config.site_local`, which must reside at the
+toplevel directory in this repo.
+
+For example, to retain the old behavior of mock using `/etc/mock/clear.cfg`,
+add this line to `Makefile.config.site_local`:
+
+```
+MOCK_CONF = /etc/mock/clear.cfg
+```
+
+If `Makefile.config.site_local` doesn't exist already, create it.
+
 ### Manual setup
 
 If you did not run the user-setup script (see "Automated setup" section above),

packages

@@ -225,6 +225,7 @@ R-formatR
 R-fpc
 R-futile.logger
 R-futile.options
+R-future
 R-gam
 R-gamm4
 R-gbm
@@ -239,6 +240,7 @@ R-ggplot2movies
 R-ggridges
 R-git2r
 R-glmnet
+R-globals
 R-glue
 R-gmodels
 R-gmp
@@ -277,6 +279,7 @@ R-labelled
 R-laeken
 R-lambda.r
 R-lars
+R-later
 R-latticeExtra
 R-lava
 R-lazyeval
@@ -285,6 +288,7 @@ R-leaflet
 R-leaps
 R-lfe
 R-libcoin
+R-listenv
 R-lle
 R-lme4
 R-lmtest
@@ -374,6 +378,7 @@ R-processx
 R-prodlim
 R-profileModel
 R-progress
+R-promises
 R-proto
 R-proxy
 R-pryr
@@ -702,6 +707,7 @@ colord
 colord-gtk
 comedilib
 compat-SDL2-soname1
+compat-cryptsetup-soname4
 compat-efivar-soname0
 compat-fuse-soname2
 compat-gegl
@@ -755,6 +761,7 @@ cups-filters
 cups-pk-helper
 curl
 cve-check-tool
+cxxfilt
 cycler
 dapl
 darktable
@@ -763,6 +770,7 @@ db
 dbus
 dbus-glib
 dconf
+dconf-editor
 deap
 decorator
 defusedxml
@@ -776,6 +784,7 @@ diffoscope
 diffstat
 diffutils
 dist-pam-configs
+distro
 dmenu
 dmidecode
 dnf
@@ -905,6 +914,7 @@ glib
 glib-networking
 glibc
 glibmm
+glmark2
 global
 glog
 glslang
@@ -1031,6 +1041,7 @@ i2c-tools
 i3
 i3lock
 i3status
+iasimage
 ibus
 icalendar
 icdiff
@@ -1283,6 +1294,7 @@ libxslt
 libyami
 libyami-utils
 libzip
+libzmq
 linecache2
 links
 linux
@@ -1336,6 +1348,7 @@ meson
 metacity
 micro-config-drive
 micro-config-drive-aws
+micro-config-drive-oci
 mido
 minetest
 minetest_game
@@ -1358,6 +1371,7 @@ mozjs52
 mpc
 mpfr
 mpg123
+mpi4py
 msgpack-python
 msmtp
 msr-tools
@@ -1423,6 +1437,7 @@ numpydoc
 nvme-cli
 oath-toolkit
 oauth2client
+ocaml
 ocl-icd
 offlineimap
 olefile
@@ -1853,6 +1868,7 @@ testresources
 testscenarios
 testtools
 texinfo
+texlive
 tflearn
 thermal_daemon
 thin-provisioning-tools
@@ -1888,6 +1904,7 @@ uhttpmock
 unbundle
 unicode-xid
 unifdef
+unison
 unittest2
 unzip
 upower

user-setup.sh

@@ -36,15 +36,15 @@ while [ $# -gt 0 ]; do
       ;;
     "--client-cert"|"-k")
       shift
-      PEM="$PWD/$1"
+      PEM="$(realpath $1)"
       ;;
     "--server-ca"|"-s")
       shift
-      SERVERCA="$PWD/$1"
+      SERVERCA="$(realpath $1)"
       ;;
     "--client-ca"|"-c")
       shift
-      CLIENTCA="$PWD/$1"
+      CLIENTCA="$(realpath $1)"
       ;;
     "--jobs"|"-j")
       if echo "$2" | grep -qx "[1-9][0-9]*"; then
@@ -146,12 +146,6 @@ if [ "$USE_KOJI" ]; then
   fi
 fi
 
-if [ ! -f /etc/mock/clear.cfg ]; then
-  echo "Setting up mock config . . ."
-  sudo mkdir -p /etc/mock
-  sudo cp projects/common/koji-client-files/clear.cfg /etc/mock
-fi
-
 echo "Adding user to kvm group . . ."
 sudo usermod -a -G kvm $USER
 
@@ -163,6 +157,9 @@ if [ -n "$PACKAGE_REPOS" ]; then
   make ${JOBS_ARG} clone-packages
 fi
 
+echo "Creating mix workspace . . ."
+mkdir -p mix
+
 if [ "$USE_KOJI" ]; then
   echo "Testing koji installation . . ."
   if koji moshimoshi; then