Compare commits

..

3 Commits

Author SHA1 Message Date
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
2 changed files with 10 additions and 4 deletions
+7 -4
View File
@@ -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
+3
View File
@@ -3542,6 +3542,7 @@ poppler
poppler-data-clr-rename
popt
portaudio
portmidi
postfix
postgis
postgresql
@@ -3973,6 +3974,7 @@ pypi-nbsphinx
pypi-nbval
pypi-ncclient
pypi-ndg_httpsclient
pypi-neat_python
pypi-nest_asyncio
pypi-netapp_lib
pypi-netdisco
@@ -4083,6 +4085,7 @@ pypi-pydot_ng
pypi-pyelftools
pypi-pyfakefs
pypi-pyflakes
pypi-pygame
pypi-pygithub
pypi-pygments
pypi-pyicu