Disable recipe echo and set -x for 'pullrebase'

The echo commands at key points of the pullrebase should be sufficient
for users to know what action pullrebase performed.

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

Makefile.common

@@ -4,8 +4,8 @@ all: build
 
 TOPLVL = ../..
 
-include $(TOPLVL)/projects/common/Makefile.functions
 include $(TOPLVL)/projects/common/Makefile.config
+include $(TOPLVL)/projects/common/Makefile.shared
 
 SHELL  = /bin/bash
 
@@ -19,12 +19,9 @@ RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
 
-ifeq ($(wildcard $(TOPLVL)/repo/clear.cfg),)
+# MOCK_CONFIG_VAL is set in Makefile.shared
-MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONF)
+MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONFIG_VAL)
-else
+
-MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(TOPLVL)/repo/clear.cfg
-USE_LOCAL_REPO = 1
-endif
 
 ifneq ($(wildcard upstream),)
 __allsources := $(notdir $(strip $(shell cat upstream)))
@@ -118,28 +115,29 @@ shell:
 
 # Always rebuild the source rpm
 .PHONY: $(SRPMFILE)
-$(SRPMFILE): $(SPECFILE) $(__allsources)
+$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
 	@$(MAKE) spdxcheck
-	@if [ -n "${USE_LOCAL_REPO}" ]; then \
-		printf '\n\n** NOTICE: Using local repo for the build. Continuing after 3 seconds.\n'; \
-		printf '** If this is not desired, run `make repodisable`.\n'; \
-		printf '** The repo can be re-enabled later with `make repoenable`.\n'; \
-		printf '** Run `touch $(TOPLVL)/repo/opt-in-build` to prevent the 3 second delay.\n\n\n'; \
-		[ -f $(TOPLVL)/repo/opt-in-build ] || sleep 3; \
-	fi >&2
 	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
 
-# Do a git fetch and a git rebase rather than a git pull so aborting
+# Do a git fetch and a git rebase to apply local commits on top of latest
-# the git pull at a password prompt doesn't leave local changes stashed
+# commits from the remote. A git fetch/rebase is used rather than a git pull so
-# Do the the git status dance so we only apply a stash we create
+# aborting the git pull at a password prompt doesn't leave local changes
+# stashed. Do the git status dance so we only apply a stash we create. Note
+# that a fetch/rebase is not attempted if the remote 'origin' is not
+# initialized locally, or if the remote contains no commits.
 pullrebase:
-	if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \
+	@if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \
-		set -x ; \
+		if ! git rev-parse --verify --quiet origin/master > /dev/null; then \
+			echo "Remote not yet initialized. Continuing."; \
+			exit 0; \
+		fi; \
+		echo "Fetching origin"; \
 		git fetch; \
 		if ! git rev-parse --verify --quiet FETCH_HEAD > /dev/null; then \
 			echo "No commits exist in remote. Continuing."; \
 			exit 0; \
 		fi; \
+		echo "Rebasing to origin/master"; \
 		if git status --porcelain | grep -q '^.[^?]'; \
 		then \
 			git stash save; \
@@ -154,7 +152,7 @@ pullrebase:
 #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 the project at https://github.com/clearlinux/autospec
