starlingx/integ
Code Issues Proposed changes

Merge branch 'master' into f/centos8

Browse Source 
Change-Id: Iae2e063f95e572c8e32afbcd0185229574da1c7c
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
This commit is contained in:
Shuicheng Lin 2020-03-31 14:21:01 +08:00
commit 246f33226d
38 changed files with 922 additions and 34307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
.zuul.yaml
View File

@ -13,6 +13,9 @@
- openstack-tox-pep8
- openstack-tox-linters
- stx-integ-pylint
post:
jobs:
- stx-integ-upload-git-mirror
# This is the common base job definition for StarlingX flock services
- job:
@ -166,3 +169,95 @@
- starlingx/config
- starlingx/fault
- starlingx/update
- job:
name: stx-integ-upload-git-mirror
parent: upload-git-mirror
description: >
Mirrors opendev.org/starlingx/integ to
github.com/starlingx/integ
vars:
git_mirror_repository: starlingx/integ
secrets:
- name: git_mirror_credentials
secret: stx-integ-github-secret
pass-to-parent: true
- secret:
name: stx-integ-github-secret
data:
user: git
host: github.com
# yamllint disable-line rule:line-length
host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
ssh_key: !encrypted/pkcs1-oaep
- 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
- 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
- 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
- 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
- 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
- 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
- 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

47
base/anaconda/centos/meta_patches/0006-Add-support-for-https-and-IPv6-to-anaconda-preexec.patch Normal file
View File

@ -0,0 +1,47 @@
From 9a2fa4a719df870296f8559bbf775696b49847c5 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Fri, 7 Feb 2020 14:09:28 -0500
Subject: [PATCH] Add support for https and IPv6 to anaconda-preexec
Include the source patch that adds support for https and IPv6.
Signed-off-by: Don Penney <don.penney@windriver.com>
---
SPECS/anaconda.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index c482f38..8fea2fa 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -24,11 +24,12 @@ Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch
Patch9: yumpayload-dont-verify-disabled-repos.patch
Patch10: anaconda-centos-armhfp-extloader.patch
-# WRS
+# StarlingX
Patch10001: 0001-TIS-Progress-and-error-handling.patch
Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
Patch10003: 0003-Set-default-hostname-to-localhost.patch
Patch10004: 0004-Cache-server-ip-in-etc-hosts.patch
+Patch10005: 0005-Add-support-for-IPv6-and-https-to-anaconda-preexec.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@@ -256,11 +257,12 @@ runtime on NFS/HTTP/FTP servers or local disks.
%patch10 -p1
%endif
-# WRS
+# StarlingX
%patch10001 -p1
%patch10002 -p1
%patch10003 -p1
%patch10004 -p1
+%patch10005 -p1
%build
%configure --disable-static \
--
1.8.3.1

1
base/anaconda/centos/meta_patches/PATCH_ORDER
View File

@ -3,3 +3,4 @@
0003-revert-7.4-grub2-efi-handling.patch
0004-Upversion-rpm-devel-dependency.patch
0005-Add-TIS-patches-for-host-lookup.patch
0006-Add-support-for-https-and-IPv6-to-anaconda-preexec.patch

113
base/anaconda/centos/patches/0005-Add-support-for-IPv6-and-https-to-anaconda-preexec.patch Normal file
View File

@ -0,0 +1,113 @@
From fbf22f153f415b1dfed1f01879c22b15ac030652 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Mon, 10 Feb 2020 20:00:19 -0500
Subject: [PATCH] Add support for IPv6 and https to anaconda-preexec
The anaconda-preexec script runs ahead of Anaconda to cache the IP
address of the network boot server in the /etc/hosts file, to avoid
further DNS queries during installation.
This update extends the checks to add support for IPv6 and to allow
for https network access.
Signed-off-by: Don Penney <don.penney@windriver.com>
---
scripts/anaconda-preexec | 69 +++++++++++++++++++++++++++++++-----------------
1 file changed, 45 insertions(+), 24 deletions(-)
diff --git a/scripts/anaconda-preexec b/scripts/anaconda-preexec
index d491173..22e6833 100644
--- a/scripts/anaconda-preexec
+++ b/scripts/anaconda-preexec
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2019 Wind River Systems, Inc.
# SPDX-License-Identifier: Apache-2.0
#
#
@@ -14,36 +14,57 @@ set -x
function get_ip()
{
local host=$1
+ local host_ip=
# Try the DNS query
- host -t A $host | awk '{print $4}' | grep '^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' | head -1
+ host_ip=$(host -t A $host | awk '{print $4}' | grep '^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' | head -1)
+
+ if [ -z "${host_ip}" ]; then
+ # Check for IPv6
+ host_ip=$(host -t AAAA $host | grep 'has IPv6 address' | awk '{print $5}')
+ fi
+
+ echo -n ${host_ip}
+}
+
+function get_server()
+{
+ # Check for http/https first
+ cat /proc/cmdline | grep -q 'inst\.ks=http'
+ if [ $? -ne 0 ]; then
+ return
+ fi
+
+ local server_and_port=
+ server_and_port=$(cat /proc/cmdline | sed -r 's#.*inst\.ks=https*://([^/]*)/.*#\1#')
+
+ echo "${server_and_port}" | grep -q '^\['
+ if [ $? -eq 0 ]; then
+ echo "${server_and_port}" | sed -r 's#.*\[(.*)\].*#\1#'
+ else
+ echo "${server_and_port}" | sed -r 's#([^/:]*)(:[^/]*)?#\1#'
+ fi
}
# If the kickstart is net-based, wait for connectivity to server
-cat /proc/cmdline | grep -q 'inst\.ks=http://'
-if [ $? -eq 0 ]
+server=$(get_server)
+if [ -n "$server" ]
then
- server=$(cat /proc/cmdline | sed -r 's#.*inst\.ks=http://([^/:]*)(:[^/]*)?/.*#\1#')
- if [ -n "$server" ]
- then
- echo "Testing connectivity to server: $server"
- let -i ping_count=0
- ping -c 1 -w 60 $server
- while [ $? -ne 0 -a $ping_count -lt 600 ]
- do
- echo "Waiting for connectivity to server: $server"
- sleep 1
- let -i ping_count++
- ping -c 1 -w 60 $server
- done
-
- # Cache the host IP
- ipaddr=$(get_ip $server)
- if [ -n "$ipaddr" -a "$ipaddr" != "$server" ]
- then
- echo "$ipaddr $server" >> /etc/hosts
- fi
+ echo "Testing connectivity to server: $server"
+ let -i TIMEOUT=${SECONDS}+600
+ ping -c 1 -w 60 $server || ping6 -c 1 -w 60 $server
+ while [ $? -ne 0 -a ${SECONDS} -lt ${TIMEOUT} ]
+ do
+ echo "Waiting for connectivity to server: $server"
+ sleep 1
+ ping -c 1 -w 60 $server || ping6 -c 1 -w 60 $server
+ done
+ # Cache the host IP
+ ipaddr=$(get_ip $server)
+ if [ -n "$ipaddr" -a "$ipaddr" != "$server" ]
+ then
+ echo "$ipaddr $server" >> /etc/hosts
fi
fi
--
1.8.3.1

