mirror of
https://github.com/clearlinux/common.git
synced 2026-06-16 19:16:00 +00:00
Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e7f5be6fc | |||
| 36d3edd56c | |||
| 9008cbccba | |||
| 04022fb765 | |||
| 424c34140e | |||
| f85cd42756 | |||
| e7afb1ae5e | |||
| 2c52a5ab39 | |||
| d84fec113e | |||
| f1b1424db4 | |||
| df8b789d60 | |||
| 78d7b4366b | |||
| 7be12344b6 | |||
| 04e58480cb | |||
| ebcc67f00b | |||
| f5b1aa8c87 | |||
| c61c91f9f2 | |||
| a57af837d8 | |||
| 03ba957d5f | |||
| d661496a4c | |||
| 4e1ce01d4e | |||
| dfeb8f9862 | |||
| 79c4befdea | |||
| c8c0c08100 | |||
| 877cd04101 | |||
| 7453e26bc7 | |||
| 11e0b5baee |
@@ -15,6 +15,7 @@ SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || rpmspec -D '_vendor clr' --srpm -q --
|
||||
SRPMFILE = results/$(SRPMVERS).src.rpm
|
||||
|
||||
LATEST_RPMS = $(wildcard rpms/*.rpm)
|
||||
DEBUGINFO_RPM = $(wildcard rpms/*-debuginfo-*.rpm)
|
||||
RPMS ?= $(LATEST_RPMS)
|
||||
|
||||
WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
|
||||
@@ -408,6 +409,31 @@ install:
|
||||
done
|
||||
@$(MAKE) loop-down DEVICE=6
|
||||
|
||||
#help install-debuginfo-local: Install locally built debuginfo RPM to
|
||||
#help the automatic debuginfo cache location (/var/cache/debuginfo)
|
||||
install-debuginfo-local:
|
||||
tmpdir=$$(mktemp -d); \
|
||||
rpm2cpio ${DEBUGINFO_RPM} | ( cd $$tmpdir; cpio -i -d -u); \
|
||||
dest=/var/cache/debuginfo/lib; \
|
||||
find $$tmpdir/usr/lib/debug/ -mindepth 1 -maxdepth 1 | while read -r d; do \
|
||||
sudo chown -R dbginfo:dbginfo "$$d"; \
|
||||
sudo cp -a "$$d" $$dest/; \
|
||||
done; \
|
||||
dest=/var/cache/debuginfo/src; \
|
||||
find $$tmpdir/usr/src/debug/ -mindepth 1 -maxdepth 1 | while read -r d; do \
|
||||
sudo chown -R dbginfo:dbginfo "$$d"; \
|
||||
sudo cp -a "$$d" $$dest/; \
|
||||
done; \
|
||||
sudo rm -rf $$tmpdir
|
||||
|
||||
#help install-local: Install locally built RPMs to the root filesystem. Note that the
|
||||
#help debuginfo RPM installs to /var/cache/debuginfo
|
||||
install-local:
|
||||
for r in $(filter-out ${DEBUGINFO_RPM},${RPMS}); do \
|
||||
rpm2cpio $$r | (cd /; sudo cpio -i -d -u); \
|
||||
done
|
||||
$(MAKE) install-debuginfo-local
|
||||
|
||||
#help generateupstream: Run this rule to create or update the 'upstream' file
|
||||
#help by downloading the upstream source tarballs listed in the spec file and
|
||||
#help calculating their hashes. Autospec performs this step automatically, so
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -932,6 +932,7 @@ bashdb
|
||||
bats
|
||||
bazel
|
||||
bc
|
||||
bcc
|
||||
bcrypt
|
||||
bdftopcf
|
||||
beautifulsoup4
|
||||
@@ -962,6 +963,7 @@ breeze
|
||||
breeze-gtk
|
||||
breeze-icons
|
||||
bridge-utils
|
||||
bro
|
||||
brotli
|
||||
bsdiff
|
||||
btrfs-progs
|
||||
@@ -1047,6 +1049,7 @@ clr-find-bundle
|
||||
clr-fwupd-hooks
|
||||
clr-hardware-files
|
||||
clr-init
|
||||
clr-installer
|
||||
clr-man-pages
|
||||
clr-power-tweaks
|
||||
clr-python-timestamp
|
||||
@@ -1202,6 +1205,7 @@ django-discover-runner
|
||||
django-nose
|
||||
django-pyscss
|
||||
django_compressor
|
||||
dldt
|
||||
dlt-daemon
|
||||
dmenu
|
||||
dmidecode
|
||||
@@ -1249,9 +1253,11 @@ efivar
|
||||
eigen
|
||||
elasticsearch
|
||||
elasticsearch-dep
|
||||
electric-fence
|
||||
elementary-xfce
|
||||
elfutils
|
||||
elixir
|
||||
ell
|
||||
emacs
|
||||
empy
|
||||
enchant
|
||||
@@ -1305,6 +1311,7 @@ flake8-docstrings
|
||||
flake8-import-order
|
||||
flake8-polyfill
|
||||
flatpak
|
||||
flatpak-builder
|
||||
fldigi
|
||||
flex
|
||||
flmsg
|
||||
@@ -1548,8 +1555,10 @@ influxdb
|
||||
iniparse
|
||||
init-rdahead
|
||||
inotify-tools
|
||||
intel-gmmlib
|
||||
intel-gpu-tools
|
||||
intel-hybrid-driver
|
||||
intel-media-driver
|
||||
intltool
|
||||
ioc-cbc-tools
|
||||
ioping
|
||||
@@ -2073,6 +2082,8 @@ libyami-utils
|
||||
libzip
|
||||
libzmf
|
||||
libzmq
|
||||
lightdm
|
||||
lightdm-gtk-greeter
|
||||
linecache2
|
||||
links
|
||||
linux
|
||||
@@ -2083,6 +2094,7 @@ linux-gce
|
||||
linux-hyperv
|
||||
linux-hyperv-lts
|
||||
linux-hyperv-mini
|
||||
linux-iot-lts2017-preempt-rt
|
||||
linux-iot-lts2018
|
||||
linux-kata
|
||||
linux-kvm
|
||||
@@ -2108,6 +2120,7 @@ lsacpi
|
||||
lshw
|
||||
lskat
|
||||
lsof
|
||||
lsscsi
|
||||
ltp
|
||||
ltrace
|
||||
lua
|
||||
@@ -2133,6 +2146,7 @@ mcelog
|
||||
mdadm
|
||||
mdds
|
||||
media-player-info
|
||||
mediasdk
|
||||
meld
|
||||
memcached
|
||||
memkind
|
||||
@@ -2685,6 +2699,7 @@ perl-Image-Size
|
||||
perl-Import-Into
|
||||
perl-Importer
|
||||
perl-Inline
|
||||
perl-Inline-C
|
||||
perl-JSON
|
||||
perl-JSON-MaybeXS
|
||||
perl-JSON-RPC
|
||||
@@ -2838,8 +2853,6 @@ perl-Pod-Plainer
|
||||
perl-Pod-Spell
|
||||
perl-Pod-Strip
|
||||
perl-PostScript-File
|
||||
perl-Proc-Daemon
|
||||
perl-Proc-ProcessTable
|
||||
perl-Proc-Wait3
|
||||
perl-Protocol-OSC
|
||||
perl-Quota
|
||||
@@ -2925,6 +2938,7 @@ perl-Test-Manifest
|
||||
perl-Test-MockModule
|
||||
perl-Test-MockTime
|
||||
perl-Test-More-UTF8
|
||||
perl-Test-Most
|
||||
perl-Test-Needs
|
||||
perl-Test-NoWarnings
|
||||
perl-Test-Number-Delta
|
||||
@@ -2941,6 +2955,7 @@ perl-Test-Strict
|
||||
perl-Test-Synopsis
|
||||
perl-Test-TCP
|
||||
perl-Test-Taint
|
||||
perl-Test-Trap
|
||||
perl-Test-UseAllModules
|
||||
perl-Test-Warn
|
||||
perl-Test-Warnings
|
||||
@@ -3170,6 +3185,7 @@ python-cinderclient
|
||||
python-dateutil
|
||||
python-dateutil-legacypython
|
||||
python-designateclient
|
||||
python-dldt
|
||||
python-editor
|
||||
python-future
|
||||
python-gflags
|
||||
@@ -3207,6 +3223,7 @@ python-troveclient
|
||||
python-urwid
|
||||
python-zaqarclient
|
||||
python-zeep
|
||||
python2-mod_wsgi
|
||||
python3
|
||||
pytools
|
||||
pytz
|
||||
@@ -3279,6 +3296,7 @@ redsocks
|
||||
reno
|
||||
reportlab
|
||||
repoze.lru
|
||||
repoze.sphinx.autointerface
|
||||
repoze.who
|
||||
requests
|
||||
requests-kerberos
|
||||
@@ -3470,6 +3488,7 @@ text-unidecode
|
||||
tflearn
|
||||
tgt
|
||||
thermal_daemon
|
||||
thermal_monitor
|
||||
thin-provisioning-tools
|
||||
threadweaver
|
||||
thrift
|
||||
@@ -3668,7 +3687,6 @@ yelp-tools
|
||||
yelp-xsl
|
||||
yum
|
||||
yum-metadata-parser
|
||||
yum-utils
|
||||
zVMCloudConnector
|
||||
zake
|
||||
zc.lockfile
|
||||
|
||||
+9
-1
@@ -43,11 +43,19 @@ if [ ! -f "$IMAGE" ]; then
|
||||
fi
|
||||
rm -f debug.log
|
||||
|
||||
# 10/25/2018: keep back compatibility for a while
|
||||
UEFI_BIOS="-bios OVMF.fd"
|
||||
|
||||
if [ -f OVMF_VARS.fd -a -f OVMF_CODE.fd ]; then
|
||||
UEFI_BIOS=" -drive file=OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on "
|
||||
UEFI_BIOS+=" -drive file=OVMF_VARS.fd,if=pflash,format=raw,unit=1 "
|
||||
fi
|
||||
|
||||
VMN=${VMN:=1}
|
||||
|
||||
qemu-system-x86_64 \
|
||||
-enable-kvm \
|
||||
-bios OVMF.fd \
|
||||
${UEFI_BIOS} \
|
||||
-smp sockets=1,cpus=4,cores=2 -cpu host \
|
||||
-m 1024 \
|
||||
-vga none -nographic \
|
||||
|
||||
Reference in New Issue
Block a user