autospecnew: never clone the remote repo

With the assumption that developers will be keeping up-to-date by
running 'make pull; make clone', trying to clone the remote repo here is
not necessary.

If the package git repo already exists locally, no action is taken.
Otherwise, create a local package git repo, and then run autospec.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>

Makefile

@@ -15,7 +15,7 @@ endif
 
 update:
 	curl -f -o packages ${BASE_URL}/source/package-sources
-	cut -f1 packages | LC_ALL=en_US.utf8 sort > packages.new && mv packages.new packages
+	cut -f1 packages | LC_ALL=C sort > packages.new && mv packages.new packages
 
 spdx:
 	curl -s spdx.org/licenses/ | sed '0,/<tbody>/d;/<\/tbody>/q;s/<tr>/\f/g;s/$$/,/g;s/<[^>]*>//g' | awk 'BEGIN{RS="\f";FS=","} {print $$4}' | sed '/^$$/d;s/^[ ]*//' > spdx

Makefile.toplevel

@@ -148,6 +148,7 @@ proper: $(proper_PKGS)
 .PHONY: $(proper_PKGS)
 
 $(clean_PKGS):
+	@echo "cleaning $(patsubst clean_%,%,$@)"
 	-@$(MAKE) -s -j -C $(addprefix packages/,$(patsubst clean_%,%,$@)) clean
 
 $(proper_PKGS):
@@ -157,7 +158,7 @@ $(proper_PKGS):
 #help and unstaged files in addition to staged files.
 status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS))
 	@for p in projects/common $(addprefix packages/,$(PKGS)); do \
-		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in $$p:"; git status)) ;\
+	if [ -d "$$p/.git" ] &&  [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
 	done
 
 #help diff: Runs git diff for all package repos and displays the output using
@@ -192,10 +193,16 @@ autospecnew:
 		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); \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \

README.md

@@ -20,8 +20,16 @@ building Clear Linux packages.
 ### Automated setup
 
 Download the [user setup](user-setup.sh) script and run it on your Clear Linux
