Compare commits

..

43 Commits

Author SHA1 Message Date
clrbuilder 3e7f5be6fc Update packages file for version 25900
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-26 16:32:33 +00:00
clrbuilder 36d3edd56c Update packages file for version 25880
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-26 00:32:14 +00:00
Miguel Bernal Marin 9008cbccba start_qemu.sh: enable OVMF CODE and VARS usage
Currently, we use the traditional BIOS flag "-bios" to specify the OVMF
firmware device file. Ken proposes changing to pflash type BIOS and separate
BIOS code and variable.

-drive file=OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=OVMF_VARS.fd,if=pflash,format=raw,unit=1 \

Ken has following reasons:
  1. -bios can only support single flash binary, but the actual BIOS binary
      is consisted by many parts like SEC, PEI(Boot Block), DXE(Main Block)
      and Variable area as non-volatile storage for BIOS settings. During
      OMVF booting, a file called NvVars.bin will be created at
      <Disk>/<ESP Partition>/NvVars.bin for BIOS variable storage.
      This will pollute original Clearlinux-xxx.img.

  2. In future, we can add secure signed SEC BIOS part to enable full
      secure boot for Clear Linux via pflash.

  3. Some version of open stack, it requires separate Var Store NV instead
      of OVMF.fd. Ken meet with this issue recently. So if can show the separate
      pflash BIOS file via start_qemu.sh as example.

Suggested-by: "Lu, Ken" <ken.lu@intel.com>
2018-10-25 16:44:58 -05:00
clrbuilder 04022fb765 Update packages file for version 25870
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-25 21:32:21 +00:00
Miguel Bernal Marin 424c34140e Add OVMF CODE and VARS to repo
As from 0c69bfb9a9 ("Add OVMF.fd to the repo"), the CODE and VARS will
be used by start_qemu.sh.

Note that these version of OVMF_* are a copy from /usr/share/qemu
in Clear Linux OS 25840.

