Update packages file for version 33000

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Update packages file for version 32990
2026-06-16 11:06:15 +00:00 · 2020-05-01 05:08:51 +00:00 · 2020-04-30 05:09:01 +00:00 · 2020-04-29 01:51:53 +00:00 · 2020-04-28 05:08:39 +00:00 · 2020-04-27 05:08:24 +00:00
4 changed files with 74 additions and 18 deletions
@@ -62,6 +62,38 @@ define remotepkgname
 $(if $(USE_PACKAGE_MAPPING),$$(awk -v P="$(1)" '$$1 == P { res=$$2 } END { print res ? res : P }' $(TOPLVL)/projects/common/pkg-mapping),$(1))
 endef

+# Clone repo from the configured gitolite instance, but only if the repo exists
+# on that instance and matches the pattern "packages/..*".
+define try-clone-gitolite
+rpkg=$(call remotepkgname,$(1)); \
+if ssh $(GITOLITE_BASE_URL) info "packages/$$rpkg" | grep --quiet "packages/$$rpkg$$"; then \
+	git clone $(PKG_BASE_URL)/$$rpkg packages/$(1); \
+	cd packages/$(1); \
+	$(call gitoliteurl,packages/$(1)); \
+	$(call subjectprefix,$(1)); \
+fi
+endef
+
+# Clone repo from the configured package repo hosting location, as defined by
+# the PKG_BASE_URL variable, but only if the repo exists.
+define try-clone-other
+rpkg=$(call remotepkgname,$(1)); \
+if git ls-remote $(PKG_BASE_URL)/$$rpkg &> /dev/null; then \
+	git clone $(PKG_BASE_URL)/$$rpkg packages/$(1); \
+	cd packages/$(1); \
+	$(call subjectprefix,$(1)); \
+fi
+endef
+
+# First, try running `make clone_PKG`, where PKG is the first argument. If that
+# fails, proceed with fallback cloning strategies.
+define clone-if-available
+$(MAKE) clone_$(1) || { \
+	$(if $(GITOLITE_BASE_URL),$(call try-clone-gitolite,$(1)),$(call try-clone-other,$(1))); \
+}
+endef
+
+
 # Enables the local RPM repo by installing package manager and Mock configs.
 # First argument is the path to the package manager config, and the second
 # argument is the path to the mock config. Each of these config files is
@@ -166,6 +166,15 @@ diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in: $$p"; git diff |diffstat -p1)) ;\
 	done

+#help log: Run git log origin/master..HEAD for all package repos, thus
+#help displaying any committed but unpushed changes.
+log: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
+	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
+		( cd $$p; if [ "$$(git rev-parse --verify HEAD)" != "$$(git rev-parse --verify origin/master)" ] ; then \
+		echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
+		fi ; ) \
+	done
+
 #help versions: Displays the version of each package in the ./packages tree.
 versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
@@ -196,7 +205,7 @@ autospecnew: preautospecnew-checks localreponotice
 		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \
 	fi
-	-$(MAKE) clone_$(NAME)
+	$(call clone-if-available,$(NAME))
 	@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
 		echo "no remote repository found, creating new package repository and running autospec"; \
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
@@ -38,6 +38,7 @@ LS_COLORS
 LVM2
 LibRaw
 LibVNCServer
+LibreCAD
 Linux-PAM
 LuaJIT
 LyX
@@ -1036,6 +1037,7 @@ alembic
 alsa-firmware
 alsa-lib
 alsa-plugins
+alsa-tools
 alsa-ucm-conf
 alsa-utils
 amazon-efs-utils
@@ -1154,6 +1156,7 @@ bleach
 blender
 blinken
 blinker
+blis
 blktrace
 blockdiag
 bluedevil
@@ -1203,7 +1206,6 @@ buildreq-nginx
 buildreq-php
 buildreq-qmake
 buildreq-scons
-bundle-chroot-builder
 bwidget
 byobu
 bz2file
@@ -1366,6 +1368,7 @@ compat-ilmbase-soname23
 compat-intel-gmmlib-soname1
 compat-ipset-soname10
 compat-iptables-soname0.1.0
+compat-ldc-soname90
 compat-libevent-soname6
 compat-libgit2-soname27
 compat-libical-soname2
@@ -1377,10 +1380,10 @@ compat-libvpx-soname5
 compat-libwebp-soname6
 compat-llvm-soname5
 compat-llvm-soname6
-compat-llvm-soname7
 compat-mariadb-soname18
 compat-mpfr-soname4
 compat-nettle-soname6
+compat-nettle-soname7
 compat-opencv-soname41
 compat-proj-soname13
 compat-protobuf-soname14
@@ -1421,7 +1424,6 @@ cpuloadgen
 cracklib
 crcmod
 createrepo_c
-cri-containerd
 cri-o
 cri-tools
 cronie