4
centos_pkg_dirs
View File

@ -51,6 +51,7 @@ config/puppet-modules/puppet-puppi
base/systemd
#storage-drivers/python-3parclient
#storage-drivers/python-lefthandclient
storage-drivers/trident-installer
security/tboot
#networking/mellanox/libibverbs
#kernel/kernel-modules/mlnx-ofa_kernel
@ -90,3 +91,6 @@ grub/grub2
bmc/Redfishtool
#virt/kvm-timer-advance
requests-toolbelt
python/python-mechanize
python/python-html5lib
python/python-webencodings

1
centos_stable_docker_images.inc
View File

@ -2,4 +2,5 @@ virt/libvirt
database/mariadb
kubernetes/cni/sriov-cni
kubernetes/plugins/sriov-network-device-plugin
kubernetes/n3000
networking/openvswitch

8
centos_tarball-dl.lst
View File

@ -25,7 +25,7 @@ googletest-fdb850479284e2aae047b87df6beae84236d0135.tar.gz#googletest#https://ap
# gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz#gorilla-context#https://github.com/gorilla/context/archive/08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz#http##
# gorilla-mux-456bcfa82d672db7cae587c9b541463f65bc2718.tar.gz#gorilla-mux#https://github.com/gorilla/mux/archive/456bcfa82d672db7cae587c9b541463f65bc2718.tar.gz#http##
helm-v2.13.1-linux-amd64.tar.gz#linux-amd64#https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz#http##
i40e-2.10.19.30.tar.gz#i40e-2.10.19.30#https://sourceforge.net/projects/e1000/files/i40e%20stable/2.10.19.30/i40e-2.10.19.30.tar.gz/download#http##
i40e-2.10.19.82.tar.gz#i40e-2.10.19.82#https://sourceforge.net/projects/e1000/files/i40e%20stable/2.10.19.82/i40e-2.10.19.82.tar.gz/download#http##
iavf-3.7.61.20.tar.gz#iavf-3.7.61.20#https://sourceforge.net/projects/e1000/files/iavf%20stable/3.7.61.20/iavf-3.7.61.20.tar.gz/download#http##
!integrity-kmod-e6aef069.tar.gz#integrity#http://git.infradead.org/users/jjs/linux-tpmdd.git/snapshot/e6aef069b6e97790cb127d5eeb86ae9ff0b7b0e3.tar.gz#http_script##post-dl-script/integrity-kmod.sh
isa-l-7e1a337433a340bc0974ed0f04301bdaca374af6.tar.gz#isa-l#https://api.github.com/repos/ceph/isa-l/tarball/7e1a337433a340bc0974ed0f04301bdaca374af6#https##
@ -43,7 +43,7 @@ lldpd-0.9.0.tar.gz#lldpd-0.9.0#https://media.luffy.cx/files/lldpd/lldpd-0.9.0.ta
lua-1fce39c6397056db645718b8f5821571d97869a4.tar.gz#lua#https://api.github.com/repos/ceph/lua/tarball/1fce39c6397056db645718b8f5821571d97869a4#https##
!mariadb-10.1.28.tar.gz#mariadb-10.1.28#https://github.com/MariaDB/server/archive/mariadb-10.1.28.tar.gz#http_script##post-dl-script/mariadb.sh
!MLNX_OFED_SRC-4.5-1.0.1.0.tgz#MLNX_OFED_SRC-4.5-1.0.1.0#http://content.mellanox.com/ofed/MLNX_OFED-4.5-1.0.1.0/MLNX_OFED_SRC-4.5-1.0.1.0.tgz#http_script##post-dl-script/MLNX_OFEDqat1.7.sh
opae-intel-fpga-driver-1.3.0-2.tar.gz#opae-intel-fpga-driver-1.3.0-2#https://github.com/OPAE/opae-sdk/releases/download/1.3.0-2/opae-intel-fpga-driver-1.3.0-2.tar.gz#http##
opae-intel-fpga-driver-2.0.1.tar.gz#opae-intel-fpga-driver-2.0.1#https://github.com/OPAE/opae-sdk/releases/download/1.3.6-4/opae-intel-fpga-driver-2.0.1.tar.gz#http##
openvswitch-2.11.0.tar.gz#openvswitch-2.11.0#https://github.com/openvswitch/ovs/archive/v2.11.0.tar.gz#http##
puppet-boolean-22b726dd78b0a60a224cc7054aebbf28e9306f62.tar.gz#puppet-boolean#https://github.com/voxpupuli/puppet-boolean/tarball/22b726dd78b0a60a224cc7054aebbf28e9306f62#http##
puppet-dnsmasq-cff07e90890662972c97684a2baee964f68ff3ed.tar.gz#packstack/puppet/modules/dnsmasq/#https://github.com/procore/puppet-dnsmasq/tarball/cff07e90890662972c97684a2baee964f68ff3ed#http##
@ -57,6 +57,9 @@ puppet-network-7deacd5fdc22c0543455878a8d1872f2f5417c1d.tar.gz#packstack/puppet/
puppet-nslcd-b8c19b1ada89865f2e50758e054583798ad8011a.tar.gz#packstack/puppet/modules/nslcd#https://github.com/jlyheden/puppet-nslcd/tarball/b8c19b1ada89865f2e50758e054583798ad8011a#http##
puppi-c1c47f4edfd761d1bbde32a75da0c3fa7cc93a81.tar.gz#puppi-master#https://github.com/example42/puppi/tarball/c1c47f4edfd761d1bbde32a75da0c3fa7cc93a81#http##
# python-cephclient-v0.1.0.5.tar.gz#python-cephclient-0.1.0.5#https://github.com/dmsimard/python-cephclient/archive/v0.1.0.5.tar.gz#http##
mechanize-0.4.5.tar.gz#mechanize-0.4.5#https://github.com/python-mechanize/mechanize/archive/v0.4.5.tar.gz#http##
html5lib-python-1.0.1.tar.gz#html5lib-1.0.1#https://github.com/html5lib/html5lib-python/archive/1.0.1.tar.gz#http##
python-webencodings-0.5.1.tar.gz#webencodings-0.5.1#https://github.com/gsnedders/python-webencodings/archive/v0.5.1.tar.gz#http##
python-setuptools-v38.5.1.tar.gz#setuptools-38.5.1#https://github.com/pypa/setuptools/archive/v38.5.1.tar.gz#http##
!qat1.7.l.4.5.0-00034.tar.gz#quickassist#https://01.org/sites/default/files/downloads/qat1.7.l.4.5.0-00034.tar.gz#http_script##post-dl-script/qat1.7.sh
rapidjson-f54b0e47a08782a6131cc3d60f94d038fa6e0a51.tar.gz#rapidjson#https://api.github.com/repos/ceph/rapidjson/tarball/f54b0e47a08782a6131cc3d60f94d038fa6e0a51#https##
@ -69,6 +72,7 @@ spdk-f474ce6930f0a44360e1cc4ecd606d2348481c4c.tar.gz#spdk#https://api.github.com
spectre-meltdown-checker-0.37+-5cc77741.tar.gz#spectre-meltdown-checker#https://github.com/speed47/spectre-meltdown-checker/tarball/5cc77741af1d2f52140aa9f89339f56b6c4b6783#http##
swtpm-0.1.0-253eac5.tar.gz#swtpm-0.1.0#https://github.com/stefanberger/swtpm/tarball/1303be7d03294fb02204cb8242f366cbf0da076d#http##
!tpm-kmod-e6aef069.tar.gz#tpm#http://git.infradead.org/users/jjs/linux-tpmdd.git/snapshot/e6aef069b6e97790cb127d5eeb86ae9ff0b7b0e3.tar.gz#http_script#post-dl-script/tpm-kmod.sh
trident-installer-20.01.0.tar.gz#trident-installer-20.01.0#https://github.com/NetApp/trident/releases/download/v20.01.0/trident-installer-20.01.0.tar.gz#https##
!tss2-930.tar.gz#tss2-930#https://git.code.sf.net/p/ibmtpm20tss/tss#git#v930#
xxHash-1f40c6511fa8dd9d2e337ca8c9bc18b3e87663c9.tar.gz#xxHash#https://api.github.com/repos/ceph/xxHash/tarball/1f40c6511fa8dd9d2e337ca8c9bc18b3e87663c9#https##
zstd-f4340f46b2387bc8de7d5320c0b83bb1499933ad.tar.gz#zstd#https://api.github.com/repos/facebook/zstd/tarball/f4340f46b2387bc8de7d5320c0b83bb1499933ad#https##

