Compare commits

..

11 Commits

Author SHA1 Message Date
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
clrbuilder b0e3083d75 Update packages file for version 36020
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2022-03-15 04:09:07 -07:00
3 changed files with 36 additions and 13 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
+4 -4
View File
@@ -159,18 +159,18 @@ 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 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
+25 -5
View File
@@ -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,8 @@ R-future
R-future.apply
R-g.data
R-gam
R-gamlss.data
R-gamlss.dist
R-gamm4
R-gargle
R-gbRd
@@ -640,12 +644,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
@@ -1156,6 +1162,7 @@ breeze-icons
bridge-utils
brotli
bsdiff
bspwm
btrfs-progs
bubblewrap
buildreq-R
@@ -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
@@ -1500,6 +1509,7 @@ gawk
gc
gcab
gcc
gcc11
gcc7
gcc8
gcc9
@@ -1531,6 +1541,7 @@ gftp
gh
ghc
ghostscript
gi-docgen
giflib
gifsicle
gimp
@@ -1570,12 +1581,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 +1608,7 @@ gnome-shell-extensions
gnome-software
gnome-system-monitor
gnome-terminal
gnome-text-editor
gnome-themes-extra
gnome-todo
gnome-tweaks
@@ -1662,6 +1674,7 @@ gtk4
gtkmm2
gtkmm3
gtksourceview
gtksourceview4
gtkspell3
gtkwave
guile
@@ -2113,6 +2126,7 @@ libgtop
libgudev
libgusb
libgweather
libgweather4
libhandy
libical
libidn
@@ -2314,11 +2328,8 @@ linux-tools
linuxptp
lksctp-tools
llvm
llvm10
llvm11
llvm12
llvm8
llvm9
lm-sensors
lmdb
logrotate
@@ -3538,6 +3549,7 @@ poppler
poppler-data-clr-rename
popt
portaudio
portmidi
postfix
postgis
postgresql
@@ -3664,6 +3676,7 @@ pypi-cached_property
pypi-cachetools
pypi-cachy
pypi-capturer
pypi-cattrs
pypi-cchardet
pypi-cerberus
pypi-certifi
@@ -3751,6 +3764,7 @@ pypi-docstring_parser
pypi-docutils
pypi-dpcontracts
pypi-ecdsa
pypi-editables
pypi-elementpath
pypi-enrich
pypi-entrypoints
@@ -3758,6 +3772,7 @@ pypi-envs
pypi-eternalegypt
pypi-etuples
pypi-evdev
pypi-exceptiongroup
pypi-exdir
pypi-execnet
pypi-executing
@@ -3779,6 +3794,7 @@ pypi-flask
pypi-flatten_json
pypi-flit
pypi-flit_core
pypi-flit_scm
pypi-fontmath
pypi-freezegun
pypi-frozenlist
@@ -3816,6 +3832,7 @@ pypi-h11
pypi-h2
pypi-h5py
pypi-hammock
pypi-hatchling
pypi-heapdict
pypi-hkp4py
pypi-home_assistant_frontend
@@ -3967,6 +3984,7 @@ pypi-nbsphinx
pypi-nbval
pypi-ncclient
pypi-ndg_httpsclient
pypi-neat_python
pypi-nest_asyncio
pypi-netapp_lib
pypi-netdisco
@@ -3981,7 +3999,6 @@ pypi-nose_timer
pypi-notebook
pypi-numpoly
pypi-numpy
pypi-numpy_ringbuffer
pypi-numpydoc
pypi-oauth2client
pypi-oauthlib
@@ -4078,6 +4095,7 @@ pypi-pydot_ng
pypi-pyelftools
pypi-pyfakefs
pypi-pyflakes
pypi-pygame
pypi-pygithub
pypi-pygments
pypi-pyicu
@@ -4342,6 +4360,7 @@ pypi-urllib3
pypi-urlobject
pypi-urwid
pypi-user_agents
pypi-userpath
pypi-uvloop
pypi-virtualenv
pypi-volatile
@@ -4661,6 +4680,7 @@ thermal_daemon
thermal_monitor
thin-provisioning-tools
threadweaver
thrift
thunar-volman
thunderbird
thunderbolt-software-user-space