Update packages file for version 36130

Signed-off-by: clrbuilder <clrbuilder@intel.com>
log: improve query results
2026-06-16 02:56:00 +00:00 · 2022-04-05 04:10:03 -07:00 · 2022-03-31 22:28:23 -07:00 · 2022-03-31 04:09:14 -07:00 · 2022-03-30 11:07:02 -07:00 · 2022-03-30 11:06:28 -07:00
3 changed files with 14 additions and 5 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})
@@ -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

@@ -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
@@ -170,7 +170,7 @@ diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 #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 \
+		( cd $$p; if [ -n "$$(git rev-list origin/master..HEAD)" ] ; then \
 		echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
 		fi ; ) \
 	done
@@ -408,6 +408,7 @@ R-fixest
 R-flashClust
 R-flexmix
 R-flexsurv
+R-flextable
 R-float
 R-fontBitstreamVera
 R-fontLiberation
@@ -640,6 +641,7 @@ R-npsurv
 R-numDeriv
 R-nws
 R-nycflights13
+R-officer
 R-openssl
 R-openxlsx
 R-optextras
@@ -3542,6 +3544,7 @@ poppler
 poppler-data-clr-rename
 popt
 portaudio
+portmidi
 postfix
 postgis
 postgresql
@@ -3973,6 +3976,7 @@ pypi-nbsphinx
 pypi-nbval
 pypi-ncclient
 pypi-ndg_httpsclient
+pypi-neat_python
 pypi-nest_asyncio
 pypi-netapp_lib
 pypi-netdisco
@@ -4083,6 +4087,7 @@ pypi-pydot_ng
 pypi-pyelftools
 pypi-pyfakefs
 pypi-pyflakes
+pypi-pygame
 pypi-pygithub
 pypi-pygments
 pypi-pyicu
@@ -4667,6 +4672,7 @@ thermal_daemon
 thermal_monitor
 thin-provisioning-tools
 threadweaver
+thrift
 thunar-volman
 thunderbird
 thunderbolt-software-user-space
Author	SHA1	Message	Date
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