Split image.inc across git repos

Currently compiling a new package and adding it
to the iso still requires a multi-git update because
image.inc is a single centralized file in the root git.

It would be better to allow a single git update to add
a package. Too allow this, image.inc must be split across
the git repos and the build tools must be changed to
read/merge those files to arrive at the final package list.

Current scheme is to name the image.inc files using this
schema.

${distro}_${build_target}_image_${build_type}.inc

distro = centos, ...
build_target = iso, guest ...
build_type = std, rt ...

Traditionally build_type=std is omitted from config files,
so we instread use ${distro}_${build_target}_image.inc.

Change-Id: Ic0d076b4537f6edbd0c058c0dab667fea68de647
Story: 2003447
Task:  24649
Depends-On: Ib39b8063e7759842ba15330c68503bfe2dea6e20
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2018-08-15 14:11:12 -04:00
parent fe36f11192
commit 72f444f601
3 changed files with 422 additions and 0 deletions

48
centos_guest_image.inc Normal file
View File

@ -0,0 +1,48 @@
# List of packages to be included/installed in guest image
# If these have dependencies, they will be pulled in automatically
#
# build-info
build-info
# kernel
perf
#
# Network Drivers
#
# i40evf-kmod
kmod-i40evf
# i40e-kmod
kmod-i40e
# ixgbevf-kmod
kmod-ixgbevf
# ixgbe-kmod
kmod-ixgbe
# qat17
qat17
#
# TPM2 libs to enable vTPM on Guest
#
# tpm-kmod
kmod-tpm
# tss2
tss2
# tpm2-tools
tpm2-tools
#
# ima support
#
# rpm
rpm-plugin-systemd-inhibit

45
centos_guest_image_rt.inc Normal file
View File

@ -0,0 +1,45 @@
# List of packages to be included/installed in RT guest image
# If these have dependencies, they will be pulled in automatically
#
# build-info
build-info
#
# Network Drivers
#
# i40evf-kmod
kmod-i40evf-rt
# i40e-kmod
kmod-i40e-rt
# ixgbevf-kmod
kmod-ixgbevf-rt
# ixgbe-kmod
kmod-ixgbe-rt
# qat17
qat17-rt
#
# TPM2 libs to enable vTPM on Guest
#
# tpm-kmod
kmod-tpm-rt
# tss2
tss2
# tpm2-tools
tpm2-tools
#
# ima support
#
# rpm
rpm-plugin-systemd-inhibit

329
centos_iso_image.inc Normal file
View File

@ -0,0 +1,329 @@
# List of packages to be included/installed in ISO
# If these have dependencies, they will be pulled in automatically
#
# vm-topology
vm-topology
# namespace-utils
namespace-utils
# qemu-kvm-ev
qemu-kvm-ev
qemu-img-ev
qemu-kvm-tools-ev
# nfscheck
nfscheck
# libvirt
libvirt
libvirt-docs
libvirt-daemon
libvirt-daemon-config-network
libvirt-daemon-config-nwfilter
libvirt-daemon-driver-network
libvirt-daemon-driver-nwfilter
libvirt-daemon-driver-nodedev
libvirt-daemon-driver-secret
libvirt-daemon-driver-storage
libvirt-daemon-driver-qemu
libvirt-daemon-driver-lxc
libvirt-client
# python-cephclient
python-cephclient
# python-ryu
python2-ryu
python-ryu-common
# python-smartpm
python-smartpm
# lldpd
lldpd
# nova-utils
nova-utils
# mlx4-config
mlx4-config
# wrs-ssl
wrs-ssl
# tss2
tss2
# tpm2-openssl-engine
tpm2-openssl-engine
# libtpms
libtpms
# swtpm
swtpm
swtpm-cuse
swtpm-tools
# tis-extensions
tis-extensions
tis-extensions-controller
# python-3parclient
python-3parclient
# python-lefthandclient
python-lefthandclient
# collectd-extensions
collectd-extensions
# influxdb-extensions
influxdb-extensions
# docker-distribution
docker-distribution
# helm
helm
# logmgmt
logmgmt
# filesystem-scripts
filesystem-scripts
# io-scheduler
io-scheduler
# collector
collector
# platform-util
platform-util
platform-util-noncontroller
# monitor-tools
monitor-tools
# e1000e-kmod
kmod-e1000e
kmod-e1000e-rt
# i40e-kmod
kmod-i40e
kmod-i40e-rt
# ixgbevf-kmod
kmod-ixgbevf
# ixgbe-kmod
kmod-ixgbe
kmod-ixgbe-rt
# qat17
qat17
qat17-rt
# tpm-kmod
kmod-tpm
kmod-tpm-rt
# integrity-kmod
kmod-integrity
kmod-integrity-rt
# drbd-kernel
kmod-drbd
kmod-drbd-rt
# rpm
rpm-plugin-systemd-inhibit
# dpkg
dpkg
# cgcs-users
cgcs-users
# ldapscripts
ldapscripts
# drbd
drbd
drbd-utils
drbd-udev
drbd-pacemaker
drbd-heartbeat
drbd-bash-completion
# build-info
build-info
# initscripts
initscripts
# setup
setup
# lshell
lshell
# nss-pam-ldapd
nss-pam-ldapd
# centos-release
centos-release
# nfs-utils
nfs-utils
# dhcp
dhcp
dhclient
# openssh
openssh
openssh-clients
openssh-server
# facter
facter
# vim
vim-enhanced
# python
python
# libvirt-python
libvirt-python
# lighttpd
lighttpd
lighttpd-fastcgi
lighttpd-mod_geoip
lighttpd-mod_mysql_vhost
# logrotate
logrotate
# ntp
ntp
ntp-perl
ntpdate
# pam
pam
# shadow-utils
shadow-utils
# syslog-ng
syslog-ng
syslog-ng-libdbi
# novnc
novnc
# sudo
sudo
# net-snmp
net-snmp-utils
net-snmp-libs
net-snmp-python
# openldap
openldap
openldap-servers
openldap-clients
# openvswitch
openvswitch
# libevent
libevent
# tpm2-tools
tpm2-tools
# audit
audit
# kernel
kernel
kernel-tools
kernel-tools-libs
perf
python-perf
# puppet
puppet
# puppet-gnocchi
puppet-gnocchi
# systemd
systemd
# python-gunicorn
python2-gunicorn
# tboot
tboot
# memcached
memcached
# kubernetes
kubernetes
kubernetes-master
kubernetes-node
kubernetes-kubeadm
kubernetes-client
# resource-agents
resource-agents
# bash
bash
# haproxy
haproxy
# iscsi-initiator-utils
iscsi-initiator-utils
iscsi-initiator-utils-iscsiuio
# iptables
iptables
iptables-services
iptables-utils
# python-psycopg2
python-psycopg2
# dnsmasq
dnsmasq
dnsmasq-utils
# rsync
rsync
# parted
parted
# python-keyring
python-keyring
# grub2
grub2-tools
grub2-efi-x64-modules
# kernel-rt
kernel-rt
kernel-rt-kvm
kernel-rt-tools