starlingx/integ
Code Issues Proposed changes

Merge branch 'master' into f/centos8

Browse Source 
Change-Id: Ia907a71dfa89d3ce7580d788eacf29dda1fb7fc8
Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Saul Wold 2019-12-11 10:06:00 -08:00
commit 9035cd1be8
52 changed files with 424 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
base/initscripts/centos/meta_patches/0001-Include-starlingx-initscripts-changes.patch Normal file
View File

@ -0,0 +1,110 @@
From 764ce9e69477b47577fc0231f4a0190b119937f7 Mon Sep 17 00:00:00 2001
From: Joseph Richard <joseph.richard@windriver.com>
Date: Tue, 19 Nov 2019 13:06:43 -0500
Subject: [PATCH] Include starlingx initscripts changes
This is build with build-pkgs --edit initscripts, and then rebased with
git rebase -i --root, with all existing meta-patches squashed into this
commit, and then the new meta-patch created from the output of
git format-patch HEAD~
Signed-off-by: Joseph Richard <joseph.richard@windriver.com>
---
SPECS/initscripts.spec | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index fb0bd96..a446775 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.46
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -36,6 +36,20 @@ Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd
Provides: /sbin/service
+Patch1: support-interface-scriptlets.patch
+Patch2: relocate-dhclient-leases-to-var-run.patch
+Patch3: dhclient-restrict-interfaces-to-those-on-c.patch
+Patch4: support-interface-promisc.patch
+Patch5: 0001-dhclient-remove-1-arg.patch
+Patch6: 0001-force-delay-check-link-down.patch
+Patch7: run-ifdown-on-all-interfaces.patch
+Patch8: sysconfig-affirmative-check-for-link-carrier.patch
+Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch
+Patch10: ipv6-static-route-support.patch
+Patch11: ifup-eth-stop-waiting-if-link-is-up.patch
+Patch12: ifup-alias-scope.patch
+Patch13: ifup-alias-check-ipaddr.patch
+
%description
The initscripts package contains basic system scripts used
during a boot of the system. It also contains scripts which
@@ -55,6 +69,20 @@ Currently, this consists of various memory checking code.
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+
%build
make
@@ -163,10 +191,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/systemd/rhel-*
/usr/lib/systemd/system/*
/etc/inittab
-%dir /etc/rc.d
-%dir /etc/rc.d/rc[0-9].d
/etc/rc[0-9].d
-%dir /etc/rc.d/init.d
/etc/rc.d/init.d/*
%config(noreplace) /etc/sysctl.conf
/usr/lib/sysctl.d/00-system.conf
@@ -188,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/ppp-watch
%{_mandir}/man*/*
%dir %attr(775,root,root) /var/run/netreport
-%dir /etc/ppp
%dir /etc/ppp/peers
/etc/ppp/ip-up
/etc/ppp/ip-down
@@ -196,8 +220,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/ppp/ip-down.ipv6to4
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down
-%dir /etc/NetworkManager
-%dir /etc/NetworkManager/dispatcher.d
/etc/NetworkManager/dispatcher.d/00-netreport
%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING
%doc examples
@@ -207,7 +229,7 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%ghost %attr(0644,root,root) /etc/sysconfig/kvm
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
-%dir /usr/lib/tmpfiles.d
+%dir %attr(0755,root,root) /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/initscripts.conf
%dir /usr/libexec/initscripts
%dir /usr/libexec/initscripts/legacy-actions
--
1.8.3.1

27
base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,27 +0,0 @@
From f77c05868c164eebe1c84eb3fdd920ef3305cebc Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 09/13] WRS:
0001-Update-package-versioning-for-TIS-format.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index ad32f19..ace1326 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.46
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
URL: https://github.com/fedora-sysv/initscripts
Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
--
1.8.3.1

7
base/initscripts/centos/meta_patches/PATCH_ORDER
View File

@ -1,6 +1 @@
spec-include-TiS-changes.patch 0001-Include-starlingx-initscripts-changes.patch
stop-creating-shared-dirs.patch
fix-build-failures-due-to-unwanted-sgid.patch
0001-Update-package-versioning-for-TIS-format.patch
ifup-alias-scope.patch
added-ifup-alias-check-ipaddr.patch

32
base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch
View File

@ -1,32 +0,0 @@
From 7f65521a9cee14ecd136f4caf44409b2acc86bdd Mon Sep 17 00:00:00 2001
From: Teresa Ho <teresa.ho@windriver.com>
Date: Wed, 25 Sep 2019 16:19:26 -0400
Subject: [PATCH 1/1] Added ifup-alias-check-ipaddr.patch
---
SPECS/initscripts.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index fc7115c..9309d03 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -49,6 +49,7 @@ Patch10: ipv6-static-route-support.patch
Patch11: ifup-eth-stop-waiting-if-link-is-up.patch
Patch12: run-dhclient-as-daemon-for-ipv6.patch
Patch13: ifup-alias-scope.patch
+Patch14: ifup-alias-check-ipaddr.patch
%description
The initscripts package contains basic system scripts used
@@ -82,6 +83,7 @@ Currently, this consists of various memory checking code.
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%build
make
--
1.8.3.1

26
base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
View File

@ -1,26 +0,0 @@
From 2c096cfd84fea55fd1f2df466d5635c06daab2a2 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH] WRS: fix-build-failures-due-to-unwanted-sgid.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 967317f..ad32f19 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -227,7 +227,7 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%ghost %attr(0644,root,root) /etc/sysconfig/kvm
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
-%dir /usr/lib/tmpfiles.d
+%dir %attr(0755,root,root) /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/initscripts.conf
%dir /usr/libexec/initscripts
%dir /usr/libexec/initscripts/legacy-actions
--
1.8.3.1

34
base/initscripts/centos/meta_patches/ifup-alias-scope.patch
View File

@ -1,34 +0,0 @@
From ad85db9465da885a5f186db7f23655a3735a43c5 Mon Sep 17 00:00:00 2001
From: Teresa Ho <teresa.ho@windriver.com>
Date: Fri, 4 Jan 2019 10:49:27 -0500
Subject: [PATCH 1/1] Added ifup-alias-scope.patch
---
SPECS/initscripts.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index 6e9fc13..bff1e12 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -48,6 +48,7 @@ Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch
Patch10: ipv6-static-route-support.patch
Patch11: ifup-eth-stop-waiting-if-link-is-up.patch
Patch12: run-dhclient-as-daemon-for-ipv6.patch
+Patch13: ifup-alias-scope.patch
%description
The initscripts package contains basic system scripts used
@@ -80,7 +81,8 @@ Currently, this consists of various memory checking code.
%patch10 -p1
%patch11 -p1
%patch12 -p1
-
+%patch13 -p1
+
%build
make
--
1.8.3.1

57
base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch
View File

@ -1,57 +0,0 @@
From 29d8980d8c67a302a27a3084f58657414578a2b9 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH] WRS: spec-include-TiS-changes.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index e96290a..d3c2ce6 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -36,6 +36,19 @@ Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd
Provides: /sbin/service
+Patch1: support-interface-scriptlets.patch
+Patch2: relocate-dhclient-leases-to-var-run.patch
+Patch3: dhclient-restrict-interfaces-to-those-on-c.patch
+Patch4: support-interface-promisc.patch
+Patch5: 0001-dhclient-remove-1-arg.patch
+Patch6: 0001-force-delay-check-link-down.patch
+Patch7: run-ifdown-on-all-interfaces.patch
+Patch8: sysconfig-affirmative-check-for-link-carrier.patch
+Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch
+Patch10: ipv6-static-route-support.patch
+Patch11: ifup-eth-stop-waiting-if-link-is-up.patch
+Patch12: run-dhclient-as-daemon-for-ipv6.patch
+
%description
The initscripts package contains basic system scripts used
during a boot of the system. It also contains scripts which
@@ -55,6 +68,19 @@ Currently, this consists of various memory checking code.
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
%build
make
--
1.8.3.1

