Compare commits

..

15 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
clrbuilder 0697a48265 Update packages file for version 29970
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-18 12:02:24 +00:00
clrbuilder 3488d9df0b Update packages file for version 29960
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-17 17:58:32 +00:00
clrbuilder 7eda6b13d5 Update packages file for version 29950
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-17 11:58:06 +00:00
clrbuilder 22cf4d9aaa Update packages file for version 29940
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-14 17:57:53 +00:00
Arjan van de Ven abf88fe302 add some more boilerplate patterns 2019-06-14 14:48:13 +00:00
Arjan van de Ven e7d86e5ace make it clear there's no point in submitting routine stuff for review
as it only slows things down
2019-06-14 14:41:28 +00:00
clrbuilder 0ca8a71a6a Update packages file for version 29930
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2019-06-14 11:57:34 +00:00
4 changed files with 198 additions and 6 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"; \
+5 -6
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";
@@ -232,7 +231,7 @@ autospecnew: preautospecnew-checks localreponotice
python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) format-patch -1 --stdout) > $(TOPLVL)/packages/$(NAME)/for-review.txt; \
printf "\n**\n"; \
printf "** NOTICE: A patch with changes is available in the file $(TOPLVL)/packages/$(NAME)/for-review.txt\n"; \
printf "** Please submit for code review with git send-email\n"; \
printf "** Please look through this file and if you are unsure, please submit for code review with git send-email\n"; \
printf "**\n\n"; \
fi; \
else \
+180
View File
@@ -308,6 +308,7 @@ R-desc
R-devtools
R-dfoptim
R-dichromat
R-diffobj
R-diffusionMap
R-digest
R-dimRed
@@ -387,6 +388,9 @@ R-fitdistrplus
R-flashClust
R-flexmix
R-flexsurv
R-fontBitstreamVera
R-fontLiberation
R-fontquiver
R-forcats
R-foreach
R-forecast
@@ -407,6 +411,7 @@ R-gbm
R-gbutils
R-gclus
R-gdata
R-gdtools
R-geepack
R-geiger
R-generics
@@ -986,6 +991,8 @@ apache-kafka
apache-libcloud
apache-maven
apache-spark
apache-tomcat
apache-tomcat-dep
apache-zookeeper
apipkg
appdirs
@@ -1002,6 +1009,7 @@ aria2
ark
armadillo
arp-scan
arpack-ng
artikulate
asciidoc
asciinema
@@ -1647,6 +1655,7 @@ fontconfig
fontforge
fonttools
fossil
fox
frameworkintegration
freedv
freeglut
@@ -1848,6 +1857,7 @@ hadoop-dep
hamlib
hammock
haproxy
hardinfo
hardlink
harfbuzz
haskell-random
@@ -1859,6 +1869,7 @@ helloworld
helm
help2man
hexchat
hexedit
hgtools
hicolor-icon-theme
hiredis
@@ -2446,6 +2457,7 @@ libsamplerate
libsass
libseccomp
libsecret
libshout
libsigc++
libsigsegv
libsmbios
@@ -2596,6 +2608,7 @@ make
makedepend
man-db
man-pages
man-pages-posix
marble
mariadb
mash
@@ -2689,6 +2702,166 @@ musl
mutagen
mutt
mutter
mvn-aether-core
mvn-animal-sniffer
mvn-antlr
mvn-apache
mvn-apache-jar-resource-bundle
mvn-apache-rat
mvn-asm
mvn-autolink
mvn-avalon-framework
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
mvn-doxia-sitetools
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
mvn-jdom
mvn-jersey-apache-client4
mvn-jersey-core
mvn-jersey-json
mvn-jetty
mvn-jetty-util
mvn-jsch
mvn-jsch.agentproxy.connector-factory
mvn-jsch.agentproxy.sshagent
mvn-jsch.agentproxy.svnkit-trilead-ssh2
mvn-jsch.agentproxy.usocket-nc
mvn-jsoup
mvn-jsr250-api
mvn-jsr305
mvn-jsr311-api
mvn-junit
mvn-kxml2
mvn-logback-classic
mvn-logback-core
mvn-maven-aether-provider
mvn-maven-artifact
mvn-maven-artifact-manager
mvn-maven-builder-support
mvn-maven-bundle-plugin
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
mvn-maven-plugin-api
mvn-maven-plugin-descriptor
mvn-maven-plugin-parameter-documenter
mvn-maven-plugin-registry
mvn-maven-plugin-testing
mvn-maven-plugin-tools
mvn-maven-profile
mvn-maven-project
mvn-maven-reporting-api
mvn-maven-reporting-exec
mvn-maven-reporting-impl
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-mockito-core
mvn-modello
mvn-mojo-parent
mvn-mvnplugins
mvn-nekohtml
mvn-nexus-maven-plugins
mvn-nexus-public
mvn-objenesis
mvn-openhtmltopdf-core
mvn-openhtmltopdf-jsoup-dom-converter
mvn-org.apache.felix.bundlerepository
mvn-org.eclipse.sisu.inject
mvn-org.eclipse.sisu.plexus
mvn-org.osgi.compendium
mvn-org.osgi.core
mvn-oro
mvn-pdfbox
mvn-plexus
mvn-plexus-archiver
mvn-plexus-build-api
mvn-plexus-cipher
mvn-plexus-classworlds
mvn-plexus-cli
mvn-plexus-compiler
mvn-plexus-containers
mvn-plexus-i18n
mvn-plexus-interactivity
mvn-plexus-interpolation
mvn-plexus-io
mvn-plexus-resources
mvn-plexus-utils
mvn-plexus-velocity
mvn-protobuf-java
mvn-servlet-api
mvn-siesta
mvn-sisu
mvn-sisu-maven-plugin
mvn-slf4j
mvn-snappy
mvn-sonatype-aether
mvn-sonatype-plexus-sec-dispatcher
mvn-spice-zapper
mvn-sqljet
mvn-sslext
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
mypaint-brushes
@@ -2785,6 +2958,7 @@ ocl-icd
octave
offlineimap
oiio
okteta
okular
olefile
onig
@@ -3400,6 +3574,7 @@ perl-Role-Basic
perl-Role-Tiny
perl-Roman
perl-Router-Simple
perl-SGLMSpm
perl-SMTP-Server
perl-SQL-Abstract
perl-SQL-Translator
@@ -3506,6 +3681,7 @@ perl-Text-Brew
perl-Text-CSV
perl-Text-CSV-Encoded
perl-Text-CSV_XS
perl-Text-CharWidth
perl-Text-Diff
perl-Text-FindIndent
perl-Text-Format
@@ -3521,6 +3697,7 @@ perl-Text-TabularDisplay
perl-Text-Template
perl-Text-Trim
perl-Text-Unidecode
perl-Text-WrapI18N
perl-Text-Wrapper
perl-Tie-Cycle
perl-Tie-IxHash
@@ -3597,6 +3774,7 @@ persistent
pesign
pexpect
phonon
phonon-vlc
phoronix-test-suite
php
php-imagick
@@ -3772,6 +3950,7 @@ python-crfsuite
python-dateutil
python-dateutil-legacypython
python-designateclient
python-distutils-extra
python-dldt
python-editor
python-future
@@ -4002,6 +4181,7 @@ setuptools_scm_git_archive
setxkbmap
sg3_utils
shadow
shapelib
shared-mime-info
sharutils
shell
+12
View File
@@ -225,6 +225,14 @@ def main():
zap_line_in_file_start(".spec", "Source99 :")
zap_line_in_file_start(".spec", "Source0 :")
zap_line_in_file_start(".spec", "export SOURCE_DATE_EPOCH")
zap_line_in_file_start(".spec", "export GCC_IGNORE_WERROR=1")
zap_line_in_file_start(".spec", "export AR=gcc-ar")
zap_line_in_file_start(".spec", "export RANLIB=gcc-ranlib")
zap_line_in_file_start(".spec", "export NM=gcc-nm")
zap_line_in_file_start(".spec", "export CFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
zap_line_in_file_start(".spec", "export FCFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
zap_line_in_file_start(".spec", "export FFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
zap_line_in_file_start(".spec", "export CXXFLAGS=\"$CXXFLAGS -O3 -ffat-lto-objects -flto=4 \"")
zap_line_in_file_start(".spec", "%setup -q -n ")
zap_line_in_file_start(".spec", "URL :")
zap_line_in_file_start(".spec", "Version :")
@@ -236,6 +244,7 @@ def main():
zap_line_in_file_start(".spec", "data components for the")
zap_line_in_file_start(".spec", "locales components for the")
zap_line_in_file_start(".spec", "license components for the")
zap_line_in_file_start(".spec", "doc components for the")
zap_line_in_file_start(".spec", "Group: Default")
zap_line_in_file_start(".spec", "export http_proxy=http://127.0.0.1:9/")
zap_line_in_file_start(".spec", "export https_proxy=http://127.0.0.1:9/")
@@ -246,13 +255,16 @@ def main():
zap_line_in_file_start(".spec", "Group: Binaries")
zap_line_in_file_start(".spec", "Group: Data")
zap_line_in_file_start(".spec", "Group: Libraries")
zap_line_in_file_start(".spec", "Group: Documentation")
zap_line_in_file_start(".spec", "export LANG=C")
zap_line_in_file_start(".spec", "%description lib")
zap_line_in_file_start(".spec", "%description bin")
zap_line_in_file_start(".spec", "%description data")
zap_line_in_file_start(".spec", "%description doc")
zap_line_in_file_start(".spec", "%description locales")
zap_line_in_file_start(".spec", "%description dev")
zap_line_in_file_start(".spec", "%description license")
zap_line_in_file_start(".spec", "%package doc")
zap_line_in_file_start("b/Makefile", "URL =")
zap_line_in_file_start("b/Makefile", "PKG_NAME :=")