Update packages file for version 20360

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Fix support for ARCHIVES in autospec rules
2026-06-16 19:16:00 +00:00 · 2018-01-17 06:00:59 -08:00 · 2018-01-16 13:22:57 -08:00 · 2018-01-16 12:00:43 -08:00 · 2018-01-12 14:43:19 -08:00
3 changed files with 10 additions and 5 deletions
@@ -148,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} \
@@ -238,10 +238,13 @@ prekoji-checks:
 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
@@ -189,14 +189,14 @@ 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; \
+		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 \
@@ -127,6 +127,7 @@ clr-power-tweaks
 clr-python-timestamp
 clr-R-helpers
 clr-rpm-config
+clr-service-restart
 clr-systemd-config
 clr-update-triggers
 clr-wallpapers
@@ -1209,6 +1210,7 @@ rsa
 rsync
 ruby
 runc
+rust-std32
 rustc
 rxvt-unicode
 s2tc
Author	SHA1	Message	Date
clrbuilder	38059c0401	Update packages file for version 20360 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-01-17 06:00:59 -08:00
Patrick McCarty	1cc337d5fa	Fix support for ARCHIVES in autospec rules PKG_NAME and URL were properly supported, but ARCHIVES needed to be written back to the package repo makefile. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-01-16 13:22:57 -08:00
clrbuilder	d2b87af7d3	Update packages file for version 20350 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-01-16 12:00:43 -08:00
Patrick McCarty	a3f2351225	Adopt strict policy for koji submissions Because there have been very few situations in the past requiring a "make koji" from a branch other than master, add a strict check that the active local branch is "master". This also blocks submissions from a "detached" state, which was previously permitted. Also, fix and consolidate the git push commands into one. Now that the branch check is implemented, the "master" refspec can be used, and explicitly push one tag (the tag created immediately before the push). The --follow-tags and --tags options don't have the intended effect, so omit them. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-01-12 14:43:19 -08:00