45
base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch
View File

@ -1,45 +0,0 @@
From f93a873f57cf8134e371668c7514923e6fda80f3 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:49:27 -0400
Subject: [PATCH 02/13] WRS: stop-creating-shared-dirs.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
---
SPECS/initscripts.spec | 6 ------
1 file changed, 6 deletions(-)
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index d3c2ce6..967317f 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -189,10 +189,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/systemd/rhel-*
/usr/lib/systemd/system/*
/etc/inittab
-%dir /etc/rc.d
-%dir /etc/rc.d/rc[0-9].d
/etc/rc[0-9].d
-%dir /etc/rc.d/init.d
/etc/rc.d/init.d/*
%config(noreplace) /etc/sysctl.conf
/usr/lib/sysctl.d/00-system.conf
@@ -214,7 +211,6 @@ rm -rf $RPM_BUILD_ROOT
/usr/sbin/ppp-watch
%{_mandir}/man*/*
%dir %attr(775,root,root) /var/run/netreport
-%dir /etc/ppp
%dir /etc/ppp/peers
/etc/ppp/ip-up
/etc/ppp/ip-down
@@ -222,8 +218,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/ppp/ip-down.ipv6to4
/etc/ppp/ipv6-up
/etc/ppp/ipv6-down
-%dir /etc/NetworkManager
-%dir /etc/NetworkManager/dispatcher.d
/etc/NetworkManager/dispatcher.d/00-netreport
%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING
%doc examples
--
1.8.3.1

34
base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch
View File

@ -1,34 +0,0 @@
From 580624314b1b93f84264e9d60583dcde4f6b86f3 Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Thu, 11 Jan 2018 11:18:19 -0500
Subject: [PATCH] run dhclient as daemon for ipv6.
---
sysconfig/network-scripts/ifup-eth | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 4b8b992..ccb5c75 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -364,13 +364,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
echo -n $"Determining IPv6 information for ${DEVICE}..."
# Initialize the dhclient args for IPv6 and obtain the hostname options if needed:
- DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}"
+ DHCLIENTARGS="-6 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}"
set_hostname_options DHCLIENTARGS
- if /sbin/dhclient $DHCLIENTARGS; then
+ if /sbin/dhclient -1 $DHCLIENTARGS; then
echo $" done."
else
- echo $" failed."
+ /sbin/dhclient $DHCLIENTARGS&
+ echo $" failed. Retrying in background."
if [ "${dhcpipv4}" = "good" -o -n "${IPADDR}" ]; then
net_log "Unable to obtain IPv6 DHCP address ${DEVICE}." warning
else
--
1.8.3.1

41
base/ntp/centos/meta_patches/Fix-ntpq-truncates-IPV6-addresses.patch Normal file
View File

@ -0,0 +1,41 @@
From fbfbbc827d080370f71a76284dde4dc3dd1d16da Mon Sep 17 00:00:00 2001
Message-Id: <fbfbbc827d080370f71a76284dde4dc3dd1d16da.1574708120.git.Jim.Somerville@windriver.com>
In-Reply-To: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com>
References: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com>
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 3 Sep 2019 16:18:58 -0400
Subject: [PATCH 2/2] Fix ntpq truncates IPV6 addresses
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/ntp.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index 84aa1ac..4d32d8c 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -204,6 +204,9 @@ Patch78: ntp-4.2.6p5-netlinknobuf.patch
# add bugs for compatibility with original EL7 ntpstat
Patch100: ntpstat-compat.patch
+# STX IPV6 ntpq patch
+Patch500: Fix-ntpq-truncates-IPV6-addresses.patch
+
URL: http://www.ntp.org
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -361,6 +364,9 @@ This package contains NTP documentation in HTML format.
%patch100 -p1 -b .compat
+%patch500 -p1 -b .ntpq-truncates-IPV6-addresses
+
+
# set default path to sntp KoD database
sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/sntp/kod|' sntp/{sntp.1,main.c}
--
1.8.3.1

37
base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch
View File

@ -1,37 +0,0 @@
From 44c7f5aa4df30c2ac8eae5a956dc503d7e62e1fd Mon Sep 17 00:00:00 2001
From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 3 Sep 2019 16:18:58 -0400
Subject: [PATCH] Include patch Fix-ntpq-truncates-IPV6-addresses.patch.
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
---
SPECS/ntp.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index a9ebf30..330d5b0 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -207,6 +207,9 @@ Patch104: ntpstat-0.2-errorbit.patch
# improve man page
Patch105: ntpstat-0.2-manual.patch
+# STX IPV6 ntpq patch
+Patch500: Fix-ntpq-truncates-IPV6-addresses.patch
+
URL: http://www.ntp.org
Requires(post): systemd-units
Requires(preun): systemd-units
@@ -366,6 +369,9 @@ This package contains NTP documentation in HTML format.
%patch104 -p1 -b .errorbit
%patch105 -p1 -b .manual
+%patch500 -p1 -b .ntpq-truncates-IPV6-addresses
+
+
# set default path to sntp KoD database
sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/sntp/kod|' sntp/{sntp.1,main.c}
--
1.8.3.1

2
base/ntp/centos/meta_patches/PATCH_ORDER
View File

@ -1,2 +1,2 @@
Update-package-versioning-for-TIS-format.patch Update-package-versioning-for-TIS-format.patch
Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch Fix-ntpq-truncates-IPV6-addresses.patch

12
base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
View File

@ -1,23 +1,25 @@
From b7992d01d3ce4ccb51f73e7c1c4e3f4cb9e8e454 Mon Sep 17 00:00:00 2001 From 536afc9500d65768db35f6ca07c21c490b19bda7 Mon Sep 17 00:00:00 2001
Message-Id: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com>
From: Kristine Bujold <kristine.bujold@windriver.com> From: Kristine Bujold <kristine.bujold@windriver.com>
Date: Tue, 3 Sep 2019 16:08:25 -0400 Date: Tue, 3 Sep 2019 16:08:25 -0400
Subject: [PATCH] Update-package-versioning-for-TIS-format Subject: [PATCH 1/2] Update package versioning for TIS format
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com> Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
SPECS/ntp.spec | 2 +- SPECS/ntp.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index 52ad9aa..a9ebf30 100644 index 178a961..84aa1ac 100644
--- a/SPECS/ntp.spec --- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec +++ b/SPECS/ntp.spec
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
Summary: The NTP daemon and utilities Summary: The NTP daemon and utilities
Name: ntp Name: ntp
Version: 4.2.6p5 Version: 4.2.6p5
-Release: 28%{?dist} -Release: 29%{?dist}
+Release: 28.el7.centos%{?_tis_dist}.%{tis_patch_ver} +Release: 29.el7.centos%{?_tis_dist}.%{tis_patch_ver}
# primary license (COPYRIGHT) : MIT # primary license (COPYRIGHT) : MIT
# ElectricFence/ (not used) : GPLv2 # ElectricFence/ (not used) : GPLv2
# kernel/sys/ppsclock.h (not used) : BSD with advertising # kernel/sys/ppsclock.h (not used) : BSD with advertising