-system as an unprivileged user. After the script completes, make sure to logout
-and login again to complete the setup process.
+system as an unprivileged user.
+
+```
+$ curl -O https://raw.githubusercontent.com/clearlinux/common/master/user-setup.sh
+$ chmod +x user-setup.sh
+$ ./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
 configuring the Koji CLI for remote building on a Koji server. The options are

autospec.conf

@@ -13,3 +13,11 @@
 
 # String to replace with "localhost" in upstream tarball URLs
 #urlban =
+
+# Path to packages file, a list of current packages in Clear Linux. It can be
+# an absolute path or a path relative to this autospec.conf.
+#packages_file =
+
+# Path to yum config, used for generating whatrequires. It can be an absolute
+# path or a path relative to this autospec.conf.
+#yum_conf =

koji-client-files/clear.cfg

@@ -4,8 +4,10 @@ config_opts['legal_host_arches'] = ('x86_64',)
 config_opts['chroot_setup_cmd'] = 'groupinstall build srpm-build'
 config_opts['dist'] = 'clear'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
-config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s  %(user)s' 
+config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s  %(user)s'
 config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['releasever'] = 'clear'
+config_opts['package_manager'] = 'dnf'
 
 
 config_opts['yum.conf'] = """

packages

@@ -9,6 +9,7 @@ Jinja2
 Keras
 LS_COLORS
 LVM2
+LibRaw
 LibVNCServer
 Linux-PAM
 LuaJIT
@@ -24,7 +25,6 @@ OpenSP
 Paste
 PasteDeploy
 Pillow
-PyQt5
 PyWavelets
 PyYAML
 Pygments
@@ -48,6 +48,7 @@ R-TTR
 R-XML
 R-assertthat
 R-backports
+R-base64enc
 R-bitops
 R-brew
 R-car
@@ -73,6 +74,7 @@ R-gtable
 R-gtools
 R-highr
 R-hms
+R-htmltools
 R-httpuv
 R-httr
 R-iterators
@@ -117,12 +119,15 @@ R-randomForest
 R-repr
 R-reshape2
 R-rlang
+R-rmarkdown
 R-roxygen2
 R-rprojroot
 R-rstudioapi
 R-rversions
 R-sandwich
 R-scales
+R-shiny
+R-sourcetools
 R-sp
 R-statmod
 R-stringi
@@ -140,6 +145,7 @@ R-viridisLite
 R-whisker
 R-withr
 R-xml2
+R-xtable
 R-xts
 R-yaml
 R-zoo
@@ -156,6 +162,7 @@ SDL_mixer
 SDL_net
 SDL_ttf
 SQLAlchemy
+Send2Trash
 SocksiPy-branch
 Sphinx
 SuiteSparse
@@ -170,6 +177,7 @@ WebTest
 Werkzeug
 Whoosh
 abireport
+absl-py
 accountsservice
 acl
 acme
@@ -196,6 +204,7 @@ arc-theme
 argcomplete
 argparse
 asciidoc
+asio
 asn1crypto
 aspell
 aspell-en
@@ -219,6 +228,7 @@ autogen
 automake
 awscli
 azure-configs
+babeltrace
 babl
 backports.functools_lru_cache
 backports.ssl_match_hostname
@@ -245,6 +255,7 @@ bluez
 bndl-lamp-basic
 bokeh
 boost
+borgbackup
 boto
 boto3
 botocore
@@ -259,10 +270,12 @@ c_rehash
 ca-certs
 ca-certs-static
 cabextract
+cached-property
 cairo
 cairomm
 cargo
 caribou
+catch2
 catkin
 catkin_pkg
 ccache
@@ -272,12 +285,15 @@ certbot
 certifi
 cffi
 cgdb
+cgit
 chardet
 check
 cheese
 chrome-gnome-shell
+chrony
 chrpath
 cifs-utils
+clamav
 clear-config-management
 clear-containers-agent
 clear-containers-image
@@ -293,6 +309,7 @@ clr-boot-manager
 clr-debug-info
 clr-desktop-defaults
 clr-hardware-files
+clr-init
 clr-man-pages
 clr-power-tweaks
 clr-python-timestamp
@@ -319,7 +336,7 @@ comedilib
 compat-SDL2-soname1
 compat-efivar-soname0
 compat-fuse-soname2
-compat-gc-soname1
+compat-gegl
 compat-glew-soname1
 compat-guile-soname20
 compat-libical-soname2
@@ -375,6 +392,7 @@ dbus-glib
 dconf
 deap
 decorator
+defusedxml
 dejagnu
 desktop-file-utils
 dfc
@@ -410,6 +428,7 @@ ecdsa
 ed
 edk2
 efibootmgr
+efitools
 efivar
 eigen
 elasticsearch
@@ -438,6 +457,7 @@ extras
 faba-icon-theme
 fann
 farstream
+fasteners
 fcgi
 fftw
 file
@@ -479,11 +499,13 @@ gcab
 gcc
 gcr
 gcs-oauth2-boto-plugin
+gdal
 gdb
 gdbm
 gdk-pixbuf
 gdm
 geany
+geany-plugins
 gedit
 gegl
 gensim
@@ -491,6 +513,7 @@ geoclue
 geocode-glib
 gettext
 gevent
+gexiv2
 gflags
 ghostscript
 gimp
@@ -610,6 +633,7 @@ hunspell
 hwloc
 hyperstart
 hypothesis
+i2c-tools
 ibus
 icalendar
 icdiff
@@ -648,11 +672,12 @@ irssi
 isa-l
 iso-codes
 iso8601
+isodate
 isort
 ister
 itstool
 iw
-javapackages-tools
+ixpdimm_sw
 jedi
 jedi-vim
 jemalloc
@@ -835,8 +860,10 @@ libxkbcommon
 libxkbfile
 libxklavier
 libxml2
+libxml2-legacy
 libxshmfence
 libxslt
+libyami
 libzip
 linecache2
 links
@@ -851,6 +878,7 @@ linux-hyperv-mini
 linux-kvm
 linux-libc-headers
 linux-lts
+linux-pk414
 linux-steam-integration
 linux-tools
 llvm
@@ -895,6 +923,7 @@ mistune
 mixer-tools
 mkfontdir
 mkfontscale
+mkosi
 mock
 mod_wsgi
 moka-icon-theme
@@ -906,11 +935,13 @@ mozjs38
 mpc
 mpfr
 mpg123
+msgpack-python
 msmtp
 msr-tools
 mstflint
 mtdev
 multimon-ng
+multipath-tools
 murrine
 musl
 mutt
@@ -922,10 +953,12 @@ nasm
 nautilus
 nbconvert
 nbformat
+nbsphinx
 ncurses
 ncurses-compat
 ndctl
 ndg_httpsclient
+neofetch
 neon
 net-snmp
 net-tools
@@ -980,6 +1013,7 @@ openconnect
 opencv
 openjade
 openjdk
+openjdk9
 openldap
 openmpi
 opensm
@@ -992,15 +1026,18 @@ opusfile
 orc
 ordereddict
 ostree
+ovirt-guest-agent
 p11-kit
 p7zip
 packaging
 pacrunner
 pandas
+pandoc
 pandocfilters
 pango
 pangomm
 parallel
+parameter-framework
 paramiko
 parsedatetime
 parso
@@ -1039,6 +1076,7 @@ perl-Eval-Closure
 perl-Exception-Class
 perl-Exporter-Tiny
 perl-File-Listing
+perl-File-Slurp
 perl-HTML-Parser
 perl-HTML-Tagset
 perl-HTTP-Cookies
@@ -1153,11 +1191,11 @@ ptyprocess
 pugixml
 pulseaudio
 py
-py2cairo
 pyOpenSSL
 pyaml
 pyasn1
 pyasn1-modules
+pycairo
 pycodestyle
 pycparser
 pycrypto
@@ -1170,8 +1208,8 @@ pygobject
 pyliblzma
 pylint
 pynacl
+pypandoc
 pyparsing
-pypy
 pyquery
 pyrfc3339
 pyserial
@@ -1201,6 +1239,7 @@ python-systemd
 python-tappy
 python-toml
 python-urwid
+python-zeep
 python3
 pytz
 pyudev
@@ -1210,8 +1249,33 @@ pyzmq
 qemu
 qemu-lite
 qpdf
-qt-everywhere-opensource-src
+qt3d
+qtbase
+qtcanvas3d
+qtcharts
+qtconnectivity
 qtconsole
+qtdeclarative
+qtgraphicaleffects
+qtimageformats
+qtlocation
+qtmultimedia
+qtquickcontrols
+qtquickcontrols2
+qtremoteobjects
+qtscript
+qtscxml
+qtsensors
+qtserialbus
+qtserialport
+qtsvg
+qttools
+qttranslations
+qtvirtualkeyboard
+qtwebchannel
+qtwebsockets
+qtx11extras
+qtxmlpatterns
 quagga
 quilt
 randrproto
@@ -1285,12 +1349,13 @@ sox
 spark-dep
 speex
 speexdsp
+sphinx_rtd_theme
 sphinxcontrib-newsfeed
 sphinxcontrib-websupport
+spi-tools
 spice
 spice-gtk
 spice-protocol
-spyder
 spyder-notebook
 sqlite-autoconf
 sqlparse
@@ -1347,6 +1412,7 @@ tiptop
 tk
 tmux
 tokyocabinet
+toolbelt
 tornado
 totem
 totem-pl-parser
@@ -1371,6 +1437,7 @@ upower
 uritemplate
 urlgrabber
 urllib3
+usbredir
 usbutils
 usermode
 userspace-rcu
@@ -1390,6 +1457,7 @@ virt-viewer
 virtualenv
 vlc
 volume_key
+vsqlite
 vte
 vulkan-sdk
 waitress
@@ -1417,7 +1485,9 @@ xauth
 xbitmaps
 xcb-proto
 xcb-util
+xcb-util-image
 xcb-util-keysyms
+xcb-util-wm
 xclip
 xcmiscproto
 xcursor-themes
@@ -1477,6 +1547,7 @@ xz
 yajl
 yaml
 yasm
+yelp
 yelp-tools
 yelp-xsl
 yum