Update packages file for version 36210

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Update packages file for version 36200
2026-06-16 11:06:15 +00:00 · 2022-04-19 05:29:14 -07:00 · 2022-04-18 07:47:06 -07:00 · 2022-04-14 04:08:26 -07:00 · 2022-04-12 04:27:31 -07:00 · 2022-04-11 16:13:18 -07:00
4 changed files with 69 additions and 31 deletions
@@ -26,6 +26,9 @@ WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
 MOCK_SMP_FLAGS=$(patsubst -j%, -D_smp_mflags\ -j%,$(filter -j%, $(MAKEFLAGS)))
 MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONFIG_VAL) $(MOCK_SMP_FLAGS) $(MOCK_OPTS)

+MOCK_CLEANUP_OPT := $(if $(CLEANUP),--cleanup-after,--no-cleanup-after)
+AUTOSPEC_CLEANUP_OPT := $(if $(CLEANUP),-C)
+
 ifneq ($(wildcard upstream),)
 __allsources := $(notdir $(strip $(shell cat upstream)))
 __missingsources := $(filter-out $(wildcard ${__allsources}), ${__allsources})
@@ -71,7 +74,7 @@ mockproper:
 	$(MOCK) --clean --uniqueext=$(PKG_NAME)

 configemail:
-	@test -d .git || git init
+	@test -d .git || git init -b main
 	@$(call subjectprefix,$(PKG_NAME))
 	@echo -n "Subject prefix email configured to: "
 	@git config --get format.subjectPrefix
@@ -88,7 +91,7 @@ prebuild-checks:
 #help which creates a src.rpm file from the spec file.
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options.
 build: prebuild-checks configemail $(SPECFILE) upstream $(SRPMFILE)
-	$(MOCK) $(SRPMFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) $(SRPMFILE) --result=results/ $(MOCK_CLEANUP_OPT) --uniqueext=$(PKG_NAME)
 	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
@@ -96,7 +99,7 @@ build: prebuild-checks configemail $(SPECFILE) upstream $(SRPMFILE)

 #help build-nocheck: Same as 'make build', but do not run the package's test suite.
 build-nocheck: configemail $(SPECFILE) upstream $(SRPMFILE)
-	$(MOCK) $(SRPMFILE) --nocheck --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) $(SRPMFILE) --nocheck --result=results/ $(MOCK_CLEANUP_OPT) --uniqueext=$(PKG_NAME)
 	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
