Add support for debian bookworm (#66)

* Add support for debian bookworm Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai> * Lint Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai> --------- Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
gazebosim · Nov 2, 2023 · e39eae3 · e39eae3
1 parent 6f41f11
commit e39eae3
Show file tree

Hide file tree

Showing 33 changed files with 61 additions and 34 deletions.
diff --git a/workspace/X11/repository.bzl b/workspace/X11/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/X11", "include/X11")
 

diff --git a/workspace/assimp/repository.bzl b/workspace/assimp/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/assimp/", "include/assimp/")
 

diff --git a/workspace/buildifier/repository.bzl b/workspace/buildifier/repository.bzl
@@ -45,7 +45,7 @@ def _impl(repository_ctx):
     if os_result.is_macos:
         urls = darwin_urls
         sha256 = darwin_sha256
-    elif os_result.is_ubuntu or os_result.is_manylinux:
+    elif os_result.is_ubuntu or os_result.is_manylinux or os_result.is_debian:
         urls = linux_urls
         sha256 = linux_sha256
     else:

diff --git a/workspace/curl/repository.bzl b/workspace/curl/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink(
             "/usr/include/x86_64-linux-gnu/curl",

diff --git a/workspace/eigen3/repository.bzl b/workspace/eigen3/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         repository_ctx.symlink("/usr/include/eigen3/Eigen", "include/eigen3/Eigen")  # noqa
         repository_ctx.symlink("/usr/include/eigen3/unsupported", "include/eigen3/unsupported")  # noqa
 

diff --git a/workspace/fcl/repository.bzl b/workspace/fcl/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib"
         repository_ctx.symlink("/usr/include/fcl", "include/fcl")
 

diff --git a/workspace/ffmpeg/repository.bzl b/workspace/ffmpeg/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/x86_64-linux-gnu/libavcodec", "include/libavcodec")  # noqa
         repository_ctx.symlink("/usr/include/x86_64-linux-gnu/libavdevice", "include/libavdevice")  # noqa

diff --git a/workspace/fmt/repository.bzl b/workspace/fmt/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu/"
         repository_ctx.symlink("/usr/include/fmt", "include/fmt")
 

diff --git a/workspace/freeimage/repository.bzl b/workspace/freeimage/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/FreeImage.h", "include/FreeImage.h")  # noqa
 

diff --git a/workspace/freetype2/repository.bzl b/workspace/freetype2/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/freetype2", "include/freetype2")  # noqa
 

diff --git a/workspace/gdal/repository.bzl b/workspace/gdal/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib"
         repository_ctx.symlink("/usr/include/gdal", "include/gdal")
 

diff --git a/workspace/gl/repository.bzl b/workspace/gl/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/EGL/", "include/EGL/")
         repository_ctx.symlink("/usr/include/GL/", "include/GL/")

diff --git a/workspace/glib/repository.bzl b/workspace/glib/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/glib-2.0/", "include/glib-2.0/")
         repository_ctx.symlink(libdir + "/glib-2.0/include/glibconfig.h", "include/glibconfig.h")

diff --git a/workspace/glslang/repository.bzl b/workspace/glslang/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/glslang", "include/glslang")
 

diff --git a/workspace/glut/repository.bzl b/workspace/glut/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux/gnu"
         repository_ctx.symlink("/usr/include/GL/glut.h", "include/GL/glut.h")
         repository_ctx.symlink("/usr/include/GL/freeglut_std.h", "include/GL/freeglut_std.h")  # noqa

diff --git a/workspace/gts/repository.bzl b/workspace/gts/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/gts.h", "include/gts.h")
         repository_ctx.symlink("/usr/include/gtsconfig.h", "include/gtsconfig.h")  # noqa

diff --git a/workspace/jsoncpp/repository.bzl b/workspace/jsoncpp/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/jsoncpp", "include/jsoncpp")
 

diff --git a/workspace/nlopt/repository.bzl b/workspace/nlopt/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/nlopt.h", "include/nlopt.h")
 

diff --git a/workspace/ode/repository.bzl b/workspace/ode/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu/"
         repository_ctx.symlink("/usr/include/ode", "include/ode")
 

diff --git a/workspace/os.bzl b/workspace/os.bzl
@@ -54,19 +54,23 @@ def _make_result(
         error = None,
         macos_release = None,
         ubuntu_release = None,
+        debian_release = None,
         is_wheel = False,
         homebrew_prefix = None):
     """Return a fully-populated struct result for determine_os, below."""
     is_macos = (macos_release != None) and not is_wheel
     is_macos_wheel = (macos_release != None) and is_wheel
     is_ubuntu = (ubuntu_release != None) and not is_wheel
     is_manylinux = (ubuntu_release != None) and is_wheel
+    is_debian = (debian_release != None) and not is_wheel
     if is_macos:
         target = "macos"
     elif is_macos_wheel:
         target = "macos_wheel"
     elif is_ubuntu:
         target = "ubuntu"
+    elif is_debian:
+        target = "debian"
     elif is_manylinux:
         target = "manylinux"
     else:
@@ -77,10 +81,12 @@ def _make_result(
         is_macos = is_macos,
         is_macos_wheel = is_macos_wheel,
         is_ubuntu = is_ubuntu,
+        is_debian = is_debian,
         is_manylinux = is_manylinux,
         ubuntu_release = ubuntu_release,
         macos_release = macos_release,
         homebrew_prefix = homebrew_prefix,
+        debian_release = debian_release,
     )
 
 def _determine_linux(repository_ctx):
@@ -128,6 +134,24 @@ def _determine_linux(repository_ctx):
                      "unsupported '%s' release '%s'" %
                      (distro, ubuntu_release)),
         )
