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>
Improve behavior of 'make autospec' for new repos
2026-06-17 11:36:24 +00:00 · 2018-03-23 16:42:20 -07:00 · 2018-03-23 11:59:56 -07:00 · 2018-03-23 06:01:38 -07:00 · 2018-03-22 12:48:08 -07:00 · 2018-03-22 07:16:18 -07:00
2 changed files with 20 additions and 5 deletions
@@ -119,17 +119,25 @@ $(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
 	@$(MAKE) spdxcheck
 	$(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
-# the git pull at a password prompt doesn't leave local changes stashed
-# Do the the git status dance so we only apply a stash we create
+# Do a git fetch and a git rebase to apply local commits on top of latest
+# commits from the remote. A git fetch/rebase is used rather than a git pull so
+# 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 \
-		set -x ; \
+	@if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \
+		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; \
@@ -503,6 +503,7 @@ WebOb
 WebTest
 Werkzeug
 Whoosh
+Z3
 abireport
 absl-py
 accountsservice
@@ -590,6 +591,7 @@ boto
 boto3
 botocore
 bridge-utils
+brotli
 bsdiff
 btrfs-progs
 bundle-chroot-builder
@@ -674,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
@@ -990,6 +993,7 @@ icon-naming-utils
 icu4c
 idna
 imagesize
+imapfilter
 indent
 infiniband-diags
 iniparse
@@ -1171,6 +1175,7 @@ libpthread-stubs
 libpwquality
 librepo
 librsvg
+librtlsdr
 libsamplerate
 libseccomp
 libsecret
@@ -1179,6 +1184,7 @@ libsndfile
 libsolv
 libsoup
 libspectre
+libsrtp
 libssh
 libssh2
 libstoragemgmt
@@ -1831,6 +1837,7 @@ wget
 wheel
 which
 widgetsnbextension
+woff2
 wol
 wpa_supplicant
 wrapt
Author	SHA1	Message	Date
Patrick McCarty	05634010e9	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>	2018-03-23 16:42:20 -07:00
Patrick McCarty	f6442a0e7f	Improve behavior of 'make autospec' for new repos If a new package repo is created with make autospecnew, and then make autospec is run immediately afterward, a git fetch is performed, but the remote repo is not likely to exist yet. Address this issue by only running the git fetch if the remote origin is initialized locally via a git push, git pull, etc. In addition to properly supporting the workflow described above, this change also enables developers to build packages that are not intended to be included in Clear Linux OS, thus not destined to appear in the 'packages' file. Package repos of this nature might have different, manually configured remotes, or the remote may never be initialized at all if builds are only run locally. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-03-23 11:59:56 -07:00
clrbuilder	d6250a68cd	Update packages file for version 21500 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-03-23 06:01:38 -07:00
clrbuilder	a0208a0509	Update packages file for version 21490 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-03-22 12:48:08 -07:00
clrbuilder	7ff122463b	Update packages file for version 21480 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-03-22 07:16:18 -07:00
clrbuilder	08498361a4	Update packages file for version 21470 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-03-22 06:01:51 -07:00