3
ceph/ceph/files/ceph-init-wrapper.sh
View File

@ -159,7 +159,8 @@ log_and_restart_blocked_osds ()
local message=$2
for name in $names; do
wlog $name "INFO" "$message"
${CEPH_SCRIPT} restart $name
# Restart the daemons but release ceph mon and osd file descriptors
${CEPH_SCRIPT} restart $name {LOCK_CEPH_MON_STATUS_FD}>&- {LOCK_CEPH_OSD_STATUS_FD}>&-
done
}

2
doc/source/conf.py
View File

@ -23,7 +23,7 @@
# -- Project information -----------------------------------------------------
project = u'stx-integ'
project = u'StarlingX Integration'
copyright = u'2018, StarlingX'
author = u'StarlingX'

22
doc/source/index.rst
View File

@ -1,24 +1,26 @@
=======================
stx-integ Documentation
=======================
===================================
StarlingX Integration Project
===================================
This is the documentation for StarlingX integration and packaging.
The starlingx/integ project provides integration and packaging for StarlingX.
Release Notes
-------------
Release notes
-------------
.. toctree::
:maxdepth: 1
Release Notes <https://docs.starlingx.io/releasenotes/stx-integ>
Release notes <https://docs.starlingx.io/releasenotes/integ>
-----
Links
-----
* Source: `stx-integ`_
* Code Review: `Gerrit`_
* Bugs: `Storyboard`_
* Source: `starlingx/integ`_
* Code review: `Gerrit`_
* Project tracking: `Storyboard`_
.. _stx-integ: https://opendev.org/starlingx/integ
.. _starlingx/integ: https://opendev.org/starlingx/integ
.. _Gerrit: https://review.opendev.org/#/q/project:starlingx/integ
.. _Storyboard: https://storyboard.openstack.org/#!/project/starlingx/integ

2
kernel/kernel-modules/intel-i40e/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
COPY_LIST=" \
$PKG_BASE/files/* \
$STX_BASE/downloads/i40e-2.10.19.30.tar.gz"
$STX_BASE/downloads/i40e-2.10.19.82.tar.gz"
TIS_PATCH_VER=1

2
kernel/kernel-modules/intel-i40e/centos/i40e-kmod.spec
View File

@ -8,7 +8,7 @@
%define kmod_name i40e
Name: %{kmod_name}-kmod%{?bt_ext}
Version: 2.10.19.30
Version: 2.10.19.82
Release: 0%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Kernel
License: GPLv2

3
kernel/kernel-modules/intel-opae-fpga/centos/build_srpm.data
View File

