[Debian-ha-commits] [pcs] 01/02: Updated patch 0001 to include a fix for MultiArch on Debian
Richard Winters
devrik-guest at moszumanska.debian.org
Thu May 7 09:51:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository pcs.
commit 21c0cbd12da39d14d7424fcce7c1e27922a766a9
Author: Richard B Winters <rik at mmogp.com>
Date: Thu May 7 04:11:23 2015 -0400
Updated patch 0001 to include a fix for MultiArch on Debian
- Since pacemaker's arch dep binaries install to arch dep
locations, we need to provide alternate content for
pcs/settings.py; as this file directs the pcs binaries to
several of pacemaker's binaries
Change-Id: I4070799421821f52b7f29a32654c41de85a304c5
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
...ne-upstream-for-compatibility-with-Debian.patch | 109 +++++++++++++++++++--
1 file changed, 100 insertions(+), 9 deletions(-)
diff --git a/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch b/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
index 18f2dd6..fef876b 100644
--- a/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
+++ b/debian/patches/0001-Streamline-upstream-for-compatibility-with-Debian.patch
@@ -18,24 +18,32 @@ Summary of Changes for Debian:
- Debian specific init; pcsd.debian is added
- Variables are introduced which discretely eases packaging
for systemd; BUILD_GEMS and systemddir
+ - pcs/settings.py has variants for multi-arch support with
+ 64-bit and 32-bit architectures, updated to know the
+ proper location of pacemaker binaries depending on the
+ flag install_settings during build
Change-Id: Ie06f5ed5232fbf00881f7c4a45c00a7822645d4c
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
- Makefile | 68 +++++++++++++++++++----
- pcsd/pcsd.debian | 141 +++++++++++++++++++++++++++++++++++++++++++++++
- pcsd/pcsd.pam.debian | 5 ++
- pcsd/pcsd.service.debian | 9 +++
- 4 files changed, 213 insertions(+), 10 deletions(-)
+ Makefile | 95 ++++++++++++++++++---
+ pcs/settings.py.i386-linux-gnu.debian | 19 +++++
+ pcs/settings.py.x86_64-linux-gnu.debian | 19 +++++
+ pcsd/pcsd.debian | 141 ++++++++++++++++++++++++++++++++
+ pcsd/pcsd.pam.debian | 5 ++
+ pcsd/pcsd.service.debian | 9 ++
+ 6 files changed, 278 insertions(+), 10 deletions(-)
+ create mode 100644 pcs/settings.py.i386-linux-gnu.debian
+ create mode 100644 pcs/settings.py.x86_64-linux-gnu.debian
create mode 100755 pcsd/pcsd.debian
create mode 100644 pcsd/pcsd.pam.debian
create mode 100644 pcsd/pcsd.service.debian
diff --git a/Makefile b/Makefile
-index c37373b..db794f1 100644
+index c37373b..ccf1202 100644
--- a/Makefile
+++ b/Makefile
-@@ -1,3 +1,16 @@
+@@ -1,3 +1,21 @@
+# Compatibility with GNU/Linux [i.e. Debian] based distros
+UNAME_OS_GNU := $(shell if uname -o | grep -q "GNU/Linux" ; then echo true; else echo false; fi)
+UNAME_KERNEL_DEBIAN := $(shell if uname -v | grep -q "Debian" ; then echo true; else echo false; fi)
@@ -46,13 +54,18 @@ index c37373b..db794f1 100644
+ ifeq ($(UNAME_KERNEL_DEBIAN),true)
+ IS_DEBIAN=true
+ UNAME_DEBIAN_VER_8 := $(shell if grep -q -i "8" /etc/debian_version ; then echo true; else echo false; fi)
++ settings_x86_64 := $(shell if uname -m | grep -q -i "x86_64" ; then echo true; else echo false; fi)
++ settings_i386=false
++ ifeq ($(settings_64),false)
++ settings_i386 := $(shell if uname -m | grep -q -i "i386" ; then echo true; else echo false; fi)
++ endif
+ endif
+endif
+
ifndef PYTHON_SITELIB
PYTHON_SITELIB=$(shell python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
endif
-@@ -8,21 +21,36 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
+@@ -8,25 +26,54 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
EXTRA_SETUP_OPTS="--install-layout=deb"
endif
@@ -92,8 +105,36 @@ index c37373b..db794f1 100644
ifndef initdir
initdir=/etc/init.d
endif
-@@ -36,28 +64,48 @@ install: bash_completion
+
++ifndef install_settings
++ install_settings=false
++else
++ ifeq ($(install_settings),true)
++ ifeq ($(settings_x86_64),true)
++ settings_file=settings.py.x86_64-linux-gnu.debian
++ else
++ ifeq ($(settings_i386),true)
++ settings_file=settings.py.i386-linux-gnu.debian
++ endif
++ endif
++ endif
++endif
++
+ install: bash_completion
+ python setup.py install --prefix ${DESTDIR}${PREFIX} ${EXTRA_SETUP_OPTS}
+ mkdir -p ${DESTDIR}${PREFIX}/sbin/
+@@ -34,30 +81,58 @@ install: bash_completion
+ ln -fs ${PYTHON_SITELIB}/pcs/pcs.py ${DESTDIR}${PREFIX}/sbin/pcs
+ install -D pcs/bash_completion.d.pcs ${DESTDIR}/etc/bash_completion.d/pcs
install -m644 -D pcs/pcs.8 ${DESTDIR}/${MANDIR}/man8/pcs.8
++ifeq ($(IS_DEBIAN),true)
++ ifeq ($(install_settings),true)
++ rm -f ${DESTDIR}${PYTHON_SITELIB}/pcs/settings.py
++ install -m755 pcs/${settings_file} ${DESTDIR}${PYTHON_SITELIB}/pcs/settings.py
++ else
++ endif
++endif
++
install_pcsd:
+ifeq ($(BUILD_GEMS),true)
@@ -148,6 +189,56 @@ index c37373b..db794f1 100644
else
rm -f ${DESTDIR}/${initdir}/pcsd
endif
+diff --git a/pcs/settings.py.i386-linux-gnu.debian b/pcs/settings.py.i386-linux-gnu.debian
+new file mode 100644
+index 0000000..105ad2f
+--- /dev/null
++++ b/pcs/settings.py.i386-linux-gnu.debian
+@@ -0,0 +1,19 @@
++pacemaker_binaries = "/usr/sbin/"
++corosync_binaries = "/usr/sbin/"
++corosync_conf_file = "/etc/corosync/corosync.conf"
++cluster_conf_file = "/etc/cluster/cluster.conf"
++fence_agent_binaries = "/usr/sbin/"
++pengine_binary = "/usr/lib/i386-linux-gnu/pacemaker/pengine"
++crmd_binary = "/usr/lib/i386-linux-gnu/pacemaker/crmd"
++cib_binary = "/usr/lib/i386-linux-gnu/pacemaker/cib"
++stonithd_binary = "/usr/lib/i386-linux-gnu/pacemaker/stonithd"
++pcs_version = "0.9.139"
++crm_report = pacemaker_binaries + "crm_report"
++crm_verify = pacemaker_binaries + "crm_verify"
++pcsd_cert_location = "/var/lib/pcsd/pcsd.crt"
++pcsd_key_location = "/var/lib/pcsd/pcsd.key"
++corosync_uidgid_dir = "/etc/corosync/uidgid.d/"
++cib_dir = "/var/lib/pacemaker/cib/"
++pacemaker_uname = "hacluster"
++pacemaker_gname = "haclient"
++default_wait = 30
+diff --git a/pcs/settings.py.x86_64-linux-gnu.debian b/pcs/settings.py.x86_64-linux-gnu.debian
+new file mode 100644
+index 0000000..8740369
+--- /dev/null
++++ b/pcs/settings.py.x86_64-linux-gnu.debian
+@@ -0,0 +1,19 @@
++pacemaker_binaries = "/usr/sbin/"
++corosync_binaries = "/usr/sbin/"
++corosync_conf_file = "/etc/corosync/corosync.conf"
++cluster_conf_file = "/etc/cluster/cluster.conf"
++fence_agent_binaries = "/usr/sbin/"
++pengine_binary = "/usr/lib/x86_64-linux-gnu/pacemaker/pengine"
++crmd_binary = "/usr/lib/x86_64-linux-gnu/pacemaker/crmd"
++cib_binary = "/usr/lib/x86_64-linux-gnu/pacemaker/cib"
++stonithd_binary = "/usr/lib/x86_64-linux-gnu/pacemaker/stonithd"
++pcs_version = "0.9.139"
++crm_report = pacemaker_binaries + "crm_report"
++crm_verify = pacemaker_binaries + "crm_verify"
++pcsd_cert_location = "/var/lib/pcsd/pcsd.crt"
++pcsd_key_location = "/var/lib/pcsd/pcsd.key"
++corosync_uidgid_dir = "/etc/corosync/uidgid.d/"
++cib_dir = "/var/lib/pacemaker/cib/"
++pacemaker_uname = "hacluster"
++pacemaker_gname = "haclient"
++default_wait = 30
diff --git a/pcsd/pcsd.debian b/pcsd/pcsd.debian
new file mode 100755
index 0000000..1d63ea5
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list