starlingx/integ
Code Issues Proposed changes

rebase iptables patch to CentOS7.5

Browse Source 
Story: 2003389
Task: 24472

Change-Id: Ie7fa1821325295f1b5fadf85b5bb8edb4248fd3a
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-14 00:33:44 +08:00 committed by chenyan
parent f97b0ed320
commit 3a91f4cfb4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
networking/iptables/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,7 +1,7 @@
From d34bb2d38b4a62db5be32ddd901b1ebd6966165c Mon Sep 17 00:00:00 2001
From a198eb6f0fe109511ebfd69bc5e21fe346cc9e31 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:15:33 -0400
Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/iptables.spec
@ -10,18 +10,18 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec
index ddf75a0..9d65fc7 100644
index 1bcfb4d..0de8812 100644
--- a/SPECS/iptables.spec
+++ b/SPECS/iptables.spec
@@ -7,7 +7,7 @@
Name: iptables
Summary: Tools for managing Linux kernel packet filtering capabilities
Version: 1.4.21
-Release: 18.0.1%{?dist}
+Release: 18.0.1.el7%{?_tis_dist}.%{tis_patch_ver}
-Release: 24.1%{?dist}
+Release: 24.1.el7_5%{?_tis_dist}.%{tis_patch_ver}
Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
Source1: iptables.init
Source2: iptables-config
--
1.9.1
2.7.4

2
networking/iptables/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/iptables-1.4.21-18.0.1.el7.centos.src.rpm
mirror:Source/iptables-1.4.21-24.1.el7_5.src.rpm