[pve-devel] [PATCH v2 corosync-pve 2/3] reformat old patches

Fabian Grünbichler f.gruenbichler at proxmox.com
Fri Apr 13 11:10:32 CEST 2018


to reduce future patch churn

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 patches/0001-add-Provides-Replaces-corosync-pve.patch          |  8 ++++----
 patches/0002-don-t-install-default-corosync.conf.patch         | 10 +++++-----
 patches/0003-restart-after-package-upgrade-is-complete.patch   |  8 ++++----
 patches/0004-remove-init-script.patch                          |  8 ++++----
 ...-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch |  8 ++++----
 patches/0006-add-libcorosync4-pve-transitional-package.patch   |  8 ++++----
 patches/0007-only-start-corosync.service-if-conf-exists.patch  | 10 +++++-----
 7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/patches/0001-add-Provides-Replaces-corosync-pve.patch b/patches/0001-add-Provides-Replaces-corosync-pve.patch
index 247adc1..3b467f9 100644
--- a/patches/0001-add-Provides-Replaces-corosync-pve.patch
+++ b/patches/0001-add-Provides-Replaces-corosync-pve.patch
@@ -1,7 +1,7 @@
-From 60055d6619687705a248bf3ff0f7e09bf2da488c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Tue, 7 Mar 2017 13:29:31 +0100
-Subject: [PATCH 1/8] add Provides/Replaces: corosync-pve
+Subject: [PATCH] add Provides/Replaces: corosync-pve
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/debian/control b/debian/control
-index fad5635..d11dc18 100644
+index fad56353..d11dc18c 100644
 --- a/debian/control
 +++ b/debian/control
 @@ -31,6 +31,11 @@ Homepage: http://corosync.github.io/corosync/
@@ -37,5 +37,5 @@ index fad5635..d11dc18 100644
   ${DESCRIPTION}
   This package contains the Corosync daemon and some administration tools.
 -- 
-2.1.4
+2.14.2
 
diff --git a/patches/0002-don-t-install-default-corosync.conf.patch b/patches/0002-don-t-install-default-corosync.conf.patch
index 1c50a93..5ad2c47 100644
--- a/patches/0002-don-t-install-default-corosync.conf.patch
+++ b/patches/0002-don-t-install-default-corosync.conf.patch
@@ -1,7 +1,7 @@
-From 34924c90ccb5cb883ac135b35e3ffdd48c459db7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Tue, 7 Mar 2017 13:32:02 +0100
-Subject: [PATCH 2/8] don't install default corosync.conf
+Subject: [PATCH] don't install default corosync.conf
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
 
 diff --git a/debian/corosync.conf b/debian/corosync.conf
 deleted file mode 100644
-index 0444432..0000000
+index 04444322..00000000
 --- a/debian/corosync.conf
 +++ /dev/null
 @@ -1,111 +0,0 @@
@@ -131,7 +131,7 @@ index 0444432..0000000
 -	expected_votes: 2
 -}
 diff --git a/debian/corosync.install b/debian/corosync.install
-index da4efa1..3c03c3f 100755
+index da4efa17..3c03c3f6 100755
 --- a/debian/corosync.install
 +++ b/debian/corosync.install
 @@ -31,6 +31,5 @@ usr/share/augeas/lenses/corosync.aug
@@ -142,5 +142,5 @@ index da4efa1..3c03c3f 100755
  usr/share/corosync/xml2conf.xsl
  var/lib/corosync
 -- 
-2.1.4
+2.14.2
 
diff --git a/patches/0003-restart-after-package-upgrade-is-complete.patch b/patches/0003-restart-after-package-upgrade-is-complete.patch
index 9fd6c3a..5545d81 100644
--- a/patches/0003-restart-after-package-upgrade-is-complete.patch
+++ b/patches/0003-restart-after-package-upgrade-is-complete.patch
@@ -1,7 +1,7 @@
-From d962302d3a91eb614c6ecccf836b30032f1ae600 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Wed, 8 Mar 2017 12:12:05 +0100
-Subject: [PATCH 3/8] restart after package upgrade is complete
+Subject: [PATCH] restart after package upgrade is complete
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/debian/rules b/debian/rules
-index d43bf29..f45847c 100755
+index d43bf29b..f45847cc 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -86,6 +86,9 @@ override_dh_systemd_enable:
@@ -26,5 +26,5 @@ index d43bf29..f45847c 100755
  	dh_strip --dbgsym-migration=corosync-dbg
  
 -- 
-2.1.4
+2.14.2
 