@@ -1640,6 +1642,7 @@ flake8-import-order
 flake8-polyfill
 flare-engine
 flare-game
+flask-restx
 flatpak
 flatpak-builder
 flatten_json
@@ -1668,6 +1671,7 @@ freezegun
 fribidi
 fritzing-app
 fs
+fsearch
 funcparserlib
 funcsigs
 fuse
@@ -1708,6 +1712,7 @@ geocode-glib
 geos
 gettext
 gevent
+geventhttpclient-wheels
 gexiv2
 gfbgraph
 gflags
@@ -1761,6 +1766,7 @@ gnome-common
 gnome-contacts
 gnome-control-center
 gnome-desktop
+gnome-desktop-testing
 gnome-disk-utility
 gnome-flashback
 gnome-font-viewer
@@ -1858,7 +1864,6 @@ gtk-doc
 gtk-vnc
 gtk-xfce-engine
 gtk3
-gtkglext
 gtkmm2
 gtkmm3
 gtksourceview
@@ -1883,7 +1888,6 @@ haveged
 hdf5
 hdmedians
 hdparm
-heat
 helloworld
 helm
 help2man
@@ -1913,6 +1917,7 @@ hyperscan
 hyperstart
 hyphen
 hypothesis
+hypre
 i2c-tools
 i3
 i3blocks
@@ -1981,7 +1986,7 @@ ipmitool
 iproute2
 ipset
 iptables
-iptraf
+iptraf-ng
 iptstate
 iputils
 ipvsadm
@@ -2125,6 +2130,7 @@ kdiamond
 kdiff3
 kdnssd
 kdoctools
+kdsoap
 keditbookmarks
 keepalived
 keepassxc
@@ -2354,6 +2360,7 @@ libcomps
 libconfig
 libcroco
 libcryptui
+libcxx
 libdaemon
 libdatrie
 libdazzle
@@ -2382,6 +2389,7 @@ libfakekey
 libfastjson
 libffi
 libffmpeg-stub
+libflame
 libfm
 libfm-qt
 libfontenc
@@ -2471,6 +2479,7 @@ libnfnetlink
 libnftnl
 libnice
 libnl
+libnma
 libnotify
 libnova
 libnumbertext
@@ -2621,10 +2630,11 @@ lldb
 llfuse
 llvm
 llvm8
-llvmlite
+llvm9
 lm-sensors
 lmdb
 locket
+lockfile
 locustio
 log4cpp
 logilab-common
@@ -2735,6 +2745,8 @@ mock
 mod_perl
 mod_wsgi
 modemmanager-qt
+modsecurity
+modsecurity-nginx
 modules
 moka-icon-theme
 mokutil
@@ -2750,7 +2762,6 @@ motif
 mox
 mox3
 mozjs
-mozjs52
 mozjs60
 mozjs68
 mpc
@@ -2880,7 +2891,6 @@ ntp
 ntplib
 numactl
 numatop
-numba
 numlockx
 numpy
 numpy-stl
@@ -2922,6 +2932,7 @@ openjade
 openjdk
 openjdk11
 openjdk13
+openjpeg
 openldap
 openmpi
 openscad
@@ -3004,7 +3015,6 @@ pandoc
 pandocfilters
 pango
 pangomm
-pangox-compat
 paper-icon-theme
 papi
 papirus-icon-theme
@@ -3151,6 +3161,7 @@ perl-Clone-PP
 perl-Compress-Bzip2
 perl-Compress-Raw-Lzma
 perl-Config-Any
+perl-Config-AutoConf
 perl-Config-General
 perl-Config-Grammar
 perl-Config-INI
@@ -3987,6 +3998,7 @@ potrace
 povray
 powerdevil
 powerline-fonts
+powerstat
 powertop
 poxml
 ppp
@@ -4040,7 +4052,6 @@ pycairo
 pycodestyle
 pycosat
 pycparser
-pycrypto
 pycurl
 pydocstyle
 pydot
@@ -4092,6 +4103,7 @@ pytest-repeat
 pytest-rerunfailures
 pytest-runner
 pytest-sugar
+pytest-tap
 pytest-timeout
 pytest-xdist
 python
@@ -4144,7 +4156,6 @@ python-subunit
 python-swiftclient
 python-systemd
 python-tabulate
-python-tappy
 python-troveclient
 python-urwid
 python-utils
@@ -4176,6 +4187,7 @@ qpdf
 qqc2-desktop-style
 qrencode
 qscintilla
+qsstv
 qt-creator
 qt3d
 qt5ct
@@ -4308,7 +4320,6 @@ sassc
 satyr
 sbc
 sbsigntools
-scala
 scdoc
 scene-alembic
 scikit-build
@@ -4484,6 +4495,7 @@ systemtap
 taglib
 talloc
 tallow
+tap.py
 tar
 taskflow
 taskwarrior
@@ -4515,6 +4527,7 @@ terminus-font
 tesseract
 test-generator
 testdisk
