Update packages file for version 22250

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Update packages file for version 22230
2026-06-16 19:16:00 +00:00 · 2018-05-03 19:38:24 +00:00 · 2018-05-03 13:01:47 +00:00 · 2018-05-02 19:02:26 +00:00 · 2018-05-02 13:01:58 +00:00 · 2018-05-01 13:02:34 +00:00
3 changed files with 110 additions and 38 deletions
@@ -205,30 +205,12 @@ bumpnogit:

 $(__missingsources): sources

-#help sources: If SOURCES_URL is defined, download required upstream source
-#help files from that location. Otherwise, try to extract source files from the
-#help SRPM in the latest Clear Linux release, as specified by the LATEST_SRPMS
-#help variable. This will run automatically, as a dependency. NOTE: A Koji
-#help server can make use of this "make sources" command, since it lives in a
-#help repo named "common". If you use this makefile in Koji, ensure
-#help "make sources" continues to work for both remote and local builds, since
-#help it is a prerequisite of several commands for building packages.
-sources: upstream
-ifneq ($(strip $(SOURCES_URL)),)
-	while read u; do \
-		case "$$u" in \
-		    "")    continue ;; \
-		    *://*) n="$$u" ;; \
-		    *)     n="$(SOURCES_URL)/$$u" ;; \
-		esac; \
-		curl --fail --noproxy "*" "$$n" -o `basename "$$n"`; \
-	done < upstream
-else
-	@tmp=$$(mktemp -d -p "."); \
+# First argument is a Clear Linux build number (e.g. 22000)
+define fetch-from-srpm
+	tmp=$$(mktemp -d -p "."); \
 	srpm=$$(rpmspec --srpm -q --qf "%{NVR}.src.rpm\n" $(SPECFILE)); \
-	if cd "$$tmp" && ! curl -f -L -O $(LATEST_SRPMS)/$$srpm; then \
-		echo "Failed to download $$srpm from latest Clear Linux release." >&2; \
-		echo "Run \"git pull\" and try again." >&2; \
+	if cd "$$tmp" && ! curl -s -S -f -L -O $(DOWNLOAD_MIRROR)/releases/$(1)/clear/source/SRPMS/$$srpm; then \
+		echo "Failed to download $$srpm from Clear Linux release $(1)." >&2; \
 		cd .. && rm -rf "$$tmp"; \
 		exit 1; \
 	fi; \
@@ -236,14 +218,58 @@ else
 	cd ..; \
 	srclist=$$(rpmspec --srpm -q --qf "[%{SOURCE}\n]" $(SPECFILE)); \
 	for s in $$srclist; do \
-		if ! mv "$$tmp"/$$s .; then \
+		if ! mv --no-clobber "$$tmp"/$$s .; then \
 			echo "Missing source file \"$$s\" in $${srpm}." >&2; \
 			rm -rf "$$tmp"; \
 			exit 1; \
 		fi; \
 		echo "Retrieved source file $$s ..."; \
 	done; \
-	rm -rf "$$tmp";
+	rm -rf "$$tmp"
+endef
+
+#help sources: If SOURCES_URL is defined, download required upstream source files
+#help from that location. Otherwise, try to download source files according to the
+#help URLs listed in the spec file. If any of the source files fail to download,
+#help check for the relevant SRPM from published releases of Clear Linux OS, and
+#help extract the files if found. Note that SRPMs are taken from the DOWNLOAD_MIRROR
+#help location. This will run automatically, as a dependency. NOTE: A Koji server can
+#help make use of this "make sources" command, since it lives in a repo named
+#help "common". If you use this makefile in Koji, ensure "make sources" continues to
+#help work for both remote and local builds, since it is a prerequisite of several
+#help commands for building packages.
+ifneq ($(strip $(SOURCES_URL)),)
+sources: upstream
+	while read u; do \
+		case "$$u" in \
+			"")    continue ;; \
+			*://*) n="$$u" ;; \
+			*)     n="$(SOURCES_URL)/$$u" ;; \
+		esac; \
+		if ! curl --fail -L "$$n" -o `basename "$$n"`; then \
+			echo "Failed to download $$n"; \
+			exit 1; \
+		fi; \
+	done < upstream
+else
+sources:
+	@$(MAKE) generateupstream; \
+	[ $$? -eq 0 ] && exit 0; \
+	nvr="$$(rpmspec --srpm -q --qf '%{NAME}\t%{VERSION}\t%{RELEASE}\n' $(SPECFILE))"; \
+	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"; \
+		echo "Checking for source files in build $$b ..."; \
+		if grep -q "$$nvr" <(curl -s -f -L $$url); then \
+			$(call fetch-from-srpm,$$b); \
+			if [ $$? -eq 0 ]; then \
+				echo "Source files retrieved from build $$b"; \
+				exit 0; \
+			fi; \
+		fi; \
+	done; \
+	echo "Source files not found for package"; \
+	exit 1
 endif

 prekoji-checks:
