starlingx
/
integ
Code Issues Proposed changes

de-fuzz puppet patch 

With rpm version < 4.13, patch cmd will create .orig file for fuzzy
patch in default. And this .orig file may lead to rpmbuild failure
"error: Installed (but unpackaged) file(s) found:"

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Story: 2003917
Task: 26965

Change-Id: I3d68b3008688d4b32957f4ba335dea5207a4be65
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-10-09 23:01:46 +08:00
parent f09e564ffa
commit c745dcef93
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/puppet-4.8.2/centos/patches/1001-Add-timestamps-to-logs.patch
View File

@ -1,17 +1,17 @@
From 3dad4deb5e1de9be2a6722dc2f1716bb228a7c15 Mon Sep 17 00:00:00 2001
From 7418bcd86697c9403418ea90ddfe2ad3092d9854 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Fri, 30 Dec 2016 11:01:22 -0500
Subject: [PATCH] Add timestamps to logs
Subject: Add timestamps to logs
---
lib/puppet/util/log/destinations.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/puppet/util/log/destinations.rb b/lib/puppet/util/log/destinations.rb
index fb8b6aa..10fff6e 100644
index 14d5008..36f5367 100644
--- a/lib/puppet/util/log/destinations.rb
+++ b/lib/puppet/util/log/destinations.rb
@@ -165,7 +165,7 @@ Puppet::Util::Log.newdesttype :console do
@@ -167,7 +167,7 @@ Puppet::Util::Log.newdesttype :console do
str = msg.source == "Puppet" ? str : "#{msg.source}: #{str}"
level = levels[msg.level]
@ -21,5 +21,5 @@ index fb8b6aa..10fff6e 100644
end
--
1.8.3.1
2.7.4

14
config/puppet-4.8.2/centos/patches/1002-Set-hasstatus-to-false-by-default.patch
View File

@ -1,7 +1,7 @@
From a0ce82562d75c62fbe7258d0ed4e3ac6d0248ed4 Mon Sep 17 00:00:00 2001
From 3e0ed33dcd0871fbccefd5b561f41fb46c35e32a Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Fri, 30 Dec 2016 10:59:44 -0500
Subject: [PATCH] Set hasstatus to false by default
Subject: Set hasstatus to false by default
Many of the WR init scripts do not have proper status functions,
so set "hasstatus" to false by default.
@ -11,10 +11,10 @@ so set "hasstatus" to false by default.
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/puppet/provider/service/init.rb b/lib/puppet/provider/service/init.rb
index 9f2d030..69940ca 100644
index 2806ee0..17f727a 100644
--- a/lib/puppet/provider/service/init.rb
+++ b/lib/puppet/provider/service/init.rb
@@ -81,7 +81,14 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
@@ -98,7 +98,14 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
next if exclude.include? name
next if not FileTest.executable?(fullpath)
next if not is_init?(fullpath)
@ -31,10 +31,10 @@ index 9f2d030..69940ca 100644
end
instances
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index dc54f1d..2bab7fc 100644
index 1f8d266..61498b5 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -134,7 +134,8 @@ module Puppet
@@ -154,7 +154,8 @@ module Puppet
newvalues(:true, :false)
@ -45,5 +45,5 @@ index dc54f1d..2bab7fc 100644
newparam(:name) do
desc <<-EOT
--
1.8.3.1
2.7.4