+    elif distro == "Debian":
+        lsb = exec_using_which(repository_ctx, ["lsb_release", "-sc"])
+        if lsb.error != None:
+            return _make_result(error = error_prologue + lsb.error)
+        debian_codename = lsb.stdout.strip()
+
+        if debian_codename in ["rodete"]:
+            return _make_result(
+                debian_release = debian_codename,
+                is_wheel = is_manylinux,
+            )
+
+        # Nothing matched.
+        return _make_result(
+            error = (error_prologue +
+                     "unsupported '%s' release '%s'" %
+                     (distro, debian_codename)),
+        )
 
     # Nothing matched.
     return _make_result(

diff --git a/workspace/osg/repository.bzl b/workspace/osg/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu/"
         repository_ctx.symlink("/usr/include/osg", "include/osg")
         repository_ctx.symlink("/usr/include/osgAnimation", "include/osgAnimation")  # noqa

diff --git a/workspace/pycodestyle/package.BUILD.bazel b/workspace/pycodestyle/package.BUILD.bazel
@@ -1,7 +1,10 @@
 # -*- python -*-
 
-load("@gz//bazel/skylark:py.bzl", "py_binary")
 load("@gz//bazel/workspace:generate_file.bzl", "generate_file")
+load(
+    "@gz//bazel/skylark:build_defs.bzl",
+    "gz_py_binary",
+)
 
 licenses(["notice"])  # MIT
 
@@ -28,7 +31,7 @@ generate_file(
     visibility = ["//visibility:private"],
 )
 
-py_binary(
+gz_py_binary(
     name = "pycodestyle",
     srcs = [
         "__init__.py",

diff --git a/workspace/rules_qt/repository.bzl b/workspace/rules_qt/repository.bzl
@@ -8,7 +8,7 @@ def rules_qt_repository(
     github_archive(
         name = name,
         repository = "mjcarroll/bazel_rules_qt",  # License: Apache-2.0
-        commit = "709d4432748a1beae0d00a91d53b63b44d38092c",
-        sha256 = "c2a6cd95e1737ca6b592cf9ad5a9f03478298707e5e5784e4e661531b1e5640e",  # noqa
+        commit = "056d0558f6d31a0183aba62ea471b95646058899",
+        sha256 = "35136d56cadbee7b7c1b4f6bac758b209355022da2e493f7ccde38a86a790168",  # noqa
         mirrors = mirrors,
     )
diff --git a/workspace/sdl2/repository.bzl b/workspace/sdl2/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu/"
         repository_ctx.symlink("/usr/include/SDL2", "include/SDL2")
         repository_ctx.symlink(

diff --git a/workspace/spdlog/repository.bzl b/workspace/spdlog/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu/"
         repository_ctx.symlink("/usr/include/spdlog", "include/spdlog")
 

diff --git a/workspace/sqlite3/repository.bzl b/workspace/sqlite3/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/sqlite3.h", "include/sqlite3.h")
 

diff --git a/workspace/tinyxml2/repository.bzl b/workspace/tinyxml2/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/tinyxml2.h", "include/tinyxml2.h")
 

diff --git a/workspace/uuid/repository.bzl b/workspace/uuid/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu or os_result.is_manylinux:
+    if os_result.is_ubuntu or os_result.is_debian or os_result.is_manylinux:
         build_flavor = "ubuntu"
         hdrs = [
             "uuid/uuid.h",

diff --git a/workspace/vulkan/repository.bzl b/workspace/vulkan/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/vulkan", "include/vulkan")
 

diff --git a/workspace/xcb/repository.bzl b/workspace/xcb/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/xcb", "include/xcb")
 

diff --git a/workspace/yaml/repository.bzl b/workspace/yaml/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu/"
         repository_ctx.symlink("/usr/include/yaml.h", "include/yaml.h")
 

diff --git a/workspace/zip/repository.bzl b/workspace/zip/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu/"
         repository_ctx.symlink("/usr/include/zip.h", "include/zip.h")
         repository_ctx.symlink("/usr/include/zipconf.h", "include/zipconf.h")

diff --git a/workspace/zmq/repository.bzl b/workspace/zmq/repository.bzl
@@ -6,7 +6,7 @@ def _impl(repository_ctx):
     if os_result.error != None:
         fail(os_result.error)
 
-    if os_result.is_ubuntu:
+    if os_result.is_ubuntu or os_result.is_debian:
         libdir = "/usr/lib/x86_64-linux-gnu"
         repository_ctx.symlink("/usr/include/zmq.h", "include/zmq.h")
         repository_ctx.symlink("/usr/include/zmq_utils.h", "include/zmq_utils.h")  # noqa