@@ -365,15 +391,20 @@ install:
 #help calculating their hashes. Autospec performs this step automatically, so ignore
 #help it for packages managed with autospec.
 generateupstream:
-	@rm -f upstream
-	@urls=$$(rpmspec -D '_vendor clr' -P $(SPECFILE) | grep Source | cut -d: -f2- | grep '://'); \
+	@[ -e upstream ] && mv upstream upstream.bak; \
+	urls=$$(rpmspec -D '_vendor clr' -P $(SPECFILE) | sed -n "s|^Source[0-9]*[[:blank:]]*:[[:blank:]]*\(..*://..*\)$$|\1|p"); \
 	for url in $$urls; do \
-	    filename=$$(basename $$url); \
-	    if [ ! -e $$filename ]; then \
-		curl --fail -L -O $$url; \
-	    fi; \
-	    echo $$(sha1sum $$filename | cut -d\  -f1)/$$filename >> upstream; \
+		filename=$$(basename $$url); \
+		if [ ! -e $$filename ]; then \
+			if ! curl --fail -L -O $$url; then \
+				echo "Failed to download $$url"; \
+				[ -e upstream.bak ] && mv --no-clobber upstream.bak upstream; \
+				exit 1; \
+			fi; \
+		fi; \
+		echo $$(sha1sum $$filename | cut -d\  -f1)/$$filename >> upstream; \
 	done
+	@rm -f upstream.bak
 	@cat upstream

 #help drop-abandoned: Remove all unused patches from the git tree
@@ -14,9 +14,9 @@ define loopup
 	@sudo partprobe /dev/loop$(DEVICE)
 	@sleep 1
 	@if [ -e /dev/loop$(DEVICE)p3 ]; then \
-	   sudo mount /dev/loop$(DEVICE)p3 $(TOPLVL)/image; \
+		sudo mount /dev/loop$(DEVICE)p3 $(TOPLVL)/image; \
 	else \
-	   sudo mount /dev/loop$(DEVICE)p2 $(TOPLVL)/image; \
+		sudo mount /dev/loop$(DEVICE)p2 $(TOPLVL)/image; \
 	fi
 	@sudo mount /dev/loop$(DEVICE)p1 $(TOPLVL)/image/boot
 endef
@@ -63,8 +63,10 @@ R-ICSNP
 R-IRdisplay
 R-IRkernel
 R-ISwR
+R-Iso
 R-Lahman
 R-LearnBayes
+R-MCMCpack
 R-Matching
 R-MatrixModels
 R-ModelMetrics
@@ -129,6 +131,7 @@ R-bayesplot
 R-bdsmatrix
 R-betareg
 R-bibtex
+R-biglm
 R-bindr
 R-bindrcpp
 R-bipartite
@@ -202,6 +205,7 @@ R-e1071
 R-earth
 R-ellipse
 R-energy
+R-estimability
 R-evaluate
 R-expint
 R-expm
@@ -226,6 +230,7 @@ R-gamm4
 R-gbm
 R-gclus
 R-gdata
+R-geepack
 R-geometry
 R-getopt
 R-ggjoy
@@ -253,8 +258,10 @@ R-htmltools
 R-htmlwidgets
 R-httpuv
 R-httr
+R-hunspell
 R-ica
 R-igraph
+R-import
 R-inline
 R-inum
 R-ipred
@@ -274,6 +281,7 @@ R-latticeExtra
 R-lava
 R-lazyeval
 R-lda
+R-leaflet
 R-leaps
 R-lfe
 R-libcoin
@@ -283,10 +291,12 @@ R-lmtest
 R-locfit
 R-loo
 R-lpSolve
+R-lsmeans
 R-lubridate
 R-magic
 R-magrittr
 R-manipulate
+R-manipulateWidget
 R-mapproj
 R-maps
 R-maptools
@@ -295,6 +305,7 @@ R-matrixStats
 R-matrixcalc
 R-maxLik
 R-mclust
+R-mcmc
 R-mda
 R-memisc
 R-memoise
@@ -313,6 +324,7 @@ R-modelr
 R-modeltools
 R-mondate
 R-multcomp
+R-multcompView
 R-multiwayvcov
 R-munsell
 R-mvoutlier