@ -1,3 +1,4 @@
COPY_LIST=" \
$STX_BASE/downloads/opae-intel-fpga-driver-1.3.0-2.tar.gz"
$PATCHES_BASE/* \
$STX_BASE/downloads/opae-intel-fpga-driver-2.0.1.tar.gz"
TIS_PATCH_VER=1

13
kernel/kernel-modules/intel-opae-fpga/centos/fpga-kmod.spec
View File

@ -6,10 +6,11 @@
# Define the kmod package name here.
%define kmod_name opae-intel-fpga-driver
%define iteration 2
# If a release doesn't have an iteration number, just use 0
%define iteration 6
Name: %{kmod_name}-kmod%{?bt_ext}
Version: 1.3.0
Version: 2.0.1
Release: %{iteration}%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Kernel
License: GPLv2
@ -20,7 +21,9 @@ BuildRequires: kernel%{?bt_ext}-devel, redhat-rpm-config, perl, openssl
ExclusiveArch: x86_64
# Sources.
Source0: %{kmod_name}-%{version}-%{iteration}.tar.gz
# The source tarball name may or may not include the iteration number.
Source0: %{kmod_name}-%{version}.tar.gz
Patch01: Remove-regmap-mmio-as-it-is-built-into-the-kernel.patch
%define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')
@ -78,7 +81,7 @@ It is built to depend upon the specific ABI provided by a range of releases
of the same variant of the Linux kernel and not on any one specific build.
%prep
%autosetup -p 1 -n %{kmod_name}-%{version}-%{iteration}
%autosetup -p 1 -n %{kmod_name}-%{version}
%{__gzip} %{kmod_name}.7
echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf
@ -87,7 +90,7 @@ echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.con
%install
%{__install} -d %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
%{__install} %{_builddir}/%{kmod_name}-%{version}-%{iteration}/*.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
%{__install} %{_builddir}/%{kmod_name}-%{version}/*.ko %{buildroot}/lib/modules/%{kversion}/extra/%{kmod_name}/
%{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
%{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
%{__install} -d %{buildroot}%{_defaultdocdir}/kmod-%{kmod_name}-%{version}/

55
kernel/kernel-modules/intel-opae-fpga/centos/patches/Remove-regmap-mmio-as-it-is-built-into-the-kernel.patch Normal file
View File

@ -0,0 +1,55 @@
From 94704d9260d7057549b9f66461f7c2328f6080d3 Mon Sep 17 00:00:00 2001
Message-Id: <94704d9260d7057549b9f66461f7c2328f6080d3.1578602281.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Thu, 9 Jan 2020 15:36:55 -0500
Subject: [PATCH 1/1] Remove regmap mmio as it is built into the kernel
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
Makefile | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/Makefile b/Makefile
index 0dfd0a8..3386289 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,6 @@ ccflags-y += -I$(PWD)/scripts/dtc/libfdt-4-12
ifeq ($(kerval),3.10)
obj-m += spi-bitbang-mod.o
- obj-m += regmap-mmio-mod.o
endif
obj-m += i2c-altera.o
@@ -45,8 +44,6 @@ intel-max10-y += lib-4-12/fdt_sw.o
intel-max10-y += lib-4-12/fdt_strerror.o
intel-max10-y += lib-4-12/fdt_empty_tree.o
-regmap-mmio-mod-y := drivers/base/regmap/regmap-mmio-3-10.o
-
i2c-altera-y := drivers/i2c/busses/i2c-altera.o
intel-generic-qspi-y := drivers/mtd/spi-nor/intel-generic-qspi.o
@@ -99,9 +96,6 @@ load-drv:
if ! egrep -q '^intel_generic_qspi ' /proc/modules; then insmod intel-generic-qspi.ko; fi
if ! egrep -q '^intel_on_chip_flash ' /proc/modules; then insmod intel-on-chip-flash.ko; fi
if ! egrep -q '^altera_asmip2 ' /proc/modules; then insmod altera-asmip2.ko; fi
-ifeq ($(kerval),3.10)
- if ! egrep -q '^regmap_mmio_mod ' /proc/modules; then insmod regmap-mmio-mod.ko; fi
-endif
if ! egrep -q '^i2c_altera ' /proc/modules; then insmod i2c-altera.ko; fi
ifeq ($(kerval),3.10)
if ! egrep -q '^spi_bitbang_mod ' /proc/modules; then insmod spi-bitbang-mod.ko; fi
@@ -137,9 +131,6 @@ ifeq ($(kerval),3.10)
if egrep -q '^spi_bitbang_mod ' /proc/modules; then rmmod spi_bitbang_mod; fi
endif
if egrep -q '^i2c_altera ' /proc/modules; then rmmod i2c_altera; fi
-ifeq ($(kerval),3.10)
- if egrep -q '^regmap_mmio_mod ' /proc/modules; then rmmod regmap_mmio_mod; fi
-endif
if egrep -q '^altera_asmip2 ' /proc/modules; then rmmod altera_asmip2; fi
if egrep -q '^intel_on_chip_flash ' /proc/modules; then rmmod intel_on_chip_flash; fi
if egrep -q '^intel_generic_qspi ' /proc/modules; then rmmod intel_generic_qspi; fi
--
1.8.3.1

2
kernel/kernel-rt/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
COPY_LIST="files/*"
TIS_PATCH_VER=2
TIS_PATCH_VER=5
BUILD_IS_BIG=11
BUILD_IS_SLOW=12

31
kernel/kernel-rt/centos/meta_patches/Compile-issues.patch
View File

@ -1,37 +1,36 @@
From d85ae09a0e333ba2c0b2630a1d4768655cacf481 Mon Sep 17 00:00:00 2001
Message-Id: <d85ae09a0e333ba2c0b2630a1d4768655cacf481.1566591106.git.Jim.Somerville@windriver.com>
In-Reply-To: <5d869ea9407975726a95d046391cd640b726ca93.1566591106.git.Jim.Somerville@windriver.com>
References: <5d869ea9407975726a95d046391cd640b726ca93.1566591106.git.Jim.Somerville@windriver.com>
From: Bin Yang <bin.yang@intel.com>
Date: Wed, 31 Jul 2019 14:23:20 +0800
From 611efdc47a31f229612fd324925c76f6fb204d9c Mon Sep 17 00:00:00 2001
Message-Id: <611efdc47a31f229612fd324925c76f6fb204d9c.1584650624.git.Jim.Somerville@windriver.com>
In-Reply-To: <0a8e423b2d06a4604c51a1e5bfcc305203d49a62.1584650624.git.Jim.Somerville@windriver.com>
References: <0a8e423b2d06a4604c51a1e5bfcc305203d49a62.1584650624.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 13 Mar 2020 16:15:29 -0400
Subject: [PATCH 2/2] Compile issues
Signed-off-by: Bin Yang <bin.yang@intel.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f7aad95..29d3878 100644
index c549d7e..f8fe5be 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -425,6 +425,11 @@ Patch1031: epoll-fix-use-after-free-in-eventpoll_release_file.patch
Patch1032: ipvs-fix-memory-leak-in-ip_vs_ctl.c.patch
Patch1033: rh-ext4-release-leaked-posix-acl-in-ext4_acl_chmod.patch
@@ -426,6 +426,11 @@ Patch1033: rh-ext4-release-leaked-posix-acl-in-ext4_acl_chmod.patch
Patch1034: rh-ext4-release-leaked-posix-acl-in-ext4_xattr_set_a.patch
+Patch1035: fix-compilation-issues.patch
# Workaround for broken bios causing IOMMU issues
Patch1035: Allow-dmar-quirks-for-broken-bioses.patch
+Patch1100: fix-compilation-issues.patch
+# Fix CentOS 7.6 upgrade compile error
+Patch1036: fix-CentOS-7.6-upgrade-compile-error.patch
+Patch1101: fix-CentOS-7.6-upgrade-compile-error.patch
+# Compile fix for disabling CONFIG_MEMCG_KMEM
+Patch1037: compile-fix-for-disabling-CONFIG_MEMCG_KMEM.patch
+Patch1102: compile-fix-for-disabling-CONFIG_MEMCG_KMEM.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -798,6 +803,9 @@ ApplyPatch epoll-fix-use-after-free-in-eventpoll_release_file.patch
ApplyPatch ipvs-fix-memory-leak-in-ip_vs_ctl.c.patch
@@ -799,6 +804,9 @@ ApplyPatch ipvs-fix-memory-leak-in-ip_vs_ctl.c.patch
ApplyPatch rh-ext4-release-leaked-posix-acl-in-ext4_acl_chmod.patch
ApplyPatch rh-ext4-release-leaked-posix-acl-in-ext4_xattr_set_a.patch
ApplyPatch Allow-dmar-quirks-for-broken-bioses.patch
+ApplyPatch fix-compilation-issues.patch
+ApplyPatch fix-CentOS-7.6-upgrade-compile-error.patch
+ApplyPatch compile-fix-for-disabling-CONFIG_MEMCG_KMEM.patch

25
kernel/kernel-rt/centos/meta_patches/Kernel-source-patches-for-TiC.patch
View File

@ -1,21 +1,19 @@
From 5d869ea9407975726a95d046391cd640b726ca93 Mon Sep 17 00:00:00 2001
Message-Id: <5d869ea9407975726a95d046391cd640b726ca93.1566591106.git.Jim.Somerville@windriver.com>
From: Bin Yang <bin.yang@intel.com>
Date: Mon, 29 Jul 2019 11:48:49 -0400
From 0a8e423b2d06a4604c51a1e5bfcc305203d49a62 Mon Sep 17 00:00:00 2001
Message-Id: <0a8e423b2d06a4604c51a1e5bfcc305203d49a62.1584650624.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 13 Mar 2020 16:15:29 -0400
Subject: [PATCH 1/2] Kernel source patches for TiC
Signed-off-by: Bin Yang <bin.yang@intel.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
Signed-off-by: Robin Lu <bin1.lu@intel.com>
---
SPECS/kernel-rt.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
SPECS/kernel-rt.spec | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index adffde2..f7aad95 100644
index c48b73e..c549d7e 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -388,6 +388,43 @@ Source30002: kernel-3.10.0-x86_64-rt-trace.config.tis_extra
@@ -388,6 +388,44 @@ Source30002: kernel-3.10.0-x86_64-rt-trace.config.tis_extra
# Empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
@ -33,7 +31,6 @@ index adffde2..f7aad95 100644
+Patch1011: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+Patch1012: x86-enable-DMA-CMA-with-swiotlb.patch
+Patch1013: Add-missing-ifdef-around-max-latency-variable.patch
+Patch1014: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
+Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
+Patch1016: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+Patch1018: Porting-Cacheinfo-from-Kernel-4.10.17.patch
@ -56,10 +53,12 @@ index adffde2..f7aad95 100644
+Patch1032: ipvs-fix-memory-leak-in-ip_vs_ctl.c.patch
+Patch1033: rh-ext4-release-leaked-posix-acl-in-ext4_acl_chmod.patch
+Patch1034: rh-ext4-release-leaked-posix-acl-in-ext4_xattr_set_a.patch
+# Workaround for broken bios causing IOMMU issues
+Patch1035: Allow-dmar-quirks-for-broken-bioses.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -727,6 +764,40 @@ cp %{SOURCE38} .
@@ -727,6 +765,40 @@ cp %{SOURCE38} .
## Apply Patches here
ApplyPatch linux-kernel-test.patch
@ -77,7 +76,6 @@ index adffde2..f7aad95 100644
+ApplyPatch Notification-of-death-of-arbitrary-processes.patch
+ApplyPatch x86-enable-DMA-CMA-with-swiotlb.patch
+ApplyPatch Add-missing-ifdef-around-max-latency-variable.patch
+ApplyPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
+ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
+ApplyPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+ApplyPatch Porting-Cacheinfo-from-Kernel-4.10.17.patch
@ -97,6 +95,7 @@ index adffde2..f7aad95 100644
+ApplyPatch ipvs-fix-memory-leak-in-ip_vs_ctl.c.patch
+ApplyPatch rh-ext4-release-leaked-posix-acl-in-ext4_acl_chmod.patch
+ApplyPatch rh-ext4-release-leaked-posix-acl-in-ext4_xattr_set_a.patch
+ApplyPatch Allow-dmar-quirks-for-broken-bioses.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then

79
kernel/kernel-rt/centos/patches/Allow-dmar-quirks-for-broken-bioses.patch Normal file
View File

@ -0,0 +1,79 @@
From 340fbe20b7ede7b9a6dca8c3d03cead97257a99d Mon Sep 17 00:00:00 2001
Message-Id: <340fbe20b7ede7b9a6dca8c3d03cead97257a99d.1584649859.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Wed, 29 Jan 2020 14:19:22 -0500
Subject: [PATCH 1/1] Allow dmar quirks for broken bioses
Problem:
Broken bios creates inaccurate DMAR tables,
reporting some bridges as having endpoint types.
This causes IOMMU initialization to bail
out early with an error code, the result of
which is vfio not working correctly.
This is seen on some Skylake based Wolfpass
server platforms with up-to-date bios installed.
Solution:
Instead of just bailing out of IOMMU
initialization when such a condition is found,
we report it and continue. The IOMMU ends
up successfully initialized anyway. We do this
only on platforms that have the Skylake bridges
where this issue has been seen.
This change is inspired by a similar one posted by
Lu Baolu of Intel Corp to lkml
https://lkml.org/lkml/2019/12/24/15
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
drivers/iommu/dmar.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 4658dc3..eeaef2e 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -75,6 +75,26 @@ static unsigned long dmar_seq_ids[BITS_TO_LONGS(DMAR_UNITS_SUPPORTED)];
static int alloc_iommu(struct dmar_drhd_unit *drhd);
static void free_iommu(struct intel_iommu *iommu);
+static int scope_mismatch_quirk;
+static void quirk_dmar_scope_mismatch(struct pci_dev *dev)
+{
+ pci_info(dev, "scope mismatch ignored\n");
+ scope_mismatch_quirk = 1;
+}
+
+/*
+ * We expect devices with endpoint scope to have normal PCI
+ * headers, and devices with bridge scope to have bridge PCI
+ * headers. However some PCI devices may be listed in the
+ * DMAR table with bridge scope, even though they have a
+ * normal PCI header and vice versa. We don't declare a
+ * scope mismatch for the special cases below, even though
+ * the bios creates broken tables.
+ */
+/* Sky Lake-E PCI Express Root Port A */
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2030,
+ quirk_dmar_scope_mismatch);
+
static void dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
{
/*
@@ -257,7 +277,10 @@ int dmar_insert_dev_scope(struct dmar_pci_notify_info *info,
info->dev->class >> 8 != PCI_CLASS_BRIDGE_OTHER))) {
pr_warn("Device scope type does not match for %s\n",
pci_name(info->dev));
- return -EINVAL;
+ if (!scope_mismatch_quirk)
+ return -EINVAL;
+ else
+ pr_warn("but continuing anyway\n");
}
for_each_dev_scope(devices, devices_cnt, i, tmp)
--
1.8.3.1

34236
kernel/kernel-rt/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
View File

File diff suppressed because it is too large Load Diff

8
kernel/kernel-rt/centos/patches/kernel-3.10.0-x86_64-rt.config.tis_extra
View File

@ -24,8 +24,9 @@ CONFIG_SCSI_PMCRAID=y
CONFIG_SCSI_HPSA=y
CONFIG_MEGARAID_SAS=y
CONFIG_SCSI_SMARTPQI=y
CONFIG_SCSI_MPT2SAS=y
CONFIG_SCSI_MPT3SAS=y
# These two will only build as modules
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT3SAS=m
CONFIG_SCSI_VIRTIO=y
CONFIG_FUSION_SAS=y
CONFIG_SCSI_AIC94XX=y
@ -959,3 +960,6 @@ CONFIG_LOCK_TORTURE_TEST=n
# Disable kernel memory accounting, which is broken
CONFIG_MEMCG_KMEM=n
# Needed for opae fpga kernel module
# as it turns on hidden option REGMAP_MMIO
CONFIG_MFD_SYSCON=y

2
kernel/kernel-std/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
COPY_LIST="files/*"
TIS_PATCH_VER=1
TIS_PATCH_VER=4
BUILD_IS_BIG=11
BUILD_IS_SLOW=12

79
kernel/kernel-std/centos/patches/Allow-dmar-quirks-for-broken-bioses.patch Normal file
View File

@ -0,0 +1,79 @@
From 3ea9b69ea4e791797b42d73b609b2e1f4fdb9882 Mon Sep 17 00:00:00 2001
Message-Id: <3ea9b69ea4e791797b42d73b609b2e1f4fdb9882.1584647338.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Wed, 29 Jan 2020 14:19:22 -0500
Subject: [PATCH 1/1] Allow dmar quirks for broken bioses
Problem:
Broken bios creates inaccurate DMAR tables,
reporting some bridges as having endpoint types.
This causes IOMMU initialization to bail
out early with an error code, the result of
which is vfio not working correctly.
This is seen on some Skylake based Wolfpass
server platforms with up-to-date bios installed.
Solution:
Instead of just bailing out of IOMMU
initialization when such a condition is found,
we report it and continue. The IOMMU ends
up successfully initialized anyway. We do this
only on platforms that have the Skylake bridges
where this issue has been seen.
This change is inspired by a similar one posted by
Lu Baolu of Intel Corp to lkml
https://lkml.org/lkml/2019/12/24/15
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
drivers/iommu/dmar.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 4658dc3..eeaef2e 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -75,6 +75,26 @@ static unsigned long dmar_seq_ids[BITS_TO_LONGS(DMAR_UNITS_SUPPORTED)];
static int alloc_iommu(struct dmar_drhd_unit *drhd);
static void free_iommu(struct intel_iommu *iommu);
+static int scope_mismatch_quirk;
+static void quirk_dmar_scope_mismatch(struct pci_dev *dev)
+{
+ pci_info(dev, "scope mismatch ignored\n");
+ scope_mismatch_quirk = 1;
+}
+
+/*
+ * We expect devices with endpoint scope to have normal PCI
+ * headers, and devices with bridge scope to have bridge PCI
+ * headers. However some PCI devices may be listed in the
+ * DMAR table with bridge scope, even though they have a
+ * normal PCI header and vice versa. We don't declare a
+ * scope mismatch for the special cases below, even though
+ * the bios creates broken tables.
+ */
+/* Sky Lake-E PCI Express Root Port A */
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2030,
+ quirk_dmar_scope_mismatch);
+
static void dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
{
/*
@@ -257,7 +277,10 @@ int dmar_insert_dev_scope(struct dmar_pci_notify_info *info,
info->dev->class >> 8 != PCI_CLASS_BRIDGE_OTHER))) {
pr_warn("Device scope type does not match for %s\n",
pci_name(info->dev));
- return -EINVAL;
+ if (!scope_mismatch_quirk)
+ return -EINVAL;
+ else
+ pr_warn("but continuing anyway\n");
}
for_each_dev_scope(devices, devices_cnt, i, tmp)
--
1.8.3.1

9
kernel/kernel-std/centos/patches/kernel-x86_64.config.tis_extra
View File

@ -24,8 +24,9 @@ CONFIG_SCSI_PMCRAID=y
CONFIG_SCSI_HPSA=y
CONFIG_MEGARAID_SAS=y
CONFIG_SCSI_SMARTPQI=y
CONFIG_SCSI_MPT2SAS=y
CONFIG_SCSI_MPT3SAS=y
# These two will only build as modules
CONFIG_SCSI_MPT2SAS=m
CONFIG_SCSI_MPT3SAS=m
CONFIG_SCSI_VIRTIO=y
CONFIG_FUSION_SAS=y
CONFIG_SCSI_AIC94XX=y
@ -814,3 +815,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# Disable kernel memory accounting, which is broken
CONFIG_MEMCG_KMEM=n
# Needed for opae fpga kernel module
# as it turns on hidden option REGMAP_MMIO
CONFIG_MFD_SYSCON=y

22
kubernetes/containerd/centos/files/0001-customize-containerd-for-StarlingX.patch
View File

@ -4,12 +4,16 @@ Date: Wed, 25 Sep 2019 20:02:34 +0800
Subject: [PATCH] customize containerd for StarlingX
1. disable btrfs to pass build.
2. docker registry in StarlingX 3.0 branch doesn't support POST method
for token and will return 400. Switch to GET method to get token if
StatusCode is 400.
3. hardcode version info due to miss git info in tarball.
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
containerd/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
containerd/Makefile | 3 ++-
containerd/remotes/docker/authorizer.go | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/containerd/Makefile b/containerd/Makefile
index 6758161..49dd612 100644
@ -32,6 +36,20 @@ index 6758161..49dd612 100644
GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)",)
GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)'
SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)'
diff --git a/containerd/remotes/docker/authorizer.go b/containerd/remotes/docker/authorizer.go
index 9652d3a..38ab5fb 100644
--- a/containerd/remotes/docker/authorizer.go
+++ b/containerd/remotes/docker/authorizer.go
@@ -366,7 +366,8 @@ func (ah *authHandler) fetchTokenWithOAuth(ctx context.Context, to tokenOptions)
// Registries without support for POST may return 404 for POST /v2/token.
// As of September 2017, GCR is known to return 404.
// As of February 2018, JFrog Artifactory is known to return 401.
- if (resp.StatusCode == 405 && to.username != "") || resp.StatusCode == 404 || resp.StatusCode == 401 {
+ // Current Registry in StarlingX returns 400 for POST /v2/token.
+ if (resp.StatusCode == 405 && to.username != "") || resp.StatusCode == 404 || resp.StatusCode == 401 || resp.StatusCode == 400 {
return ah.fetchToken(ctx, to)
} else if resp.StatusCode < 200 || resp.StatusCode >= 400 {
b, _ := ioutil.ReadAll(io.LimitReader(resp.Body, 64000)) // 64KB
--
2.7.4

9
kubernetes/n3000/centos/docker/Dockerfile Normal file
View File

@ -0,0 +1,9 @@
ARG BASE
FROM ${BASE}
RUN yum install -y \
pciutils which hwloc-libs libuuid-devel \
sysvinit-tools epel-release opae opae.admin && \
yum install -y python-pip && \
yum clean all && \
rm -rf /var/cache/yum
RUN pip install intelhex

3
kubernetes/n3000/centos/n3000-opae.stable_docker_image Normal file
View File

@ -0,0 +1,3 @@
BUILDER=docker
LABEL=n3000-opae

3
python/python-html5lib/centos/build_srpm.data Normal file
View File

@ -0,0 +1,3 @@
COPY_LIST="$CGCS_BASE/downloads/html5lib-python-1.0.1.tar.gz"
TIS_PATCH_VER=0

99
python/python-html5lib/centos/python-html5lib.spec Normal file
View File

@ -0,0 +1,99 @@
# define some macros for RHEL 6
%global __python2 %__python
%global python2_sitelib %python_sitelib
Name: html5lib-python
Version: 1.0.1
Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Python library for parsing HTML
Group: Applications/System
License: MIT License
URL: https://github.com/html5lib/html5lib-python/archive/1.0.1.tar.gz
Source0: html5lib-python-1.0.1.tar.gz
BuildArch: noarch
Requires: python-webencodings
%description
Python library for parsing HTML
%package -n python2-html5lib
Summary: Python library for parsing HTML
%{?python_provide:%python_provide python2-html5lib}
%description -n python2-html5lib
Python library for parsing HTML
%if 0%{?with_python3}
%package -n python3-html5lib
Summary: Python library for parsing HTML
Group: Applications/System
%{?python_provide:%python_provide python3-html5lib}
%description -n python3-html5lib
Python library for parsing HTML
%endif # with_python3
%prep
%setup -q -n html5lib-%{version}
%build
export PBR_VERSION=%{version}
%{__python} setup.py build
%py2_build_wheel
%if 0%{?with_python3}
%{__python3} setup.py build
%endif # with_python3
%install
# Must do the python3 install first because the scripts in /usr/bin are
# overwritten with every setup.py install (and we want the python2 version
# to be the default for now).
%if 0%{?with_python3}
%if 0%{?build_wheel}
pip3 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
sed -i '/\/usr\/bin\/easy_install,/d' %{buildroot}%{python3_record}
%else
%{__python3} setup.py install --skip-build --root %{buildroot}
%endif
find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f
%endif # with_python3
%if 0%{?build_wheel}
pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
%else
%{__python2} setup.py install --skip-build --root %{buildroot}
%endif
find %{buildroot}%{python2_sitelib} -name '*.exe' | xargs rm -f
# Don't ship these
# rm -r docs/{Makefile,conf.py}
%if 0%{?with_check}
%check
LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test
%if 0%{?with_python3}
LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version}
%endif # with_python3
%endif # with_check
%files -n python2-html5lib
# %doc docs/*
%{python2_sitelib}/*
%if 0%{?with_python3}
%files -n python3-html5lib
# %doc docs/*
%{python3_sitelib}/html5lib*/
%endif # with_python3
%changelog

3
python/python-mechanize/centos/build_srpm.data Normal file
View File

@ -0,0 +1,3 @@
COPY_LIST="$CGCS_BASE/downloads/mechanize-0.4.5.tar.gz"
TIS_PATCH_VER=0

115
python/python-mechanize/centos/python-mechanize.spec Normal file
View File

@ -0,0 +1,115 @@
# Dependencies for check and wheel introduce circular dependencies
# Set this to 0 after we've bootstrapped.
%global with_check 0
%global build_wheel 0
# define some macros for RHEL 6
%global __python2 %__python
%global python2_sitelib %python_sitelib
Name: mechanize
Version: 0.4.5
Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Automate interaction with HTTP web servers
Group: Applications/System
License: (Python or ZPLv2.0) and ASL 2.0
URL: https://github.com/python-mechanize/mechanize
Source0: mechanize-0.4.5.tar.gz
BuildArch: noarch
Requires: python-html5lib
%description
Stateful programmatic web browsing in Python.
%package -n python2-mechanize
Summary: Automate interaction with HTTP web servers
%{?python_provide:%python_provide python2-mechanize}
%description -n python2-mechanize
Stateful programmatic web browsing in Python.
%if 0%{?with_python3}
%package -n python3-mechanize
Summary: Automate interaction with HTTP web servers
Group: Applications/System
%{?python_provide:%python_provide python3-mechanize}
%description -n python3-mechanize
Stateful programmatic web browsing in Python.
%endif # with_python3
%prep
%setup
%build
export PBR_VERSION=%{version}
%{__python} setup.py build
%if 0%{?with_python3}
%{__python3} setup.py build
%endif # with_python3
%install
# Must do the python3 install first because the scripts in /usr/bin are
# overwritten with every setup.py install (and we want the python2 version
# to be the default for now).
%if 0%{?with_python3}
%if 0%{?build_wheel}
pip3 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
%else
%{__python3} setup.py install --skip-build --root %{buildroot}
%endif
rm -rf %{buildroot}%{python3_sitelib}/mechanize/test
rm -rf %{buildroot}%{python3_sitelib}/mechanize/test-tools
rm -rf %{buildroot}%{python3_sitelib}/mechanize/run_tests.py
%if 0%{?build_wheel}
sed -i '/^mechanize\/tests\//d' %{buildroot}%{python3_record}
%endif
find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f
%endif # with_python3
%if 0%{?build_wheel}
pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
%else
%{__python2} setup.py install --skip-build --root %{buildroot}
%endif
rm -rf %{buildroot}%{python2_sitelib}/mechanize/test
rm -rf %{buildroot}%{python2_sitelib}/mechanize/test-tools
rm -rf %{buildroot}%{python2_sitelib}/mechanize/run_tests.py
%if 0%{?build_wheel}
sed -i '/^mechanize\/tests\//d' %{buildroot}%{python2_record}
%endif
find %{buildroot}%{python2_sitelib} -name '*.exe' | xargs rm -f
# Don't ship these
rm -r docs/{Makefile,conf.py}
%if 0%{?with_check}
%check
LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test
%if 0%{?with_python3}
LANG=en_US.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version}
%endif # with_python3
%endif # with_check
%files -n python2-mechanize
%doc docs/*
%{python2_sitelib}/*
%if 0%{?with_python3}
%files -n python3-mechanize
%doc docs/*
%{python3_sitelib}/mechanize*/
%endif # with_python3
%changelog

