[pve-devel] [PATCH corosync-pve 06/10] build: drop transitional packages
Fabian Grünbichler
f.gruenbichler at proxmox.com
Wed May 22 15:37:21 CEST 2019
corosync-pve and libcorosync4-pve, which were introduced as part of the
PVE 4.x -> PVE 5.x upgrade
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
Makefile | 5 +--
...1-add-Provides-Replaces-corosync-pve.patch | 38 -------------------
...don-t-install-default-corosync.conf.patch} | 0
...pt.patch => 0002-remove-init-script.patch} | 0
...art-corosync.service-if-conf-exists.patch} | 22 +++++------
...-postinst-for-restart-on-dist-upgrad.patch | 32 ----------------
...h => 0004-bsys-disable-augeas-tools.patch} | 2 +-
...ibcorosync4-pve-transitional-package.patch | 29 --------------
patches/series | 11 ++----
9 files changed, 15 insertions(+), 124 deletions(-)
delete mode 100644 patches/0001-add-Provides-Replaces-corosync-pve.patch
rename patches/{0002-don-t-install-default-corosync.conf.patch => 0001-don-t-install-default-corosync.conf.patch} (100%)
rename patches/{0003-remove-init-script.patch => 0002-remove-init-script.patch} (100%)
rename patches/{0006-only-start-corosync.service-if-conf-exists.patch => 0003-only-start-corosync.service-if-conf-exists.patch} (80%)
delete mode 100644 patches/0004-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
rename patches/{0007-bsys-disable-augeas-tools.patch => 0004-bsys-disable-augeas-tools.patch} (98%)
delete mode 100644 patches/0005-add-libcorosync4-pve-transitional-package.patch
diff --git a/Makefile b/Makefile
index 786abba..ea74c94 100644
--- a/Makefile
+++ b/Makefile
@@ -9,16 +9,13 @@ CSSRC=corosync_${CSVERSION}.orig.tar.gz
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
GITVERSION:=$(shell git rev-parse HEAD)
-MAIN_DEB=corosync-pve_${CSVERSION}-${CSRELEASE}_all.deb
+MAIN_DEB=corosync_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
OTHER_DEBS=\
-libcorosync4-pve_${CSVERSION}-${CSRELEASE}_all.deb \
-corosync_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-notifyd_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-qdevice_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-qnetd_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
corosync-doc_${CSVERSION}-${CSRELEASE}_all.deb \
-corosync-dev_${CSVERSION}-${CSRELEASE}_all.deb \
libcfg6_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
libcmap4_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
libcorosync-common4_${CSVERSION}-${CSRELEASE}_${DEB_BUILD_ARCH}.deb \
diff --git a/patches/0001-add-Provides-Replaces-corosync-pve.patch b/patches/0001-add-Provides-Replaces-corosync-pve.patch
deleted file mode 100644
index 1998838..0000000
--- a/patches/0001-add-Provides-Replaces-corosync-pve.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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] add Provides/Replaces: corosync-pve
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
----
- debian/control | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index 8a0855ce..d5e2513a 100644
---- a/debian/control
-+++ b/debian/control
-@@ -43,6 +43,11 @@ X-Common-Description: The Corosync Cluster Engine is a Group Communication
- * A quorum system that notifies applications when quorum is achieved
- or lost.
-
-+Package: corosync-pve
-+Architecture: all
-+Depends: corosync (= ${binary:Version})
-+Description: Transitional package.
-+
- Package: corosync
- Architecture: any
- Pre-Depends:
-@@ -52,6 +57,8 @@ Depends: ${shlibs:Depends},
- lsb-base (>= 3.0-6),
- adduser,
- xsltproc
-+Provides: corosync-pve (= ${binary:Version})
-+Replaces: corosync-pve (<< 2.4.2-2)
- Description: cluster engine daemon and utilities
- ${S:X-Common-Description}
- .
diff --git a/patches/0002-don-t-install-default-corosync.conf.patch b/patches/0001-don-t-install-default-corosync.conf.patch
similarity index 100%
rename from patches/0002-don-t-install-default-corosync.conf.patch
rename to patches/0001-don-t-install-default-corosync.conf.patch
diff --git a/patches/0003-remove-init-script.patch b/patches/0002-remove-init-script.patch
similarity index 100%
rename from patches/0003-remove-init-script.patch
rename to patches/0002-remove-init-script.patch
diff --git a/patches/0006-only-start-corosync.service-if-conf-exists.patch b/patches/0003-only-start-corosync.service-if-conf-exists.patch
similarity index 80%
rename from patches/0006-only-start-corosync.service-if-conf-exists.patch
rename to patches/0003-only-start-corosync.service-if-conf-exists.patch
index b911a77..cdc1f29 100644
--- a/patches/0006-only-start-corosync.service-if-conf-exists.patch
+++ b/patches/0003-only-start-corosync.service-if-conf-exists.patch
@@ -8,23 +8,22 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
- ...tart-corosync.service-if-conf-exists.patch | 28 +++++++++++++++++++
+ ...tart-corosync.service-if-conf-exists.patch | 24 +++++++++++++++++++
debian/patches/series | 1 +
- 2 files changed, 29 insertions(+)
+ 2 files changed, 25 insertions(+)
create mode 100644 debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
diff --git a/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch b/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
new file mode 100644
-index 00000000..18afb84e
+index 00000000..edbc5eb0
--- /dev/null
+++ b/debian/patches/pve__only-start-corosync.service-if-conf-exists.patch
-@@ -0,0 +1,28 @@
-+From 306692e2627b0fe072bfae21ddb5d501189c57c5 Mon Sep 17 00:00:00 2001
-+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+@@ -0,0 +1,24 @@
++From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
+Date: Mon, 13 Mar 2017 13:27:49 +0100
-+Subject: [PATCH] only start corosync.service if conf exists
++Subject: only start corosync.service if conf exists
+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
++Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
@@ -33,7 +32,7 @@ index 00000000..18afb84e
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init/corosync.service.in b/init/corosync.service.in
-+index 7733a98c..1b65c94b 100644
++index dc99a4a..28046ca 100644
+--- a/init/corosync.service.in
++++ b/init/corosync.service.in
+@@ -2,6 +2,7 @@
@@ -43,10 +42,7 @@ index 00000000..18afb84e
++ConditionPathExists=/etc/corosync/corosync.conf
+ Requires=network-online.target
+ After=network-online.target
-+
-+--
-+2.19.1
-+
++ StopWhenUnneeded=yes
diff --git a/debian/patches/series b/debian/patches/series
index 41866b14..fcba2944 100644
--- a/debian/patches/series
diff --git a/patches/0004-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch b/patches/0004-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
deleted file mode 100644
index ae25a75..0000000
--- a/patches/0004-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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] add corosync-pve postinst for restart on dist-upgrade
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
----
- debian/corosync-pve.postinst | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
- create mode 100755 debian/corosync-pve.postinst
-
-diff --git a/debian/corosync-pve.postinst b/debian/corosync-pve.postinst
-new file mode 100755
-index 00000000..f282563f
---- /dev/null
-+++ b/debian/corosync-pve.postinst
-@@ -0,0 +1,12 @@
-+#!/bin/sh
-+
-+set -e
-+
-+if [ "$1" = "configure" ]; then
-+ if [ -n "$2" ]; then
-+ # switching package name from corosync-pve to corosync requires a manual restart on upgrade, once
-+ if dpkg --compare-versions "$2" lt "2.4.2-pve1" ; then
-+ deb-systemd-invoke try-restart corosync.service > /dev/null || true
-+ fi
-+ fi
-+fi
diff --git a/patches/0007-bsys-disable-augeas-tools.patch b/patches/0004-bsys-disable-augeas-tools.patch
similarity index 98%
rename from patches/0007-bsys-disable-augeas-tools.patch
rename to patches/0004-bsys-disable-augeas-tools.patch
index d8cef5a..ccaecf5 100644
--- a/patches/0007-bsys-disable-augeas-tools.patch
+++ b/patches/0004-bsys-disable-augeas-tools.patch
@@ -15,7 +15,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
-index 7643c79e..c3e1608b 100644
+index 8a0855ce..717638e1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
diff --git a/patches/0005-add-libcorosync4-pve-transitional-package.patch b/patches/0005-add-libcorosync4-pve-transitional-package.patch
deleted file mode 100644
index 658fc28..0000000
--- a/patches/0005-add-libcorosync4-pve-transitional-package.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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] add libcorosync4-pve transitional package
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
----
- debian/control | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index d5e2513a..7643c79e 100644
---- a/debian/control
-+++ b/debian/control
-@@ -48,6 +48,11 @@ Architecture: all
- Depends: corosync (= ${binary:Version})
- Description: Transitional package.
-
-+Package: libcorosync4-pve
-+Architecture: all
-+Depends: corosync (= ${binary:Version})
-+Description: Transitional package.
-+
- Package: corosync
- Architecture: any
- Pre-Depends:
diff --git a/patches/series b/patches/series
index 90d47d1..0f845a0 100644
--- a/patches/series
+++ b/patches/series
@@ -1,7 +1,4 @@
-0001-add-Provides-Replaces-corosync-pve.patch
-0002-don-t-install-default-corosync.conf.patch
-0003-remove-init-script.patch
-0004-add-corosync-pve-postinst-for-restart-on-dist-upgrad.patch
-0005-add-libcorosync4-pve-transitional-package.patch
-0006-only-start-corosync.service-if-conf-exists.patch
-0007-bsys-disable-augeas-tools.patch
+0001-don-t-install-default-corosync.conf.patch
+0002-remove-init-script.patch
+0003-only-start-corosync.service-if-conf-exists.patch
+0004-bsys-disable-augeas-tools.patch
--
2.20.1
More information about the pve-devel
mailing list