use bundled boost instead of Debian's

since Ceph now requires boost_container, which is not
available in Debian Stretch

diff --git a/patches/0002-build-with-system-boost.patch b/patches/0002-build-with-system-boost.patch
deleted file mode 100644 (file)
index 205814a..0000000
--- a/patches/0002-build-with-system-boost.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 22302166a96657850a29aed838a44774e7de13ec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Mon, 20 Mar 2017 09:16:06 +0100
-Subject: [PATCH 2/6] build with system boost
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/rules | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/debian/rules b/debian/rules
-index f8fb811..3810602 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -11,6 +11,7 @@ extraopts += -DWITH_CEPHFS_JAVA=ON
- extraopts += -DCMAKE_INSTALL_LIBDIR=/usr/lib
- extraopts += -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib
- extraopts += -DCMAKE_INSTALL_SYSCONFDIR=/etc
-+extraopts += -DWITH_SYSTEM_BOOST=ON
- ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-   NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-   extraopts += -DBOOST_J=$(NUMJOBS)
--- 
-2.1.4
-

diff --git a/patches/0002-ceph-detect-init-support-Debian-Stretch.patch b/patches/0002-ceph-detect-init-support-Debian-Stretch.patch
new file mode 100644 (file)
index 0000000..2454cb2
--- /dev/null
+++ b/patches/0002-ceph-detect-init-support-Debian-Stretch.patch
@@ -0,0 +1,28 @@
+From 73818f98fd6c2c7d3719bf59ecad9979c0d6b009 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Tue, 21 Mar 2017 07:47:08 +0100
+Subject: [PATCH 2/5] ceph-detect-init: support Debian Stretch
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ src/ceph-detect-init/ceph_detect_init/__init__.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ceph-detect-init/ceph_detect_init/__init__.py b/src/ceph-detect-init/ceph_detect_init/__init__.py
+index 78374be..21e60c8 100644
+--- a/src/ceph-detect-init/ceph_detect_init/__init__.py
++++ b/src/ceph-detect-init/ceph_detect_init/__init__.py
+@@ -142,6 +142,7 @@ def platform_information():
+     # this could be an empty string in Debian
+     if not codename and 'debian' in distro_lower:
+         debian_codenames = {
++            '9': 'stretch',
+             '8': 'jessie',
+             '7': 'wheezy',
+             '6': 'squeeze',
+-- 
+2.1.4
+

diff --git a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch b/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
deleted file mode 100644 (file)
index 8f2bc8f..0000000
--- a/patches/0003-ceph-detect-init-support-Debian-Stretch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 70c45191ce08042685c958995f08da33daf5b252 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Tue, 21 Mar 2017 07:47:08 +0100
-Subject: [PATCH 3/6] ceph-detect-init: support Debian Stretch
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- src/ceph-detect-init/ceph_detect_init/__init__.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ceph-detect-init/ceph_detect_init/__init__.py b/src/ceph-detect-init/ceph_detect_init/__init__.py
-index 78374be..21e60c8 100644
---- a/src/ceph-detect-init/ceph_detect_init/__init__.py
-+++ b/src/ceph-detect-init/ceph_detect_init/__init__.py
-@@ -142,6 +142,7 @@ def platform_information():
-     # this could be an empty string in Debian
-     if not codename and 'debian' in distro_lower:
-         debian_codenames = {
-+            '9': 'stretch',
-             '8': 'jessie',
-             '7': 'wheezy',
-             '6': 'squeeze',
--- 
-2.1.4
-

diff --git a/patches/0003-enable-systemd-targets-by-default.patch b/patches/0003-enable-systemd-targets-by-default.patch
new file mode 100644 (file)
index 0000000..8ffb4e0
--- /dev/null
+++ b/patches/0003-enable-systemd-targets-by-default.patch
@@ -0,0 +1,30 @@
+From b30a92874ff7829cfec9f52ee4b907811122f82c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 22 Mar 2017 09:00:34 +0100
+Subject: [PATCH 3/5] enable systemd targets by default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ debian/rules | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/debian/rules b/debian/rules
+index f8fb811..e12913c 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -123,6 +123,9 @@ override_dh_installinit:
+ 
+       dh_installinit -p ceph-base --name ceph --no-start
+       dh_installinit -p radosgw --no-start
++      dh_systemd_enable -p ceph-common ceph.target
++      dh_systemd_enable -p ceph-mon ceph-mon.target
++      dh_systemd_enable -p ceph-osd ceph-osd.target
+ 
+ override_dh_systemd_start:
+       dh_systemd_start --no-restart-on-upgrade
+-- 
+2.1.4
+

diff --git a/patches/0004-enable-systemd-targets-by-default.patch b/patches/0004-enable-systemd-targets-by-default.patch
deleted file mode 100644 (file)
index c2fc1e5..0000000
--- a/patches/0004-enable-systemd-targets-by-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6932e11c9ef71f6182bee690a7d985e12c9cb678 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 22 Mar 2017 09:00:34 +0100
-Subject: [PATCH 4/6] enable systemd targets by default
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/rules | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/debian/rules b/debian/rules
-index 3810602..9c1b33c 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -124,6 +124,9 @@ override_dh_installinit:
- 
-       dh_installinit -p ceph-base --name ceph --no-start
-       dh_installinit -p radosgw --no-start
-+      dh_systemd_enable -p ceph-common ceph.target
-+      dh_systemd_enable -p ceph-mon ceph-mon.target
-+      dh_systemd_enable -p ceph-osd ceph-osd.target
- 
- override_dh_systemd_start:
-       dh_systemd_start --no-restart-on-upgrade
--- 
-2.1.4
-

diff --git a/patches/0005-Revert-debian-drop-boost-build-dependencies.patch b/patches/0005-Revert-debian-drop-boost-build-dependencies.patch
deleted file mode 100644 (file)
index 54bbc4b..0000000
--- a/patches/0005-Revert-debian-drop-boost-build-dependencies.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 088b229bb647c406170b0214b29c32a617f99bdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 29 Mar 2017 09:10:54 +0200
-Subject: [PATCH 5/6] Revert "debian: drop boost build dependencies"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-we build with system boost currently, so those are actually
-valid for us.
-
-This reverts commit 0d43b76268a41989dc0e285bfcf78b9f98386aaf.
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/control | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/debian/control b/debian/control
-index 1ae3a8a..8974d32 100644
---- a/debian/control
-+++ b/debian/control
-@@ -28,6 +28,14 @@ Build-Depends: bc,
-                libbabeltrace-ctf-dev,
-                libbabeltrace-dev,
-                libblkid-dev (>= 2.17),
-+               libboost-dev (>= 1.42),
-+               libboost-program-options-dev (>= 1.42),
-+               libboost-system-dev (>= 1.42),
-+               libboost-thread-dev (>= 1.42),
-+             libboost-regex-dev,
-+             libboost-random-dev,
-+               libboost-iostreams-dev (>= 1.42),
-+               libboost-python-dev,
-                libcurl4-gnutls-dev,
-                libexpat1-dev,
-                libfcgi-dev,
--- 
-2.1.4
-