2
base/ntp/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/ntp-4.2.6p5-28.el7.centos.src.rpm mirror:Source/ntp-4.2.6p5-29.el7.centos.src.rpm

4
base/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -15,8 +15,8 @@ index c8d2f64..b6402bb 100644
Summary: Allows restricted root access for specified users Summary: Allows restricted root access for specified users
Name: sudo Name: sudo
Version: 1.8.23 Version: 1.8.23
-Release: 3%{?dist} -Release: 4%{?dist}.1
+Release: 3.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 4.el7_7.1%{?_tis_dist}.%{tis_patch_ver}
License: ISC License: ISC
Group: Applications/System Group: Applications/System
URL: http://www.courtesan.com/sudo/ URL: http://www.courtesan.com/sudo/

6
base/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec
index b6402bb..acbcb26 100644 index b6402bb..acbcb26 100644
--- a/SPECS/sudo.spec --- a/SPECS/sudo.spec
+++ b/SPECS/sudo.spec +++ b/SPECS/sudo.spec
@@ -111,7 +111,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL @@ -126,7 +126,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL
--with-ignore-dot \ --with-ignore-dot \
--with-tty-tickets \ --with-tty-tickets \
--with-ldap \ --with-ldap \
@ -20,7 +20,7 @@ index b6402bb..acbcb26 100644
--with-selinux \ --with-selinux \
--with-passprompt="[sudo] password for %p: " \ --with-passprompt="[sudo] password for %p: " \
--with-linux-audit \ --with-linux-audit \
@@ -138,6 +138,9 @@ install -p -c -m 0440 %{SOURCE1} %{buildroot}%{_sysconfdir}/sudoers @@ -153,6 +153,9 @@ install -p -c -m 0440 %{SOURCE1} %{buildroot}%{_sysconfdir}/sudoers
install -p -c -m 0640 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudo.conf install -p -c -m 0640 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudo.conf
install -p -c -m 0640 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudo-ldap.conf install -p -c -m 0640 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudo-ldap.conf
@ -30,7 +30,7 @@ index b6402bb..acbcb26 100644
# Remove upstream sudoers file # Remove upstream sudoers file
rm -f %{buildroot}%{_sysconfdir}/sudoers.dist rm -f %{buildroot}%{_sysconfdir}/sudoers.dist
@@ -210,6 +213,7 @@ rm -rf %{buildroot} @@ -225,6 +228,7 @@ rm -rf %{buildroot}
%{_mandir}/man5/sudoers_timestamp.5.gz %{_mandir}/man5/sudoers_timestamp.5.gz
%dir %{_docdir}/sudo-%{version} %dir %{_docdir}/sudo-%{version}
%{_docdir}/sudo-%{version}/* %{_docdir}/sudo-%{version}/*

2
base/sudo/centos/meta_patches/0003-remove-make-check.patch
View File

@ -2,7 +2,7 @@ diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec
index 8c3f395..17531f7 100644 index 8c3f395..17531f7 100644
--- a/SPECS/sudo.spec --- a/SPECS/sudo.spec
+++ b/SPECS/sudo.spec +++ b/SPECS/sudo.spec
@@ -120,7 +120,8 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL @@ -135,7 +135,8 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL
make make
%check %check

2
base/sudo/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/sudo-1.8.23-3.el7.src.rpm mirror:Source/sudo-1.8.23-4.el7_7.1.src.rpm

2
base/systemd/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=11 TIS_PATCH_VER=1
BUILD_IS_SLOW=7 BUILD_IS_SLOW=7

32
base/systemd/centos/meta_patches/Add-STX-patches.patch Normal file
View File

@ -0,0 +1,32 @@
From 3c0e59a677c921f60f27002a27eb5f4776475e44 Mon Sep 17 00:00:00 2001
Message-Id: <3c0e59a677c921f60f27002a27eb5f4776475e44.1574265913.git.Jim.Somerville@windriver.com>
In-Reply-To: <eeb3e979288cb8c14d8546d12a27da4c88fbb0e4.1574265913.git.Jim.Somerville@windriver.com>
References: <eeb3e979288cb8c14d8546d12a27da4c88fbb0e4.1574265913.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Wed, 20 Nov 2019 10:59:45 -0500
Subject: [PATCH 3/3] Add STX patches
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/systemd.spec | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 4c83150..e1e98bb 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -786,6 +786,11 @@ Patch0744: 0744-selinux-don-t-log-SELINUX_INFO-and-SELINUX_WARNING-m.patch
Patch0745: 0745-fix-mis-merge.patch
Patch0746: 0746-fs-util-chase_symlinks-prevent-double-free.patch
+# STX Patches
+Patch0801: 801-inject-millisec-in-syslog-date.patch
+Patch0802: 802-fix-build-error-for-unused-variable.patch
+Patch0803: 803-Fix-compile-failure-due-to-deprecated-value.patch
+
Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
1.8.3.1

6
base/systemd/centos/meta_patches/PATCH_ORDER
View File

@ -1,5 +1,3 @@
update-package-versioning-for-TIS-format.patch update-package-versioning-for-STX.patch
Protect-sections-of-systemd-post-from-running-on-pat.patch Protect-sections-of-systemd-post-from-running-on-pat.patch
spec-millisec-in-syslog-date.patch Add-STX-patches.patch
fix-build-error-for-unused-variable.patch
fix-build-error-for-CentOS76.patch

21
base/systemd/centos/meta_patches/Protect-sections-of-systemd-post-from-running-on-pat.patch
View File

@ -1,18 +1,21 @@
From e54be64fa16349c94826b17a4dc206a7513f0d9c Mon Sep 17 00:00:00 2001 From eece9585b5f9258c7180247b1664e92b5ef83efe Mon Sep 17 00:00:00 2001
Message-Id: <eece9585b5f9258c7180247b1664e92b5ef83efe.1574265913.git.Jim.Somerville@windriver.com>
In-Reply-To: <eeb3e979288cb8c14d8546d12a27da4c88fbb0e4.1574265913.git.Jim.Somerville@windriver.com>
References: <eeb3e979288cb8c14d8546d12a27da4c88fbb0e4.1574265913.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:53:00 -0400 Date: Mon, 2 Oct 2017 17:53:00 -0400
Subject: [PATCH] WRS: Subject: [PATCH 2/3] Protect sections of systemd post from running on patch
0004-Protect-sections-of-systemd-post-from-running-on-pat.patch
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
SPECS/systemd.spec | 4 ++++ SPECS/systemd.spec | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 6e1d7e1..6a04c16 100644 index 16262fb..4c83150 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -1221,6 +1221,7 @@ fi @@ -1297,6 +1297,7 @@ fi
rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || : rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || :
rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || : rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || :
@ -20,7 +23,7 @@ index 6e1d7e1..6a04c16 100644
# Migrate HOSTNAME= from /etc/sysconfig/network # Migrate HOSTNAME= from /etc/sysconfig/network
if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
unset HOSTNAME unset HOSTNAME
@@ -1228,6 +1229,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then @@ -1304,6 +1305,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
[ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || : [ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || :
fi fi
sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || : sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || :
@ -28,7 +31,7 @@ index 6e1d7e1..6a04c16 100644
# Migrate the old systemd-setup-keyboard X11 configuration fragment # Migrate the old systemd-setup-keyboard X11 configuration fragment
if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then
@@ -1236,6 +1238,7 @@ else @@ -1312,6 +1314,7 @@ else
rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || : rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || :
fi fi
@ -36,7 +39,7 @@ index 6e1d7e1..6a04c16 100644
# sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf # sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf
# Only do that when installing, not when updating. # Only do that when installing, not when updating.
if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
@@ -1245,6 +1248,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then @@ -1321,6 +1324,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
s/[[:blank:]]*$/ myhostname/ s/[[:blank:]]*$/ myhostname/
' /etc/nsswitch.conf >/dev/null 2>&1 || : ' /etc/nsswitch.conf >/dev/null 2>&1 || :
fi fi
@ -45,5 +48,5 @@ index 6e1d7e1..6a04c16 100644
%posttrans %posttrans
# Convert old /etc/sysconfig/desktop settings # Convert old /etc/sysconfig/desktop settings
-- --
2.7.4 1.8.3.1

25
base/systemd/centos/meta_patches/fix-build-error-for-CentOS76.patch
View File

@ -1,25 +0,0 @@
From 0816ac70222fec2609ed893c30d55f8c37fba632 Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Tue, 8 Jan 2019 21:06:06 +0800
Subject: [PATCH] Add patch to fix build failure in CentOS 7.6
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index f794c3b..8e3715b 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -715,6 +715,7 @@ Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
#WRS Patches
Patch0701: 0701-inject-millisec-in-syslog-date.patch
Patch0702: 0702-fix-build-error-for-unused-variable.patch
+Patch0703: 0703-fix-build-error-for-CentOS7.6.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
2.7.4

25
base/systemd/centos/meta_patches/fix-build-error-for-unused-variable.patch
View File

@ -1,25 +0,0 @@
From 6aead74fb56ae75cc16be507165d3fc75c38fac0 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Thu, 9 Aug 2018 18:40:36 +0800
Subject: [PATCH] Add 0702-fix-build-error-for-unused-variable.patch
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index ffd0770..3f7cc10 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -714,6 +714,7 @@ Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
#WRS Patches
Patch0701: 0701-inject-millisec-in-syslog-date.patch
+Patch0702: 0702-fix-build-error-for-unused-variable.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
2.7.4

26
base/systemd/centos/meta_patches/spec-millisec-in-syslog-date.patch
View File

@ -1,26 +0,0 @@
From 6f9a8e792bad1f4bb8d9dad4f2430d89a1058d0c Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:53:00 -0400
Subject: [PATCH] WRS: 0005-spec-millisec-in-syslog-date.patch
---
SPECS/systemd.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 6a04c16..845d1dd 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -712,6 +712,9 @@ Patch0670: 0670-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
Patch0671: 0671-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
+#WRS Patches
+Patch0701: 0701-inject-millisec-in-syslog-date.patch
+
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
BuildRequires: libcap-devel
--
2.7.4

14
base/systemd/centos/meta_patches/update-package-versioning-for-TIS-format.patch → base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch
View File

@ -1,25 +1,27 @@
From e1b3591beb36a45f7cc4bf9340dd640b359955b7 Mon Sep 17 00:00:00 2001 From eeb3e979288cb8c14d8546d12a27da4c88fbb0e4 Mon Sep 17 00:00:00 2001
Message-Id: <eeb3e979288cb8c14d8546d12a27da4c88fbb0e4.1574265913.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:53:00 -0400 Date: Mon, 2 Oct 2017 17:53:00 -0400
Subject: [PATCH] WRS: 0001-update-package-versioning-for-TIS-format.patch Subject: [PATCH 1/3] update package versioning for STX
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
SPECS/systemd.spec | 2 +- SPECS/systemd.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 6bdbb74..3b2aa7f 100644 index b1ffe88..16262fb 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219 Version: 219
-Release: 62%{?dist}.5 -Release: 67%{?dist}
+Release: 62.el7_6.5%{?_tis_dist}.%{tis_patch_ver} +Release: 67.el7%{?_tis_dist}.%{tis_patch_ver}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager Summary: A System and Service Manager
-- --
2.7.4 1.8.3.1

10
base/systemd/centos/patches/0701-inject-millisec-in-syslog-date.patch → base/systemd/centos/patches/801-inject-millisec-in-syslog-date.patch
View File

@ -1,14 +1,16 @@
From 08353c7cc596d2d09fd7f22a9bfde4d83bd9ebda Mon Sep 17 00:00:00 2001 From 8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7 Mon Sep 17 00:00:00 2001
Message-Id: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com>
From: systemd team <systemd-maint@redhat.com> From: systemd team <systemd-maint@redhat.com>
Date: Tue, 8 Nov 2016 17:06:01 -0500 Date: Tue, 8 Nov 2016 17:06:01 -0500
Subject: [PATCH 1/1] inject millisec in syslog date Subject: [PATCH 1/3] inject millisec in syslog date
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
src/journal/journald-syslog.c | 48 +++++++++++++++++++++++++++++++++++++------ src/journal/journald-syslog.c | 48 +++++++++++++++++++++++++++++++++++++------
1 file changed, 42 insertions(+), 6 deletions(-) 1 file changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 4e118aa..85cdeb9 100644 index 1a9db59..36288cb 100644
--- a/src/journal/journald-syslog.c --- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c
@@ -35,6 +35,44 @@ @@ -35,6 +35,44 @@
@ -75,5 +77,5 @@ index 4e118aa..85cdeb9 100644
/* Third: identifier and PID */ /* Third: identifier and PID */
-- --
1.9.1 1.8.3.1

