Compare commits

..

27 Commits

Author SHA1 Message Date
clrbuilder e88fcdc4bc Update packages file for version 24190
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-08-03 12:02:14 +00:00
clrbuilder a381875001 Update packages file for version 24150
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-08-02 07:07:54 +00:00
clrbuilder 114936fc23 Update packages file for version 24140
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-08-02 04:52:55 +00:00
Patrick McCarty 3739bc0e0f repoadd: use new rpms directory, and hardlink instead
Since binary RPMs are now stored in the "rpms" directory, follow a
similar method for storing them in the local repo, too.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-08-01 09:38:27 -07:00
Patrick McCarty f43a186a78 Store copies of binary RPMs in "rpms" dir
To improve visibility of which RPMs a user may want to install after a
build, copy (hardlink) them to a separate "rpms" directory.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-08-01 09:38:27 -07:00
Patrick McCarty da562cb750 Always clean rpms and logs from previous builds
I often find myself running "make clean proper", when by default, I
think the old build artifacts should be removed so that the results
directory is pristine at the start of a new build.

As a result, if users wish to keep all build artifacts from a previous
"make build" or "make autospec", they must keep manual backups, as the
tooling no longer keeps them around.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-08-01 09:38:27 -07:00
Patrick McCarty 16467cfbc0 Avoid appending to srpm logs
Mock will append the binary rpm build logs to the srpm logs, but this is
confusing. After the srpm finishes building, rename the log files to
avoid this behavior.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-08-01 09:38:27 -07:00
Patrick McCarty 16466cac02 Make results/ directory un-nested again
Because Mock dumps its logs and and resulting rpms in the same directory
(results), shuffling the logs and rpms only after a successful build is
confusing, since they will be untouched for the error case.

