Compare commits

...

2 Commits

Author SHA1 Message Date
clrbuilder c6749e0569 Update packages file for version 30010
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-19 20:21:46 +00:00
Geoffroy Van Cutsem 79b17335fa Really set 'latest_builds' to the latest value of the day
Consider the following scenario:
* System being set-up on day 0 (by running user-setup.sh script)
* The github.com/clearlinux/common repo is cloned under projects/common
* Fast-forward in the future
* Clone a package for which there is no reachable upstream URL
	(e.g. clr-power-tweaks or clr-systemd-config
* Run 'make sources'
That operation will fail because it will search for the src.rpm files starting
with the Clear Linux build determined by looking up the latest tag in the
project/common repo (and the latest is the one from day 0). So it will only find
older versions of those src.rpm, and will eventually fail.

This patch adds a line that fetches all the latest tags from the upstream
projects/common repo so the 'latest_builds' variable is *really* set to the
latest of the day.

Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
2019-06-19 11:03:00 -07:00
2 changed files with 9 additions and 1 deletions
+1
View File
@@ -279,6 +279,7 @@ sources:
@$(MAKE) generateupstream; \
[ $$? -eq 0 ] && exit 0; \
nvr="$$(rpmspec --srpm -q --qf '%{NAME}\t%{VERSION}\t%{RELEASE}\n' $(SPECFILE))"; \
git -C $(TOPLVL)/projects/common fetch --tags >/dev/null 2>&1; \
latest_builds=$$(git -C $(TOPLVL)/projects/common tag -l | sort -rn); \
for b in $$latest_builds; do \
url="$(DOWNLOAD_MIRROR)/releases/$$b/clear/source/package-sources"; \
+8 -1
View File
@@ -2712,6 +2712,7 @@ mvn-beanshell
mvn-biz.aQute.bndlib
mvn-bndlib
mvn-build-helper-maven-plugin
mvn-buildnumber-maven-plugin
mvn-cdi-api
mvn-checker-compat-qual
mvn-checkstyle
@@ -2735,10 +2736,12 @@ mvn-file-management
mvn-google-collections
mvn-guava
mvn-guice
mvn-hamcrest
mvn-httpcomponents-client
mvn-httpcomponents-core
mvn-j2objc-annotations
mvn-jackson-databind
mvn-jansi
mvn-java-boot-classpath-detector
mvn-javax.inject
mvn-jaxb-impl
@@ -2770,6 +2773,7 @@ mvn-maven-compat
mvn-maven-core
mvn-maven-embedder
mvn-maven-error-diagnostics
mvn-maven-model
mvn-maven-model-builder
mvn-maven-monitor
mvn-maven-parent
@@ -2788,10 +2792,11 @@ mvn-maven-repository-metadata
mvn-maven-resolver
mvn-maven-resolver-provider
mvn-maven-scm
mvn-maven-settings
mvn-maven-shared
mvn-maven-slf4j-provider
mvn-maven-surefire
mvn-maven-toolchain
mvn-maven-wagon
mvn-mockito-core
mvn-modello
mvn-mojo-parent
@@ -2838,6 +2843,7 @@ mvn-struts
mvn-trilead-ssh2
mvn-tycho
mvn-validation-api
mvn-wagon
mvn-xbean-reflect
mvn-xercesImpl
mvn-xercesMinimal
@@ -4161,6 +4167,7 @@ setuptools_scm_git_archive
setxkbmap
sg3_utils
shadow
shapelib
shared-mime-info
sharutils
shell