[Debian-ha-commits] [pcs] 08/09: Patches updated after correcting mistakes
Richard Winters
devrik-guest at moszumanska.debian.org
Mon May 4 19:55:46 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 74d4a6afbb91af03027c0df703f864203317f20a
Author: Richard B Winters <rik at mmogp.com>
Date: Mon May 4 00:04:05 2015 -0400
Patches updated after correcting mistakes
- Each patch run through gbp pq again in order to fix some
inconsistencies without the convenience of a a fast-forward
commit.
Change-Id: I247784bc64260cec98b7db509c3496ab2367bb6b
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
.../0001-Fix-pcsd-makefile-for-gnu-linux.patch | 2 +
.../0002-Remove-Gemfile.lock-for-debian.patch | 3 ++
.../0003-Remove-build_gems-from-install_pcsd.patch | 4 +-
.../patches/0004-Source-lsb-init-functions.patch | 2 +
...e-rc.d-source-functions-in-pcsd-init-file.patch | 2 +
...Fix-pcsd-location-and-args-in-init-script.patch | 4 +-
...ix-pcsd.conf-destination-in-pcsd-makefile.patch | 4 +-
.../0008-Fix-conf-directory-in-pcsd-init.patch | 4 +-
.../0009-Fix-file-locations-in-pcsd.service.patch | 2 +
...-Fix-pcsd.service-destination-in-Makefile.patch | 17 +++++--
...0011-Change-pcsd-destination-to-usr-share.patch | 38 +++++++++++++++
.../0012-Fix-check-for-systemctl-on-Debian.patch | 56 ++++++++++++++++++++++
debian/patches/series | 2 +
13 files changed, 133 insertions(+), 7 deletions(-)
diff --git a/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch b/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
index 720c629..32214a1 100644
--- a/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
+++ b/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
@@ -12,6 +12,8 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/pcsd/Makefile b/pcsd/Makefile
+index 325f54a..8779671 100644
--- a/pcsd/Makefile
+++ b/pcsd/Makefile
@@ -1,9 +1,9 @@
diff --git a/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch b/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
index f169671..07fe77d 100644
--- a/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
+++ b/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
@@ -12,6 +12,9 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
1 file changed, 50 deletions(-)
delete mode 100644 pcsd/Gemfile.lock
+diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
+deleted file mode 100644
+index 06db6d6..0000000
--- a/pcsd/Gemfile.lock
+++ /dev/null
@@ -1,50 +0,0 @@
diff --git a/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch b/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
index 86b1c10..c4479ad 100644
--- a/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
+++ b/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
@@ -11,9 +11,11 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
Makefile | 1 -
1 file changed, 1 deletion(-)
+diff --git a/Makefile b/Makefile
+index c37373b..0bc1767 100644
--- a/Makefile
+++ b/Makefile
-@@ -36,7 +36,6 @@
+@@ -36,7 +36,6 @@ install: bash_completion
install -m644 -D pcs/pcs.8 ${DESTDIR}/${MANDIR}/man8/pcs.8
install_pcsd:
diff --git a/debian/patches/0004-Source-lsb-init-functions.patch b/debian/patches/0004-Source-lsb-init-functions.patch
index d68e742..19709f5 100644
--- a/debian/patches/0004-Source-lsb-init-functions.patch
+++ b/debian/patches/0004-Source-lsb-init-functions.patch
@@ -13,6 +13,8 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 3 +++
1 file changed, 3 insertions(+)
+diff --git a/pcsd/pcsd b/pcsd/pcsd
+index b47472a..29bacc3 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -20,6 +20,9 @@
diff --git a/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch b/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
index 0797809..e69c0d8 100644
--- a/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
+++ b/debian/patches/0005-Remove-rc.d-source-functions-in-pcsd-init-file.patch
@@ -10,6 +10,8 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/pcsd/pcsd b/pcsd/pcsd
+index 29bacc3..b2c385d 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -18,7 +18,7 @@
diff --git a/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch b/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
index 33ce23d..5d8118c 100644
--- a/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
+++ b/debian/patches/0006-Fix-pcsd-location-and-args-in-init-script.patch
@@ -10,6 +10,8 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
+diff --git a/pcsd/pcsd b/pcsd/pcsd
+index b2c385d..226447a 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -7,8 +7,8 @@
@@ -32,7 +34,7 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-@@ -34,9 +34,9 @@
+@@ -34,9 +34,9 @@ lockfile=/var/lock/subsys/$prog
start() {
[ -x $exec ] || exit 5
echo -n $"Starting $prog: "
diff --git a/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch b/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
index 5394488..17fcd01 100644
--- a/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
+++ b/debian/patches/0007-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
@@ -11,9 +11,11 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/Makefile b/Makefile
+index 0bc1767..1e0c00b 100644
--- a/Makefile
+++ b/Makefile
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ install_pcsd:
mkdir -p ${DESTDIR}/var/log/pcsd
mkdir -p ${DESTDIR}${PREFIX}/lib/
cp -r pcsd ${DESTDIR}${PREFIX}/lib/
diff --git a/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch b/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
index 3a644a2..9a2a2f4 100644
--- a/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
+++ b/debian/patches/0008-Fix-conf-directory-in-pcsd-init.patch
@@ -11,6 +11,8 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
+diff --git a/pcsd/pcsd b/pcsd/pcsd
+index 226447a..64a35da 100755
--- a/pcsd/pcsd
+++ b/pcsd/pcsd
@@ -25,9 +25,10 @@
@@ -25,7 +27,7 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
lockfile=/var/lock/subsys/$prog
-@@ -36,7 +37,7 @@
+@@ -36,7 +37,7 @@ start() {
echo -n $"Starting $prog: "
#export GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby
cd /var/lib/pcsd
diff --git a/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch b/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
index 6f4550f..b92d6be 100644
--- a/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
+++ b/debian/patches/0009-Fix-file-locations-in-pcsd.service.patch
@@ -11,6 +11,8 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
pcsd/pcsd.service | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/pcsd/pcsd.service b/pcsd/pcsd.service
+index 5254905..77b0cbe 100644
--- a/pcsd/pcsd.service
+++ b/pcsd/pcsd.service
@@ -2,9 +2,9 @@
diff --git a/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch b/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
index 4e8fcb2..689f8b5 100644
--- a/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
+++ b/debian/patches/0010-Fix-pcsd.service-destination-in-Makefile.patch
@@ -8,12 +8,14 @@ Subject: Fix pcsd.service destination in Makefile
Change-Id: If33c6f26eb50e218ea1b97ee8f2bc0f616e23784
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/Makefile b/Makefile
+index 1e0c00b..da27d98 100644
--- a/Makefile
+++ b/Makefile
-@@ -45,8 +45,8 @@
+@@ -45,8 +45,8 @@ install_pcsd:
install -m 700 -d ${DESTDIR}/var/lib/pcsd
install -m 644 -D pcsd/pcsd.logrotate ${DESTDIR}/etc/logrotate.d/pcsd
ifeq ($(IS_SYSTEMCTL),true)
@@ -24,3 +26,12 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
else
install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
endif
+@@ -56,7 +56,7 @@ uninstall:
+ rm -rf ${DESTDIR}${PYTHON_SITELIB}/pcs
+ rm -rf ${DESTDIR}${PREFIX}/lib/pcsd
+ ifeq ($(IS_SYSTEMCTL),true)
+- rm -f ${DESTDIR}/usr/lib/systemd/system/pcsd.service
++ rm -f ${DESTDIR}/lib/systemd/system/pcsd.service
+ else
+ rm -f ${DESTDIR}/${initdir}/pcsd
+ endif
diff --git a/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch b/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
new file mode 100644
index 0000000..265583b
--- /dev/null
+++ b/debian/patches/0011-Change-pcsd-destination-to-usr-share.patch
@@ -0,0 +1,38 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Mon, 4 May 2015 00:00:44 -0400
+Subject: Change pcsd destination to usr share
+
+ - By default pcsd/Makefile installs pcsd to usr/lib/pcsd, but
+ lintian wants those arch indep files to live in usr/share,
+ thus the patch was born.
+
+Change-Id: I592ebe46b721389fbda4634c2a6f5354fa5f2e39
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index da27d98..f318313 100644
+--- a/Makefile
++++ b/Makefile
+@@ -37,8 +37,8 @@ install: bash_completion
+
+ install_pcsd:
+ mkdir -p ${DESTDIR}/var/log/pcsd
+- mkdir -p ${DESTDIR}${PREFIX}/lib/
+- cp -r pcsd ${DESTDIR}${PREFIX}/lib/
++ mkdir -p ${DESTDIR}${PREFIX}/share/
++ cp -r pcsd ${DESTDIR}${PREFIX}/share/
+ install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/default/pcsd.conf
+ install -d ${DESTDIR}/etc/pam.d
+ install pcsd/pcsd.pam ${DESTDIR}/etc/pam.d/pcsd
+@@ -54,7 +54,7 @@ endif
+ uninstall:
+ rm -f ${DESTDIR}${PREFIX}/sbin/pcs
+ rm -rf ${DESTDIR}${PYTHON_SITELIB}/pcs
+- rm -rf ${DESTDIR}${PREFIX}/lib/pcsd
++ rm -rf ${DESTDIR}${PREFIX}/share/pcsd
+ ifeq ($(IS_SYSTEMCTL),true)
+ rm -f ${DESTDIR}/lib/systemd/system/pcsd.service
+ else
diff --git a/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch b/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch
new file mode 100644
index 0000000..48f6a46
--- /dev/null
+++ b/debian/patches/0012-Fix-check-for-systemctl-on-Debian.patch
@@ -0,0 +1,56 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Mon, 4 May 2015 00:02:33 -0400
+Subject: Fix check for systemctl on Debian
+
+ - By default the Makefile checks for /usr/bin/systemctl in
+ order to determine if systemd is utilized by the
+ environment. On debian we can do this by checking pid 1
+
+Change-Id: Ie4a490d5c2801c14c8b383bead370e93d7a4950c
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ Makefile | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f318313..e0073e3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,14 +8,7 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
+ EXTRA_SETUP_OPTS="--install-layout=deb"
+ endif
+
+-IS_SYSTEMCTL=false
+-ifeq ("$(wildcard /usr/bin/systemctl)","/usr/bin/systemctl")
+- IS_SYSTEMCTL=true
+-else
+- ifeq ("$(wildcard /bin/systemctl)","/usr/bin/systemctl")
+- IS_SYSTEMCTL=true
+- endif
+-endif
++IS_SYSTEMCTL = $(shell if ps -p 1 -o comm= | grep -q -i "systemd" ; then echo true; else echo false; fi)
+
+ MANDIR=/usr/share/man
+
+@@ -47,9 +40,8 @@ install_pcsd:
+ ifeq ($(IS_SYSTEMCTL),true)
+ install -d ${DESTDIR}/lib/systemd/system
+ install -m 644 pcsd/pcsd.service ${DESTDIR}/lib/systemd/system/
+-else
+- install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
+ endif
++ install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
+
+ uninstall:
+ rm -f ${DESTDIR}${PREFIX}/sbin/pcs
+@@ -57,9 +49,8 @@ uninstall:
+ rm -rf ${DESTDIR}${PREFIX}/share/pcsd
+ ifeq ($(IS_SYSTEMCTL),true)
+ rm -f ${DESTDIR}/lib/systemd/system/pcsd.service
+-else
+- rm -f ${DESTDIR}/${initdir}/pcsd
+ endif
++ rm -f ${DESTDIR}/${initdir}/pcsd
+ rm -f ${DESTDIR}/etc/pam.d/pcsd
+ rm -rf ${DESTDIR}/var/lib/pcsd
+
diff --git a/debian/patches/series b/debian/patches/series
index baefeff..743a1c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@
0008-Fix-conf-directory-in-pcsd-init.patch
0009-Fix-file-locations-in-pcsd.service.patch
0010-Fix-pcsd.service-destination-in-Makefile.patch
+0011-Change-pcsd-destination-to-usr-share.patch
+0012-Fix-check-for-systemctl-on-Debian.patch
--
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