mirror of
https://github.com/clearlinux/common.git
synced 2026-06-16 19:16:00 +00:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 38b5e792cd | |||
| 43a333f08f | |||
| 9985956b7c | |||
| 7a62e62b28 | |||
| 92977583a6 | |||
| b8d121260a | |||
| ace60d849e | |||
| a2759eca40 | |||
| 7d0977c785 | |||
| 9184a2fd62 | |||
| e80c6eb4bd | |||
| 5cf5fd71cb |
@@ -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),
|
||||
|
||||
@@ -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
|
||||
@@ -777,6 +783,7 @@ diffoscope
|
||||
diffstat
|
||||
diffutils
|
||||
dist-pam-configs
|
||||
distro
|
||||
dmenu
|
||||
dmidecode
|
||||
dnf
|
||||
@@ -906,6 +913,7 @@ glib
|
||||
glib-networking
|
||||
glibc
|
||||
glibmm
|
||||
glmark2
|
||||
global
|
||||
glog
|
||||
glslang
|
||||
@@ -1284,6 +1292,7 @@ libxslt
|
||||
libyami
|
||||
libyami-utils
|
||||
libzip
|
||||
libzmq
|
||||
linecache2
|
||||
links
|
||||
linux
|
||||
@@ -1337,6 +1346,7 @@ meson
|
||||
metacity
|
||||
micro-config-drive
|
||||
micro-config-drive-aws
|
||||
micro-config-drive-oci
|
||||
mido
|
||||
minetest
|
||||
minetest_game
|
||||
@@ -1359,6 +1369,7 @@ mozjs52
|
||||
mpc
|
||||
mpfr
|
||||
mpg123
|
||||
mpi4py
|
||||
msgpack-python
|
||||
msmtp
|
||||
msr-tools
|
||||
@@ -1424,6 +1435,7 @@ numpydoc
|
||||
nvme-cli
|
||||
oath-toolkit
|
||||
oauth2client
|
||||
ocaml
|
||||
ocl-icd
|
||||
offlineimap
|
||||
olefile
|
||||
@@ -1854,6 +1866,7 @@ testresources
|
||||
testscenarios
|
||||
testtools
|
||||
texinfo
|
||||
texlive
|
||||
tflearn
|
||||
thermal_daemon
|
||||
thin-provisioning-tools
|
||||
@@ -1889,6 +1902,7 @@ uhttpmock
|
||||
unbundle
|
||||
unicode-xid
|
||||
unifdef
|
||||
unison
|
||||
unittest2
|
||||
unzip
|
||||
upower
|
||||
|
||||
+6
-9
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user