$ sha512sum /usr/share/qemu/OVMF_*
efea56944ad8153ed956390863c30c1a61eb4e52c43a8a0e3e6e3a71e56796f3c6a1c32e107a3d86e7a2e59faa462c7ffb10916b62a73d110bd0b0b84a60e02a  /usr/share/qemu/OVMF_CODE.fd
448412fd7ba267b4180db8ade6edb67af467e5b9b3e3ff8dfd583a2fded4070f6951667297e6896ce8bd9f4d2ec3dd8a5a70b6e9a2f686efec9a57124fec512a  /usr/share/qemu/OVMF_VARS.fd
2018-10-25 15:36:19 -05:00
clrbuilder f85cd42756 Update packages file for version 25840
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-25 14:00:41 +00:00
clrbuilder e7afb1ae5e Update packages file for version 25800
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-24 18:57:09 +00:00
clrbuilder 2c52a5ab39 Update packages file for version 25780
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-23 22:38:57 +00:00
Patrick McCarty d84fec113e Remove duplicate swupd-client package
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-10-22 15:44:37 -07:00
clrbuilder f1b1424db4 Update packages file for version 25760
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-22 21:57:08 +00:00
clrbuilder df8b789d60 Update packages file for version 25730
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-22 01:08:44 +00:00
clrbuilder 78d7b4366b Update packages file for version 25720
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-19 18:03:15 +00:00
clrbuilder 7be12344b6 Update packages file for version 25710
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-19 12:02:56 +00:00
clrbuilder 04e58480cb Update packages file for version 25700
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-18 18:05:45 +00:00
clrbuilder ebcc67f00b Update packages file for version 25690
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-18 12:02:51 +00:00
clrbuilder f5b1aa8c87 Update packages file for version 25680
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-17 18:03:13 +00:00
clrbuilder c61c91f9f2 Update packages file for version 25670
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-17 12:03:10 +00:00
clrbuilder a57af837d8 Update packages file for version 25630
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-16 03:45:15 +00:00
clrbuilder 03ba957d5f Update packages file for version 25610
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-15 13:22:48 +00:00
Patrick McCarty d661496a4c Fix packages list again
The repos are in an unusual state for 25600 (just like for 25590) in
that two swupd-client packages were added. The tooling for updating this
packages file does not expect that condition, so revert the change.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-10-12 20:52:51 -07:00
clrbuilder 4e1ce01d4e Update packages file for version 25600
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-13 00:38:15 +00:00
Patrick McCarty dfeb8f9862 There is only swupd-client in the distro...
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-10-12 15:18:46 -07:00
clrbuilder 79c4befdea Update packages file for version 25590
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-12 21:06:15 +00:00
clrbuilder c8c0c08100 Update packages file for version 25580
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-12 18:03:15 +00:00
clrbuilder 877cd04101 Update packages file for version 25570
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-12 12:02:52 +00:00
clrbuilder 7453e26bc7 Update packages file for version 25540
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-10 21:05:34 +00:00
Patrick McCarty 11e0b5baee Add new commands for installing rpms on the running system
For testing purposes only, if developers want to install RPMs they just
built onto their development system, potentially overwriting content
that is tracked by swupd, they can now run 'make install-local' to
install all of the RPMs, or 'make install-debuginfo-local' to just
install the debuginfo package.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-10-10 13:09:20 -07:00
clrbuilder 54c652944f Update packages file for version 25530
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-10 18:03:02 +00:00
clrbuilder ef5179c975 Update packages file for version 25520
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-10 12:02:42 +00:00
clrbuilder fc9793ff4e Update packages file for version 25460
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-08 02:13:02 +00:00
clrbuilder 1508582709 Update packages file for version 25430
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-05 12:02:24 +00:00
clrbuilder fca82072fa Update packages file for version 25420
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-04 18:04:01 +00:00
clrbuilder 7fb07fdb29 Update packages file for version 25410
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-04 12:03:09 +00:00
Patrick McCarty 387cb23c79 Only add kvm group if needed
The user may have run the user-setup script previously, or they may
already belong to the 'kvm' group to begin with, so avoid running the
usermod command in these situations.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-10-03 16:28:44 -07:00
clrbuilder c63ed02014 Update packages file for version 25380
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-03 01:40:23 +00:00
clrbuilder d0773602f5 Update packages file for version 25360
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-02 00:47:15 +00:00
clrbuilder 7b2b947843 Update packages file for version 25340
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-10-01 16:18:23 +00:00
clrbuilder e619aeeab5 Update packages file for version 25330
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-29 00:43:51 +00:00
clrbuilder f041821042 Update packages file for version 25310
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-28 05:19:12 +00:00
clrbuilder 04e79ac6f7 Update packages file for version 25280
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-26 23:06:46 +00:00
clrbuilder 942c21283f Update packages file for version 25260
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-25 22:41:48 +00:00
clrbuilder 0803beead9 Update packages file for version 25240
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-25 22:10:02 +00:00
clrbuilder 8bf3888935 Update packages file for version 25220
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-25 21:12:26 +00:00
6 changed files with 105 additions and 9 deletions
+26
View File
@@ -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
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+58 -5
View File
@@ -41,6 +41,7 @@ Pint
PyDispatcher
PyJWT
PyMySQL
PyNaCl
PyWavelets
PyYAML
Pygments
@@ -785,6 +786,9 @@ Theano
Thunar
UkPostcodeParser
Vertex-theme
Vulkan-Headers
Vulkan-Loader
Vulkan-Tools
WALinuxAgent
WSGIProxy2
WSME
@@ -873,6 +877,7 @@ argparse
ark
artikulate
asciidoc
asciinema
asio
asn1crypto
aspell
@@ -927,6 +932,7 @@ bashdb
bats
bazel
bc
bcc
bcrypt
bdftopcf
beautifulsoup4
@@ -957,6 +963,7 @@ breeze
breeze-gtk
breeze-icons
bridge-utils
bro
brotli
bsdiff
btrfs-progs
@@ -1012,6 +1019,7 @@ cgdb
cgit
chardet
check
check-manifest
cheese
cheroot
chrome-gnome-shell
@@ -1041,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
@@ -1132,8 +1141,10 @@ cov-core
coverage
cpio
cppcheck
cpprestsdk
cppunit
cpuid
cpuloadgen
cracklib
crcmod
createrepo_c
@@ -1194,6 +1205,8 @@ django-discover-runner
django-nose
django-pyscss
django_compressor
dldt
dlt-daemon
dmenu
dmidecode
dnf
@@ -1217,6 +1230,7 @@ dosfstools
double-conversion
dovecot
doxygen
dpcontracts
dpdk
dracut
dragon
@@ -1239,9 +1253,11 @@ efivar
eigen
elasticsearch
elasticsearch-dep
electric-fence
elementary-xfce
elfutils
elixir
ell
emacs
empy
enchant
@@ -1295,6 +1311,7 @@ flake8-docstrings
flake8-import-order
flake8-polyfill
flatpak
flatpak-builder
fldigi
flex
flmsg
@@ -1306,6 +1323,8 @@ font-adobe-75dpi
font-bitstream-type1
font-util
fontconfig
fontforge
fonttools
frameworkintegration
freeglut
freeipmi
@@ -1526,6 +1545,7 @@ idna-ssl
ifaddr
iftop
ilmbase
image
imagesize
imapfilter
imlib2
@@ -1535,14 +1555,18 @@ influxdb
iniparse
init-rdahead
inotify-tools
intel-gmmlib
intel-gpu-tools
intel-hybrid-driver
intel-media-driver
intltool
ioc-cbc-tools
ioping
iotop
ipaddr
ipaddress
ipdb
ipdbplugin
iperf
ipmctl
ipmitool
@@ -1599,6 +1623,7 @@ jupyter_console
jupyter_core
jupyterlab
jupyterlab_launcher
jupyterlab_server
kactivities
kactivities-stats
kactivitymanagerd
@@ -1771,6 +1796,7 @@ kqtquickcharts
krb5
krdc
kreversi
krita
kross
kruler
krunner
@@ -1887,6 +1913,7 @@ libe-book
libepoxy
libepubgen
liberasurecode
liberation-fonts
libetonyek
libev
libevdev
@@ -2004,6 +2031,7 @@ libsodium
libsolv
libsoup
libspectre
libspiro
libsrtp
libssh
libssh2
@@ -2016,6 +2044,7 @@ libtirpc
libtool
libudev0-shim
libuev
libuninameslist
libunistring
libunwind
libusb
@@ -2053,6 +2082,8 @@ libyami-utils
libzip
libzmf
libzmq
lightdm
lightdm-gtk-greeter
linecache2
links
linux
@@ -2063,6 +2094,8 @@ linux-gce
linux-hyperv
linux-hyperv-lts
linux-hyperv-mini
linux-iot-lts2017-preempt-rt
linux-iot-lts2018
linux-kata
linux-kvm
linux-libc-headers
@@ -2087,6 +2120,7 @@ lsacpi
lshw
lskat
lsof
lsscsi
ltp
ltrace
lua
@@ -2112,6 +2146,7 @@ mcelog
mdadm
mdds
media-player-info
mediasdk
meld
memcached
memkind
@@ -2136,6 +2171,7 @@ mistune
mixer-tools
mkfontdir
mkfontscale
mkl-dnn
mkosi
mobile-broadband-provider-info
mock
@@ -2162,6 +2198,7 @@ mpfr
mpg123
mpi4py
mpmath
mraa
msgpack
msmtp
msr-tools
@@ -2236,6 +2273,7 @@ nss-altfiles
nss-pam-ldapd
ntfs-3g
ntlm-auth
ntp
ntplib
numactl
numatop
@@ -2256,6 +2294,7 @@ olefile
onig
onnx
opa-psm2
opcodes
open-iscsi
open-isns
open-lldp
@@ -2327,6 +2366,9 @@ p11-kit
p7zip
packaging
pacrunner
paho-mqtt
paho.mqtt.c
paho.mqtt.cpp
palapeli
pandas
pandoc
@@ -2657,6 +2699,7 @@ perl-Image-Size
perl-Import-Into
perl-Importer
perl-Inline
perl-Inline-C
perl-JSON
perl-JSON-MaybeXS
perl-JSON-RPC
@@ -2752,6 +2795,7 @@ perl-Net-IDN-Encode
perl-Net-INET6Glue
perl-Net-Ident
perl-Net-MAC
perl-Net-MQTT
perl-Net-NTP
perl-Net-OpenID-Common
perl-Net-OpenID-Consumer
@@ -2809,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
@@ -2896,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
@@ -2912,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
@@ -3103,11 +3147,11 @@ pyflakes
pygobject
pyinotify
pykerberos
pylama
pyliblzma
pylint
pymemcache
pymongo
pynacl
pypandoc
pyparsing
pyperclip
@@ -3115,6 +3159,7 @@ pypowervm
pyquery
pyreadline
pyrfc3339
pyroma
pyroute2
pyrsistent
pysaml2
@@ -3124,6 +3169,7 @@ pysnmp
pytest
pytest-cov
pytest-forked
pytest-randomly
pytest-repeat
pytest-rerunfailures
pytest-runner
@@ -3137,12 +3183,15 @@ python-barbicanclient
python-ceilometerclient
python-cinderclient
python-dateutil
python-dateutil-legacypython
python-designateclient
python-dldt
python-editor
python-future
python-gflags
python-glanceclient
python-heatclient
python-hwinfo
python-kconfiglib
python-keystoneclient
python-krbV
@@ -3174,7 +3223,9 @@ python-troveclient
python-urwid
python-zaqarclient
python-zeep
python2-mod_wsgi
python3
pytools
pytz
pyudev
pywbem
@@ -3245,6 +3296,7 @@ redsocks
reno
reportlab
repoze.lru
repoze.sphinx.autointerface
repoze.who
requests
requests-kerberos
@@ -3315,6 +3367,7 @@ sg3_utils
shadow
shared-mime-info
sharutils
shell
shim
siege
simg-tools
@@ -3435,6 +3488,7 @@ text-unidecode
tflearn
tgt
thermal_daemon
thermal_monitor
thin-provisioning-tools
threadweaver
thrift
@@ -3515,7 +3569,6 @@ voluptuous
voluptuous-serialize
vsqlite
vte
vulkan-sdk
waffle
waitress
warlock
@@ -3534,6 +3587,7 @@ weston
wget
wheel
which
whois
widgetsnbextension
winpdb
wireless-regdb-master
@@ -3633,7 +3687,6 @@ yelp-tools
yelp-xsl
yum
yum-metadata-parser
yum-utils
zVMCloudConnector
zake
zc.lockfile
+9 -1
View File
@@ -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 \
+12 -3
View File
@@ -6,6 +6,7 @@ SERVERCA=""
CLIENTCA=""
WORKSPACE="clearlinux"
PACKAGE_REPOS=
NEEDS_KVM_GROUP=
help() {
printf "%s\n" >&2 "Usage: $SCRIPT [options]" \
@@ -115,6 +116,10 @@ required_progs() {
required_progs
if ! groups | grep -qw kvm; then
NEEDS_KVM_GROUP=1
fi
echo "Initializing development workspace in \"$WORKSPACE\" . . ."
mkdir "$WORKSPACE"
@@ -146,8 +151,10 @@ if [ "$USE_KOJI" ]; then
fi
fi
echo "Adding user to kvm group . . ."
sudo usermod -a -G kvm $USER
if [ -n "$NEEDS_KVM_GROUP" ]; then
echo "Adding user to kvm group . . ."
sudo usermod -a -G kvm $USER
fi
echo "Cloning special project repositories . . ."
make ${JOBS_ARG} clone-projects
@@ -179,7 +186,9 @@ if [ -z "$PACKAGE_REPOS" ]; then
echo "NOTE: To clone all package repos, run \"cd $WORKSPACE; make [-j NUM] clone-packages\""
echo "NOTE: To clone a single package repo with NAME, run \"cd $WORKSPACE; make clone_NAME\""
fi
echo 'NOTE: logout and log back in to finalize the setup process'
if [ -n "$NEEDS_KVM_GROUP" ]; then
echo 'NOTE: logout and log back in to finalize the setup process'
fi
# vi: ft=sh sw=2 et sts=2