mirror of
https://github.com/clearlinux/common.git
synced 2026-06-16 02:56:00 +00:00
Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 26582bd9f2 | |||
| c6a2d6fabd | |||
| 2d8fc9a155 | |||
| 1eadce9aad | |||
| 6613644b9c | |||
| 93115e4073 | |||
| 12537cbfb0 | |||
| d397ee463a | |||
| dfe55331e6 | |||
| 0c69bfb9a9 | |||
| 689e48a2f7 | |||
| 82e334a93a | |||
| ab6c4a674f | |||
| 78de1a6a13 | |||
| 74e79ffea2 | |||
| bb21809c73 | |||
| e912d4e6ae | |||
| 340b6a74d4 | |||
| 2e8f9ef0ab | |||
| 4bdd1765c5 | |||
| 45f39671d6 | |||
| 1d46a683e0 | |||
| 41d2113b8a | |||
| 528cd77168 |
+22
-12
@@ -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/$(SRPMVERS).src.rpm
|
||||
SRPMFILE = results/srpm/$(SRPMVERS).src.rpm
|
||||
|
||||
LATEST_RPMS = $(shell [ ! -s results/build.log ] || for r in `egrep 'Wrote.*/RPMS/.*.rpm' results/build.log | sed 's/.*\///'` ; do echo "results/$$r"; done)
|
||||
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)
|
||||
RPMS ?= $(LATEST_RPMS)
|
||||
|
||||
WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
|
||||
@@ -91,18 +91,24 @@ 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)
|
||||
@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
|
||||
@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
|
||||
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) 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)
|
||||
@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
|
||||
@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
|
||||
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) checkblacklist
|
||||
|
||||
fmvpatches: results/build.log
|
||||
fmvpatches: results/logs/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.
|
||||
@@ -117,7 +123,7 @@ shell:
|
||||
.PHONY: $(SRPMFILE)
|
||||
$(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice
|
||||
@$(MAKE) spdxcheck
|
||||
$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
|
||||
$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/srpm/ --no-cleanup-after --uniqueext=$(PKG_NAME)
|
||||
|
||||
# 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
|
||||
@@ -155,7 +161,7 @@ pullrebase:
|
||||
#help to autospec.
|
||||
#help For more information, see the project at https://github.com/clearlinux/autospec
|
||||
autospec: pullrebase localreponotice
|
||||
rm -f results/*src.rpm
|
||||
rm -f results/srpm/*src.rpm
|
||||
@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; \
|
||||
@@ -287,6 +293,10 @@ koji: prekoji-checks kojidef
|
||||
echo "Error: Must be on the master branch to submit to koji" >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
if ! git diff --quiet HEAD ${SPECFILE}; then \
|
||||
echo "Error: All changes to ${SPECFILE} must be committed first" >&2; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
if git rev-parse --verify --quiet origin/master > /dev/null; then \
|
||||
git pull --rebase; \
|
||||
fi
|
||||
@@ -317,7 +327,7 @@ rekoji-nowait:
|
||||
$(MAKE) KOJI_NOWAIT="--nowait --background" rekoji
|
||||
|
||||
logcheck:
|
||||
@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
|
||||
@perl $(TOPLVL)/projects/common/logcheck.pl results/logs/build.log
|
||||
|
||||
$(TOPLVL)/repo:
|
||||
@echo "Creating local RPM repository $(TOPLVL)/repo"
|
||||
@@ -327,8 +337,8 @@ $(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/build.log $(TOPLVL)/repo
|
||||
@if [ -z "`grep '^Wrote: .*$(shell basename $(SRPMFILE))$$' results/build.log`" ]; then \
|
||||
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 \
|
||||
|
||||
+1
-1
@@ -18,6 +18,6 @@
|
||||
# an absolute path or a path relative to this autospec.conf.
|
||||
#packages_file =
|
||||
|
||||
# Path to yum config, used for generating whatrequires. It can be an absolute
|
||||
# Path to dnf/yum config, used for generating whatrequires. It can be an absolute
|
||||
# path or a path relative to this autospec.conf.
|
||||
#yum_conf =
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
[main]
|
||||
cachedir=/var/cache/dnf
|
||||
keepcache=1
|
||||
debuglevel=1
|
||||
logfile=/var/log/dnf.log
|
||||
|
||||
+1
-1
@@ -82,7 +82,7 @@ sub find_file {
|
||||
return $file;
|
||||
}
|
||||
|
||||
open(BUILD_LOG, '<', "results/build.log") or die $!;
|
||||
open(BUILD_LOG, '<', "results/logs/build.log") or die $!;
|
||||
while (<BUILD_LOG>) {
|
||||
if($_ =~ /(\S+):([0-9]*):([0-9]*): note: (basic block|loop) (vectorized)/) {
|
||||
$fmv->{s_name} = (split('/',$1))[-1];
|
||||
|
||||
@@ -27,6 +27,7 @@ OpenSP
|
||||
Paste
|
||||
PasteDeploy
|
||||
Pillow
|
||||
PyMySQL
|
||||
PyWavelets
|
||||
PyYAML
|
||||
Pygments
|
||||
@@ -116,6 +117,8 @@ R-TeachingDemos
|
||||
R-VGAM
|
||||
R-VGAMdata
|
||||
R-VIM
|
||||
R-WikidataR
|
||||
R-WikipediR
|
||||
R-XML
|
||||
R-abind
|
||||
R-acepack
|
||||
@@ -172,6 +175,7 @@ R-corrplot
|
||||
R-cowplot
|
||||
R-crayon
|
||||
R-crosstalk
|
||||
R-crul
|
||||
R-curl
|
||||
R-cvTools
|
||||
R-data.table
|
||||
@@ -209,11 +213,13 @@ R-ellipse
|
||||
R-energy
|
||||
R-estimability
|
||||
R-evaluate
|
||||
R-evd
|
||||
R-expint
|
||||
R-expm
|
||||
R-fastICA
|
||||
R-fastcluster
|
||||
R-fastmatch
|
||||
R-fauxpas
|
||||
R-fda
|
||||
R-ff
|
||||
R-fields
|
||||
@@ -224,6 +230,7 @@ R-flexmix
|
||||
R-forcats
|
||||
R-foreach
|
||||
R-formatR
|
||||
R-fossil
|
||||
R-fpc
|
||||
R-futile.logger
|
||||
R-futile.options
|
||||
@@ -260,6 +267,7 @@ R-hms
|
||||
R-htmlTable
|
||||
R-htmltools
|
||||
R-htmlwidgets
|
||||
R-httpcode
|
||||
R-httpuv
|
||||
R-httr
|
||||
R-hunspell
|
||||
@@ -439,6 +447,7 @@ R-setRNG
|
||||
R-sfsmisc
|
||||
R-sgeostat
|
||||
R-shape
|
||||
R-shapefiles
|
||||
R-shiny
|
||||
R-shinyjs
|
||||
R-shinystan
|
||||
@@ -483,15 +492,20 @@ R-tidyr
|
||||
R-tidyselect
|
||||
R-tidyverse
|
||||
R-timeDate
|
||||
R-tinytex
|
||||
R-tis
|
||||
R-tm
|
||||
R-topicmodels
|
||||
R-treatSens
|
||||
R-tree
|
||||
R-triebeard
|
||||
R-trimcluster
|
||||
R-truncdist
|
||||
R-truncnorm
|
||||
R-tseries
|
||||
R-tsne
|
||||
R-urca
|
||||
R-urltools
|
||||
R-utf8
|
||||
R-uuid
|
||||
R-vcd
|
||||
@@ -500,7 +514,9 @@ R-viridis
|
||||
R-viridisLite
|
||||
R-visNetwork
|
||||
R-webshot
|
||||
R-webutils
|
||||
R-whisker
|
||||
R-wikitaxa
|
||||
R-withr
|
||||
R-xml2
|
||||
R-xtable
|
||||
@@ -544,7 +560,6 @@ accountsservice
|
||||
acl
|
||||
acme
|
||||
acpica-unix2
|
||||
acrn-devicemodel
|
||||
acrn-hypervisor
|
||||
adwaita-icon-theme
|
||||
aeon
|
||||
@@ -1124,6 +1139,7 @@ kata-shim
|
||||
kbd
|
||||
kernel-install
|
||||
kexec-tools
|
||||
keychain
|
||||
keyring
|
||||
keyutils
|
||||
khal
|
||||
@@ -1281,6 +1297,7 @@ libunistring
|
||||
libunwind
|
||||
libusb
|
||||
libuser
|
||||
libuv
|
||||
libva
|
||||
libva-intel-driver
|
||||
libva-utils
|
||||
@@ -1317,6 +1334,7 @@ linux-gce
|
||||
linux-hyperv
|
||||
linux-hyperv-lts
|
||||
linux-hyperv-mini
|
||||
linux-kata
|
||||
linux-kvm
|
||||
linux-libc-headers
|
||||
linux-lts
|
||||
@@ -1353,6 +1371,7 @@ mc
|
||||
mccabe
|
||||
mcelog
|
||||
mdadm
|
||||
meld
|
||||
memkind
|
||||
memshrinker
|
||||
mesa
|
||||
@@ -1372,10 +1391,12 @@ mixer-tools
|
||||
mkfontdir
|
||||
mkfontscale
|
||||
mkosi
|
||||
mobile-broadband-provider-info
|
||||
mock
|
||||
mod_wsgi
|
||||
moka-icon-theme
|
||||
more-itertools
|
||||
moreutils
|
||||
mosh
|
||||
motd-update
|
||||
motif
|
||||
@@ -1503,6 +1524,7 @@ patch
|
||||
patchutils
|
||||
pavucontrol
|
||||
pbr
|
||||
pbr-legacy
|
||||
pbzip2
|
||||
pciutils
|
||||
pcre
|
||||
@@ -1511,21 +1533,28 @@ pecan
|
||||
pep8
|
||||
perftest
|
||||
perl
|
||||
perl-Algorithm-C3
|
||||
perl-Archive-Extract
|
||||
perl-B-Hooks-EndOfScope
|
||||
perl-CPAN-Meta-Check
|
||||
perl-Capture-Tiny
|
||||
perl-Class-Accessor
|
||||
perl-Class-C3
|
||||
perl-Class-Data-Inheritable
|
||||
perl-Class-Inspector
|
||||
perl-Class-Singleton
|
||||
perl-Class-Tiny
|
||||
perl-Clone
|
||||
perl-Crypt-SSLeay
|
||||
perl-DBI
|
||||
perl-DateTime
|
||||
perl-DateTime-Locale
|
||||
perl-DateTime-TimeZone
|
||||
perl-Devel-Confess
|
||||
perl-Devel-GlobalDestruction
|
||||
perl-Devel-StackTrace
|
||||
perl-Digest-CRC
|
||||
perl-Digest-HMAC
|
||||
perl-Digest-MD5
|
||||
perl-Dist-CheckConflicts
|
||||
perl-Encode-Locale
|
||||
@@ -1537,6 +1566,7 @@ perl-ExtUtils-Config
|
||||
perl-ExtUtils-Helpers
|
||||
perl-ExtUtils-InstallPaths
|
||||
perl-File-Copy-Recursive
|
||||
perl-File-FcntlLock
|
||||
perl-File-Listing
|
||||
perl-File-MMagic
|
||||
perl-File-ShareDir
|
||||
@@ -1554,6 +1584,7 @@ perl-IO-Interactive-Tiny
|
||||
perl-IO-Socket-SSL
|
||||
perl-IO-stringy
|
||||
perl-IPC-Run
|
||||
perl-IPC-System-Simple
|
||||
perl-Importer
|
||||
perl-LWP-MediaTypes
|
||||
perl-LWP-Protocol-https
|
||||
@@ -1574,11 +1605,18 @@ perl-Module-ScanDeps
|
||||
perl-Mozilla-CA
|
||||
perl-Net-HTTP
|
||||
perl-Net-SSLeay
|
||||
perl-Package-Constants
|
||||
perl-Package-Stash
|
||||
perl-Package-Stash-XS
|
||||
perl-Params-Classify
|
||||
perl-Params-Validate
|
||||
perl-Params-ValidationCompiler
|
||||
perl-Path-Class
|
||||
perl-Path-Tiny
|
||||
perl-Perl4-CoreLibs
|
||||
perl-PerlIO-gzip
|
||||
perl-Pod-LaTeX
|
||||
perl-Protocol-OSC
|
||||
perl-Role-Tiny
|
||||
perl-Scope-Guard
|
||||
perl-Specio
|
||||
@@ -1587,8 +1625,11 @@ perl-Sub-Identify
|
||||
perl-Sub-Info
|
||||
perl-Sub-Quote
|
||||
perl-Sub-Uplevel
|
||||
perl-Switch
|
||||
perl-Sys-Hostname-Long
|
||||
perl-TAP-Harness-Archive
|
||||
perl-Term-Table
|
||||
perl-TermReadKey
|
||||
perl-Test-Deep
|
||||
perl-Test-Exception
|
||||
perl-Test-Fatal
|
||||
@@ -1599,6 +1640,7 @@ perl-Test-NoWarnings
|
||||
perl-Test-Output
|
||||
perl-Test-Pod
|
||||
perl-Test-Requires
|
||||
perl-Test-RequiresInternet
|
||||
perl-Test-Simple
|
||||
perl-Test-Taint
|
||||
perl-Test-Warn
|
||||
@@ -1607,7 +1649,10 @@ perl-Test-utf8
|
||||
perl-Test2-Suite
|
||||
perl-Text-Autoformat
|
||||
perl-Text-CSV_XS
|
||||
perl-Text-Levenshtein
|
||||
perl-Text-Reform
|
||||
perl-Tie-IxHash
|
||||
perl-TimeDate
|
||||
perl-Try-Tiny
|
||||
perl-URI
|
||||
perl-Variable-Magic
|
||||
@@ -1618,7 +1663,9 @@ perl-XML-SAX
|
||||
perl-XML-SAX-Base
|
||||
perl-XML-SAX-Expat
|
||||
perl-XML-Simple
|
||||
perl-YAML-LibYAML
|
||||
perl-YAML-Tiny
|
||||
perl-gettext
|
||||
perl-libwww-perl
|
||||
perl-namespace-autoclean
|
||||
perl-namespace-clean
|
||||
@@ -1633,6 +1680,7 @@ pidgin-sipe
|
||||
pigz
|
||||
pinentry
|
||||
pip
|
||||
pip-legacy
|
||||
pixman
|
||||
pkcs11-helper
|
||||
pkg-config
|
||||
@@ -1699,6 +1747,7 @@ python-augeas
|
||||
python-dateutil
|
||||
python-future
|
||||
python-gflags
|
||||
python-kconfiglib
|
||||
python-krbV
|
||||
python-magic
|
||||
python-memcached
|
||||
@@ -1708,6 +1757,7 @@ python-multilib
|
||||
python-pkgconfig
|
||||
python-pocketlint
|
||||
python-polib
|
||||
python-rpm-legacypython
|
||||
python-subunit
|
||||
python-systemd
|
||||
python-tappy
|
||||
@@ -1772,6 +1822,7 @@ rpm
|
||||
rr
|
||||
rsa
|
||||
rsync
|
||||
rt-tests
|
||||
ruby
|
||||
runc
|
||||
rust-std32
|
||||
@@ -1802,6 +1853,7 @@ serf
|
||||
setproctitle
|
||||
setserial
|
||||
setuptools
|
||||
setuptools-legacy
|
||||
setuptools_scm
|
||||
setuptools_scm_git_archive
|
||||
shadow
|
||||
@@ -1840,11 +1892,13 @@ spice-protocol
|
||||
spyder-notebook
|
||||
sqlite-autoconf
|
||||
sqlparse
|
||||
squashfs-tools
|
||||
sshfs
|
||||
stack
|
||||
startup-notification
|
||||
stow
|
||||
strace
|
||||
stress-ng
|
||||
subunit
|
||||
subversion
|
||||
sudo
|
||||
@@ -1949,6 +2003,7 @@ volume_key
|
||||
vsqlite
|
||||
vte
|
||||
vulkan-sdk
|
||||
waffle
|
||||
waitress
|
||||
wayland
|
||||
wayland-protocols
|
||||
|
||||
Regular → Executable
+1
@@ -54,4 +54,5 @@ qemu-system-x86_64 \
|
||||
-drive file="$IMAGE",if=virtio,aio=threads,format=raw \
|
||||
-netdev user,id=mynet0,hostfwd=tcp::${VMN}0022-:22,hostfwd=tcp::${VMN}2375-:2375 \
|
||||
-device virtio-net-pci,netdev=mynet0 \
|
||||
-device virtio-rng-pci \
|
||||
-debugcon file:debug.log -global isa-debugcon.iobase=0x402 $@
|
||||
|
||||
Reference in New Issue
Block a user