@@ -117,7 +120,7 @@ shell:
 .PHONY: $(SRPMFILE)
 $(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice clean-old-content
 	@$(MAKE) spdxcheck
-	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ $(MOCK_CLEANUP_OPT) --uniqueext=$(PKG_NAME)
 	mv results/root.log results/srpm-root.log
 	mv results/build.log results/srpm-build.log

@@ -129,7 +132,7 @@ $(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice clean-old-content
 # initialized locally, or if the remote contains no commits.
 pullrebase:
 	@if [ -z "$$SKIP_GIT" ] && [ -e .git ]; then \
-		if ! git rev-parse --verify --quiet origin/master > /dev/null; then \
+		if ! git rev-parse --verify --quiet origin/main > /dev/null; then \
 			echo "Remote not yet initialized. Continuing."; \
 			exit 0; \
 		fi; \
@@ -143,7 +146,7 @@ pullrebase:
 			echo "Current branch up-to-date. Continuing."; \
 			exit 0; \
 		fi; \
-		echo "Rebasing to origin/master"; \
+		echo "Rebasing to origin/main"; \
 		if git status --porcelain | grep -q '^.[^?]'; \
 		then \
 			git stash save; \
@@ -179,7 +182,7 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
 		$${SETVERSION:+ --version $${SETVERSION}} \
 		$${NON_INTERACTIVE:+ --non_interactive} \
 		$${SKIP_GIT:+ --skip-git} \
-		$${CLEANUP:+ -C} \
+		$(AUTOSPEC_CLEANUP_OPT) \
 		$(firstword $(NEWURL) $(URL));
 	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@$(MAKE) spdxcheck
@@ -307,8 +310,8 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
-	@if [ "$(CURRENT_BRANCH)" != "master" ] && [ "$(CURRENT_BRANCH)" != "main" ]; then \
-		echo "Error: Must be on the \"master\" or \"main\" branch to submit to koji" >&2; \
+	@if [ "$(CURRENT_BRANCH)" != "main" ]; then \
+		echo "Error: Must be on the \"main\" branch to submit to koji" >&2; \
 		exit 1; \
 	fi; \
 	if ! git diff --quiet HEAD -- ${SPECFILE}; then \
@@ -316,7 +319,7 @@ koji: prekoji-checks kojidef
 		exit 1; \
 	fi; \
 	git fetch; \
-	if git rev-parse --verify --quiet origin/master >/dev/null; then \
+	if git rev-parse --verify --quiet origin/main >/dev/null; then \
 		git pull --rebase; \
 	fi; \
 	if git ls-remote --tags --exit-code origin $(SRPMVERS) >/dev/null; then \
@@ -324,7 +327,7 @@ koji: prekoji-checks kojidef
 		exit 1; \
 	fi
 	git tag $(SRPMVERS)
-	git push origin $(CURRENT_BRANCH):master refs/tags/$(SRPMVERS)
+	git push origin $(CURRENT_BRANCH):main refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)

 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
@@ -68,13 +68,18 @@ ${PULL_PKGS}:
 	if [ ! -d "$$p/.git" ]; then echo "Nothing to pull for $$p - $$p/.git missing"; exit 0; fi; \
 	cd "$$p" ; \
 	if git remote | grep origin >/dev/null 2>&1; then \
-		O=$$(git rev-parse origin/master 2>/dev/null); \
+		case "$$p" in \
+			("projects/"*) BRANCH=master ;; \
+			("packages/"*) BRANCH=main ;; \
+			(*) BRANCH=master ;; \
+		esac; \
+		O=$$(git rev-parse origin/"$$BRANCH" 2>/dev/null); \
 		git fetch --tags origin >/dev/null 2>&1; \
-		N=$$(git rev-parse origin/master); \
+		N=$$(git rev-parse origin/"$$BRANCH"); \
 		if [ "$$O" != "$$N" ]; then \
 			echo "Updating: $$p"; \
-			if ! git merge --ff-only origin/master 2>/dev/null; then \
-				echo "$$p: Cannot fast-forward $$(git rev-parse --abbrev-ref HEAD) to origin/master" ; \
+			if ! git merge --ff-only origin/"$$BRANCH" 2>/dev/null; then \
+				echo "$$p: Cannot fast-forward $$(git rev-parse --abbrev-ref HEAD) to origin/$$BRANCH" ; \
 			fi ; \
 			git --no-pager log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit $$O..$$N; echo; \
 		fi ; \
@@ -159,19 +164,19 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	if [ -d "$$p/.git" ] &&  [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
 	done

-#help diff: Runs git diff for all package repos and displays the output using
-#help diffstat. Requires that diffstat is installed.
+#help diff: Runs git diff for all package repos and displays the diffstat using
+#help the --stat flag.
 diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff | diffstat -p1); :) ;\
+		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff --stat); :) ;\
 	done

-#help log: Run git log origin/master..HEAD for all package repos, thus
+#help log: Run git log origin/main..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;\
+		( cd $$p; if [ -n "$$(git rev-list origin/main..HEAD)" ] ; then \
+		echo $$p ; git --no-pager log --pretty="format:%s" origin/main..HEAD ; echo ; echo;\
 		fi ; ) \
 	done

