Update packages file for version 21150

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

.gitignore

@@ -0,0 +1,3 @@
+*~
+.*swp
+Makefile*.site_local

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.common

@@ -81,11 +81,13 @@ configemail:
 checkblacklist:
 	@$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist results/*.rpm
 
+prebuild-checks:
+
 #help build: Builds from current directory on your machine and puts log
 #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.
-build: configemail $(SPECFILE) upstream $(SRPMFILE)
+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
 	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
@@ -146,7 +148,7 @@ autospec: pullrebase
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
 		exit 1; \
 	fi
-	@printf 'PKG_NAME := %s\nURL = %s\n\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' > Makefile
+	@printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' '$(value ARCHIVES)' > Makefile
 	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --integrity \
 		${NON_INTERACTIVE} --config "$(AUTOSPEC_CONF)" ${SKIP_GIT} \
 		$(firstword $(NEWURL) $(URL)) --name $(PKG_NAME) ${CLEANUP} \
@@ -228,16 +230,21 @@ else
 	rm -rf "$$tmp";
 endif
 
+prekoji-checks:
+
 #help koji: Creates a git tag on the latest local commit, then asks koji to
 #help build from that tag on the server. If you have uncommitted local changes,
 #help they will not be included.
-koji: kojidef
+koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
+	@if ! git branch | grep -q -E '^\* master'; then \
+		echo "Error: Must be on the master branch to submit to koji" >&2; \
+		exit 1; \
+	fi
 	git pull --rebase
 	git tag $(SRPMVERS)
-	git push --follow-tags
-	git push --tags
+	git push origin master refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
 
 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the

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
@@ -189,14 +190,20 @@ provides:
 #help process. For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
 autospecnew:
 	@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
-		echo "Please specify NAME and URL"; \
+		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); \
-		printf 'PKG_NAME := %s\nURL = %s\n\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
+		( \
+			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; \
 	else \

README.md

@@ -19,8 +19,17 @@ 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.
+Download the [user setup](user-setup.sh) script and run it on your Clear Linux
+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'] = """