Update packages file for version 22770

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Update packages file for version 22760
2026-06-16 11:06:15 +00:00 · 2018-06-04 13:02:08 +00:00 · 2018-06-03 06:49:53 +00:00 · 2018-06-01 13:02:38 +00:00 · 2018-05-31 21:08:28 +00:00 · 2018-05-31 16:14:03 +00:00
12 changed files with 109 additions and 15 deletions
@@ -54,17 +54,17 @@ LATEST_SRPMS = $(LATEST_RELEASE)/source/SRPMS
 PACKAGES_FILE = $(TOPLVL)/projects/common/packages

 # Configuration file for autospec.
-AUTOSPEC_CONF = $(TOPLVL)/projects/common/autospec.conf
+AUTOSPEC_CONF = $(TOPLVL)/projects/common/conf/autospec.conf

 # Set this variable to any non-empty value to use the package mappings stored
 # 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
+# Package manager config file. Default to the in-tree copy of dnf.conf.
+PM_CONF = $(TOPLVL)/projects/common/conf/dnf.conf

 # Mock configuration file. Default to the in-tree copy.
-MOCK_CONF = $(TOPLVL)/projects/common/koji-client-files/clear.cfg
+MOCK_CONF = $(TOPLVL)/projects/common/conf/clear.cfg


 # Include any site local configuration variables. These variables may override