@@ -211,7 +216,7 @@ autospecnew: preautospecnew-checks localreponotice
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
 		( \
 			cd $(TOPLVL)/packages/$(NAME); \
-			git init; \
+			git init -b main; \
 			git remote add origin $(PKG_BASE_URL)/$(NAME); \
 			$(call gitoliteurl,packages/$(NAME)); \
 			$(call subjectprefix,$(NAME)); \
@@ -262,7 +267,7 @@ autospecnewgo: preautospecnew-checks localreponotice
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
 		( \
 			cd $(TOPLVL)/packages/$(NAME); \
-			git init; \
+			git init -b main; \
 			git remote add origin $(PKG_BASE_URL)/$(NAME); \
 			$(call gitoliteurl,packages/$(NAME)); \
 			$(call subjectprefix,$(NAME)); \
@@ -23,7 +23,7 @@ Download the [user setup](user-setup.sh) script and run it on your Clear Linux
 system as an unprivileged user.

 ```
-$ curl -O https://raw.githubusercontent.com/clearlinux/common/master/user-setup.sh
+$ curl -O https://raw.githubusercontent.com/clearlinux/common/main/user-setup.sh
 $ chmod +x user-setup.sh
 $ ./user-setup.sh
 ```
@@ -49,6 +49,7 @@ QGIS
 R
 R-AER
 R-AMORE
+R-ATR
 R-Amelia
 R-AmesHousing
 R-BB
@@ -408,6 +409,7 @@ R-fixest
 R-flashClust
 R-flexmix
 R-flexsurv
+R-flextable
 R-float
 R-fontBitstreamVera
 R-fontLiberation
@@ -431,6 +433,9 @@ R-future
 R-future.apply
 R-g.data
 R-gam
+R-gamlss
+R-gamlss.data
+R-gamlss.dist
 R-gamm4
 R-gargle
 R-gbRd
@@ -640,12 +645,14 @@ R-npsurv
 R-numDeriv
 R-nws
 R-nycflights13
+R-officer
 R-openssl
 R-openxlsx
 R-optextras
 R-optimx
 R-optparse
 R-ordinal
+R-ordinalCont
 R-orthopolynom
 R-pROC
 R-packrat
@@ -935,6 +942,7 @@ R-tm
 R-tmvnsim
 R-toOrdinal
 R-topicmodels
+R-tram
 R-tree
 R-triebeard
 R-trimcluster
@@ -1059,7 +1067,6 @@ analitza
 ansible
 ansible-core
 antlr4-python3-runtime
-anyio
 apache-ant
 applaunchservices
 appstream
@@ -1156,6 +1163,7 @@ breeze-icons
 bridge-utils
 brotli
 bsdiff
+bspwm
 btrfs-progs
 bubblewrap
 buildreq-R
@@ -1199,7 +1207,6 @@ cdparanoia
 ceph
 ceph-deploy
 cereal
-certbot
 cfitsio
 cgdb
 cgit
@@ -1249,6 +1256,7 @@ clutter
 clutter-gst
 clutter-gtk
 cmake
+cmark
 cmocka
 cmrt
 cmus
@@ -1275,6 +1283,7 @@ compat-fuse-soname2
 compat-gcc-10
 compat-gdal-soname27
 compat-glibmm-soname24
+compat-gnome-bluetooth-soname-13
 compat-gtksourceview-soname3
 compat-icu4c-soname67
 compat-json-c-soname4
@@ -1380,6 +1389,7 @@ docbook2X
 docker
 docker-cli
 dockerpty
+docutils
 dolphin
 dolphin-plugins
 dos2unix
@@ -1500,6 +1510,7 @@ gawk
 gc
 gcab
 gcc
+gcc11
 gcc7
 gcc8
 gcc9
@@ -1531,6 +1542,7 @@ gftp
 gh
 ghc
 ghostscript
+gi-docgen
 giflib
 gifsicle
 gimp
@@ -1570,12 +1582,12 @@ gnome-chess
 gnome-clocks
 gnome-color-manager
 gnome-common
+gnome-console
 gnome-contacts
 gnome-control-center
 gnome-desktop
 gnome-desktop-testing
 gnome-disk-utility
-gnome-flashback
 gnome-font-viewer
 gnome-getting-started-docs
 gnome-icon-theme
@@ -1597,6 +1609,7 @@ gnome-shell-extensions
 gnome-software
 gnome-system-monitor
 gnome-terminal
+gnome-text-editor
 gnome-themes-extra
 gnome-todo
 gnome-tweaks
@@ -1662,6 +1675,7 @@ gtk4
 gtkmm2
 gtkmm3
 gtksourceview
+gtksourceview4
 gtkspell3
 gtkwave
 guile
@@ -2062,6 +2076,7 @@ libcomps
 libconfig
 libcroco
 libcryptui
+libcuckoo
 libcxx
 libdaemon
 libdatrie
@@ -2113,6 +2128,7 @@ libgtop
 libgudev
 libgusb
 libgweather
+libgweather4
 libhandy
 libical
 libidn
@@ -2314,11 +2330,8 @@ linux-tools
 linuxptp
 lksctp-tools
 llvm
-llvm10
 llvm11
 llvm12
-llvm8
-llvm9
 lm-sensors
 lmdb
 logrotate
@@ -3538,6 +3551,7 @@ poppler
 poppler-data-clr-rename
 popt
 portaudio
+portmidi
 postfix
 postgis
 postgresql
@@ -3595,10 +3609,12 @@ pypi-alabaster
 pypi-ansi2html
 pypi-ansible_compat
 pypi-ansible_pygments
+pypi-anyio
 pypi-apacheconfig
 pypi-apipkg
 pypi-appdirs
 pypi-applicationinsights
+pypi-appnope
 pypi-argcomplete
 pypi-argon2_cffi
 pypi-argon2_cffi_bindings
@@ -3633,6 +3649,7 @@ pypi-backcall
 pypi-backports.cached_property
 pypi-backports.entry_points_selectable
 pypi-backports.functools_lru_cache
+pypi-backports.shutil_get_terminal_size
 pypi-backports.ssl_match_hostname
 pypi-backports.weakref
 pypi-bash_kernel
@@ -3664,8 +3681,11 @@ pypi-cached_property
 pypi-cachetools
 pypi-cachy
 pypi-capturer
+pypi-cattrs
 pypi-cchardet
 pypi-cerberus
+pypi-certbot
+pypi-certbot_dns_google
 pypi-certifi
 pypi-cffi
 pypi-cffsubr
@@ -3759,6 +3779,7 @@ pypi-envs
 pypi-eternalegypt
 pypi-etuples
 pypi-evdev
+pypi-exceptiongroup
 pypi-exdir
 pypi-execnet
 pypi-executing
@@ -3780,6 +3801,7 @@ pypi-flask
 pypi-flatten_json
 pypi-flit
 pypi-flit_core
+pypi-flit_scm
 pypi-fontmath
 pypi-freezegun
 pypi-frozenlist
@@ -3817,6 +3839,7 @@ pypi-h11
 pypi-h2
 pypi-h5py
 pypi-hammock
+pypi-hatch_vcs
 pypi-hatchling
 pypi-heapdict
 pypi-hkp4py
@@ -3944,6 +3967,7 @@ pypi-mkdocs_material
 pypi-mkdocs_material_extensions
 pypi-mock
 pypi-molecule
+pypi-molecule_docker
 pypi-monotonic
 pypi-more_itertools
 pypi-moreorless
@@ -3969,21 +3993,23 @@ pypi-nbsphinx
 pypi-nbval
 pypi-ncclient
 pypi-ndg_httpsclient
+pypi-neat_python
 pypi-nest_asyncio
 pypi-netapp_lib
 pypi-netdisco
 pypi-netifaces
 pypi-networkx
 pypi-nibabel
+pypi-nltk
 pypi-nocasedict
 pypi-nocaselist
 pypi-nodeenv
 pypi-nose
 pypi-nose_timer
 pypi-notebook
+pypi-notebook_shim
 pypi-numpoly
 pypi-numpy
-pypi-numpy_ringbuffer
 pypi-numpydoc
 pypi-oauth2client
 pypi-oauthlib
@@ -4080,6 +4106,7 @@ pypi-pydot_ng
 pypi-pyelftools
 pypi-pyfakefs
 pypi-pyflakes
+pypi-pygame
 pypi-pygithub
 pypi-pygments
 pypi-pyicu
@@ -4359,6 +4386,7 @@ pypi-webcolors
 pypi-webencodings
 pypi-webob
 pypi-websocket_client
+pypi-websockets
 pypi-webtest
 pypi-werkzeug
 pypi-wheel
@@ -4664,6 +4692,7 @@ thermal_daemon
 thermal_monitor
 thin-provisioning-tools
 threadweaver
+thrift
 thunar-volman
 thunderbird
 thunderbolt-software-user-space
@@ -4869,3 +4898,4 @@ zopfli
 zsh
 zstd
 zstd-bin
+zxing
Author	SHA1	Message	Date
clrbuilder	0e420e434d	Update packages file for version 36210 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-04-19 05:29:14 -07:00
clrbuilder	be0cdd6c5d	Update packages file for version 36200 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-04-18 07:47:06 -07:00
clrbuilder	7111d57d6c	Update packages file for version 36170 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-04-14 04:08:26 -07:00
clrbuilder	96850c538a	Update packages file for version 36160 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-04-12 04:27:31 -07:00
Patrick McCarty	96fd23e88b	Specify branch name of `main` for `git init` of package repos The default package repo branches are now `main`. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2022-04-11 16:13:18 -07:00
William Douglas	6f5fd11673	Move packages content over to main branch World has moved to main, start updating accordingly. Signed-off-by: William Douglas <william.douglas@intel.com>	2022-04-08 01:22:35 -07:00
clrbuilder	7ea85257af	Update packages file for version 36140 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-04-06 12:50:53 -07:00
Patrick McCarty	4ccec6a4d0	diff: use `git diff --stat` instead of requiring `diffstat` Using the --stat flag also has the benefit of automatically colorizing the output when appropriate. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2022-04-05 12:35:09 -07:00
clrbuilder	c76272e46a	Update packages file for version 36130 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-04-05 04:10:03 -07:00
Patrick McCarty	1559d4e0b5	log: improve query results Comparing whether commit hashes for `HEAD` and `origin/master` are not equal captures three typical scenarios: 1. HEAD is behind origin/master 2. HEAD is ahead of origin/master 3. HEAD is ahead of an older commit in origin/master The intent of `make log` is to capture cases #2 and #3, and not #1, so use `git rev-list ...` with the appropriate commit range instead. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2022-03-31 22:28:23 -07:00
clrbuilder	3ab672318e	Update packages file for version 36120 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-03-31 04:09:14 -07:00
Patrick McCarty	890363f65f	Handle CLEANUP variable similarly for `make autospec` To make the handling of the variable more uniform, set autospec's cleanup flag using make conditional constructs rather than shell expansion. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2022-03-30 11:07:02 -07:00
Patrick McCarty	e90b6f8c72	Support CLEANUP environment variable for more commands Now, whenever the `CLEANUP` variable is set in the environment, `make build` and `make build-nocheck` will automatically clean up the build chroot after a build completes. The same feature has been supported by `make autospec` for many years. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2022-03-30 11:06:28 -07:00
clrbuilder	684a600f80	Update packages file for version 36070 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-03-24 04:08:20 -07:00
clrbuilder	a45fc62812	Update packages file for version 36060 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-03-22 13:13:41 -07:00
clrbuilder	511bd629c9	Update packages file for version 36040 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2022-03-22 04:09:58 -07:00