Compare commits

..

37 Commits

Author SHA1 Message Date
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
clrbuilder 3f2c7de583 Update packages file for version 25180
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-25 12:02:49 +00:00
clrbuilder 514048840f Update packages file for version 25160
Signed-off-by: clrbuilder <clrbuilder@intel.com>
2018-09-24 02:55:14 +00:00
Patrick McCarty 012a1a3767 Support pre-checks for autospec and autospecnew too
For some commands, it is useful to be able to add custom prerequisites.
We already support this for `make koji` and `make build`, and there was
just a request to add it for `make autospec` and `make autospecnew`.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
2018-09-21 12:12:23 -07:00
4 changed files with 100 additions and 8 deletions
+29 -1
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 )
@@ -154,13 +155,15 @@ pullrebase:
fi \
fi
preautospec-checks:
#help autospec: automatically generates a specfile. If there is
#help already a specfile, it will be overwritten. Several files used by
#help autospec will be created in the process.
#help Use MOCK_OPTS environment varible to pass down arbitrary mock options
#help to autospec.
#help For more information, see the project at https://github.com/clearlinux/autospec
autospec: pullrebase localreponotice clean-old-content
autospec: preautospec-checks pullrebase localreponotice clean-old-content
@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; \
@@ -406,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
+3 -1
View File
@@ -190,13 +190,15 @@ releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
provides:
@$(TOPLVL)/projects/common/provides.sh -f $(FP) -r $(RN)
preautospecnew-checks:
#help autospecnew: Creates a new autospec package with for a given URL=$(URL)
#help with NAME=$(NAME). Several files used by autospec will be created in the
#help process.
#help Use MOCK_OPTS environment varible to pass down arbitrary mock options
#help to autospec.
#help For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
autospecnew: localreponotice
autospecnew: preautospecnew-checks localreponotice
@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
exit 1; \
+56 -3
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
@@ -1012,6 +1018,7 @@ cgdb
cgit
chardet
check
check-manifest
cheese
cheroot
chrome-gnome-shell
@@ -1092,6 +1099,7 @@ commonmark
compat-SDL2-soname1
compat-cryptsetup-soname4
compat-efivar-soname0
compat-enchant-soname1
compat-fuse-soname2
compat-gegl
compat-gegl-0.3
@@ -1107,6 +1115,7 @@ compat-libpng-soname12
compat-libwebp-soname6
compat-llvm-soname4
compat-llvm-soname5
compat-llvm-soname6
compat-mpfr-soname4
compat-opencv-soname32
compat-opencv-soname33
@@ -1130,8 +1139,10 @@ cov-core
coverage
cpio
cppcheck
cpprestsdk
cppunit
cpuid
cpuloadgen
cracklib
crcmod
createrepo_c
@@ -1156,6 +1167,7 @@ cyrus-sasl
dapl
darktable
dask
datefudge
db
dbus
dbus-broker
@@ -1191,6 +1203,7 @@ django-discover-runner
django-nose
django-pyscss
django_compressor
dlt-daemon
dmenu
dmidecode
dnf
@@ -1214,6 +1227,7 @@ dosfstools
double-conversion
dovecot
doxygen
dpcontracts
dpdk
dracut
dragon
@@ -1236,6 +1250,7 @@ efivar
eigen
elasticsearch
elasticsearch-dep
electric-fence
elementary-xfce
elfutils
elixir
@@ -1292,6 +1307,7 @@ flake8-docstrings
flake8-import-order
flake8-polyfill
flatpak
flatpak-builder
fldigi
flex
flmsg
@@ -1303,6 +1319,8 @@ font-adobe-75dpi
font-bitstream-type1
font-util
fontconfig
fontforge
fonttools
frameworkintegration
freeglut
freeipmi
@@ -1523,6 +1541,7 @@ idna-ssl
ifaddr
iftop
ilmbase
image
imagesize
imapfilter
imlib2
@@ -1532,14 +1551,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
@@ -1596,6 +1619,7 @@ jupyter_console
jupyter_core
jupyterlab
jupyterlab_launcher
jupyterlab_server
kactivities
kactivities-stats
kactivitymanagerd
@@ -1768,6 +1792,7 @@ kqtquickcharts
krb5
krdc
kreversi
krita
kross
kruler
krunner
@@ -1884,6 +1909,7 @@ libe-book
libepoxy
libepubgen
liberasurecode
liberation-fonts
libetonyek
libev
libevdev
@@ -1997,9 +2023,11 @@ libsigc++
libsmbios
libsmi
libsndfile
libsodium
libsolv
libsoup
libspectre
libspiro
libsrtp
libssh
libssh2
@@ -2012,6 +2040,7 @@ libtirpc
libtool
libudev0-shim
libuev
libuninameslist
libunistring
libunwind
libusb
@@ -2049,6 +2078,8 @@ libyami-utils
libzip
libzmf
libzmq
lightdm
lightdm-gtk-greeter
linecache2
links
linux
@@ -2059,6 +2090,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
@@ -2083,6 +2116,7 @@ lsacpi
lshw
lskat
lsof
lsscsi
ltp
ltrace
lua
@@ -2108,6 +2142,7 @@ mcelog
mdadm
mdds
media-player-info
mediasdk
meld
memcached
memkind
@@ -2132,6 +2167,7 @@ mistune
mixer-tools
mkfontdir
mkfontscale
mkl-dnn
mkosi
mobile-broadband-provider-info
mock
@@ -2158,6 +2194,7 @@ mpfr
mpg123
mpi4py
mpmath
mraa
msgpack
msmtp
msr-tools
@@ -2229,8 +2266,10 @@ nrpe
nspr
nss
nss-altfiles
nss-pam-ldapd
ntfs-3g
ntlm-auth
ntp
ntplib
numactl
numatop
@@ -2251,6 +2290,7 @@ olefile
onig
onnx
opa-psm2
opcodes
open-iscsi
open-isns
open-lldp
@@ -2322,6 +2362,9 @@ p11-kit
p7zip
packaging
pacrunner
paho-mqtt
paho.mqtt.c
paho.mqtt.cpp
palapeli
pandas
pandoc
@@ -2747,6 +2790,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
@@ -3098,11 +3142,11 @@ pyflakes
pygobject
pyinotify
pykerberos
pylama
pyliblzma
pylint
pymemcache
pymongo
pynacl
pypandoc
pyparsing
pyperclip
@@ -3110,6 +3154,7 @@ pypowervm
pyquery
pyreadline
pyrfc3339
pyroma
pyroute2
pyrsistent
pysaml2
@@ -3119,6 +3164,7 @@ pysnmp
pytest
pytest-cov
pytest-forked
pytest-randomly
pytest-repeat
pytest-rerunfailures
pytest-runner
@@ -3132,12 +3178,14 @@ python-barbicanclient
python-ceilometerclient
python-cinderclient
python-dateutil
python-dateutil-legacypython
python-designateclient
python-editor
python-future
python-gflags
python-glanceclient
python-heatclient
python-hwinfo
python-kconfiglib
python-keystoneclient
python-krbV
@@ -3169,7 +3217,9 @@ python-troveclient
python-urwid
python-zaqarclient
python-zeep
python2-mod_wsgi
python3
pytools
pytz
pyudev
pywbem
@@ -3240,6 +3290,7 @@ redsocks
reno
reportlab
repoze.lru
repoze.sphinx.autointerface
repoze.who
requests
requests-kerberos
@@ -3310,6 +3361,7 @@ sg3_utils
shadow
shared-mime-info
sharutils
shell
shim
siege
simg-tools
@@ -3381,6 +3433,7 @@ sweeper
swift
swig
swupd-client
swupd-client
swupd-overdue
swupd-probe
swupd-server
@@ -3430,6 +3483,7 @@ text-unidecode
tflearn
tgt
thermal_daemon
thermal_monitor
thin-provisioning-tools
threadweaver
thrift
@@ -3510,7 +3564,6 @@ voluptuous
voluptuous-serialize
vsqlite
vte
vulkan-sdk
waffle
waitress
warlock
@@ -3529,6 +3582,7 @@ weston
wget
wheel
which
whois
widgetsnbextension
winpdb
wireless-regdb-master
@@ -3628,7 +3682,6 @@ yelp-tools
yelp-xsl
yum
yum-metadata-parser
yum-utils
zVMCloudConnector
zake
zc.lockfile
+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