Compare commits

..

9 Commits

Author SHA1 Message Date
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
3 changed files with 58 additions and 4 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
+20 -1
View File
@@ -786,6 +786,9 @@ Theano
Thunar
UkPostcodeParser
Vertex-theme
Vulkan-Headers
Vulkan-Loader
Vulkan-Tools
WALinuxAgent
WSGIProxy2
WSME
@@ -874,6 +877,7 @@ argparse
ark
artikulate
asciidoc
asciinema
asio
asn1crypto
aspell
@@ -928,6 +932,7 @@ bashdb
bats
bazel
bc
bcc
bcrypt
bdftopcf
beautifulsoup4
@@ -1013,6 +1018,7 @@ cgdb
cgit
chardet
check
check-manifest
cheese
cheroot
chrome-gnome-shell
@@ -1311,6 +1317,8 @@ font-adobe-75dpi
font-bitstream-type1
font-util
fontconfig
fontforge
fonttools
frameworkintegration
freeglut
freeipmi
@@ -1531,6 +1539,7 @@ idna-ssl
ifaddr
iftop
ilmbase
image
imagesize
imapfilter
imlib2
@@ -1549,6 +1558,7 @@ iotop
ipaddr
ipaddress
ipdb
ipdbplugin
iperf
ipmctl
ipmitool
@@ -1605,6 +1615,7 @@ jupyter_console
jupyter_core
jupyterlab
jupyterlab_launcher
jupyterlab_server
kactivities
kactivities-stats
kactivitymanagerd
@@ -1777,6 +1788,7 @@ kqtquickcharts
krb5
krdc
kreversi
krita
kross
kruler
krunner
@@ -1893,6 +1905,7 @@ libe-book
libepoxy
libepubgen
liberasurecode
liberation-fonts
libetonyek
libev
libevdev
@@ -2010,6 +2023,7 @@ libsodium
libsolv
libsoup
libspectre
libspiro
libsrtp
libssh
libssh2
@@ -2022,6 +2036,7 @@ libtirpc
libtool
libudev0-shim
libuev
libuninameslist
libunistring
libunwind
libusb
@@ -2069,6 +2084,7 @@ linux-gce
linux-hyperv
linux-hyperv-lts
linux-hyperv-mini
linux-iot-lts2018
linux-kata
linux-kvm
linux-libc-headers
@@ -2169,6 +2185,7 @@ mpfr
mpg123
mpi4py
mpmath
mraa
msgpack
msmtp
msr-tools
@@ -3128,6 +3145,7 @@ pypowervm
pyquery
pyreadline
pyrfc3339
pyroma
pyroute2
pyrsistent
pysaml2
@@ -3332,6 +3350,7 @@ sg3_utils
shadow
shared-mime-info
sharutils
shell
shim
siege
simg-tools
@@ -3532,7 +3551,6 @@ voluptuous
voluptuous-serialize
vsqlite
vte
vulkan-sdk
waffle
waitress
warlock
@@ -3551,6 +3569,7 @@ weston
wget
wheel
which
whois
widgetsnbextension
winpdb
wireless-regdb-master
+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