diff -Nru ceph-10.2.5/debian/changelog ceph-10.2.5/debian/changelog --- ceph-10.2.5/debian/changelog 2017-06-07 08:39:39.000000000 +0000 +++ ceph-10.2.5/debian/changelog 2017-07-30 09:48:17.000000000 +0000 @@ -1,3 +1,11 @@ +ceph (10.2.5-7.2+rpi1) buster-staging; urgency=medium + + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. + + -- Peter Michael Green Sun, 30 Jul 2017 09:48:17 +0000 + ceph (10.2.5-7.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru ceph-10.2.5/debian/patches/detect-raspbian.diff ceph-10.2.5/debian/patches/detect-raspbian.diff --- ceph-10.2.5/debian/patches/detect-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ ceph-10.2.5/debian/patches/detect-raspbian.diff 2017-07-30 09:48:17.000000000 +0000 @@ -0,0 +1,206 @@ +Description: Add Raspbian to lists of "debian-like" distros. + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. +Author: Peter Michael Green + +--- ceph-10.2.5.orig/install-deps.sh ++++ ceph-10.2.5/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file +--- ceph-10.2.5.orig/qa/workunits/ceph-helpers-root.sh ++++ ceph-10.2.5/qa/workunits/ceph-helpers-root.sh +@@ -26,7 +26,7 @@ function install() { + + function install_one() { + case $(lsb_release -si) in +- Ubuntu|Debian|Devuan) ++ Ubuntu|Debian|Devuan|Raspbian) + sudo apt-get install -y "$@" + ;; + CentOS|Fedora|RedHatEnterpriseServer) +--- ceph-10.2.5.orig/src/Makefile.in ++++ ceph-10.2.5/src/Makefile.in +@@ -32721,7 +32721,7 @@ ceph-detect-init-clean: + ceph-detect-init-install-data: + cd $(srcdir)/ceph-detect-init ; \ + if test "$(DESTDIR)" ; then \ +- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + options=--install-layout=deb ; \ + else \ + options=--prefix=/usr ; \ +@@ -32743,7 +32743,7 @@ ceph-disk-clean: + ceph-disk-install-data: + cd $(srcdir)/ceph-disk ; \ + if test "$(DESTDIR)" ; then \ +- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + options=--install-layout=deb ; \ + else \ + options=--prefix=/usr ; \ +@@ -32835,7 +32835,7 @@ unittests:: $(check_PROGRAMS) + + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@rados-pybind-install-exec: ${srcdir}/ceph_ver.h + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ if test "$(DESTDIR)" ; then \ +-@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ options=--install-layout=deb ; \ + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ else \ + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ options=--prefix=/usr ; \ +@@ -32864,7 +32864,7 @@ unittests:: $(check_PROGRAMS) + + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@rbd-pybind-install-exec: ${srcdir}/ceph_ver.h + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@ if test "$(DESTDIR)" ; then \ +-@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++@ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@ options=--install-layout=deb ; \ + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@ else \ + @ENABLE_CLIENT_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@@WITH_RBD_TRUE@ options=--prefix=/usr ; \ +@@ -32893,7 +32893,7 @@ unittests:: $(check_PROGRAMS) + + @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h + @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ if test "$(DESTDIR)" ; then \ +-@ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++@ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ options=--install-layout=deb ; \ + @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ else \ + @ENABLE_CLIENT_TRUE@@WITH_CEPHFS_TRUE@@WITH_CYTHON_TRUE@@WITH_RADOS_TRUE@ options=--prefix=/usr ; \ +--- ceph-10.2.5.orig/src/ceph-detect-init/Makefile.am ++++ ceph-10.2.5/src/ceph-detect-init/Makefile.am +@@ -67,7 +67,7 @@ ceph-detect-init-clean: + ceph-detect-init-install-data: + cd $(srcdir)/ceph-detect-init ; \ + if test "$(DESTDIR)" ; then \ +- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + options=--install-layout=deb ; \ + else \ + options=--prefix=/usr ; \ +--- ceph-10.2.5.orig/src/ceph-disk/Makefile.am ++++ ceph-10.2.5/src/ceph-disk/Makefile.am +@@ -43,7 +43,7 @@ ceph-disk-clean: + ceph-disk-install-data: + cd $(srcdir)/ceph-disk ; \ + if test "$(DESTDIR)" ; then \ +- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + options=--install-layout=deb ; \ + else \ + options=--prefix=/usr ; \ +--- ceph-10.2.5.orig/src/pybind/cephfs/Makefile.am ++++ ceph-10.2.5/src/pybind/cephfs/Makefile.am +@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver. + + cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h + if test "$(DESTDIR)" ; then \ +- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + options=--install-layout=deb ; \ + else \ + options=--prefix=/usr ; \ +--- ceph-10.2.5.orig/src/pybind/rados/Makefile.am ++++ ceph-10.2.5/src/pybind/rados/Makefile.am +@@ -15,7 +15,7 @@ rados-pybind-clean: ${srcdir}/ceph_ver.h + + rados-pybind-install-exec: ${srcdir}/ceph_ver.h + if test "$(DESTDIR)" ; then \ +- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + options=--install-layout=deb ; \ + else \ + options=--prefix=/usr ; \ +--- ceph-10.2.5.orig/src/pybind/rbd/Makefile.am ++++ ceph-10.2.5/src/pybind/rbd/Makefile.am +@@ -15,7 +15,7 @@ rbd-pybind-clean: ${srcdir}/ceph_ver.h + + rbd-pybind-install-exec: ${srcdir}/ceph_ver.h + if test "$(DESTDIR)" ; then \ +- if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ ++ if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan\|Raspbian' ; then \ + options=--install-layout=deb ; \ + else \ + options=--prefix=/usr ; \ +--- ceph-10.2.5.orig/src/test/centos-6/install-deps.sh ++++ ceph-10.2.5/src/test/centos-6/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file +--- ceph-10.2.5.orig/src/test/centos-7/install-deps.sh ++++ ceph-10.2.5/src/test/centos-7/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file +--- ceph-10.2.5.orig/src/test/debian-jessie/install-deps.sh ++++ ceph-10.2.5/src/test/debian-jessie/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file +--- ceph-10.2.5.orig/src/test/fedora-21/install-deps.sh ++++ ceph-10.2.5/src/test/fedora-21/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file +--- ceph-10.2.5.orig/src/test/opensuse-13.2/install-deps.sh ++++ ceph-10.2.5/src/test/opensuse-13.2/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file +--- ceph-10.2.5.orig/src/test/ubuntu-12.04/install-deps.sh ++++ ceph-10.2.5/src/test/ubuntu-12.04/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file +--- ceph-10.2.5.orig/src/test/ubuntu-14.04/install-deps.sh ++++ ceph-10.2.5/src/test/ubuntu-14.04/install-deps.sh +@@ -32,7 +32,7 @@ if type zypper > /dev/null 2>&1 ; then + fi + + case $(lsb_release -si) in +-Ubuntu|Debian|Devuan) ++Ubuntu|Debian|Devuan|Raspbian) + $SUDO apt-get install -y dpkg-dev + if ! test -r debian/control ; then + echo debian/control is not a readable file diff -Nru ceph-10.2.5/debian/patches/series ceph-10.2.5/debian/patches/series --- ceph-10.2.5/debian/patches/series 2017-05-12 10:09:22.000000000 +0000 +++ ceph-10.2.5/debian/patches/series 2017-07-30 09:48:17.000000000 +0000 @@ -24,3 +24,4 @@ disable-openssl-linking.patch osd-limit-omap-data-in-push-op.patch rgw_rados-creation_time.patch +detect-raspbian.diff