Update packages file for version 20460

Signed-off-by: clrbuilder <david.j.klimesh@intel.com>
Update packages file for version 20450
2026-06-16 11:06:15 +00:00 · 2018-01-19 12:29:34 -08:00 · 2018-01-18 12:15:50 -08: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
5 changed files with 287 additions and 252 deletions
@@ -0,0 +1,3 @@
+*~
+.*swp
+Makefile*.site_local
@@ -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
@@ -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 \
@@ -19,8 +19,9 @@ 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. 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
Author	SHA1	Message	Date
clrbuilder	0fd03748cb	Update packages file for version 20460 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-01-19 12:29:34 -08:00
clrbuilder	523a4ce1e2	Update packages file for version 20450 Signed-off-by: clrbuilder <david.j.klimesh@intel.com>	2018-01-18 12:15:50 -08:00
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
clrbuilder	a96e245866	Update packages file for version 20310 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-01-12 06:00:54 -08:00
clrbuilder	ed31b0d4d7	Update packages file for version 20300 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-01-11 12:00:56 -08:00
Leandro Dorileo	e0a2933bce	Introduce pre build and koji targets These are targets to be executed before build and koji targets. They are meant to execute security and validation checks. Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>	2018-01-10 12:57:33 -08:00
Patrick McCarty	d933700e4e	Note that login/logout is required when user-setup completes Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-01-08 13:37:58 -08:00
Patrick McCarty	ad95a0b5dd	Add gitignore file Note that the *.site_local makefiles can be used to add additional rules and configuration overrides. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-01-08 13:09:01 -08:00
clrbuilder	ae089fc77b	Update packages file for version 20250 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-01-08 12:00:59 -08:00
clrbuilder	6a9a5d3d00	Update packages file for version 20230 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-01-08 10:32:38 -08:00