+testfixtures
 testpath
 testrepository
 testresources
@@ -4576,8 +4589,8 @@ trollius
 trustme
 twine
 typed_ast
-typing
 typing_extensions
+typing_inspect
 tzdata
 tzlocal
 ua-parser
@@ -4600,7 +4613,6 @@ unit
 unittest2
 unixODBC
 unzip
-upm
 upower
 uritemplate
 urllib3
@@ -244,14 +244,15 @@ def main():
    
    zap_line_in_file_start(".spec", "Release  :")
    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 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 FCFLAGS=\"$FFLAGS -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 FFLAGS=\"$FFLAGS -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      :")
@@ -288,13 +289,15 @@ def main():
    zap_line_in_file_start(".spec", "cp -a ")
    zap_line_in_file_start(".spec", "cd %{_builddir}/")
    zap_line_in_file_start(".spec", "export GCC_IGNORE_WERROR=1")
+    zap_line_in_file_start(".spec", "rm -rf %{buildroot}")
 
    zap_line_in_file_start("b/Makefile", "URL =")
    zap_line_in_file_start("b/Makefile", "PKG_NAME :=")

+    zap_line_in_file_start("b/options.conf", "name = ")
    zap_line_in_file("b/options.conf", "archives = ")
    zap_line_in_file("b/options.conf", "giturl = ")
-    zap_line_in_file("b/options.conf", "url = ")
+    zap_line_in_file_start("b/options.conf", "url = ")
    zap_line_in_file("b/options.conf", "[package]")
    zap_line_in_file("b/options.conf", "")
    zap_line_in_file("b/options.conf", "[autospec]")
Author	SHA1	Message	Date
clrbuilder	aa98640939	Update packages file for version 33000 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-05-01 05:08:51 +00:00
clrbuilder	2b355f3fcb	Update packages file for version 32990 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-30 05:09:01 +00:00
clrbuilder	57632934c0	Update packages file for version 32970 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-29 01:51:53 +00:00
clrbuilder	a4b3da2bca	Update packages file for version 32940 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-28 05:08:39 +00:00
clrbuilder	f0f2ae6fdf	Update packages file for version 32930 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-27 05:08:24 +00:00
clrbuilder	9d82331cfa	Update packages file for version 32910 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-23 18:18:29 +00:00
Patrick McCarty	ea568f6239	Support cloning of pre-existing package repos Over the lifetime of Clear Linux OS, many packages have been added and removed, but the package repos always remain once they have been created. Thus, if a package is removed at one point, and later added back to the distro, the same package repo should be used. This commit adds support to `make autospecnew` for that use case, always using a pre-existing package repo if one is available. (Note that the gitolite repo detection is more complicated because it must support configurations with and without "wild repos" enabled.) Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2020-04-22 10:45:34 -07:00
clrbuilder	4e2e716a76	Update packages file for version 32900 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-22 05:09:24 +00:00
clrbuilder	c64bda09fc	Update packages file for version 32890 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-21 05:09:11 +00:00
Patrick McCarty	65c5758c08	patchfilter: more cleanups - FFLAGS/FCLAGS defaults were recently modified, so support both old and new defaults. - `rm -rf %{buildroot}` is another autospec default line for %install, so it will never be a manual addition. - The `name` field from options.conf is the same as the package name. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2020-04-20 11:37:34 -07:00
clrbuilder	3d334b1fd4	Update packages file for version 32880 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-20 06:38:03 +00:00
Ross Burton	31399a1cb7	Makefile.toplevel: add 'log' command Add a new 'log' command that is similar to 'diff' but shows the log of commits from HEAD to origin/master, thus listing all commits that have not yet been pushed. For example: $ make log packages/glib-networking glib-networking: enable installed tests packages/gnome-desktop gnome-desktop: Autospec creation for update from version 3.34.3 to version 3.36.0 packages/gnome-terminal gnome-terminal: Autospec creation for update from version 3.34.2 to version 3.36.0.1 Signed-off-by: Ross Burton <ross.burton@intel.com>	2020-04-17 11:45:11 +01:00
clrbuilder	d7bff595de	Update packages file for version 32870 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-17 05:08:26 +00:00
clrbuilder	3f53222de8	Update packages file for version 32860 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-16 05:08:19 +00:00
clrbuilder	4435eace17	Update packages file for version 32850 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-15 05:09:15 +00:00
clrbuilder	e971c54843	Update packages file for version 32840 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-14 05:08:44 +00:00
clrbuilder	c5df45b631	Update packages file for version 32830 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-04-13 05:09:34 +00:00
Patrick McCarty	1123cf8edc	patchfilter: show diffs of Source0 instead of url from options.conf Modification of Source0 is more trustworthy, since not all packages use autospec. Also, (to me) the line stands out more when it appears at the top of the spec file diff. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2020-04-09 22:15:49 -07:00