Update packages file for version 22420

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

Makefile.common

@@ -20,8 +20,7 @@ RPMS ?= $(LATEST_RPMS)
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
 
 # MOCK_CONFIG_VAL is set in Makefile.shared
-MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONFIG_VAL)
+MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONFIG_VAL) $(MOCK_OPTS)
-
 
 ifneq ($(wildcard upstream),)
 __allsources := $(notdir $(strip $(shell cat upstream)))
@@ -89,6 +88,7 @@ prebuild-checks:
 #help files and rpms in the results directory of your package.  If there
 #help are mutlple tar.gz files for a package, make will do make sources,
 #help which creates a src.rpm file from the spec file.
+#help Use MOCK_OPTS environment varible to pass down arbitrary mock options.
 build: prebuild-checks configemail $(SPECFILE) upstream $(SRPMFILE)
 	$(MOCK) $(SRPMFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
@@ -150,8 +150,10 @@ pullrebase:
 
 #help autospec: automatically generates a specfile. If there is
 #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 autospec will be created in the process.
-#help the project at https://github.com/clearlinux/autospec
+#help Use MOCK_OPTS environment varible to pass down arbitrary mock options
+#help to autospec.
+#help For more information, see the project at https://github.com/clearlinux/autospec
 autospec: pullrebase localreponotice
 	rm -f results/*src.rpm
 	@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
@@ -166,6 +168,7 @@ autospec: pullrebase localreponotice
 		--name $(PKG_NAME) \
 		--archives $(ARCHIVES) \
 		--mock-config $(MOCK_CONFIG_VAL) \
+		--mock-opts "$(MOCK_OPTS)" \
 		$${SETVERSION:+ --version $${SETVERSION}} \
 		${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
 		$(firstword $(NEWURL) $(URL));
@@ -209,7 +212,7 @@ $(__missingsources): sources
 define fetch-from-srpm
 	tmp=$$(mktemp -d -p "."); \
 	srpm=$$(rpmspec --srpm -q --qf "%{NVR}.src.rpm\n" $(SPECFILE)); \
-	if cd "$$tmp" && ! curl -s -S -f -L -O $(DOWNLOAD_MIRROR)/releases/$(1)/clear/source/SRPMS/$$srpm; then \
+	if cd "$$tmp" && ! curl -s -S -f -L -O $(MIRROR_CURL_OPTS) $(DOWNLOAD_MIRROR)/releases/$(1)/clear/source/SRPMS/$$srpm; then \
 		echo "Failed to download $$srpm from Clear Linux release $(1)." >&2; \
 		cd .. && rm -rf "$$tmp"; \
 		exit 1; \
@@ -246,7 +249,7 @@ sources: upstream
 			*://*) n="$$u" ;; \
 			*)     n="$(SOURCES_URL)/$$u" ;; \
 		esac; \
-		if ! curl --fail -L "$$n" -o `basename "$$n"`; then \
+		if ! curl --fail -L -o `basename "$$n"` $(SOURCES_CURL_OPTS) "$$n"; then \
 			echo "Failed to download $$n"; \
 			exit 1; \
 		fi; \
@@ -260,7 +263,7 @@ sources:
 	for b in $$latest_builds; do \
 		url="$(DOWNLOAD_MIRROR)/releases/$$b/clear/source/package-sources"; \
 		echo "Checking for source files in build $$b ..."; \
-		if grep -q "$$nvr" <(curl -s -f -L $$url); then \
+		if grep -q "$$nvr" <(curl -s -f -L $(MIRROR_CURL_OPTS) $$url); then \
 			$(call fetch-from-srpm,$$b); \
 			if [ $$? -eq 0 ]; then \
 				echo "Source files retrieved from build $$b"; \
@@ -283,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)
@@ -388,15 +393,17 @@ install:
 
 #help generateupstream: Run this rule to create or update the 'upstream' file
 #help by downloading the upstream source tarballs listed in the spec file and
-#help calculating their hashes. Autospec performs this step automatically, so ignore
+#help calculating their hashes. Autospec performs this step automatically, so
-#help it for packages managed with autospec.
+#help ignore it for packages managed with autospec. Additional curl options
+#help may be used for downloading the upstream source tarballs by defining the
+#help CURL_OPTS variable for this rule.
 generateupstream:
 	@[ -e upstream ] && mv upstream upstream.bak; \
 	urls=$$(rpmspec -D '_vendor clr' -P $(SPECFILE) | sed -n "s|^Source[0-9]*[[:blank:]]*:[[:blank:]]*\(..*://..*\)$$|\1|p"); \
 	for url in $$urls; do \
 		filename=$$(basename $$url); \
 		if [ ! -e $$filename ]; then \
-			if ! curl --fail -L -O $$url; then \
+			if ! curl --fail -L -O $(CURL_OPTS) $$url; then \
 				echo "Failed to download $$url"; \
 				[ -e upstream.bak ] && mv --no-clobber upstream.bak upstream; \
 				exit 1; \

Makefile.config

@@ -26,6 +26,9 @@ CGIT_BASE_URL =
 # Location of upstream tarball cache used by 'make build', 'make sources', etc.
 SOURCES_URL =
 
+# Additional curl options to use when downloading files from SOURCES_URL
+SOURCES_CURL_OPTS =
+
 # Location where package repos are hosted.
 PKG_BASE_URL = https://github.com/clearlinux-pkgs
 
@@ -38,6 +41,9 @@ PROJ_PKGS = autospec clr-bundles common
 # Clear Linux download mirror to use
 DOWNLOAD_MIRROR = https://cdn.download.clearlinux.org
 
+# Additional curl options to use when downloading files from DOWNLOAD_MIRROR
+MIRROR_CURL_OPTS =
+
 # Location of release content from latest Clear Linux release
 LATEST_RELEASE = $(DOWNLOAD_MIRROR)/current
 

Makefile.toplevel

@@ -191,12 +191,16 @@ 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
+#help process.
+#help Use MOCK_OPTS environment varible to pass down arbitrary mock options
+#help to autospec.
+#help For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
 autospecnew: localreponotice
 	@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
 		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \
 	fi
+	-$(MAKE) clone_$(NAME)
 	@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
 		echo "no remote repository found, creating new package repository and running autospec"; \
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
@@ -215,6 +219,7 @@ autospecnew: localreponotice
 			--name $(NAME) \
 			--archives $(ARCHIVES) \
 			--mock-config $(MOCK_CONFIG_VAL) \
+			--mock-opts "$(MOCK_OPTS)" \
 			$${SETVERSION:+ --version $${SETVERSION}} \
 			${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
 			$(URL); \

README.md

@@ -31,43 +31,13 @@ $ ./user-setup.sh
 After the script completes, make sure to logout and login again to complete the
 setup process.
 
-The script either accepts no options, or all (3) options in case you are
+The script accepts several options, or no options at all. The options are
-configuring the Koji CLI for remote building on a Koji server. The options are
+documented in the script's `--help` output. Note that if you are supplying any
-documented in the script's `--help` output.
+of the three Koji cert options (`-k`, `-s`, or `-c`), the other two options
+must be supplied as well.
 
-### Manual setup
+If you do not wish to run the user-setup script, see the "Manual setup" section
-
+below for hints about how to initialize the tooling workspace.
-On your Clear Linux system, create a workspace for Clear Linux development
-work:
-
-```
-$ mkdir clearlinux
-```
-
-Clone this repo into a `projects` directory within the workspace:
-
-```
-$ cd clearlinux
-$ mkdir projects
-$ git clone https://github.com/clearlinux/common projects/common
-```
-
-Create the toplevel tooling Makefile:
-
-```
-$ ln -s projects/common/Makefile.toplevel Makefile
-```
-
-Clone all Clear Linux package and project repositories:
-
-```
-$ make clone
-```
-
-Note: You can clone the repos in parallel by using make's `-j` option.
-
-At this point, the `packages` directory will contain all Clear Linux package
-repos, and `projects` will contain common, clr-bundles, and autospec repos.
 
 ## Example usage
 
@@ -141,3 +111,44 @@ package, a `make bump` command is available for this purpose.
 $ make bump
 $ make build
 ```
+
+## Other topics
+
+### Manual setup
+
+If you did not run the user-setup script (see "Automated setup" section above),
+you will want to set up the developer tooling workspace manually. This section
+provides general documentation for the manual setup process, and it is not
+meant to be exhaustive.
+
+On your Clear Linux system, create a workspace for Clear Linux development
+work:
+
+```
+$ mkdir clearlinux
+```
+
+Clone this repo into a `projects` directory within the workspace:
+
+```
+$ cd clearlinux
+$ mkdir projects
+$ git clone https://github.com/clearlinux/common projects/common
+```
+
+Create the toplevel tooling Makefile:
+
+```
+$ ln -s projects/common/Makefile.toplevel Makefile
+```
+
+Clone all Clear Linux package and project repositories:
+
+```
+$ make clone
+```
+
+Note: You can clone the repos in parallel by using make's `-j` option.
+
+At this point, the `packages` directory will contain all Clear Linux package
+repos, and `projects` will contain common, clr-bundles, and autospec repos.

packages

@@ -596,6 +596,7 @@ backports.weakref
 baobab
 bash
 bash-completion
+bash.static
 bash_kernel
 bashdb
 bats
@@ -605,7 +606,6 @@ bcrypt
 bdftopcf
 beautifulsoup4
 beignet
-bigreqsproto
 bind-utils
 binutils
 bison
@@ -654,6 +654,8 @@ cgit
 chardet
 check
 cheese
+cheroot
+cherrypy
 chrome-gnome-shell
 chrony
 chrpath
@@ -700,9 +702,11 @@ colord
 colord-gtk
 comedilib
 compat-SDL2-soname1
+compat-cryptsetup-soname4
 compat-efivar-soname0
 compat-fuse-soname2
 compat-gegl
+compat-gegl-0.3
 compat-glew-soname1
 compat-gtksourceview-soname3
 compat-guile-soname20
@@ -718,10 +722,10 @@ compat-opencv-soname33
 compat-protobuf-soname14
 compat-readline
 component
-compositeproto
 compute-image-packages
 configobj
 configparser
+confuse
 connect-proxy
 connman
 connman-gtk
@@ -752,8 +756,8 @@ cups-filters
 cups-pk-helper
 curl
 cve-check-tool
+cxxfilt
 cycler
-damageproto
 dapl
 darktable
 dask
@@ -774,8 +778,8 @@ diffoscope
 diffstat
 diffutils
 dist-pam-configs
+dmenu
 dmidecode
-dmxproto
 dnf
 dnf-plugins-core
 dnsmasq
@@ -793,10 +797,9 @@ double-conversion
 doxygen
 dpdk
 dracut
-dri2proto
-dri3proto
 dstat
 dtc
+dyskctl
 e2fsprogs
 ebtables
 ecdsa
@@ -842,7 +845,6 @@ findutils
 fio
 firefox
 fish
-fixesproto
 fixtures
 flac
 flake8
@@ -858,7 +860,6 @@ font-adobe-75dpi
 font-bitstream-type1
 font-util
 fontconfig
-fontsproto
 freeglut
 freeipmi
 freetype
@@ -868,6 +869,8 @@ funcsigs
 functools32
 fuse
 futures
+fwupd
+fwupdate
 garcon
 gast
 gawk
@@ -906,7 +909,6 @@ glibc
 glibmm
 global
 glog
-glproto
 glslang
 glu
 glusterfs
@@ -1028,6 +1030,9 @@ hyperscan
 hyperstart
 hypothesis
 i2c-tools
+i3
+i3lock
+i3status
 ibus
 icalendar
 icdiff
@@ -1039,10 +1044,12 @@ imagesize
 imapfilter
 indent
 infiniband-diags
+influxdb
 iniparse
 init-rdahead
 inotify-tools
-inputproto
+intel-gpu-tools
+intel-hybrid-driver
 intltool
 invm-frameworks
 ioping
@@ -1096,7 +1103,6 @@ jupyterlab
 jupyterlab_launcher
 kafka-dep
 kbd
-kbproto
 kernel-install
 kexec-tools
 keyring
@@ -1168,6 +1174,7 @@ libdmx
 libdnf
 libdrm
 libepoxy
+libev
 libevdev
 libevent
 libexif
@@ -1180,6 +1187,7 @@ libgee
 libgepub
 libgfortran-avx
 libgfortran-compat-soname3
+libgfortran-compat-soname4
 libgit2
 libglade
 libgnome-keyring
@@ -1203,6 +1211,7 @@ libmediaart
 libmnl
 libmspack
 libmtp
+libmypaint
 libndp
 libnetfilter_conntrack
 libnetfilter_cthelper
@@ -1231,6 +1240,8 @@ libsass
 libseccomp
 libsecret
 libsigc++
+libsmbios
+libsmi
 libsndfile
 libsolv
 libsoup
@@ -1272,6 +1283,7 @@ libxml2-legacy
 libxshmfence
 libxslt
 libyami
+libyami-utils
 libzip
 linecache2
 links
@@ -1326,6 +1338,7 @@ meson
 metacity
 micro-config-drive
 micro-config-drive-aws
+micro-config-drive-oci
 mido
 minetest
 minetest_game
@@ -1338,6 +1351,7 @@ mkosi
 mock
 mod_wsgi
 moka-icon-theme
+more-itertools
 mosh
 motd-update
 motif
@@ -1347,6 +1361,7 @@ mozjs52
 mpc
 mpfr
 mpg123
+mpi4py
 msgpack-python
 msmtp
 msr-tools
@@ -1358,6 +1373,7 @@ murrine
 musl
 mutt
 mutter
+mypaint-brushes
 mypy
 nagios-plugins
 nano
@@ -1390,6 +1406,7 @@ ninja
 nlopt
 nodejs
 nose
+nose-cov
 nose-parameterized
 nosync
 notebook
@@ -1403,10 +1420,12 @@ nss
 nss-altfiles
 ntfs-3g
 numactl
+numatop
 numba
 numpy
 numpydoc
 nvme-cli
+oath-toolkit
 oauth2client
 ocl-icd
 offlineimap
@@ -1436,6 +1455,7 @@ opusfile
 orc
 orca
 ordereddict
+osinfo-db-tools
 ostree
 ovirt-guest-agent
 p11-kit
@@ -1596,13 +1616,14 @@ ply
 pmdk
 polkit
 poppler
+poppler-data
 popt
 portaudio
+portend
 posix_ipc
 postgresql
 powerline-fonts
 powertop
-presentproto
 pretend
 prettytable
 proc-macro2
@@ -1708,17 +1729,14 @@ qtxmlpatterns
 quagga
 quilt
 ragel
-randrproto
 rdma-core
 re2c
 readline
-recordproto
 redis
 redis-native
 redsocks
-renderproto
 requests
-resourceproto
+requests-mock
 rest
 retry_decorator
 retype
@@ -1751,20 +1769,22 @@ scipy
 scons
 screen
 scripttest
-scrnsaverproto
 seaborn
 seahorse
 secretstorage
 sed
+serf
 setproctitle
 setserial
 setuptools
 setuptools_scm
+setuptools_scm_git_archive
 shadow
 shared-mime-info
 sharutils
 shim
 siege
+simg-tools
 simple-scan
 simplegeneric
 simplejson
@@ -1781,6 +1801,7 @@ soundmodem
 source-code-pro
 source-highlight
 sox
+spandsp
 spark-dep
 speex
 speexdsp
@@ -1824,6 +1845,7 @@ tcpdump
 telemetrics-client
 telepathy-glib
 telepathy-logger
+tempora
 tensorboard
 tensorflow
 termcolor
@@ -1888,7 +1910,6 @@ v4l-utils
 vala
 valgrind
 vcversioner
-videoproto
 vim
 vim-go
 vinagre
@@ -1898,7 +1919,6 @@ virt-viewer
 virtualenv
 vlc
 volume_key
-vorbis-tools
 vsqlite
 vte
 vulkan-sdk
@@ -1918,6 +1938,7 @@ wheel
 which
 widgetsnbextension
 wireless-regdb-master
+wireshark
 woff2
 wol
 wpa_supplicant
@@ -1930,11 +1951,13 @@ xauth
 xbitmaps
 xcb-proto
 xcb-util
+xcb-util-cursor
 xcb-util-image
 xcb-util-keysyms
+xcb-util-renderutil
 xcb-util-wm
+xcb-util-xrm
 xclip
-xcmiscproto
 xcursor-themes
 xcursorgen
 xdg-desktop-portal
@@ -1942,7 +1965,6 @@ xdg-user-dirs
 xdg-user-dirs-gtk
 xdg-utils
 xemacs
-xextproto
 xf86-input-evdev
 xf86-input-libinput
 xf86-input-mouse
@@ -1953,10 +1975,6 @@ xf86-video-ati
 xf86-video-fbdev
 xf86-video-nouveau
 xf86-video-vesa
-xf86bigfontproto
-xf86dgaproto
-xf86driproto
-xf86vidmodeproto
 xfburn
 xfce4-appfinder
 xfce4-dev-tools
@@ -1972,7 +1990,6 @@ xfdesktop
 xfsprogs
 xfwm4
 xhost
-xineramaproto
 xinit
 xkbcomp
 xkeyboard-config
@@ -1981,8 +1998,8 @@ xmlsec1
 xmlstarlet
 xmlto
 xorg-server
+xorgproto
 xorriso
-xproto
 xrandr
 xrdb
 xrdp

user-setup.sh

@@ -1,102 +1,131 @@
-#!/bin/sh
+#!/bin/bash
 
 SCRIPT=$(/usr/bin/basename $0)
 PEM=""
 SERVERCA=""
 CLIENTCA=""
+WORKSPACE="clearlinux"
+PACKAGE_REPOS=
 
 help() {
-	printf "%s\n" >&2 "Usage: $SCRIPT [options]" \
+  printf "%s\n" >&2 "Usage: $SCRIPT [options]" \
-			  "" \
+    "" \
-			  "Options:" \
+    "Options:" \
-			  "-k --client-cert PEM_FILE: Enable client user cert for koji configuration; requires a PEM file argument" \
+    "" \
-			  "-s --server-ca PEM_FILE: Enable server CA cert for koji configuration; requires a PEM file argument" \
+    "-d --directory NAME: Set up workspace in the given directory." \
-			  "-c --client-ca PEM_FILE: Enable client CA cert for koji configuration; requires a PEM file argument" \
+    "-a --clone-packages: Clone all package repos." \
-			  ""
+    "-j --jobs [NUM]: Clone repos with NUM jobs. If NUM is not given, it is set to the available CPU count." \
+    "" \
+    "-k --client-cert PEM_FILE: Enable client user cert for koji configuration; requires a PEM file argument" \
+    "-s --server-ca PEM_FILE: Enable server CA cert for koji configuration; requires a PEM file argument" \
+    "-c --client-ca PEM_FILE: Enable client CA cert for koji configuration; requires a PEM file argument" \
+    ""
+}
+
+error() {
+  echo -e "Error: $1\n" >&2
+  help
+  exit 1
 }
 
 while [ $# -gt 0 ]; do
-	case "$1" in
+  case "$1" in
-		"--help"|"-h")
+    "--help"|"-h")
-			help
+      help
-			exit 0
+      exit 0
-			;;
+      ;;
-		"--client-cert"|"-k")
+    "--client-cert"|"-k")
-			shift
+      shift
-			PEM="$PWD/$1"
+      PEM="$PWD/$1"
-			;;
+      ;;
-		"--server-ca"|"-s")
+    "--server-ca"|"-s")
-			shift
+      shift
-			SERVERCA="$PWD/$1"
+      SERVERCA="$PWD/$1"
-			;;
+      ;;
-		"--client-ca"|"-c")
+    "--client-ca"|"-c")
-			shift
+      shift
-			CLIENTCA="$PWD/$1"
+      CLIENTCA="$PWD/$1"
-			;;
+      ;;
-		*)
+    "--jobs"|"-j")
-			help
+      if echo "$2" | grep -qx "[1-9][0-9]*"; then
-			exit 1
+        shift
-			;;
+        JOBS="$1"
-	esac
+      elif [ -f /proc/cpuinfo ]; then
-	shift
+        JOBS=$(grep -Ec '^processor.*:.*[0-9]+$' /proc/cpuinfo)
+      fi
+      ;;
+    "--directory"|"-d")
+      [ -z "$2" ] && error "Must supply a directory name to the -d option"
+      [ "${2:0:1}" = "-" ] && error "Directory name cannot begin with \"-\""
+      shift
+      WORKSPACE="$1"
+      ;;
+    "--clone-packages"|"-a")
+      PACKAGE_REPOS=1
+      ;;
+    *)
+      help
+      exit 1
+      ;;
+  esac
+  shift
 done
 
-error() {
-	echo -e "Error: $1\n" >&2
-	help
-	exit 1
-}
 
 if [ -z "$PEM" ] && [ -z "$SERVERCA" ] && [ -z "$CLIENTCA" ]; then
-	USE_KOJI=
+  USE_KOJI=
 else
-	if [ -z "$PEM" ] || [ -z "$SERVERCA" ] || [ -z "$CLIENTCA" ]; then
+  if [ -z "$PEM" ] || [ -z "$SERVERCA" ] || [ -z "$CLIENTCA" ]; then
-		error "Must specify all three command line options (or none)"
+    error "Must specify all three command line options (or none)"
-	fi
+  fi
-	if [ ! -f "$PEM" ]; then
+  if [ ! -f "$PEM" ]; then
-		error "Missing koji client PEM key file"
+    error "Missing koji client PEM key file"
-	fi
+  fi
-	if [ ! -f "$SERVERCA" ]; then
+  if [ ! -f "$SERVERCA" ]; then
-		error "Missing koji server CA PEM file"
+    error "Missing koji server CA PEM file"
-	fi
+  fi
-	if [ ! -f "$CLIENTCA" ]; then
+  if [ ! -f "$CLIENTCA" ]; then
-		error "Missing koji client CA PEM file"
+    error "Missing koji client CA PEM file"
-	fi
+  fi
-	USE_KOJI="yes"
+  USE_KOJI="yes"
+fi
+
+if [ -n "$JOBS" ]; then
+  JOBS_ARG="-j $JOBS"
+fi
+
+if [ -d "$WORKSPACE" ]; then
+  error "Directory \"$WORKSPACE\" already exists. \
+Either remove this workspace, or use a different workspace name."
 fi
 
 required_progs() {
-	local bindir="/usr/bin"
+  local bindir="/usr/bin"
-	for f in git mock rpm rpmbuild ; do
+  for f in git mock rpm rpmbuild ; do
-		[ ! -x "${bindir}/${f}" ] && missing+="${f} "
+    [ ! -x "${bindir}/${f}" ] && missing+="${f} "
-	done
+  done
-	[ "$PEM" ] && [ ! -x /usr/bin/koji ] && missing+="koji "
+  [ "$PEM" ] && [ ! -x /usr/bin/koji ] && missing+="koji "
-	if [ -n "$missing" ]; then
+  if [ -n "$missing" ]; then
-		echo "Install the following programs and re-run this script:" >&2
+    echo "Install the following programs and re-run this script:" >&2
-		echo $missing >&2
+    echo $missing >&2
-		echo 'All programs should be provided in the "os-clr-on-clr" bundle.' >&2
+    echo 'All programs should be provided in the "os-clr-on-clr" bundle.' >&2
-		exit 1
+    exit 1
-	fi
+  fi
 }
 
 required_progs
 
-echo 'Initializing development workspace in "clearlinux" . . .'
+echo "Initializing development workspace in \"$WORKSPACE\" . . ."
-if [ -d "clearlinux" ]; then
-	echo 'Directory "clearlinux" already exists in current directory.' >&2
-	echo "Cannot initialize workspace." >&2
-	exit 1
-fi
 
-mkdir clearlinux
+mkdir "$WORKSPACE"
-cd clearlinux
+cd "$WORKSPACE"
 
 echo "Setting up common repo . . ."
 mkdir projects
 git clone https://github.com/clearlinux/common projects/common
 if [ $? -ne 0 ]; then
-	echo "Failed to clone common repo." >&2
+  echo "Failed to clone common repo." >&2
-	exit 1
+  exit 1
 fi
 
 # Finish setup for packages/projects hierarchy
@@ -105,48 +134,55 @@ mkdir -p packages/common
 ln -sf ../../projects/common/Makefile.common packages/common/Makefile.common
 
 if [ "$USE_KOJI" ]; then
-	echo "Setting up koji certs . . ."
+  echo "Setting up koji certs . . ."
-	mkdir -p ~/.koji
+  mkdir -p ~/.koji
-	cp "$PEM" ~/.koji/client.crt
+  cp "$PEM" ~/.koji/client.crt
-	cp "$CLIENTCA" ~/.koji/clientca.crt
+  cp "$CLIENTCA" ~/.koji/clientca.crt
-	cp "$SERVERCA" ~/.koji/serverca.crt
+  cp "$SERVERCA" ~/.koji/serverca.crt
 
-	if [ ! -f /etc/koji.conf ]; then
+  if [ ! -f /etc/koji.conf ]; then
-		echo "Setting up koji config . . ."
+    echo "Setting up koji config . . ."
-		sudo cp projects/common/koji-client-files/koji.conf /etc
+    sudo cp projects/common/koji-client-files/koji.conf /etc
-	fi
+  fi
 fi
 
 if [ ! -f /etc/mock/clear.cfg ]; then
-	echo "Setting up mock config . . ."
+  echo "Setting up mock config . . ."
-	sudo mkdir -p /etc/mock
+  sudo mkdir -p /etc/mock
-	sudo cp projects/common/koji-client-files/clear.cfg /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
 
 echo "Cloning special project repositories . . ."
-make clone-projects
+make ${JOBS_ARG} clone-projects
 
-if [ -z "$NO_PACKAGE_REPOS" ]; then
+if [ -n "$PACKAGE_REPOS" ]; then
-	echo "Cloning all package repositories . . ."
+  echo "Cloning all package repositories . . ."
-	make clone-packages
+  make ${JOBS_ARG} clone-packages
 fi
 
 if [ "$USE_KOJI" ]; then
-	echo "Testing koji installation . . ."
+  echo "Testing koji installation . . ."
-	if koji moshimoshi; then
+  if koji moshimoshi; then
-		echo -en "\n************************\n\n"
+    echo -en "\n************************\n\n"
-		echo "Koji installed and configured successfully"
+    echo "Koji installed and configured successfully"
-	else
+  else
-		echo -en "\n************************\n\n"
+    echo -en "\n************************\n\n"
-		echo "Error with koji installation or configuration" >&2
+    echo "Error with koji installation or configuration" >&2
-		exit 1
+    exit 1
-	fi
+  fi
 fi
 
 echo -en "\n************************\n"
 
-echo 'Workspace has been set up in the "clearlinux" directory'
+echo "Workspace has been set up in \"$WORKSPACE\""
+if [ -z "$PACKAGE_REPOS" ]; then
+  echo "NOTE: To clone all package repos, run \"cd $WORKSPACE; make [-j NUM] clone-packages\""
+  echo "NOTE: To clone a single package repo with NAME, run \"cd $WORKSPACE; make clone_NAME\""
+fi
 echo 'NOTE: logout and log back in to finalize the setup process'
+
+
+# vi: ft=sh sw=2 et sts=2