It's simpler to avoid moving the files entirely. The only exceptions
will be to avoid clobbering existing log files. Changes of this nature
will appear in later commits and in autospec.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-08-01 09:38:27 -07:00
clrbuilder 6e8d00eb30 Update packages file for version 24120
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-08-01 12:02:17 +00:00
clrbuilder c160c30218 Update packages file for version 24110
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-31 18:17:35 +00:00
clrbuilder 9b09c217da Update packages file for version 24100
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-31 12:02:22 +00:00
Thiago Macieira 00230e7d1d Use zstd for compressing the mock root cache
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
2018-07-30 19:33:17 -07:00
Arjan van de Ven ff40498428 packages update 2018-07-31 01:40:40 +00:00
clrbuilder 6483c7dd86 Update packages file for version 24090
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-30 18:02:43 +00:00
clrbuilder d1079234d9 Update packages file for version 24080
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-30 12:03:58 +00:00
clrbuilder 51a2c03a4a Update packages file for version 24070
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-29 20:42:57 +00:00
clrbuilder 3d8c98b0d8 Update packages file for version 24060
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-29 14:30:22 +00:00
clrbuilder 243ad03d32 Update packages file for version 24030
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-27 14:38:37 +00:00
clrbuilder e1072736aa Update packages file for version 24010
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-27 02:28:58 +00:00
clrbuilder 9a557531f4 Update packages file for version 23980
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-26 12:02:28 +00:00
clrbuilder d8cb4987e5 Update packages file for version 23960
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-25 18:03:16 +00:00
clrbuilder 6719c0f7df Update packages file for version 23950
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-25 12:44:51 +00:00
clrbuilder 7166df721b Update packages file for version 23940
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-24 23:07:56 +00:00
Brett T. Warden a70cf49f45 Include Makefile.custom from package repo 2018-07-24 15:42:12 -07:00
clrbuilder 781eae34bb Update packages file for version 23930
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-24 18:57:22 +00:00
clrbuilder ee17bc50a9 Update packages file for version 23910
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-24 02:17:42 +00:00
clrbuilder 1fcfde404c Update packages file for version 23900
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-07-23 18:03:30 +00:00
5 changed files with 141 additions and 27 deletions
+31 -25
View File
@@ -12,9 +12,9 @@ SHELL = /bin/bash
SPECFILE = $(addsuffix .spec, $(PKG_NAME))
SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || rpmspec -D '_vendor clr' --srpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' $(SPECFILE))
SRPMFILE = results/srpm/$(SRPMVERS).src.rpm
SRPMFILE = results/$(SRPMVERS).src.rpm
LATEST_RPMS = $(shell [ ! -s results/logs/build.log ] || for r in `egrep 'Wrote.*/RPMS/.*.rpm' results/logs/build.log | sed 's/.*\///;s/.*debuginfo/debuginfo\/&/'` ; do echo "results/$$r"; done)
LATEST_RPMS = $(wildcard rpms/*.rpm)
RPMS ?= $(LATEST_RPMS)
WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
@@ -91,24 +91,20 @@ prebuild-checks:
#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)
mkdir -p results/logs results/debuginfo
mv results/*.log results/logs
-mv results/*-debuginfo*.rpm results/debuginfo/
@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
@perl $(TOPLVL)/projects/common/count.pl results/logs/build.log &> testresults
$(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
@$(MAKE) checkblacklist
#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)
mkdir -p results/logs results/debuginfo
mv results/*.log results/logs
-mv results/*-debuginfo*.rpm results/debuginfo/
@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
@perl $(TOPLVL)/projects/common/count.pl results/logs/build.log &> testresults
$(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
@$(MAKE) checkblacklist
fmvpatches: results/logs/build.log
fmvpatches: results/build.log
@perl $(TOPLVL)/projects/common/fmvpatches.pl $(PKG_NAME)
#help rootshell: Puts you in a root shell at the top of your build root.
@@ -121,9 +117,11 @@ shell:
# Always rebuild the source rpm
.PHONY: $(SRPMFILE)
$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice clean-old-content
@$(MAKE) spdxcheck
$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/srpm/ --no-cleanup-after --uniqueext=$(PKG_NAME)
$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
mv results/root.log results/srpm-root.log
mv results/build.log results/srpm-build.log
# Do a git fetch and a git rebase to apply local commits on top of latest
# commits from the remote. A git fetch/rebase is used rather than a git pull so
@@ -160,8 +158,7 @@ pullrebase:
#help Use MOCK_OPTS environment varible to pass down arbitrary mock options
#help to autospec.
#help For more information, see the project at https://github.com/clearlinux/autospec
autospec: pullrebase localreponotice
rm -f results/srpm/*src.rpm
autospec: pullrebase localreponotice clean-old-content
@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
echo "Specfile already exists and was not created by autospec.py! Aborting."; \
exit 1; \
@@ -178,6 +175,7 @@ autospec: pullrebase localreponotice
$${SETVERSION:+ --version $${SETVERSION}} \
${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
$(firstword $(NEWURL) $(URL));
$(MAKE) link-new-rpms PKG_REPO_DIR="."
@$(MAKE) spdxcheck
@$(MAKE) checkblacklist
@if [ -e update_changelog.sh ] && [ -z "$$SKIP_GIT" ] ; then \
@@ -327,7 +325,7 @@ rekoji-nowait:
$(MAKE) KOJI_NOWAIT="--nowait --background" rekoji
logcheck:
@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
$(TOPLVL)/repo:
@echo "Creating local RPM repository $(TOPLVL)/repo"
@@ -337,19 +335,24 @@ $(TOPLVL)/repo:
#help repoadd: Adds locally-built RPMs for this package to the local RPM
#help repository. If this repository does not yet exist, it is created and
#help enabled.
repoadd: results/logs/build.log $(TOPLVL)/repo
@if [ -z "`grep '^Wrote: .*$(shell basename $(SRPMFILE))$$' results/logs/build.log`" ]; then \
echo "You have not yet succesfully built this release yet"; exit 1; \
fi
@if [ -f .repo-index ]; then \
repoadd: $(TOPLVL)/repo
@if [ -z "${LATEST_RPMS}" ]; then \
echo "No rpms found in rpms/ directory."; \
exit 1; \
fi; \
if [ -f .repo-index ]; then \
echo "Cleaning old rpms:"; \
for r in `cat .repo-index`; do \
echo "-$$r"; \
rm -f $(TOPLVL)/repo/$$r; \
done; \
rm .repo-index; \
fi
for r in $(LATEST_RPMS); do echo "+$$r"; echo $$(basename $$r) >> .repo-index; cp $$r $(TOPLVL)/repo; done
fi; \
for r in ${LATEST_RPMS}; do \
echo "+$$r"; \
echo $$(basename $$r) >> .repo-index; \
ln -f $$r $(TOPLVL)/repo/; \
done
$(MAKE) localrepocreate
$(call localrepoenable,${PM_CONF},${MOCK_CONF})
@@ -430,3 +433,6 @@ drop-abandoned: $(SPECFILE)
# Define site local common targets in a separate makefile
-include $(TOPLVL)/projects/common/Makefile.common.site_local
# Include optional extended makefiles from individual package repos
-include Makefile.custom
+24
View File
@@ -138,6 +138,30 @@ localreponotice:
[ -f $(TOPLVL)/repo/opt-in-build ] || sleep 3; \
fi >&2
.PHONY: clean-old-rpms clean-old-logs clean-old-content
clean-old-rpms:
rm -rf ./rpms
rm -f ./results/*.rpm
clean-old-logs:
rm -f ./results/*.log
clean-old-content: clean-old-rpms clean-old-logs
.PHONY: require-pkg-repo-dir link-new-rpms
require-pkg-repo-dir:
@if [ -z ${PKG_REPO_DIR} ]; then \
echo "Please specify PKG_REPO_DIR to indicate package repo location."; \
exit 1; \
fi
link-new-rpms: require-pkg-repo-dir
mkdir -p ${PKG_REPO_DIR}/rpms
rm -f ${PKG_REPO_DIR}/rpms/*.rpm
find ${PKG_REPO_DIR}/results -name '*.rpm' -exec ln {} ${PKG_REPO_DIR}/rpms/ \;
rm -f ${PKG_REPO_DIR}/rpms/*.src.rpm
.PHONY: help
##### Code
# Make sure that HELPSPACE has exactly HELPLEN spaces in it
+1
View File
@@ -224,6 +224,7 @@ autospecnew: localreponotice
$${SETVERSION:+ --version $${SETVERSION}} \
${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
$(URL); \
[ $$? -eq 0 ] && $(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \
$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
else \
echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \
+2
View File
@@ -6,6 +6,8 @@ config_opts['dist'] = 'clear' # only useful for --resultdir variable subst
config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
config_opts['useradd'] = '/usr/sbin/useradd -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['plugin_conf']['root_cache_opts']['compress_program'] = 'zstd -5'
config_opts['plugin_conf']['root_cache_opts']['extension'] = '.zst'
config_opts['releasever'] = 'clear'
config_opts['package_manager'] = 'dnf'
config_opts['chrootgroup'] = 'mockbuild'
+83 -2
View File
@@ -418,6 +418,7 @@ R-lfe
R-lhs
R-libcoin
R-listenv
R-listviewer
R-lle
R-lme4
R-lmerTest
@@ -509,7 +510,9 @@ R-phylobase
R-phylogram
R-pillar
R-pkgKitten
R-pkgbuild
R-pkgconfig
R-pkgload
R-pkgmaker
R-plm
R-plogr
@@ -563,6 +566,7 @@ R-randtoolbox
R-ranger
R-raster
R-rasterVis
R-reactR
R-readr
R-readstata13
R-readxl
@@ -812,7 +816,9 @@ apr
apr-util
arc-theme
argcomplete
argon2
argparse
ark
asciidoc
asio
asn1crypto
@@ -844,6 +850,7 @@ autogen
automake
automaton
awscli
axel
azure-configs
babeltrace
babl
@@ -921,6 +928,7 @@ cargo
caribou
case
castellan
casync
catch2
catkin
catkin_pkg
@@ -965,6 +973,7 @@ clr-init
clr-man-pages
clr-power-tweaks
clr-python-timestamp
clr-pyversion-strip
clr-rpm-config
clr-service-restart
clr-systemd-config
@@ -977,11 +986,31 @@ clutter-gst
clutter-gtk
cmake
cmd2
cmocka
cmrt
cni
cni-plugins
cockpit
cogl
colcon-bash
colcon-cmake
colcon-common-extensions
colcon-core
colcon-defaults
colcon-devtools
colcon-library-path
colcon-metadata
colcon-output
colcon-package-information
colcon-package-selection
colcon-parallel-executor
colcon-pkg-config
colcon-powershell
colcon-python-setup-py
colcon-recursive-crawl
colcon-ros
colcon-test-result
colcon-zsh
collectl
colorama
colord
@@ -1080,7 +1109,6 @@ django-discover-runner
django-nose
django-pyscss
django_compressor
django_openstack_auth
dmenu
dmidecode
dnf
@@ -1097,6 +1125,7 @@ docutils
dogpile.cache
dogpile.core
dogtail
dolphin
dos2unix
dosfstools
double-conversion
@@ -1105,6 +1134,7 @@ dpdk
dracut
dstat
dtc
dulwich
dyskctl
e2fsprogs
ebtables
@@ -1156,7 +1186,13 @@ fish
fixtures
flac
flake8
flake8-blind-except
flake8-builtins
flake8-class-newline
flake8-comprehensions
flake8-deprecated
flake8-docstrings
flake8-import-order
flake8-polyfill
flatpak
fldigi
@@ -1181,6 +1217,7 @@ fuse
futures
futurist
fwupd
fwupdate
garcon
gast
gawk
@@ -1257,6 +1294,7 @@ gnome-session
gnome-settings-daemon
gnome-shell
gnome-shell-extensions
gnome-software
gnome-system-monitor
gnome-terminal
gnome-themes-standard
@@ -1449,10 +1487,14 @@ kcoreaddons
kcrash
kdbusaddons
kdeclarative
kdecoration
kded
kdelibs4support
kdesignerplugin
kdesu
kdnssd
kdoctools
keepassxc
kemoticons
kernel-install
kexec-tools
@@ -1466,6 +1508,8 @@ kfilemetadata
kglobalaccel
kguiaddons
khal
kholidays
khtml
ki18n
kiconthemes
kidletime
@@ -1473,9 +1517,13 @@ kinit
kio
kio-extras
kirigami2
kitemmodels
kitemviews
kiwisolver
kjobwidgets
kjs
kjsembed
kmime
kmod
knewstuff
knotifications
@@ -1490,13 +1538,16 @@ kplotting
kpty
krb5
krunner
kscreenlocker
kservice
ktexteditor
ktextwidgets
kubernetes
kunitconversion
kwallet
kwayland
kwidgetsaddons
kwin
kwindowsystem
kxmlgui
latencytop
@@ -1511,6 +1562,7 @@ libSM
libX11
libXScrnSaver
libXau
libXaw
libXcomposite
libXcursor
libXdamage
@@ -1535,6 +1587,7 @@ libXvMC
libXxf86dga
libXxf86misc
libXxf86vm
libabigail
libaio
libarchive
libarchive-c
@@ -1594,6 +1647,7 @@ libisofs
libjpeg-turbo
libjpeg-turbo-soname8
libksba
libksysguard
libmbim
libmediaart
libmnl
@@ -1755,6 +1809,7 @@ monotonic
more-itertools
moreutils
mosh
mosquitto
motd-update
motif
mox
@@ -1800,6 +1855,7 @@ netcat
netifaces
nettle
network-manager-applet
networkmanager-qt
networkx
neutron
newt
@@ -1838,14 +1894,17 @@ oauth2client
oauthlib
ocaml
ocl-icd
octave
offlineimap
olefile
onig
onnx
opa-psm2
open-iscsi
open-isns
open-lldp
open-vm-tools
openQA
openal-soft
openblas
openconnect
@@ -1867,6 +1926,7 @@ opusfile
orc
orca
ordereddict
os-autoinst
os-brick
os-client-config
os-testr
@@ -2053,6 +2113,7 @@ perl-Devel-Refactor
perl-Devel-Size
perl-Devel-StackTrace
perl-Devel-StackTrace-AsHTML
perl-Devel-Symdump
perl-Digest-CRC
perl-Digest-HMAC
perl-Digest-JHash
@@ -2186,6 +2247,7 @@ perl-Image-Size
perl-Import-Into
perl-Importer
perl-Inline
perl-JSON
perl-JSON-MaybeXS
perl-JSON-RPC
perl-JavaScript-Minifier-XS
@@ -2255,6 +2317,8 @@ perl-Module-ScanDeps
perl-Module-Starter
perl-Module-Util
perl-Module-Versions-Report
perl-Mojolicious
perl-Mojolicious-Plugin-AssetPack
perl-Mozilla-CA
perl-Net-CIDR-Lite
perl-Net-DNS
@@ -2307,6 +2371,7 @@ perl-PerlIO-gzip
perl-PerlIO-utf8_strict
perl-PerlIO-via-Timeout
perl-Pod-Constants
perl-Pod-Coverage
perl-Pod-LaTeX
perl-Pod-Plainer
perl-Pod-Spell
@@ -2334,6 +2399,7 @@ perl-Scope-Upper
perl-Set-Object
perl-Set-Scalar
perl-Smart-Comments
perl-Socket-MsgHdr
perl-Socket6
perl-Sort-Key
perl-Sort-Naturally
@@ -2376,6 +2442,7 @@ perl-Term-Table
perl-Term-UI
perl-TermReadKey
perl-Test-Assertions
perl-Test-Compile
perl-Test-Deep
perl-Test-Exception
perl-Test-FailWarnings
@@ -2509,7 +2576,9 @@ pip-legacy
pixman
pkcs11-helper
pkg-config
plasma-desktop
plasma-framework
plasma-workspace
pluggy
ply
pmdk
@@ -2529,6 +2598,7 @@ prettytable
proc-macro2
processor-trace
procps-ng
prometheus_client
prompt_toolkit
protobuf
protobuf-c
@@ -2576,6 +2646,9 @@ pyserial
pysnmp
pytest
pytest-cov
pytest-forked
pytest-repeat
pytest-rerunfailures
pytest-runner
pytest-timeout
pytest-xdist
@@ -2661,6 +2734,7 @@ qttranslations
qtvirtualkeyboard
qtwayland
qtwebchannel
qtwebengine
qtwebsockets
qtx11extras
qtxmlpatterns
@@ -2680,6 +2754,7 @@ repoze.lru
repoze.who
requests
requests-mock
requests-toolbelt
requestsexceptions
rest
restructuredtext_lint
@@ -2690,6 +2765,8 @@ rfc3986
rjsmin
rng-tools
rope
rosdistro
rospkg
rpcbind
rpm
rr
@@ -2790,6 +2867,7 @@ subunit
subversion
sudo
suds-jurko
sundials
sure
suricata
swift
@@ -2800,6 +2878,7 @@ swupd-probe
swupd-server
sympy
synergy
syntax-highlighting
sysdig
syslinux
sysstat
@@ -2832,6 +2911,7 @@ testscenarios
testtools
texinfo
texlive
text-unidecode
tflearn
thermal_daemon
thin-provisioning-tools
@@ -2843,11 +2923,11 @@ tiff
tig
tigervnc
time
tinyxml2
tiptop
tk
tmux
tokyocabinet
toolbelt
tooz
tornado
totem
@@ -2889,6 +2969,7 @@ uwsgi
v4l-utils
vala
valgrind
vcstool
vcversioner
vim
vim-go