cd ${BUILDSRC}; rm -rf .pc ./patches
echo "git clone git://git.proxmox.com/git/ceph.git\\ngit checkout ${GITVERSION}" > ${BUILDSRC}/debian/SOURCE
echo "debian/SOURCE" >> ${BUILDSRC}/debian/docs
+ echo "${GITVERSION}\\nv${VER}" > ${BUILDSRC}/src/.git_version
cd ${BUILDSRC}; dpkg-buildpackage -b -uc -us
@echo ${DEBS}
+++ /dev/null
-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
-
--- /dev/null
+From cd591c10ab6f746d6dde0da3842efb4877581428 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Wed, 31 May 2017 14:33:09 +0200
+Subject: [PATCH 2/6] cmake: disable version from git
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+as this recurses up the directory tree and gets wrong
+information from the parent repository.
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ src/CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c68c5fe..26c9a69 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -202,15 +202,10 @@ set(GCOV_PREFIX_STRIP 4)
+
+ option(ENABLE_GIT_VERSION "build Ceph with git version string" ON)
+ if(${ENABLE_GIT_VERSION})
+- get_git_head_revision(GIT_REFSPEC CEPH_GIT_VER)
+- git_describe(CEPH_GIT_NICE_VER --always)
+- #if building from a source tarball via make-dist
+- if(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
+ message(STATUS "Ceph/.git directory not found, parsing ${CMAKE_CURRENT_SOURCE_DIR}/.git_version for CEPH_GIT_VER and CEPH_GIT_NICE_VER")
+ file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/.git_version CEPH_GIT_SHA_AND_TAG)
+ list(GET CEPH_GIT_SHA_AND_TAG 0 CEPH_GIT_VER)
+ list(GET CEPH_GIT_SHA_AND_TAG 1 CEPH_GIT_NICE_VER)
+- endif(${CEPH_GIT_VER} STREQUAL "GITDIR-NOTFOUND")
+ # remove 'v' prefix from raw git version
+ string(SUBSTRING ${CEPH_GIT_NICE_VER} 1 -1 CEPH_GIT_NICE_VER)
+ else(${ENABLE_GIT_VERSION})
+--
+2.1.4
+
--- /dev/null
+From 3b9799d44ec7d67284e2446563c85bf5411add81 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
+
+++ /dev/null
-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
-
--- /dev/null
+From 49241b48abf146098b335071671aab7dc41358a3 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 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
+
0001-update-changelog.patch
-0002-build-with-system-boost.patch
+0002-cmake-disable-version-from-git.patch
0003-ceph-detect-init-support-Debian-Stretch.patch
0004-enable-systemd-targets-by-default.patch
-0005-Revert-debian-drop-boost-build-dependencies.patch
-0006-mon-OSDMonitor-tolerate-upgrade-from-post-kraken-dev.patch
projects / ceph.git / commitdiff