Compare commits

..

8 Commits

Author SHA1 Message Date
clrbuilder 19d7dfcc56 Update packages file for version 30030
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-21 12:02:15 +00:00
clrbuilder 25e60b8d7f Update packages file for version 30020
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-20 18:02:35 +00:00
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
clrbuilder 18503d7ff9 Update packages file for version 30000
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-19 15:32:37 +00:00
clrbuilder d4a14d4b51 Update packages file for version 29990
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-19 12:02:34 +00:00
Patrick McCarty 67f9a85781 toplevel: simplify clean-pkgs-dir command
Create a PKGS_ORPHANED list containing all orphaned package repos (i.e.
package repos for packages not listed in projects/common/packages,
excluding the local compatibility packages/common directory), and use
that list for the `clean-pkgs-dir` command.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2019-06-18 17:30:19 -07:00
clrbuilder 2ab93bc546 Update packages file for version 29980
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-18 18:06:21 +00:00
3 changed files with 33 additions and 7 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"; \
+4 -5
View File
@@ -11,6 +11,7 @@ SHELL = /bin/bash
PKGS = $(shell cat $(PACKAGES_FILE))
PKGS_LOCAL = $(sort $(filter ${PKGS},$(subst packages/,,$(wildcard packages/*))))
PKGS_ORPHANED = $(sort $(filter-out common ${PKGS},$(subst packages/,,$(wildcard packages/*))))
proj_PKGS = $(addprefix proj_,$(PROJ_PKGS))
clone_PKGS = $(addprefix clone_,$(PKGS))
@@ -128,11 +129,9 @@ pull: ${PULL_PKGS}
#help clean-pkgs-dir: For packages that are no longer present in the distro,
#help removes the associated package repos from the ./packages tree
clean-pkgs-dir: $(PACKAGES_FILE)
@for p in `ls packages`; do \
if ! grep -wq "^$$p$$" "$<" && [ "$$p" != common ]; then \
echo "Removing $$p from packages, it is no longer in common/packages."; \
rm -rf packages/$$p; \
fi \
@for p in ${PKGS_ORPHANED}; do \
echo "Removing $$p from packages, it is no longer in common/packages."; \
rm -rf packages/$$p; \
done
@echo "packages directory cleaned";
+28 -2
View File
@@ -991,6 +991,8 @@ apache-kafka
apache-libcloud
apache-maven
apache-spark
apache-tomcat
apache-tomcat-dep
apache-zookeeper
apipkg
appdirs
@@ -1653,6 +1655,7 @@ fontconfig
fontforge
fonttools
fossil
fox
frameworkintegration
freedv
freeglut
@@ -1854,6 +1857,7 @@ hadoop-dep
hamlib
hammock
haproxy
hardinfo
hardlink
harfbuzz
haskell-random
@@ -1865,6 +1869,7 @@ helloworld
helm
help2man
hexchat
hexedit
hgtools
hicolor-icon-theme
hiredis
@@ -2477,7 +2482,6 @@ libthai
libtheora
libtirpc
libtk-img
libtomcrypt
libtool
libtorrent-rasterbar
libudev0-shim
@@ -2701,6 +2705,7 @@ mutter
mvn-aether-core
mvn-animal-sniffer
mvn-antlr
mvn-apache
mvn-apache-jar-resource-bundle
mvn-apache-rat
mvn-asm
@@ -2710,18 +2715,24 @@ 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
mvn-codehaus-jackson
mvn-commons-beanutils
mvn-commons-cli
mvn-commons-codec
mvn-commons-collections
mvn-commons-compress
mvn-commons-digester
mvn-commons-httpclient
mvn-commons-io
mvn-commons-jxpath
mvn-commons-lang
mvn-commons-lang3
mvn-commons-logging
mvn-commons-parent
mvn-commons-validator
mvn-decentxml
mvn-doxia
@@ -2730,13 +2741,16 @@ mvn-enforcer
mvn-error_prone_annotations
mvn-extra-enforcer-rules
mvn-file-management
mvn-google
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
@@ -2768,6 +2782,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
@@ -2786,12 +2801,14 @@ 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
mvn-mvnplugins
mvn-nekohtml
mvn-nexus-maven-plugins
@@ -2806,6 +2823,7 @@ mvn-org.osgi.compendium
mvn-org.osgi.core
mvn-oro
mvn-pdfbox
mvn-plexus
mvn-plexus-archiver
mvn-plexus-build-api
mvn-plexus-cipher
@@ -2814,6 +2832,7 @@ mvn-plexus-cli
mvn-plexus-compiler
mvn-plexus-containers
mvn-plexus-i18n
mvn-plexus-interactivity
mvn-plexus-interpolation
mvn-plexus-io
mvn-plexus-resources
@@ -2835,9 +2854,13 @@ mvn-struts
mvn-trilead-ssh2
mvn-tycho
mvn-validation-api
mvn-velocity
mvn-wagon
mvn-xbean-reflect
mvn-xercesImpl
mvn-xercesMinimal
mvn-xml-apis
mvn-xmlunit
mvn-xmlunit-core
mxnet
mycroft-core
@@ -2935,6 +2958,7 @@ ocl-icd
octave
offlineimap
oiio
okteta
okular
olefile
onig
@@ -3926,6 +3950,7 @@ python-crfsuite
python-dateutil
python-dateutil-legacypython
python-designateclient
python-distutils-extra
python-dldt
python-editor
python-future
@@ -4156,6 +4181,7 @@ setuptools_scm_git_archive
setxkbmap
sg3_utils
shadow
shapelib
shared-mime-info
sharutils
shell