Update detect-raspbian.diff
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 10 Mar 2022 15:02:23 +0000 (15:02 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 10 Mar 2022 15:02:23 +0000 (15:02 +0000)
debian/patches/detect-raspbian.diff

index 1ecc173d5531a245c7231e6690a95df747921264..eec08b00f6c600ddf006899a8159b3baa879ceb1 100644 (file)
@@ -4,20 +4,20 @@ Description:  Add Raspbian to lists of "debian-like" distros.
 Author: Peter Michael Green <plugwash@raspbian.org>
 
 diff --git a/install-deps.sh b/install-deps.sh
-index 0fccd5b62..95c02c562 100755
+index 3ba5e47ff..ad7f338e2 100755
 --- a/install-deps.sh
 +++ b/install-deps.sh
-@@ -276,7 +276,7 @@ else
-     fi
+@@ -301,7 +301,7 @@ else
+     [ $WITH_ZBD ] && with_zbd=true || with_zbd=false
      source /etc/os-release
      case "$ID" in
--    debian|ubuntu|devuan)
-+    debian|ubuntu|devuan|raspbian)
+-    debian|ubuntu|devuan|elementary)
++    debian|ubuntu|devuan|raspbian|elementary)
          echo "Using apt-get to install dependencies"
          $SUDO apt-get install -y devscripts equivs
          $SUDO apt-get install -y dpkg-dev
 diff --git a/qa/workunits/ceph-helpers-root.sh b/qa/workunits/ceph-helpers-root.sh
-index dc81b2b3a..f0d061941 100755
+index e0ea4f07d..0f30b0a40 100755
 --- a/qa/workunits/ceph-helpers-root.sh
 +++ b/qa/workunits/ceph-helpers-root.sh
 @@ -35,7 +35,7 @@ function install() {
@@ -30,7 +30,7 @@ index dc81b2b3a..f0d061941 100755
              ;;
          centos|fedora|rhel)
 diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
-index 7099dafb3..64b9540f4 100755
+index ca9b8d2ea..54a80b13b 100755
 --- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
 +++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
 @@ -19,7 +19,7 @@ CURRENT_PATH=`pwd`