12
base/systemd/centos/patches/0702-fix-build-error-for-unused-variable.patch → base/systemd/centos/patches/802-fix-build-error-for-unused-variable.patch
View File

@ -1,15 +1,19 @@
From 193fcf879dbee168238227e2123d63f5bf8a135d Mon Sep 17 00:00:00 2001 From 7cc3363381f83bb060e8e686eb64b5425f2d4409 Mon Sep 17 00:00:00 2001
Message-Id: <7cc3363381f83bb060e8e686eb64b5425f2d4409.1574264572.git.Jim.Somerville@windriver.com>
In-Reply-To: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com>
References: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com>
From: slin14 <shuicheng.lin@intel.com> From: slin14 <shuicheng.lin@intel.com>
Date: Thu, 9 Aug 2018 18:38:18 +0800 Date: Thu, 9 Aug 2018 18:38:18 +0800
Subject: [PATCH] fix build error for unused variable Subject: [PATCH 2/3] fix build error for unused variable
Signed-off-by: slin14 <shuicheng.lin@intel.com> Signed-off-by: slin14 <shuicheng.lin@intel.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
src/journal/journald-syslog.c | 2 -- src/journal/journald-syslog.c | 2 --
1 file changed, 2 deletions(-) 1 file changed, 2 deletions(-)
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 33062ea..fd4e070 100644 index 36288cb..2e49b4c 100644
--- a/src/journal/journald-syslog.c --- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c
@@ -167,8 +167,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons @@ -167,8 +167,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
@ -22,5 +26,5 @@ index 33062ea..fd4e070 100644
assert(s); assert(s);
-- --
2.7.4 1.8.3.1

15
base/systemd/centos/patches/0703-fix-build-error-for-CentOS7.6.patch → base/systemd/centos/patches/803-Fix-compile-failure-due-to-deprecated-value.patch
View File

