Compare commits

..

3 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
2 changed files with 33 additions and 0 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
+7
View File
@@ -877,6 +877,7 @@ argparse
ark
artikulate
asciidoc
asciinema
asio
asn1crypto
aspell
@@ -931,6 +932,7 @@ bashdb
bats
bazel
bc
bcc
bcrypt
bdftopcf
beautifulsoup4
@@ -1315,6 +1317,8 @@ font-adobe-75dpi
font-bitstream-type1
font-util
fontconfig
fontforge
fonttools
frameworkintegration
freeglut
freeipmi
@@ -1901,6 +1905,7 @@ libe-book
libepoxy
libepubgen
liberasurecode
liberation-fonts
libetonyek
libev
libevdev
@@ -2018,6 +2023,7 @@ libsodium
libsolv
libsoup
libspectre
libspiro
libsrtp
libssh
libssh2
@@ -2030,6 +2036,7 @@ libtirpc
libtool
libudev0-shim
libuev
libuninameslist
libunistring
libunwind
libusb