From: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
Date: Sun, 30 Jul 2017 09:48:17 +0000 (+0100)
Subject: detect-raspbian
X-Git-Tag: archive/raspbian/12.2.8+dfsg1-5+rpi1~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=30b5599e857067342798ddb35051d0b3d3f1d8fe;p=ceph.git

detect-raspbian


Gbp-Pq: Name detect-raspbian.diff
---

diff --git a/install-deps.sh b/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/install-deps.sh
+++ b/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 --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh
index a622bd5ab..742067063 100755
--- a/qa/workunits/ceph-helpers-root.sh
+++ b/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)
diff --git a/src/Makefile.in b/src/Makefile.in
index 055214bef..10251a22d 100644
--- a/src/Makefile.in
+++ b/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 ; \
diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
index 3926ac4be..e36ebdd42 100644
--- a/src/ceph-detect-init/Makefile.am
+++ b/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 ; \
diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am
index a8532878c..d09d5ac6d 100644
--- a/src/ceph-disk/Makefile.am
+++ b/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 ; \
diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am
index 698522daa..baac76529 100644
--- a/src/pybind/cephfs/Makefile.am
+++ b/src/pybind/cephfs/Makefile.am
@@ -15,7 +15,7 @@ cephfs-pybind-clean: ${srcdir}/ceph_ver.h
 
 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 ; \
diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am
index a4145bf0f..4e649acfd 100644
--- a/src/pybind/rados/Makefile.am
+++ b/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 ; \
diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am
index 7dd49333f..9f442c2a7 100644
--- a/src/pybind/rbd/Makefile.am
+++ b/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 ; \
diff --git a/src/test/centos-6/install-deps.sh b/src/test/centos-6/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/src/test/centos-6/install-deps.sh
+++ b/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
diff --git a/src/test/centos-7/install-deps.sh b/src/test/centos-7/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/src/test/centos-7/install-deps.sh
+++ b/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
diff --git a/src/test/debian-jessie/install-deps.sh b/src/test/debian-jessie/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/src/test/debian-jessie/install-deps.sh
+++ b/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
diff --git a/src/test/fedora-21/install-deps.sh b/src/test/fedora-21/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/src/test/fedora-21/install-deps.sh
+++ b/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
diff --git a/src/test/opensuse-13.2/install-deps.sh b/src/test/opensuse-13.2/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/src/test/opensuse-13.2/install-deps.sh
+++ b/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
diff --git a/src/test/ubuntu-12.04/install-deps.sh b/src/test/ubuntu-12.04/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/src/test/ubuntu-12.04/install-deps.sh
+++ b/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
diff --git a/src/test/ubuntu-14.04/install-deps.sh b/src/test/ubuntu-14.04/install-deps.sh
index 129178fd0..2c3be5170 100755
--- a/src/test/ubuntu-14.04/install-deps.sh
+++ b/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