@@ -358,6 +370,7 @@ R-pracma
 R-praise
 R-prettyunits
 R-princurve
+R-processx
 R-prodlim
 R-profileModel
 R-progress
@@ -439,6 +452,8 @@ R-spatstat
 R-spatstat.data
 R-spatstat.utils
 R-spdep
+R-speedglm
+R-spelling
 R-spls
 R-statmod
 R-statnet.common
@@ -477,6 +492,7 @@ R-vegan
 R-viridis
 R-viridisLite
 R-visNetwork
+R-webshot
 R-whisker
 R-withr
 R-xml2
@@ -580,6 +596,7 @@ backports.weakref
 baobab
 bash
 bash-completion
+bash.static
 bash_kernel
 bashdb
 bats
@@ -597,6 +614,7 @@ bkcharts
 bleach
 blktrace
 bluez
+bmap-tools
 bndl-lamp-basic
 bokeh
 boost
@@ -686,6 +704,7 @@ compat-SDL2-soname1
 compat-efivar-soname0
 compat-fuse-soname2
 compat-gegl
+compat-gegl-0.3
 compat-glew-soname1
 compat-gtksourceview-soname3
 compat-guile-soname20
@@ -705,6 +724,7 @@ compositeproto
 compute-image-packages
 configobj
 configparser
+confuse
 connect-proxy
 connman
 connman-gtk
@@ -757,6 +777,7 @@ diffoscope
 diffstat
 diffutils
 dist-pam-configs
+dmenu
 dmidecode
 dmxproto
 dnf
@@ -1011,6 +1032,9 @@ hyperscan
 hyperstart
 hypothesis
 i2c-tools
+i3
+i3lock
+i3status
 ibus
 icalendar
 icdiff
@@ -1080,6 +1104,7 @@ jupyterlab_launcher
 kafka-dep
 kbd
 kbproto
+kernel-install
 kexec-tools
 keyring
 keyutils
@@ -1150,6 +1175,7 @@ libdmx
 libdnf
 libdrm
 libepoxy
+libev
 libevdev
 libevent
 libexif
@@ -1185,6 +1211,7 @@ libmediaart
 libmnl
 libmspack
 libmtp
+libmypaint
 libndp
 libnetfilter_conntrack
 libnetfilter_cthelper
@@ -1213,6 +1240,7 @@ libsass
 libseccomp
 libsecret
 libsigc++
+libsmi
 libsndfile
 libsolv
 libsoup
@@ -1268,9 +1296,11 @@ linux-hyperv-mini
 linux-kvm
 linux-libc-headers
 linux-lts
+linux-oracle
 linux-pk414
 linux-steam-integration
 linux-tools
+linuxptp
 llvm
 llvmlite
 lmdb
@@ -1338,6 +1368,7 @@ murrine
 musl
 mutt
 mutter
+mypaint-brushes
 mypy
 nagios-plugins
 nano
@@ -1383,11 +1414,11 @@ nss
 nss-altfiles
 ntfs-3g
 numactl
+numatop
 numba
 numpy
 numpydoc
 nvme-cli
-nvml
 oauth2client
 ocl-icd
 offlineimap
@@ -1417,6 +1448,7 @@ opusfile
 orc
 orca
 ordereddict
+osinfo-db-tools
 ostree
 ovirt-guest-agent
 p11-kit
@@ -1474,6 +1506,7 @@ perl-ExtUtils-Helpers
 perl-ExtUtils-InstallPaths
 perl-File-Copy-Recursive
 perl-File-Listing
+perl-File-MMagic
 perl-File-ShareDir
 perl-File-ShareDir-Install
 perl-File-Slurp
@@ -1573,8 +1606,10 @@ pkcs11-helper
 pkg-config
 pluggy
 ply
+pmdk
 polkit
 poppler
+poppler-data
 popt
 portaudio
 posix_ipc
@@ -1607,7 +1642,6 @@ pyatspi
 pycairo
 pycodestyle
 pycparser
-pycrypto
 pycurl
 pydot
 pydot_ng
@@ -1633,7 +1667,6 @@ python-augeas
 python-dateutil
 python-future
 python-gflags
-python-keyczar
 python-krbV
 python-magic
 python-memcached
@@ -1718,6 +1751,7 @@ rxvt-unicode
 s2tc
 s3transfer
 samba
+sane-backends
 sassc
 satyr
 sbc
@@ -1736,6 +1770,7 @@ seaborn
 seahorse
 secretstorage
 sed
+serf
 setproctitle
 setserial
 setuptools
@@ -1745,6 +1780,7 @@ shared-mime-info
 sharutils
 shim
 siege