@@ -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 (`conf/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),
@@ -0,0 +1,31 @@
+# Configuration files
+
+This directory contains various configuration files used by the developer
+tooling framework.
+
+Unless otherwise noted in the config file documentation below, the config files
+can be modified with custom, site-local changes by modifying a variable in
+`Makefile.config.site_local` to point to a location of your choice (e.g.
+somewhere in `/etc`). The framework will then read the config file from the
+location you have specified instead, so copy the in-tree copy to that location
+as a starting point if you need to.
+
+* `autospec.conf`: default Autospec configuration file used by `make autospec`
+  and `make autospecnew`. All configuration is commented out by default, so
+  default Autospec settings are used. Config variable: `AUTOSPEC_CONF`
+
+* `clear.cfg`: default Mock configuration file used by various targets that
+  call out to Mock. Config variable: `MOCK_CONF`
+
+* `dnf.conf`: DNF conf for use as the package manager configuration file, made
+  available for the framework's local repo support. Config variable: `PM_CONF`
+
+* `yum.conf`: YUM conf for use as the package manager configuration file, made
+  available for the framework's local repo support. Config variable: `PM_CONF`
+
+* `koji.conf`: template Koji configuration file. It is installed by
+  `user-setup.sh` to `/etc/koji.conf`, and the in-tree copy is not used. If you
+  are using Koji with the framework, you will need to modify `/etc/koji.conf`
+  according to how the Koji instance is set up for your environment. Configuring
+  the installation location via `Makefile.config.site_local` is not possible at
+  the moment but is a planned feature.
@@ -10,13 +10,14 @@ config_opts['releasever'] = 'clear'
 config_opts['package_manager'] = 'dnf'


-config_opts['yum.conf'] = """
+config_opts['dnf.conf'] = """

 [main]
-cachedir=/var/cache/yum
+cachedir=/var/cache/dnf
+keepcache=1
 debuglevel=1
 reposdir=/dev/null
-logfile=/var/log/yum.log
+logfile=/var/log/dnf.log
 retries=20
 obsoletes=1
 gpgcheck=0
@@ -0,0 +1,25 @@
+[main]
+cachedir=/var/cache/dnf
+keepcache=1
+debuglevel=1
+logfile=/var/log/dnf.log
+exactarch=1
+obsoletes=1
+gpgcheck=0
+plugins=0
+retries=10
+installonly_limit=3
+reposdir=/root/mash
+
+[clear]
+name=Clear
+baseurl=https://cdn.download.clearlinux.org/current/x86_64/os/
+enabled=1
+gpgcheck=0
+
+[clear-source]
+name=Clear sources
+failovermethod=priority
+baseurl=https://cdn.download.clearlinux.org/current/source/SRPMS/
+enabled=1
+gpgcheck=0
@@ -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
@@ -500,6 +505,7 @@ R-xtable
 R-xts
 R-yaml
 R-zCompositions
+R-zip
 R-zoo
 Remmina
 SDL
@@ -765,6 +771,7 @@ db
 dbus
 dbus-glib
 dconf
+dconf-editor
 deap
 decorator
 defusedxml
@@ -897,6 +904,7 @@ gevent
 gexiv2
 gfbgraph
 gflags
+gftp
 ghostscript
 gimp
 git
@@ -908,6 +916,7 @@ glib
 glib-networking
 glibc
 glibmm
+glmark2
 global
 glog
 glslang
@@ -1034,6 +1043,7 @@ i2c-tools
 i3
 i3lock
 i3status
+iasimage
 ibus
 icalendar
 icdiff
@@ -1103,6 +1113,7 @@ jupyter_core
 jupyterlab
 jupyterlab_launcher
 kafka-dep
+kata-qemu-lite
 kbd
 kernel-install
 kexec-tools
@@ -1208,6 +1219,7 @@ libisofs
 libjpeg-turbo
 libjpeg-turbo-soname8
 libksba
+libmbim
 libmediaart
 libmnl
 libmspack
@@ -1233,6 +1245,7 @@ libpipeline
 libpng
 libpthread-stubs
 libpwquality
+libqmi
 librepo
 librsvg
 librtlsdr
@@ -1286,6 +1299,7 @@ libxslt
 libyami
 libyami-utils
 libzip
+libzmq
 linecache2
 links
 linux
@@ -1332,6 +1346,7 @@ mc
 mccabe
 mcelog
 mdadm
+memkind
 memshrinker
 mesa
 mesa-demos
@@ -1428,6 +1443,7 @@ numpydoc
 nvme-cli
 oath-toolkit
 oauth2client
+ocaml
 ocl-icd
 offlineimap
 olefile
@@ -1858,6 +1874,7 @@ testresources
 testscenarios
 testtools
 texinfo
+texlive
 tflearn
 thermal_daemon
 thin-provisioning-tools
@@ -1893,6 +1910,7 @@ uhttpmock
 unbundle
 unicode-xid
 unifdef
+unison
 unittest2
 unzip
 upower
@@ -23,7 +23,7 @@ if [ "$#" -eq 0 ]; then
 fi

 if [ ! -e /etc/yum.conf ]; then
-  echo "Error: yum.conf is missing. Please copy projects/common/image-creator/yum.conf to /etc"
+  echo "Error: yum.conf is missing. Please copy projects/common/conf/yum.conf to /etc"
  exit 1
 fi

@@ -142,16 +142,10 @@ if [ "$USE_KOJI" ]; then

  if [ ! -f /etc/koji.conf ]; then
    echo "Setting up koji config . . ."
-    sudo cp projects/common/koji-client-files/koji.conf /etc
+    sudo cp projects/common/conf/koji.conf /etc
  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
Author	SHA1	Message	Date
clrbuilder	2323c9924f	Update packages file for version 22770 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-06-04 13:02:08 +00:00
clrbuilder	da1f1f7483	Update packages file for version 22760 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-06-03 06:49:53 +00:00
clrbuilder	723a925ed8	Update packages file for version 22730 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-06-01 13:02:38 +00:00
clrbuilder	7e9ee1949d	Update packages file for version 22720 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-31 21:08:28 +00:00
clrbuilder	f0df3f7809	Update packages file for version 22710 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-31 16:14:03 +00:00
Patrick McCarty	9f77c5b172	Adjust mock config for improved caching Not setting "keepcache=1" results to DNF removing cached RPMs after every local build. Also, naming the cachedir "/var/cache/dnf" is important for the cache to stick around and be stored in /var/cache/mock/clear/dnf_cache. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-05-30 13:17:34 -07:00
Patrick McCarty	3c52bbd7d7	Add a dnf.conf, and use it by default The new dnf.conf is very similar to the yum.conf, but because the in-tree Mock config specifies to use DNF, we should track a dnf.conf here as well and use it by default. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-05-30 13:15:17 -07:00
Patrick McCarty	7203329212	Move conf files into dedicated "conf" directory The "image-creator" and "koji-client-files" subdirectories are named as such to reflect their purpose from long ago. In the present, the names are confusing, so I am shuffling files around a bit to reflect current usage. All conf files (or conf file templates) have been moved to "conf" instead, and some documentation has been added to explain what the files are used for, and how they can be customized. Also, after moving the conf files, the last file remaining in one of the old subdirectories is "start_qemu.sh", so move it to the toplevel dir. We could eventually move the miscellaneous scripts into a dedicated directory too, but I will save that for another time. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-05-30 13:15:17 -07:00
clrbuilder	b76562fe35	Update packages file for version 22680 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-30 13:02:40 +00:00
clrbuilder	657bf44505	Update packages file for version 22630 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-26 17:06:00 +00:00
clrbuilder	c0e4bbf18e	Update packages file for version 22610 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-25 13:40:50 +00:00
clrbuilder	38b5e792cd	Update packages file for version 22600 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-24 18:31:08 +00:00
clrbuilder	43a333f08f	Update packages file for version 22590 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-24 05:43:36 +00:00
clrbuilder	9985956b7c	Update packages file for version 22580 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-24 00:19:37 +00:00
clrbuilder	7a62e62b28	Update packages file for version 22540 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-22 13:02:25 +00:00
Patrick McCarty	92977583a6	user-setup: stop installing mock config to /etc The common tooling behavior changed a while back with respect to the mock config usage, so update the user-setup script to reflect the changes. Also add documentation about how to customize the mock config, which can be leveraged to revert back to the original behavior as well. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-05-21 16:32:52 -07:00
Patrick McCarty	b8d121260a	user-setup: create 'mix' directory for future use To enable future shared workflows between the common tooling and mixer, create a directory named 'mix' within the tooling workspace. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-05-21 16:12:44 -07:00
clrbuilder	ace60d849e	Update packages file for version 22530 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-21 13:02:36 +00:00
clrbuilder	a2759eca40	Update packages file for version 22520 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-20 14:28:39 +00:00