3
python/python-webencodings/centos/build_srpm.data Normal file
View File

@ -0,0 +1,3 @@
COPY_LIST="$CGCS_BASE/downloads/python-webencodings-0.5.1.tar.gz"
TIS_PATCH_VER=0

43
python/python-webencodings/centos/python-webencodings.spec Normal file
View File

@ -0,0 +1,43 @@
%global __python2 %__python
%global python2_sitelib %python_sitelib
Name: python-webencodings
Version: 0.5.1
Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: This is a Python implementation of the WHATWG Encoding standard.
Group: Applications/System
License: (Python or ZPLv2.0) and ASL 2.0
URL: https://github.com/gsnedders/python-webencodings/archive/v0.5.1.tar.gz
Source0: python-webencodings-0.5.1.tar.gz
BuildArch: noarch
%description
This is a Python implementation of the WHATWG Encoding standard.
%package -n python2-webencodings
Summary: This is a Python implementation of the WHATWG Encoding standard.
%{?python_provide:%python_provide python2-webencodings}
%description -n python2-webencodings
This is a Python implementation of the WHATWG Encoding standard.
%prep
%setup -q -n webencodings-%{version}
%build
export PBR_VERSION=%{version}
%{__python} setup.py build
%install
%{__python2} setup.py install --skip-build --root %{buildroot}
# Don't ship these
# rm -r docs/{conf.py}
%files -n python2-webencodings
# %doc docs/*
%{python2_sitelib}/*
%changelog

2
releasenotes/source/conf.py
View File

@ -46,7 +46,7 @@ source_suffix = '.rst'
# The master toctree document.
master_doc = 'index'
project = u'stx-integ'
project = u'StarlingX Integration'
# Release notes are version independent, no need to set version and release
release = ''

6
releasenotes/source/index.rst
View File

@ -1,6 +1,6 @@
=======================
stx-integ Release Notes
=======================
===================================
StarlingX Integration Release Notes
===================================
.. toctree::
:maxdepth: 2

44
security/shim-unsigned/centos/patches/0001-Use-Titanium-certificate.patch
View File

@ -1,12 +1,13 @@
From 057532ac6c77d20ae8d6ce0354e7ef67b1870eb6 Mon Sep 17 00:00:00 2001
From 7fc985a350f9f7f5abbd19cef7a1947a3e33e5c8 Mon Sep 17 00:00:00 2001
From: root <root@yow-cgts4-lx.wrs.com>
Date: Mon, 15 Jan 2018 13:25:04 -0500
Subject: [PATCH] Use Titanium certificate
Signed-off-by: Scott Little <scott.little@windriver.com>
---
Make.defaults | 6 ++++++
Makefile | 20 ++++++++++++--------
2 files changed, 18 insertions(+), 8 deletions(-)
Makefile | 29 ++++++++++++++++-------------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/Make.defaults b/Make.defaults
index e11ab5a..d16510c 100644
@ -26,11 +27,14 @@ index e11ab5a..d16510c 100644
CFLAGS += -DOVERRIDE_SECURITY_POLICY
endif
diff --git a/Makefile b/Makefile
index 115e7f0..933c859 100644
index 115e7f0..f2b37fa 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ else
@@ -32,9 +32,10 @@ TARGETS += $(MMNAME).signed $(FBNAME).signed
CFLAGS += -DENABLE_SHIM_CERT
else
TARGETS += $(MMNAME) $(FBNAME)
+CFLAGS += -DENABLE_SHIM_CERT
endif
OBJS = shim.o mok.o netboot.o cert.o replacements.o tpm.o version.o errlog.o
-KEYS = shim_cert.h ocsp.* ca.* shim.crt shim.csr shim.p12 shim.pem shim.key shim.cer
@ -38,7 +42,7 @@ index 115e7f0..933c859 100644
ORIG_SOURCES = shim.c mok.c netboot.c replacements.c tpm.c errlog.c shim.h version.h $(wildcard include/*.h)
MOK_OBJS = MokManager.o PasswordCrypt.o crypt_blowfish.o
ORIG_MOK_SOURCES = MokManager.c PasswordCrypt.c crypt_blowfish.c shim.h $(wildcard include/*.h)
@@ -52,14 +52,18 @@ FALLBACK_SRCS = $(foreach source,$(ORIG_FALLBACK_SRCS),$(TOPDIR)/$(source))
@@ -52,14 +53,18 @@ FALLBACK_SRCS = $(foreach source,$(ORIG_FALLBACK_SRCS),$(TOPDIR)/$(source))
all: $(TARGETS)
@ -61,7 +65,7 @@ index 115e7f0..933c859 100644
echo "static UINT8 shim_cert[] __attribute__((__unused__)) = {" > $@
$(HEXDUMP) -v -e '1/1 "0x%02x, "' $< >> $@
echo "};" >> $@
@@ -70,10 +74,10 @@ version.c : $(TOPDIR)/version.c.in
@@ -70,15 +75,13 @@ version.c : $(TOPDIR)/version.c.in
-e "s,@@COMMIT@@,$(COMMIT_ID)," \
< $< > $@
@ -74,7 +78,31 @@ index 115e7f0..933c859 100644
+ $(CERTUTIL) -d certdb/ -A -i $(INTERNAL_CERT).crt -n shim -t u
shim.o: $(SOURCES)
ifneq ($(origin ENABLE_SHIM_CERT),undefined)
-ifneq ($(origin ENABLE_SHIM_CERT),undefined)
shim.o: shim_cert.h
-endif
shim.o: $(wildcard $(TOPDIR)/*.h)
cert.o : $(TOPDIR)/cert.S
@@ -213,8 +216,8 @@ endif
$^ $@
ifneq ($(origin ENABLE_SBSIGN),undefined)
-%.efi.signed: %.efi shim.key shim.crt
- $(SBSIGN) --key shim.key --cert shim.crt --output $@ $<
+%.efi.signed: %.efi $(INTERNAL_CERT).key $(INTERNAL_CERT).crt
+ $(SBSIGN) --key $(INTERNAL_CERT).key --cert $(INTERNAL_CERT).crt --output $@ $<
else
%.efi.signed: %.efi certdb/secmod.db
$(PESIGN) -n certdb -i $< -c "shim" -s -o $@ -f
@@ -258,6 +261,6 @@ archive: tag
@rm -rf /tmp/shim-$(VERSION)
@echo "The archive is in shim-$(VERSION).tar.bz2"
-.PHONY : install-deps shim.key
+.PHONY : install-deps $(INTERNAL_CERT).key
export ARCH CC LD OBJCOPY EFI_INCLUDE
--
2.7.4

2
storage-drivers/trident-installer/centos/build_srpm.data Normal file
View File

@ -0,0 +1,2 @@
COPY_LIST="$CGCS_BASE/downloads/trident-installer-20.01.0.tar.gz"
TIS_PATCH_VER=1

33
storage-drivers/trident-installer/centos/trident-installer.spec Normal file
View File

@ -0,0 +1,33 @@
Summary: trident-installer
Name: trident-installer
Version: 20.01.0
Release: 0%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2 and GPLv2+ and LGPLv2+ and Public Domain and BSD
Group: base
Packager: Wind River <info@windriver.com>
URL: https://github.com/NetApp/trident/releases/download/v20.01.0/trident-installer-20.01.0.tar.gz
Source0: %{name}-%{version}.tar.gz
Requires: nfs-utils
%description
Netapp Trident-installer
https://netapp-trident.readthedocs.io/en/stable-v20.01/introduction.html
%define debug_package %{nil}
%prep
%setup -q
%build
%install
mkdir -p %{buildroot}/%{_bindir}
install -m 755 tridentctl %{buildroot}/%{_bindir}/tridentctl
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/tridentctl