+simple-scan
 simplegeneric
 simplejson
 sip
@@ -1760,6 +1796,7 @@ soundmodem
 source-code-pro
 source-highlight
 sox
+spandsp
 spark-dep
 speex
 speexdsp
@@ -1779,6 +1816,7 @@ startup-notification
 stow
 strace
 subunit
+subversion
 sudo
 sure
 suricata
@@ -1876,7 +1914,6 @@ virt-viewer
 virtualenv
 vlc
 volume_key
-vorbis-tools
 vsqlite
 vte
 vulkan-sdk
@@ -1896,6 +1933,7 @@ wheel
 which
 widgetsnbextension
 wireless-regdb-master
+wireshark
 woff2
 wol
 wpa_supplicant
@@ -1908,9 +1946,12 @@ xauth
 xbitmaps
 xcb-proto
 xcb-util
+xcb-util-cursor
 xcb-util-image
 xcb-util-keysyms
+xcb-util-renderutil
 xcb-util-wm
+xcb-util-xrm
 xclip
 xcmiscproto
 xcursor-themes
Author	SHA1	Message	Date
clrbuilder	aadbd40a21	Update packages file for version 22250 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-03 19:38:24 +00:00
clrbuilder	60020aebcc	Update packages file for version 22230 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-03 13:01:47 +00:00
clrbuilder	3a00f7eda4	Update packages file for version 22220 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-02 19:02:26 +00:00
clrbuilder	0470861400	Update packages file for version 22210 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-02 13:01:58 +00:00
clrbuilder	4fac58a65e	Update packages file for version 22190 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-05-01 13:02:34 +00:00
clrbuilder	743041a30c	Update packages file for version 22180 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-30 17:25:53 +00:00
clrbuilder	59f9bb1f7a	Update packages file for version 22150 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-28 21:26:16 +00:00
clrbuilder	1e74d17500	Update packages file for version 22120 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-26 19:20:29 +00:00
clrbuilder	6a7fac08d9	Update packages file for version 22060 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-24 19:02:11 +00:00
Patrick McCarty	932c2236a7	generateupstream: fix upstream file handling My previous change to handling of the 'upstream' file assumed that the file exists already, but this need not be true. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-04-24 10:12:34 -07:00
Patrick McCarty	6c92ce3160	sources: download files directly if SOURCES_URL undefined When SOURCES_URL is not defined, the current behavior of extracting source files from SRPMs in the latest published Clear Linux release has proven to not work so well: It is not optimal when users are adding new packages, modifying existing packages, not building from latest master, etc. Instead, run 'generateupstream' automatically so that source files are downloaded from the remote locations listed in the spec file. This target creates the 'upstream' file too, which becomes useful if the user later defines SOURCES_URL, when 'upstream' is actively consumed. In the event that download errors occur, as a fallback mechanism, try to find the corresponding SRPM from a published release of Clear Linux OS. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-04-23 16:07:33 -07:00
Patrick McCarty	3e2219c07e	sources: move srpm fetch code to separate target I will reusing this code (largely unmodified) in the next commit, so move it into a separate target to easily inspect changes. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-04-23 16:07:33 -07:00
Patrick McCarty	f0d2523151	sources/generateupstream: properly handle curl errors If any of the curl commands fail, it's better for the entire target to fail. In this way, developers will be properly notified. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-04-23 14:25:51 -07:00
Patrick McCarty	de39e64e29	Fix some indentation issues Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-04-23 14:15:58 -07:00
Patrick McCarty	877fee6375	sources: follow SOURCES_URL redirects; remove noproxy requirement The curl --no-proxy hint is not needed anymore, since Clear Linux OS has an autoproxy, and curl will honor proxy environment variables. Also, pass -L to curl to follow redirects, similarly to other curl calls in this makefile. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-04-23 13:47:24 -07:00
Patrick McCarty	e921a2a883	generateupstream: make URL extraction more robust Improve the detection of source URLs by matching only non-commented Source* lines with "://" present. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2018-04-23 13:30:21 -07:00
clrbuilder	e00c76846b	Update packages file for version 22010 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-20 18:32:15 +00:00
clrbuilder	af2c0bea72	Update packages file for version 21970 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-18 19:02:08 +00:00
clrbuilder	b99b7e8c25	Update packages file for version 21960 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-18 12:47:49 +00:00
clrbuilder	359d2a8379	Update packages file for version 21860 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-16 02:52:02 +00:00
clrbuilder	d828f3a3ce	Update packages file for version 21850 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2018-04-14 20:29:27 +00:00