-autospec: pullrebase
+autospec: pullrebase localreponotice
 	rm -f results/*src.rpm
 	@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
@@ -164,7 +162,8 @@ autospec: pullrebase
 	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --integrity \
 		${NON_INTERACTIVE} --config "$(AUTOSPEC_CONF)" ${SKIP_GIT} \
 		$(firstword $(NEWURL) $(URL)) --name $(PKG_NAME) ${CLEANUP} \
-		$${SETVERSION:+ -v $${SETVERSION}} -a $(ARCHIVES)
+		$${SETVERSION:+ -v $${SETVERSION}} -a $(ARCHIVES) \
+		-m $(MOCK_CONFIG_VAL)
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
 	@if [ -e update_changelog.sh ] && [ -z "$$SKIP_GIT" ] ; then \

Makefile.shared

@@ -119,6 +119,24 @@ localrepostatus:
 		fi; \
 	)
 
+# Detection of whether to use the local RPM repo occurs on-the-fly. Normally,
+# variable definitions appear in Makefile.config, but these variables are not
+# intended to be user-modifiable.
+ifeq ($(wildcard $(TOPLVL)/repo/clear.cfg),)
+MOCK_CONFIG_VAL = $(realpath $(MOCK_CONF))
+else
+MOCK_CONFIG_VAL = $(realpath $(TOPLVL)/repo/clear.cfg)
+USE_LOCAL_REPO = 1
+endif
+
+localreponotice:
+	@if [ -n "${USE_LOCAL_REPO}" ]; then \
+		printf '\n\n** NOTICE: Using local repo for the build. Continuing after 3 seconds.\n'; \
+		printf '** If this is not desired, run `make repodisable`.\n'; \
+		printf '** The repo can be re-enabled later with `make repoenable`.\n'; \
+		printf '** Run `touch $(TOPLVL)/repo/opt-in-build` to prevent the 3 second delay.\n\n\n'; \
+		[ -f $(TOPLVL)/repo/opt-in-build ] || sleep 3; \
+	fi >&2
 
 .PHONY: help
 ##### Code

Makefile.toplevel

@@ -4,8 +4,8 @@ all: clone
 
 TOPLVL  = .
 
-include $(TOPLVL)/projects/common/Makefile.functions
 include $(TOPLVL)/projects/common/Makefile.config
+include $(TOPLVL)/projects/common/Makefile.shared
 
 SHELL   = /bin/bash
 
@@ -80,7 +80,11 @@ ${PULL_PKGS}:
 			fi ; \
 			git --no-pager log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit $$O..$$N; echo; \
 		fi ; \
-		$(call gitoliteurl,$$p); \
+		if [ "$$p" = "projects/autospec" ] ; then \
+			git remote set-url --push origin https://github.com/clearlinux/autospec.git; \
+		else \
+			$(call gitoliteurl,$$p); \
+		fi ; \
 	else \
 		echo "$$p: no such remote 'origin'"; \
 	fi ; \
@@ -188,7 +192,7 @@ 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
-autospecnew:
+autospecnew: localreponotice
 	@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
 		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \
@@ -204,7 +208,7 @@ autospecnew:
 			$(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); \
+		python3 $(TOPLVL)/projects/autospec/autospec/autospec.py --integrity -t packages/$(NAME) --config $(AUTOSPEC_CONF) $(URL) --name $(NAME) -m $(MOCK_CONFIG_VAL); \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \

packages

@@ -31,117 +31,444 @@ Pygments
 QtAwesome
 QtPy
 R
+R-AER
 R-BH
+R-Brobdingnag
+R-CVST
 R-Cairo
+R-CircStats
+R-Cubist
 R-DBI
+R-DBItest
+R-DEoptim
+R-DEoptimR
+R-DRR
+R-DT
+R-DendSer
+R-DistributionUtils
+R-Ecdat
+R-Ecfun
+R-EnvStats
+R-FNN
+R-Formula
+R-GGally
+R-GPArotation
+R-GeneralizedHyperbolic
+R-GlobalOptions
+R-Hmisc
+R-ICS
+R-ICSNP
 R-IRdisplay
 R-IRkernel
+R-ISwR
+R-Lahman
+R-LearnBayes
+R-Matching
 R-MatrixModels
+R-ModelMetrics
+R-NLP
+R-NMF
+R-NMOF
+R-PKI
+R-R.methodsS3
+R-R.oo
+R-R.utils
+R-R2Cuba
+R-R2HTML
 R-R6
+R-RANN
 R-RColorBrewer
 R-RCurl
+R-RJSONIO
+R-ROCR
+R-RSQLite
+R-RSclient
+R-RUnit
+R-RandomFields
+R-RandomFieldsUtils
 R-Rcpp
+R-RcppArmadillo
 R-RcppEigen
+R-RcppProgress
+R-RcppRoll
+R-Rmpfr
+R-Rmpi
+R-Rtsne
+R-SDMTools
+R-SQUAREM
+R-Sleuth2
+R-SnowballC
 R-SparseM
+R-StanHeaders
+R-SuppDists
 R-TH.data
+R-TRAMPR
+R-TSP
 R-TTR
+R-TeachingDemos
+R-VGAM
+R-VGAMdata
+R-VIM
 R-XML
+R-abind
+R-acepack
+R-actuar
+R-ade4
+R-analogue
+R-ape
+R-argparse
+R-arm
 R-assertthat
 R-backports
 R-base64enc
+R-bayesm
+R-bayesplot
+R-bdsmatrix
+R-betareg
+R-bibtex
+R-bindr
+R-bindrcpp
+R-bipartite
+R-bit
+R-bit64
 R-bitops
+R-blob
 R-brew
+R-brglm
+R-bridgesampling
+R-brms
+R-broom
+R-caTools
+R-callr
 R-car
+R-caret
+R-cclust
+R-cellranger
+R-checkmate
 R-chron
+R-circlize
+R-classInt
+R-cli
+R-clustMixType
+R-coda
+R-coin
 R-colorspace
+R-colourpicker
+R-combinat
 R-commonmark
+R-compositions
+R-corpcor
+R-corrplot
+R-cowplot
 R-crayon
+R-crosstalk
 R-curl
+R-cvTools
+R-data.table
+R-dbarts
+R-dbplyr
+R-ddalpha
+R-deSolve
+R-debugme
 R-deepnet
+R-deldir
+R-dendextend
 R-desc
 R-devtools
+R-dfoptim
 R-dichromat
+R-diffusionMap
 R-digest
+R-dimRed
+R-diptest
+R-dlm
+R-doMC
+R-doMPI
+R-doParallel
+R-doRNG
+R-doSNOW
+R-dotCall64
+R-dplyr
+R-drc
+R-dtw
+R-dygraphs
 R-dynlm
 R-e1071
+R-earth
+R-ellipse
+R-energy
 R-evaluate
+R-expint
+R-expm
+R-fastICA
+R-fastcluster
+R-fastmatch
+R-fda
+R-ff
+R-fields
+R-findpython
+R-fitdistrplus
+R-flashClust
+R-flexmix
+R-forcats
 R-foreach
 R-formatR
+R-fpc
+R-futile.logger
+R-futile.options
+R-gam
+R-gamm4
+R-gbm
+R-gclus
+R-gdata
+R-geometry
+R-getopt
+R-ggjoy
 R-ggplot2
+R-ggplot2movies
+R-ggridges
 R-git2r
 R-glmnet
+R-glue
+R-gmodels
+R-gmp
+R-goftest
+R-gower
+R-gplots
+R-gridBase
+R-gridExtra
 R-gtable
 R-gtools
+R-haven
+R-hexbin
 R-highr
 R-hms
+R-htmlTable
 R-htmltools
+R-htmlwidgets
 R-httpuv
 R-httr
+R-ica
+R-igraph
+R-inline
+R-inum
+R-ipred
+R-irlba
 R-iterators
+R-jpeg
 R-jsonlite
+R-kernlab
+R-klaR
 R-knitr
 R-labeling
+R-labelled
+R-laeken
+R-lambda.r
+R-lars
+R-latticeExtra
+R-lava
 R-lazyeval
+R-lda
+R-leaps
+R-lfe
+R-libcoin
+R-lle
 R-lme4
 R-lmtest
+R-locfit
+R-loo
+R-lpSolve
 R-lubridate
+R-magic
 R-magrittr
 R-manipulate
 R-mapproj
 R-maps
 R-maptools
 R-markdown
+R-matrixStats
+R-matrixcalc
+R-maxLik
+R-mclust
+R-mda
+R-memisc
 R-memoise
+R-mi
 R-microbenchmark
 R-mime
+R-miniUI
+R-minpack.lm
 R-minqa
+R-miscTools
+R-mixtools
+R-mlbench
+R-mnormt
 R-mockery
+R-modelr
+R-modeltools
 R-mondate
 R-multcomp
+R-multiwayvcov
 R-munsell
+R-mvoutlier
 R-mvtnorm
+R-network
 R-neuralnet
+R-nleqslv
 R-nloptr
+R-nortest
+R-numDeriv
+R-nycflights13
 R-openssl
+R-optparse
+R-packrat
+R-pamr
+R-party
+R-partykit
+R-pbapply
 R-pbdZMQ
 R-pbkrtest
+R-pcaPP
+R-pdfCluster
+R-permute
+R-phylogram
 R-pillar
 R-pkgconfig
+R-pkgmaker
+R-plm
+R-plogr
+R-plotly
+R-plotmo
+R-plotrix
+R-pls
 R-plyr
+R-pmml
 R-png
+R-polspline
+R-polyclip
+R-polycor
+R-prabclus
+R-pracma
 R-praise
+R-prettyunits
+R-princurve
+R-prodlim
+R-profileModel
+R-progress
 R-proto
+R-proxy
 R-pryr
+R-psych
+R-purrr
+R-pxweb
+R-qap
 R-quadprog
 R-quantmod
 R-quantreg
+R-questionr
 R-randomForest
+R-ranger
+R-raster
+R-rasterVis
+R-readr
+R-readxl
+R-recipes
+R-registry
+R-rematch
 R-repr
+R-reprex
+R-reshape
 R-reshape2
+R-reticulate
+R-rgenoud
+R-rgl
 R-rlang
 R-rmarkdown
+R-rms
+R-rngtools
+R-robCompositions
+R-robustbase
+R-rootSolve
 R-roxygen2
 R-rprojroot
+R-rrcov
+R-rsconnect
+R-rstan
+R-rstanarm
+R-rstantools
 R-rstudioapi
 R-rversions
+R-rvest
+R-sROC
+R-sampling
 R-sandwich
 R-scales
+R-scatterplot3d
+R-segmented
+R-selectr
+R-sem
+R-seriation
+R-setRNG
+R-sfsmisc
+R-sgeostat
+R-shape
 R-shiny
+R-shinyjs
+R-shinystan
+R-shinythemes
+R-slam
+R-sm
+R-smoother
+R-sn
+R-sna
+R-snow
+R-snowfall
+R-som
 R-sourcetools
 R-sp
+R-spData
+R-spam
+R-spatstat.data
+R-spatstat.utils
+R-spdep
+R-spls
 R-statmod
+R-statnet.common
 R-stringi
 R-stringr
+R-strucchange
+R-subselect
+R-superpc
+R-survey
+R-systemfit
 R-tau
+R-tclust
+R-tensor
+R-tensorA
 R-testit
 R-testthat
+R-threejs
 R-tibble
+R-tidyr
+R-tidyselect
+R-tidyverse
 R-timeDate
 R-tis
+R-tm
+R-topicmodels
+R-treatSens
 R-tree
+R-trimcluster
+R-truncnorm
 R-tseries
+R-tsne
+R-utf8
 R-uuid
+R-vcd
+R-vegan
+R-viridis
 R-viridisLite
+R-visNetwork
 R-whisker
 R-withr
 R-xml2
@@ -176,12 +503,15 @@ WebOb
 WebTest
 Werkzeug
 Whoosh
+Z3
 abireport
 absl-py
 accountsservice
 acl
 acme
 acpica-unix2
+acrn-devicemodel
+acrn-hypervisor
 adwaita-icon-theme
 aeon
 alabaster
@@ -233,6 +563,7 @@ babl
 backports.functools_lru_cache
 backports.ssl_match_hostname
 backports.weakref
+baobab
 bash
 bash-completion
 bash_kernel
@@ -260,6 +591,7 @@ boto
 boto3
 botocore
 bridge-utils
+brotli
 bsdiff
 btrfs-progs
 bundle-chroot-builder
@@ -273,6 +605,7 @@ cabextract
 cached-property
 cairo
 cairomm
+cantarell-fonts
 cargo
 caribou
 catch2
@@ -343,6 +676,7 @@ compat-libical-soname2
 compat-libpng-soname12
 compat-libwebp-soname6
 compat-llvm-soname4
+compat-llvm-soname5
 compat-mpfr-soname4
 compat-opencv-soname32
 compat-opencv-soname33
@@ -368,6 +702,7 @@ cpuid
 cracklib
 crcmod
 createrepo_c
+cri-containerd
 cri-o
 cri-tools
 cryptography
@@ -413,6 +748,7 @@ docbook-xml
 docker
 docker-py
 docutils
+dogtail
 dos2unix
 dosfstools
 double-conversion
@@ -477,6 +813,7 @@ flex
 flmsg
 flnet
 fltk
+folks
 font-adobe-100dpi
 font-adobe-75dpi
 font-bitstream-type1
@@ -514,6 +851,7 @@ geocode-glib
 gettext
 gevent
 gexiv2
+gfbgraph
 gflags
 ghostscript
 gimp
@@ -542,6 +880,7 @@ gnome-bluetooth
 gnome-calculator
 gnome-calendar
 gnome-characters
+gnome-color-manager
 gnome-common
 gnome-control-center
 gnome-desktop
@@ -550,17 +889,26 @@ gnome-font-viewer
 gnome-icon-theme
 gnome-initial-setup
 gnome-keyring
+gnome-logs
+gnome-maps
 gnome-menus
+gnome-music
 gnome-online-accounts
 gnome-panel
+gnome-photos
 gnome-screenshot
 gnome-session
 gnome-settings-daemon
 gnome-shell
 gnome-shell-extensions
+gnome-system-monitor
 gnome-terminal
 gnome-themes-standard
+gnome-todo
 gnome-tweak-tool
+gnome-user-docs
+gnome-video-effects
+gnome-weather
 gnu-efi
 gnupg
 gnuplot
@@ -568,6 +916,7 @@ gnutls
 go
 gobject-introspection
 golang-github-cpuguy83-go-md2man
+gom
 goocanvas
 google-api-python-client
 google-apitools
@@ -580,6 +929,7 @@ gpredict
 gptfdisk
 gradle
 gradle-dep
+graphene
 graphviz
 greenlet
 grep
@@ -590,6 +940,7 @@ groff
 grub
 gsettings-desktop-schemas
 gsl
+gsound
 gspell
 gst-plugins-bad
 gst-plugins-base
@@ -642,6 +993,7 @@ icon-naming-utils
 icu4c
 idna
 imagesize
+imapfilter
 indent
 infiniband-diags
 iniparse
@@ -649,6 +1001,7 @@ init-rdahead
 inotify-tools
 inputproto
 intltool
+invm-frameworks
 ioping
 iotop
 ipaddr
@@ -755,6 +1108,7 @@ libcap
 libcap-ng
 libcdio
 libcgroup
+libchamplain
 libcomps
 libconfig
 libcroco
@@ -773,6 +1127,7 @@ libgcrypt
 libgd
 libgdata
 libgee
+libgepub
 libgfortran-avx
 libgfortran-compat-soname3
 libgit2
@@ -820,6 +1175,7 @@ libpthread-stubs
 libpwquality
 librepo
 librsvg
+librtlsdr
 libsamplerate
 libseccomp
 libsecret
@@ -828,6 +1184,7 @@ libsndfile
 libsolv
 libsoup
 libspectre
+libsrtp
 libssh
 libssh2
 libstoragemgmt
@@ -1195,6 +1552,7 @@ pyOpenSSL
 pyaml
 pyasn1
 pyasn1-modules
+pyatspi
 pycairo
 pycodestyle
 pycparser
@@ -1272,6 +1630,7 @@ qtsvg
 qttools
 qttranslations
 qtvirtualkeyboard
+qtwayland
 qtwebchannel
 qtwebsockets
 qtx11extras
@@ -1320,6 +1679,7 @@ screen
 scripttest
 scrnsaverproto
 seaborn
+seahorse
 secretstorage
 sed
 setproctitle
@@ -1421,6 +1781,7 @@ tqdm
 traceback2
 traceroute
 tracker
+tracker-miners
 traitlets
 tree
 typed-ast
@@ -1452,6 +1813,7 @@ videoproto
 vim
 vim-go
 vinagre
+vino
 virt-manager
 virt-viewer
 virtualenv
@@ -1469,11 +1831,13 @@ webencodings
 webkitgtk
 websocket_client
 websockify
+weechat
 weston
 wget
 wheel
 which
 widgetsnbextension
+woff2
 wol
 wpa_supplicant
 wrapt