diff --git a/patches/0004-remove-init-script.patch b/patches/0004-remove-init-script.patch
index 314f766..3a2e381 100644
--- a/patches/0004-remove-init-script.patch
+++ b/patches/0004-remove-init-script.patch
@@ -1,7 +1,7 @@
-From 047ef59e56d1456283e2d4df68234e8b88f36a2d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Wed, 8 Mar 2017 12:59:37 +0100
-Subject: [PATCH 4/8] remove init script
+Subject: [PATCH] remove init script
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
 
 diff --git a/debian/corosync.init b/debian/corosync.init
 deleted file mode 100644
-index f7b813a..0000000
+index f7b813a5..00000000
 --- a/debian/corosync.init
 +++ /dev/null
 @@ -1,122 +0,0 @@
@@ -141,5 +141,5 @@ index f7b813a..0000000
 -
 -:
 -- 
-2.1.4
+2.14.2
 
diff --git a/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch b/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
index c058492..8a31781 100644
--- a/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
+++ b/patches/0005-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
@@ -1,7 +1,7 @@
-From 519451819e81818c578ce177ad9cce859d9e55c2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Wed, 8 Mar 2017 14:08:04 +0100
-Subject: [PATCH 5/8] add corosync-pve postinst for restart on dist-upgrade
+Subject: [PATCH] add corosync-pve postinst for restart on dist-upgrade
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -14,7 +14,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
 
 diff --git a/debian/corosync-pve.postinst b/debian/corosync-pve.postinst
 new file mode 100755
-index 0000000..f282563
+index 00000000..f282563f
 --- /dev/null
 +++ b/debian/corosync-pve.postinst
 @@ -0,0 +1,12 @@
@@ -31,5 +31,5 @@ index 0000000..f282563
 +	fi
 +fi
 -- 
-2.1.4
+2.14.2
 
diff --git a/patches/0006-add-libcorosync4-pve-transitional-package.patch b/patches/0006-add-libcorosync4-pve-transitional-package.patch
index e385122..bdb0599 100644
--- a/patches/0006-add-libcorosync4-pve-transitional-package.patch
+++ b/patches/0006-add-libcorosync4-pve-transitional-package.patch
@@ -1,7 +1,7 @@
-From 99fe4ea69637a29e7b089ba857cff61208fa0679 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Mon, 13 Mar 2017 13:26:29 +0100
-Subject: [PATCH 6/8] add libcorosync4-pve transitional package
+Subject: [PATCH] add libcorosync4-pve transitional package
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +12,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/debian/control b/debian/control
-index d11dc18..bae42c6 100644
+index d11dc18c..bae42c6a 100644
 --- a/debian/control
 +++ b/debian/control
 @@ -36,6 +36,11 @@ Architecture: all
@@ -28,5 +28,5 @@ index d11dc18..bae42c6 100644
  Architecture: any
  Pre-Depends: ${misc:Pre-Depends}
 -- 
-2.1.4
+2.14.2
 
diff --git a/patches/0007-only-start-corosync.service-if-conf-exists.patch b/patches/0007-only-start-corosync.service-if-conf-exists.patch
index 73911c2..62e0271 100644
--- a/patches/0007-only-start-corosync.service-if-conf-exists.patch
+++ b/patches/0007-only-start-corosync.service-if-conf-exists.patch
@@ -1,7 +1,7 @@
-From 95e8f3ed850ddb1f42446c1d1a9582a7397c71d5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
 Date: Mon, 13 Mar 2017 13:27:49 +0100
-Subject: [PATCH 7/8] only start corosync.service if conf exists
+Subject: [PATCH] only start corosync.service if conf exists
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/init/corosync.service.in b/init/corosync.service.in
-index d71a857..3b8316a 100644
+index d71a8572..3b8316a7 100644
 --- a/init/corosync.service.in
 +++ b/init/corosync.service.in
 @@ -1,6 +1,7 @@
@@ -25,7 +25,7 @@ index d71a857..3b8316a 100644
  After=network-online.target
  
 diff --git a/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch b/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch
-index d77faae..e9f25e4 100644
+index d77faae9..e9f25e45 100644
 --- a/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch
 +++ b/debian/patches/Add-Documentation-URIs-to-the-systemd-service-files.patch
 @@ -52,5 +52,5 @@ index d71a857..12193b1 100644
@@ -36,5 +36,5 @@ index d77faae..e9f25e4 100644
   Requires=network-online.target
 - After=network-online.target
 -- 
-2.1.4
+2.14.2
 
-- 
2.14.2




More information about the pve-devel mailing list