@ -1,7 +1,10 @@
From bcfe2b0e50fed2a445f4e0dd43f33aee45d9ac5f Mon Sep 17 00:00:00 2001 From 339ea8b005c037eaad217dfd3cc10b2b110bdd28 Mon Sep 17 00:00:00 2001
Message-Id: <339ea8b005c037eaad217dfd3cc10b2b110bdd28.1574264572.git.Jim.Somerville@windriver.com>
In-Reply-To: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com>
References: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com>
From: Shuicheng Lin <shuicheng.lin@intel.com> From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Tue, 2 Apr 2019 16:43:03 +0000 Date: Tue, 2 Apr 2019 16:43:03 +0000
Subject: [PATCH] Fix compile failure due to deprecated value Subject: [PATCH 3/3] Fix compile failure due to deprecated value
Issue occur after upgrade build tool chain. Fix it per tool chain's Issue occur after upgrade build tool chain. Fix it per tool chain's
suggestion. suggestion.
@ -15,10 +18,11 @@ use MHD_HTTP_NOT_ACCEPTABLE [-Werror]
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com> Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
Signed-off-by: Mawrer Ramirez <mawrer.a.ramirez.martinez@intel.com> Signed-off-by: Mawrer Ramirez <mawrer.a.ramirez.martinez@intel.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
src/journal-remote/journal-gatewayd.c | 4 ++-- src/journal-remote/journal-gatewayd.c | 4 ++--
src/journal-remote/journal-remote.c | 4 ++-- src/journal-remote/journal-remote.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-) 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index d1f0ce3..8364044 100644 index d1f0ce3..8364044 100644
@ -43,7 +47,7 @@ index d1f0ce3..8364044 100644
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index e65daf6..9780ecb 100644 index 431e283..476c826 100644
--- a/src/journal-remote/journal-remote.c --- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c
@@ -526,13 +526,13 @@ static int process_http_upload( @@ -526,13 +526,13 @@ static int process_http_upload(
@ -73,3 +77,4 @@ index e65daf6..9780ecb 100644
if (!streq(url, "/upload")) if (!streq(url, "/upload"))
-- --
1.8.3.1 1.8.3.1

2
base/systemd/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/systemd-219-62.el7_6.5.src.rpm mirror:Source/systemd-219-67.el7.src.rpm

4
centos_guest_image.inc
View File

@ -10,8 +10,8 @@ perf
# Network Drivers # Network Drivers
# #
# i40evf-kmod # iavf-kmod
kmod-i40evf kmod-iavf
# i40e-kmod # i40e-kmod
kmod-i40e kmod-i40e

4
centos_guest_image_rt.inc
View File

@ -7,8 +7,8 @@
# Network Drivers # Network Drivers
# #
# i40evf-kmod # iavf-kmod
kmod-i40evf-rt kmod-iavf-rt
# i40e-kmod # i40e-kmod
kmod-i40e-rt kmod-i40e-rt

6
centos_iso_image.inc
View File

@ -80,9 +80,9 @@ kmod-e1000e-rt
kmod-i40e kmod-i40e
kmod-i40e-rt kmod-i40e-rt
# i40evf-kmod # iavf-kmod
kmod-i40evf kmod-iavf
kmod-i40evf-rt kmod-iavf-rt
# ixgbevf-kmod # ixgbevf-kmod
kmod-ixgbevf kmod-ixgbevf

2
centos_pkg_dirs
View File

@ -65,7 +65,7 @@ kubernetes/etcd
kubernetes/helm kubernetes/helm
grub/grubby grub/grubby
kernel/kernel-modules/intel-e1000e kernel/kernel-modules/intel-e1000e
kernel/kernel-modules/intel-i40evf kernel/kernel-modules/intel-iavf
kernel/kernel-modules/intel-i40e kernel/kernel-modules/intel-i40e
kernel/kernel-modules/intel-ixgbevf kernel/kernel-modules/intel-ixgbevf
kernel/kernel-modules/intel-ixgbe kernel/kernel-modules/intel-ixgbe

2
centos_pkg_dirs_rt
View File

@ -3,7 +3,7 @@ networking/mellanox/libibverbs
kernel/kernel-modules/mlnx-ofa_kernel kernel/kernel-modules/mlnx-ofa_kernel
networking/mellanox/rdma-core networking/mellanox/rdma-core
kernel/kernel-modules/intel-e1000e kernel/kernel-modules/intel-e1000e
kernel/kernel-modules/intel-i40evf kernel/kernel-modules/intel-iavf
kernel/kernel-modules/intel-i40e kernel/kernel-modules/intel-i40e
kernel/kernel-modules/intel-ixgbevf kernel/kernel-modules/intel-ixgbevf
kernel/kernel-modules/intel-ixgbe kernel/kernel-modules/intel-ixgbe

6
centos_srpms_centos.lst
View File

@ -15,7 +15,7 @@ logrotate-3.8.6-17.el7.src.rpm
# mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm # mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm
net-snmp-5.7.2-37.el7.src.rpm net-snmp-5.7.2-37.el7.src.rpm
net-tools-2.0-0.24.20131004git.el7.src.rpm net-tools-2.0-0.24.20131004git.el7.src.rpm
ntp-4.2.6p5-28.el7.centos.src.rpm ntp-4.2.6p5-29.el7.centos.src.rpm
openldap-2.4.44-20.el7.src.rpm openldap-2.4.44-20.el7.src.rpm
openssh-7.4p1-16.el7.src.rpm openssh-7.4p1-16.el7.src.rpm
parted-3.1-29.el7.src.rpm parted-3.1-29.el7.src.rpm
@ -40,8 +40,8 @@ resource-agents-4.1.1-12.el7_6.7.src.rpm
setup-2.8.71-10.el7.src.rpm setup-2.8.71-10.el7.src.rpm
shim-15-1.el7.centos.src.rpm shim-15-1.el7.centos.src.rpm
shim-signed-15-1.el7.centos.src.rpm shim-signed-15-1.el7.centos.src.rpm
sudo-1.8.23-3.el7.src.rpm sudo-1.8.23-4.el7_7.1.src.rpm
systemd-219-62.el7_6.5.src.rpm systemd-219-67.el7.src.rpm
tboot-1.9.6-3.el7.src.rpm tboot-1.9.6-3.el7.src.rpm
tpm2-tools-3.0.4-2.el7.src.rpm tpm2-tools-3.0.4-2.el7.src.rpm
watchdog-5.13-12.el7.src.rpm watchdog-5.13-12.el7.src.rpm

4
centos_tarball-dl.lst
View File

@ -23,8 +23,8 @@ 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-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## # 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## 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.7.29.tar.gz#i40e-2.7.29#https://sourceforge.net/projects/e1000/files/i40e%20stable/2.7.29/i40e-2.7.29.tar.gz/download#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##
i40evf-3.6.15.tar.gz#i40evf-3.6.15#https://sourceforge.net/projects/e1000/files/i40evf%20stable/3.6.15/i40evf-3.6.15.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##
ibsh-0.3e.tar.gz#cgcs-users-1.0#https://sourceforge.net/projects/ibsh/files/ibsh/ibsh-0.3e/ibsh-0.3e.tar.gz/download#http## ibsh-0.3e.tar.gz#cgcs-users-1.0#https://sourceforge.net/projects/ibsh/files/ibsh/ibsh-0.3e/ibsh-0.3e.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 !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## isa-l-7e1a337433a340bc0974ed0f04301bdaca374af6.tar.gz#isa-l#https://api.github.com/repos/ceph/isa-l/tarball/7e1a337433a340bc0974ed0f04301bdaca374af6#https##

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

@ -156,8 +156,9 @@ log_and_restart_blocked_osds ()
{ {
# Log info about the blocked osd daemons and then restart it # Log info about the blocked osd daemons and then restart it
local names=$1 local names=$1
local message=$2
for name in $names; do for name in $names; do
wlog $name "INFO" "Restarting OSD with blocked operations" wlog $name "INFO" "$message"
${CEPH_SCRIPT} restart $name ${CEPH_SCRIPT} restart $name
done done
} }
@ -253,6 +254,7 @@ status ()
erred_procs=`echo "$result" | sort | uniq | awk ' /not running|dead|failed/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'` erred_procs=`echo "$result" | sort | uniq | awk ' /not running|dead|failed/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
hung_procs=`echo "$result" | sort | uniq | awk ' /hung/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'` hung_procs=`echo "$result" | sort | uniq | awk ' /hung/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
blocked_ops_procs=`echo "$result" | sort | uniq | awk ' /blocked ops/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'` blocked_ops_procs=`echo "$result" | sort | uniq | awk ' /blocked ops/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
stuck_peering_procs=`echo "$result" | sort | uniq | awk ' /stuck peering/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'`
invalid=0 invalid=0
host=`hostname` host=`hostname`
if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" != "simplex" ]]; then if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" != "simplex" ]]; then
@ -267,14 +269,12 @@ status ()
fi fi
done done
log_and_restart_blocked_osds $blocked_ops_procs log_and_restart_blocked_osds "$blocked_ops_procs"\
"Restarting OSD with blocked operations"
log_and_restart_blocked_osds "$stuck_peering_procs"\
"Restarting OSD stuck peering"
log_and_kill_hung_procs $hung_procs log_and_kill_hung_procs $hung_procs
hung_procs_text=""
for i in $(echo $hung_procs); do
hung_procs_text+="$i(process hung) "
done
rm -f $CEPH_STATUS_FAILURE_TEXT_FILE rm -f $CEPH_STATUS_FAILURE_TEXT_FILE
if [ $invalid -eq 0 ]; then if [ $invalid -eq 0 ]; then
text="" text=""

2
config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=8 TIS_PATCH_VER=9

33
config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0007-update-Barbican-admin-secret-s-user-project-IDs.patch Normal file
View File

@ -0,0 +1,33 @@
From a53d9bfc15e1d24a604fcc461f9a6e1483ed262d Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Mon, 4 Nov 2019 20:51:22 -0500
Subject: [PATCH 1/1] update Barbican admin secret's user/project IDs
Signed-off-by: Andy Ning <andy.ning@windriver.com>
---
SPECS/puppet-keystone.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-keystone.spec b/SPECS/puppet-keystone.spec
index 5b5e255..ae233f0 100644
--- a/SPECS/puppet-keystone.spec
+++ b/SPECS/puppet-keystone.spec
@@ -15,6 +15,7 @@ Patch0002: 0002-remove-the-Keystone-admin-app.patch
Patch0003: 0003-remove-eventlet_bindhost-from-Keystoneconf.patch
Patch0004: 0004-escape-special-characters-in-bootstrap.patch
Patch0005: 0005-Add-support-for-fernet-receipts.patch
+Patch0006: 0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch
BuildArch: noarch
@@ -37,6 +38,7 @@ Puppet module for OpenStack Keystone
%patch0003 -p1
%patch0004 -p1
%patch0005 -p1
+%patch0006 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

1
config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -4,3 +4,4 @@
0004-remove-eventlet_and_bindhost-from-keystoneconf.patch 0004-remove-eventlet_and_bindhost-from-keystoneconf.patch
0005-escape-special-characters-in-bootstrap.patch 0005-escape-special-characters-in-bootstrap.patch
0006-Add-support-for-fernet-receipts.patch 0006-Add-support-for-fernet-receipts.patch
0007-update-Barbican-admin-secret-s-user-project-IDs.patch

63
config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch Normal file
View File

@ -0,0 +1,63 @@
From 60f023e20c7e1f98d1f71fb04e829a3ff0477f65 Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Mon, 4 Nov 2019 20:20:28 -0500
Subject: [PATCH 1/1] update Barbican admin secret's user/project IDs during
bootstrap
In a DC system when subcloud is managed, keystone user/project IDs are
synced with Central Cloud, including admin user and project. But the
admin's secrets in Barbian still use the original user/project IDs,
causing docker registry access failure when platform-integ-apps is
reapplied.
This updated keystone admin user/project IDs to be the same as Central
Cloud right after keystone is bootstrapped during subcloud deployment.
This way any referece to admin user/project IDs after bootstrap will be
using the IDs same as Central Cloud, including the ones in Barbican.
This will solve the problem of registry access failure issue.
Closes-Bug: 1851247
Signed-off-by: Andy Ning <andy.ning@windriver.com>
---
manifests/init.pp | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/manifests/init.pp b/manifests/init.pp
index 7bb0094..421259c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -791,6 +791,8 @@ class keystone(
$rabbit_port = $::os_service_default,
$rabbit_userid = $::os_service_default,
$rabbit_virtual_host = $::os_service_default,
+ $dc_admin_user_id = undef,
+ $dc_admin_project_id = undef,
) inherits keystone::params {
include ::keystone::deps
@@ -1311,6 +1313,22 @@ running as a standalone service, or httpd for being run by a httpd server")
subscribe => Anchor['keystone::dbsync::end'],
tag => 'keystone-exec',
}
+
+ if $dc_admin_user_id and $dc_admin_project_id {
+ exec { 'update keystone admin assignment actor_id':
+ command => "sudo -u postgres psql -d keystone -c \"update public.assignment set actor_id='$dc_admin_user_id' from public.local_user where public.assignment.actor_id=public.local_user.user_id and public.local_user.name='admin'\"",
+ require => Exec['keystone-manage bootstrap'],
+ }
+ -> exec { 'update keystone admin assignment target_id':
+ command => "sudo -u postgres psql -d keystone -c \"update public.assignment set target_id='$dc_admin_project_id' from public.project where public.assignment.target_id=public.project.id and public.project.name='admin'\"",
+ }
+ -> exec { 'update keystone admin user id':
+ command => "sudo -u postgres psql -d keystone -c \"update public.user set id='$dc_admin_user_id' from public.local_user where public.user.id=public.local_user.user_id and public.local_user.name='admin'\"",
+ }
+ -> exec { 'update keystone admin project id':
+ command => "sudo -u postgres psql -d keystone -c \"update public.project set id='$dc_admin_project_id' where name='admin'\"",
+ }
+ }
}
# WRS: Now that the keystone service has started,
--
1.8.3.1

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

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

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

@ -8,7 +8,7 @@
%define kmod_name i40e %define kmod_name i40e
Name: %{kmod_name}-kmod%{?bt_ext} Name: %{kmod_name}-kmod%{?bt_ext}
Version: 2.7.29 Version: 2.10.19.30
Release: 0%{?_tis_dist}.%{tis_patch_ver} Release: 0%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Kernel Group: System Environment/Kernel
License: GPLv2 License: GPLv2
@ -25,7 +25,6 @@ Source11: modules-load.conf
Patch01: i40e-Enable-getting-link-status-from-VF.patch Patch01: i40e-Enable-getting-link-status-from-VF.patch
Patch02: i40e-add-more-debug-info-for-VFs-still-in-reset.patch Patch02: i40e-add-more-debug-info-for-VFs-still-in-reset.patch
Patch03: ndo_get_vf_config-poll-for-out-of-vf-reset.patch
%define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//') %define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')

18
kernel/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch
View File

@ -1,8 +1,8 @@
From 412fdc8c0d51500e42e76e788ece3ca7dd260ced Mon Sep 17 00:00:00 2001 From b8c666367cd98a2b0033c043f6f206abd8e238a6 Mon Sep 17 00:00:00 2001
Message-Id: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> Message-Id: <b8c666367cd98a2b0033c043f6f206abd8e238a6.1572295393.git.Jim.Somerville@windriver.com>
From: Vadim Suraev <vsuraev@northforgeinc.com> From: Vadim Suraev <vsuraev@northforgeinc.com>
Date: Mon, 8 Feb 2016 15:57:30 -0500 Date: Mon, 8 Feb 2016 15:57:30 -0500
Subject: [PATCH 1/3] i40e: Enable getting link status from VF Subject: [PATCH 1/2] i40e: Enable getting link status from VF
Add handling of custom OP code sent from the PMD VF to get link status via the Add handling of custom OP code sent from the PMD VF to get link status via the
virtual channel interface. virtual channel interface.
@ -16,10 +16,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
2 files changed, 79 insertions(+) 2 files changed, 79 insertions(+)
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
index 020bacb..126ec19 100644 index 9e48f0d..21b4606 100644
--- a/src/i40e_virtchnl_pf.c --- a/src/i40e_virtchnl_pf.c
+++ b/src/i40e_virtchnl_pf.c +++ b/src/i40e_virtchnl_pf.c
@@ -2559,6 +2559,81 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg) @@ -2467,6 +2467,81 @@ err_out:
aq_ret); aq_ret);
} }
@ -101,7 +101,7 @@ index 020bacb..126ec19 100644
/** /**
* i40e_vc_config_queues_msg * i40e_vc_config_queues_msg
* @vf: pointer to the VF info * @vf: pointer to the VF info
@@ -4300,6 +4375,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode, @@ -4166,6 +4241,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode,
case VIRTCHNL_OP_REQUEST_QUEUES: case VIRTCHNL_OP_REQUEST_QUEUES:
ret = i40e_vc_request_queues_msg(vf, msg); ret = i40e_vc_request_queues_msg(vf, msg);
break; break;
@ -112,17 +112,17 @@ index 020bacb..126ec19 100644
case VIRTCHNL_OP_ENABLE_CHANNELS: case VIRTCHNL_OP_ENABLE_CHANNELS:
ret = i40e_vc_add_qch_msg(vf, msg); ret = i40e_vc_add_qch_msg(vf, msg);
diff --git a/src/virtchnl.h b/src/virtchnl.h diff --git a/src/virtchnl.h b/src/virtchnl.h
index afde603..b9b38c0 100644 index a22cc43..d3d9324 100644
--- a/src/virtchnl.h --- a/src/virtchnl.h
+++ b/src/virtchnl.h +++ b/src/virtchnl.h
@@ -124,6 +124,7 @@ enum virtchnl_ops { @@ -128,6 +128,7 @@ enum virtchnl_ops {
VIRTCHNL_OP_DISABLE_CHANNELS = 31, VIRTCHNL_OP_DISABLE_CHANNELS = 31,
VIRTCHNL_OP_ADD_CLOUD_FILTER = 32, VIRTCHNL_OP_ADD_CLOUD_FILTER = 32,
VIRTCHNL_OP_DEL_CLOUD_FILTER = 33, VIRTCHNL_OP_DEL_CLOUD_FILTER = 33,
+ VIRTCHNL_OP_GET_LINK_STAT = 0x101, + VIRTCHNL_OP_GET_LINK_STAT = 0x101,
}; };
/* These macros are used to generate compilation errors if a structure/union
-- --
1.8.3.1 1.8.3.1

40
kernel/kernel-modules/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch
View File

@ -1,10 +1,10 @@
From d60e87567eb5418fbb848bf30f72d3d8bec3bad6 Mon Sep 17 00:00:00 2001 From 40b257ecf5d36abf14a4ef98fc2e44dba7100fea Mon Sep 17 00:00:00 2001
Message-Id: <d60e87567eb5418fbb848bf30f72d3d8bec3bad6.1528830095.git.Jim.Somerville@windriver.com> Message-Id: <40b257ecf5d36abf14a4ef98fc2e44dba7100fea.1572295393.git.Jim.Somerville@windriver.com>
In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> In-Reply-To: <b8c666367cd98a2b0033c043f6f206abd8e238a6.1572295393.git.Jim.Somerville@windriver.com>
References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> References: <b8c666367cd98a2b0033c043f6f206abd8e238a6.1572295393.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com> From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 26 Mar 2018 11:03:47 -0400 Date: Mon, 26 Mar 2018 11:03:47 -0400
Subject: [PATCH 2/3] i40e add more debug info for VFs still in reset Subject: [PATCH 2/2] i40e add more debug info for VFs still in reset
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
--- ---
@ -12,10 +12,21 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 8 insertions(+), 8 deletions(-) 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
index 126ec19..da29fc3 100644 index 21b4606..dfb9568 100644
--- a/src/i40e_virtchnl_pf.c --- a/src/i40e_virtchnl_pf.c
+++ b/src/i40e_virtchnl_pf.c +++ b/src/i40e_virtchnl_pf.c
@@ -4650,8 +4650,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, @@ -4363,8 +4363,8 @@ static int i40e_set_vf_mac(struct i40e_vf *vf, struct i40e_vsi *vsi,
msleep(20);
}
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",
- vf->vf_id);
+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
+ __func__, vf->vf_id);
ret = -EAGAIN;
goto error_param;
}
@@ -4522,8 +4522,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
vf = &pf->vf[vf_id]; vf = &pf->vf[vf_id];
vsi = pf->vsi[vf->lan_vsi_idx]; vsi = pf->vsi[vf->lan_vsi_idx];
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
@ -26,7 +37,7 @@ index 126ec19..da29fc3 100644
ret = -EAGAIN; ret = -EAGAIN;
goto error_pvid; goto error_pvid;
} }
@@ -4784,8 +4784,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate) @@ -4678,8 +4678,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate)
vf = &pf->vf[vf_id]; vf = &pf->vf[vf_id];
vsi = pf->vsi[vf->lan_vsi_idx]; vsi = pf->vsi[vf->lan_vsi_idx];
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
@ -37,18 +48,7 @@ index 126ec19..da29fc3 100644
ret = -EAGAIN; ret = -EAGAIN;
goto error; goto error;
} }
@@ -4844,8 +4844,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, @@ -4881,8 +4881,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable)
/* first vsi is always the LAN vsi */
vsi = pf->vsi[vf->lan_vsi_idx];
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n",
- vf_id);
+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
+ __func__, vf_id);
ret = -EAGAIN;
goto error_param;
}
@@ -4989,8 +4989,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable)
vf = &(pf->vf[vf_id]); vf = &(pf->vf[vf_id]);
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {

49
kernel/kernel-modules/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch
View File

@ -1,49 +0,0 @@
From 25b521f58b33bf070c0b31d077333c13c3ad25e8 Mon Sep 17 00:00:00 2001
Message-Id: <25b521f58b33bf070c0b31d077333c13c3ad25e8.1528830095.git.Jim.Somerville@windriver.com>
In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 2 Apr 2018 15:35:12 -0400
Subject: [PATCH 3/3] ndo_get_vf_config poll for out of vf reset
Same solution as 028daf80117376b22909becd9720daaefdfceff4 from the
net-next tree as supplied by Intel, but we apply it to
ndo_get_vf_config instead.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
src/i40e_virtchnl_pf.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c
index da29fc3..d5935d6 100644
--- a/src/i40e_virtchnl_pf.c
+++ b/src/i40e_virtchnl_pf.c
@@ -4829,6 +4829,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
struct i40e_pf *pf = vsi->back;
struct i40e_vf *vf;
int ret = 0;
+ u8 i;
if (test_and_set_bit(__I40E_VIRTCHNL_OP_PENDING, pf->state)) {
dev_warn(&pf->pdev->dev, "Unable to configure VFs, other operation is pending.\n");
@@ -4843,6 +4844,16 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
vf = &pf->vf[vf_id];
/* first vsi is always the LAN vsi */
vsi = pf->vsi[vf->lan_vsi_idx];
+
+ /* When the VF is resetting wait until it is done.
+ * It can take up to 200 milliseconds,
+ * but wait for up to 300 milliseconds to be safe.
+ */
+ for (i = 0; i < 15; i++) {
+ if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states))
+ break;
+ msleep(20);
+ }
if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) {
dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n",
__func__, vf_id);
--
1.8.3.1

1
kernel/kernel-modules/intel-i40evf/files/modules-load.conf
View File

@ -1 +0,0 @@
i40evf

2
kernel/kernel-modules/intel-i40evf/centos/build_srpm.data → kernel/kernel-modules/intel-iavf/centos/build_srpm.data
View File

@ -1,4 +1,4 @@
COPY_LIST=" \ COPY_LIST=" \
$PKG_BASE/files/* \ $PKG_BASE/files/* \
$STX_BASE/downloads/i40evf-3.6.15.tar.gz" $STX_BASE/downloads/iavf-3.7.61.20.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=1

38
kernel/kernel-modules/intel-i40evf/centos/i40evf-kmod.spec → kernel/kernel-modules/intel-iavf/centos/iavf-kmod.spec
View File

@ -5,10 +5,10 @@
%endif %endif
# Define the kmod package name here. # Define the kmod package name here.
%define kmod_name i40evf %define kmod_name iavf
Name: %{kmod_name}-kmod%{?bt_ext} Name: %{kmod_name}-kmod%{?bt_ext}
Version: 3.6.15 Version: 3.7.61.20
Release: 0%{?_tis_dist}.%{tis_patch_ver} Release: 0%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Kernel Group: System Environment/Kernel
License: GPLv2 License: GPLv2
@ -25,52 +25,52 @@ Source11: modules-load.conf
%define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//') %define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')
%package -n kmod-i40evf%{?bt_ext} %package -n kmod-iavf%{?bt_ext}
Summary: i40evf kernel module(s) Summary: iavf kernel module(s)
Group: System Environment/Kernel Group: System Environment/Kernel
%global _use_internal_dependency_generator 0 %global _use_internal_dependency_generator 0
Provides: kernel-modules >= %{kversion} Provides: kernel-modules >= %{kversion}
Provides: i40evf-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Provides: iavf-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
Requires(post): /usr/sbin/depmod Requires(post): /usr/sbin/depmod
Requires(postun): /usr/sbin/depmod Requires(postun): /usr/sbin/depmod
%description -n kmod-i40evf%{?bt_ext} %description -n kmod-iavf%{?bt_ext}
This package provides the i40evf kernel module(s) built This package provides the iavf kernel module(s) built
for the Linux kernel using the %{_target_cpu} family of processors. for the Linux kernel using the %{_target_cpu} family of processors.
%post -n kmod-i40evf%{?bt_ext} %post -n kmod-iavf%{?bt_ext}
echo "Working. This may take some time ..." echo "Working. This may take some time ..."
if [ -e "/boot/System.map-%{kversion}" ]; then if [ -e "/boot/System.map-%{kversion}" ]; then
/usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
fi fi
modules=( $(find /lib/modules/%{kversion}/extra/i40evf | grep '\.ko$') ) modules=( $(find /lib/modules/%{kversion}/extra/iavf | grep '\.ko$') )
if [ -x "/sbin/weak-modules" ]; then if [ -x "/sbin/weak-modules" ]; then
printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules
fi fi
echo "Done." echo "Done."
%preun -n kmod-i40evf%{?bt_ext} %preun -n kmod-iavf%{?bt_ext}
rpm -ql kmod-i40evf%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-i40evf%{?bt_ext}-modules rpm -ql kmod-iavf%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-iavf%{?bt_ext}-modules
%postun -n kmod-i40evf%{?bt_ext} %postun -n kmod-iavf%{?bt_ext}
echo "Working. This may take some time ..." echo "Working. This may take some time ..."
if [ -e "/boot/System.map-%{kversion}" ]; then if [ -e "/boot/System.map-%{kversion}" ]; then
/usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || :
fi fi
modules=( $(cat /var/run/rpm-kmod-i40evf%{?bt_ext}-modules) ) modules=( $(cat /var/run/rpm-kmod-iavf%{?bt_ext}-modules) )
rm /var/run/rpm-kmod-i40evf%{?bt_ext}-modules rm /var/run/rpm-kmod-iavf%{?bt_ext}-modules
if [ -x "/sbin/weak-modules" ]; then if [ -x "/sbin/weak-modules" ]; then
printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules
fi fi
echo "Done." echo "Done."
%files -n kmod-i40evf%{?bt_ext} %files -n kmod-iavf%{?bt_ext}
%defattr(644,root,root,755) %defattr(644,root,root,755)
/lib/modules/%{kversion}/ /lib/modules/%{kversion}/
%config(noreplace)/etc/depmod.d/kmod-i40evf.conf %config(noreplace)/etc/depmod.d/kmod-iavf.conf
%doc /usr/share/doc/kmod-i40evf-%{version}/ %doc /usr/share/doc/kmod-iavf-%{version}/
%doc /usr/share/man/man7/ %doc /usr/share/man/man7/
%{_sysconfdir}/modules-load.d/i40evf.conf %{_sysconfdir}/modules-load.d/iavf.conf
# Disable the building of the debug package(s). # Disable the building of the debug package(s).
%define debug_package %{nil} %define debug_package %{nil}
@ -102,7 +102,7 @@ popd >/dev/null
%{__install} -d %{buildroot}%{_mandir}/man7/ %{__install} -d %{buildroot}%{_mandir}/man7/
%{__install} %{kmod_name}.7.gz %{buildroot}%{_mandir}/man7/ %{__install} %{kmod_name}.7.gz %{buildroot}%{_mandir}/man7/
%{__install} -d %{buildroot}%{_sysconfdir}/modules-load.d %{__install} -d %{buildroot}%{_sysconfdir}/modules-load.d
%{__install} -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/modules-load.d/i40evf.conf %{__install} -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/modules-load.d/iavf.conf
# Strip the modules(s). # Strip the modules(s).
find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \; find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \;

0
kernel/kernel-modules/intel-i40evf/files/GPL-v2.0.txt → kernel/kernel-modules/intel-iavf/files/GPL-v2.0.txt
View File

1
kernel/kernel-modules/intel-iavf/files/modules-load.conf Normal file
View File

@ -0,0 +1 @@
iavf