From 36f2a4f2b7a10840e34f858bcc2ba110b5b26643 Mon Sep 17 00:00:00 2001
From: Anuradha Weeraman <aweeraman@gmail.com>
Date: Thu, 2 Sep 2021 10:30:44 -0700
Subject: [PATCH] Changes for building in Debian (#943)

Summary:
Some changes that had to be done in Debian for the build to work:

* Installation of system deps failed as it was not detecting the OS correctly
* Updated the CMake manifest to uncomment the deb dependency as the CMake versions are newer
* fb303 was not getting cloned as it was looking for a non-existent master branch

Pull Request resolved: https://github.com/facebook/watchman/pull/943

Differential Revision: D30700180

Pulled By: fanzeyi

fbshipit-source-id: 62eb9f8ba57510eb98d6bd56e40384bf38a74d8c
---
 build/fbcode_builder/getdeps/platform.py | 2 +-
 build/fbcode_builder/manifests/cmake     | 5 ++---
 build/fbcode_builder/manifests/fb303     | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/fbcode_builder/getdeps/platform.py b/build/fbcode_builder/getdeps/platform.py
index fd8382e73..4fa07cd22 100644
--- a/build/fbcode_builder/getdeps/platform.py
+++ b/build/fbcode_builder/getdeps/platform.py
@@ -101,7 +101,7 @@ class HostType(object):
             return None
         if self.distro in ("fedora", "centos"):
             return "rpm"
-        if self.distro in ("debian", "ubuntu"):
+        if self.distro.startswith(("debian", "ubuntu")):
             return "deb"
         return None
 
diff --git a/build/fbcode_builder/manifests/cmake b/build/fbcode_builder/manifests/cmake
index f756caed0..ae6b83576 100644
--- a/build/fbcode_builder/manifests/cmake
+++ b/build/fbcode_builder/manifests/cmake
@@ -4,9 +4,8 @@ name = cmake
 [rpms]
 cmake
 
-# All current deb based distros have a cmake that is too old
-#[debs]
-#cmake
+[debs]
+cmake
 
 [dependencies]
 ninja
diff --git a/build/fbcode_builder/manifests/fb303 b/build/fbcode_builder/manifests/fb303
index 743aca01e..4d91af481 100644
--- a/build/fbcode_builder/manifests/fb303
+++ b/build/fbcode_builder/manifests/fb303
@@ -6,6 +6,7 @@ shipit_fbcode_builder = true
 
 [git]
 repo_url = https://github.com/facebookincubator/fb303.git
+rev = main
 
 [build]
 builder = cmake