From 93ccb227682de72f2d90ae868a31f4f3ed24df31 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 19 Jan 2019 14:52:46 +0000 Subject: [PATCH] Update quilt patch. --- debian/patches/detect-raspbian.diff | 223 ++++------------------------ 1 file changed, 32 insertions(+), 191 deletions(-) diff --git a/debian/patches/detect-raspbian.diff b/debian/patches/detect-raspbian.diff index 2e07b53f4..346541f02 100644 --- a/debian/patches/detect-raspbian.diff +++ b/debian/patches/detect-raspbian.diff @@ -3,19 +3,19 @@ Description: Add Raspbian to lists of "debian-like" distros. 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 +--- ceph-12.2.10+dfsg1.orig/install-deps.sh ++++ ceph-12.2.10+dfsg1/install-deps.sh +@@ -114,7 +114,7 @@ if [ x`uname`x = xFreeBSDx ]; then + else + source /etc/os-release + case $ID in +- debian|ubuntu|devuan) ++ debian|ubuntu|devuan|raspbian) + echo "Using apt-get to install dependencies" + $SUDO apt-get install -y lsb-release devscripts equivs + $SUDO apt-get install -y dpkg-dev gcc +--- ceph-12.2.10+dfsg1.orig/qa/workunits/ceph-helpers-root.sh ++++ ceph-12.2.10+dfsg1/qa/workunits/ceph-helpers-root.sh @@ -26,7 +26,7 @@ function install() { function install_one() { @@ -25,182 +25,23 @@ Author: Peter Michael Green 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 +--- ceph-12.2.10+dfsg1.orig/qa/workunits/rados/test_envlibrados_for_rocksdb.sh ++++ ceph-12.2.10+dfsg1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +@@ -11,7 +11,7 @@ function install() { - 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 + function install_one() { + case $(lsb_release -si) in +- Ubuntu|Debian|Devuan) ++ Ubuntu|Debian|Devuan|Raspbian) + sudo apt-get install -y --force-yes "$@" + ;; + CentOS|Fedora|RedHatEnterpriseServer) +@@ -39,7 +39,7 @@ CURRENT_PATH=`pwd` + # install prerequisites + # for rocksdb + case $(lsb_release -si) in +- Ubuntu|Debian|Devuan) ++ Ubuntu|Debian|Devuan|Raspbian) + install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev + ;; + CentOS|Fedora|RedHatEnterpriseServer) -- 2.30.2