starlingx/integ
Code Issues Proposed changes

Merge "rebase bash patch to CentOS 7.6 version" into f/centos76

Browse Source
This commit is contained in:
Zuul 2018-12-26 18:36:14 +00:00 committed by Gerrit Code Review
commit e4bc1535c9
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
COPY_LIST="files/*" COPY_LIST="files/*"
TIS_PATCH_VER=3 TIS_PATCH_VER=4
BUILD_IS_SLOW=3 BUILD_IS_SLOW=3

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

@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:05:36 -0400 Date: Mon, 2 Oct 2017 16:05:36 -0400
Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/bash.spec
--- ---
SPECS/bash.spec | 2 +- SPECS/bash.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -17,8 +15,8 @@ index 4f16c8c..d749f92 100644
Version: %{baseversion}%{patchleveltag} Version: %{baseversion}%{patchleveltag}
Name: bash Name: bash
Summary: The GNU Bourne Again shell Summary: The GNU Bourne Again shell
-Release: 30%{?dist} -Release: 31%{?dist}
+Release: 30.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 31.el7%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Shells Group: System Environment/Shells
License: GPLv3+ License: GPLv3+
Url: http://www.gnu.org/software/bash Url: http://www.gnu.org/software/bash

12
base/bash/centos/meta_patches/spec-TiS-bash-history.patch
View File

@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:05:36 -0400 Date: Mon, 2 Oct 2017 16:05:36 -0400
Subject: [PATCH 1/3] WRS: spec-TiS-bash-history.patch Subject: [PATCH 1/3] WRS: spec-TiS-bash-history.patch
Conflicts:
SPECS/bash.spec
--- ---
SPECS/bash.spec | 8 ++++++++ SPECS/bash.spec | 8 ++++++++
1 file changed, 8 insertions(+) 1 file changed, 8 insertions(+)
@ -13,9 +11,9 @@ diff --git a/SPECS/bash.spec b/SPECS/bash.spec
index 4b2ec49..4f16c8c 100644 index 4b2ec49..4f16c8c 100644
--- a/SPECS/bash.spec --- a/SPECS/bash.spec
+++ b/SPECS/bash.spec +++ b/SPECS/bash.spec
@@ -195,6 +195,10 @@ Patch152: bash-4.3-pipefd-leak.patch @@ -198,6 +198,10 @@ Patch153: bash-4.3-wshouldquote.patch
#1487615 - bash fails to execute commands containing multibyte characters #1495398 - Append '/' while tab completing directory names
Patch153: bash-4.3-wshouldquote.patch Patch154: bash-4.3-dircomp-append-slash.patch
+# Patches from WindRiver +# Patches from WindRiver
+Patch500: bash-history-syslog.patch +Patch500: bash-history-syslog.patch
@ -24,9 +22,9 @@ index 4b2ec49..4f16c8c 100644
BuildRequires: texinfo bison BuildRequires: texinfo bison
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: autoconf, gettext BuildRequires: autoconf, gettext
@@ -327,6 +331,10 @@ This package contains documentation files for %{name}. @@ -331,6 +335,10 @@ This package contains documentation files for %{name}.
%patch152 -p1 -b .pipefd-leak
%patch153 -p1 -b .wshouldquote %patch153 -p1 -b .wshouldquote
%patch154 -p1 -b .append-slash
+# WindRiver patches +# WindRiver patches
+%patch500 -p1 -b .history-syslog +%patch500 -p1 -b .history-syslog

2
base/bash/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/bash-4.2.46-30.el7.src.rpm mirror:Source/bash-4.2.46-31.el7.src.rpm