From 6ffdffc9365197e3e4d2efe45471ef193a767bbd Mon Sep 17 00:00:00 2001
From: Vladimir Burdukov <chippcheg@gmail.com>
Date: Thu, 27 Jun 2024 23:51:16 +0300
Subject: [PATCH] Moved bluez to a separate image

---
 .github/workflows/pr.yml              |  35 -------
 .rust-version                         |   2 +-
 bin/isabel/Dockerfile                 |   7 +-
 bin/isabel/install_static_libs.sh     | 137 --------------------------
 bin/isabel/test.Dockerfile            |   7 +-
 bin/isabel/test_libs/amd64.Dockerfile |   8 --
 bin/isabel/test_libs/arm64.Dockerfile |   8 --
 7 files changed, 3 insertions(+), 201 deletions(-)
 delete mode 100644 bin/isabel/install_static_libs.sh
 delete mode 100644 bin/isabel/test_libs/amd64.Dockerfile
 delete mode 100644 bin/isabel/test_libs/arm64.Dockerfile

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 14a292f..7e4d896 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -48,38 +48,3 @@ jobs:
              --label "org.opencontainers.image.source=https://github.com/${{ github.repository }}" \
              --cache-from=type=registry,ref=$IMAGE_ID:cache \
              --cache-to=type=registry,ref=$IMAGE_ID:cache,mode=max
-
-  test-isabel-libs:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        build_arch:
-          - arm64
-          - amd64
-        host_arch:
-          - arm64
-          - amd64
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Log into registry
-        run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@master
-
-      - name: Test
-        run: |
-          IMAGE_ID=ghcr.io/chipp/isabel
-          RUST_VERSION=$(cat .rust-version)
-          TEST_TAG=test-cache-libs-${{ matrix.build_arch }}-${{ matrix.host_arch }}
-
-          docker buildx build . --file bin/isabel/test_libs/${{ matrix.host_arch }}.Dockerfile \
-             --load \
-             --platform linux/${{ matrix.build_arch }} \
-             --build-arg RUST_VERSION="${RUST_VERSION}" \
-             --cache-from=type=registry,ref=$IMAGE_ID:$TEST_TAG \
-             --cache-to=type=registry,ref=$IMAGE_ID:$TEST_TAG,mode=max
diff --git a/.rust-version b/.rust-version
index 6af0795..efba0ba 100644
--- a/.rust-version
+++ b/.rust-version
@@ -1 +1 @@
-1.79.0_1
\ No newline at end of file
+1.79.0_3
\ No newline at end of file
diff --git a/bin/isabel/Dockerfile b/bin/isabel/Dockerfile
index 6377b4e..bffd2b8 100644
--- a/bin/isabel/Dockerfile
+++ b/bin/isabel/Dockerfile
@@ -1,11 +1,6 @@
 ARG RUST_VERSION
 
-FROM ghcr.io/chipp/build.rust.arm64_musl:${RUST_VERSION} AS libs_builder
-
-COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
-RUN chmod +x ./install_static_libs.sh && \
-  ./install_static_libs.sh && \
-  rm ./install_static_libs.sh
+FROM ghcr.io/chipp/bluez.static.arm64_musl:5.66_3 AS libs_builder
 
 FROM ghcr.io/chipp/build.rust.arm64_musl:${RUST_VERSION} AS builder
 
diff --git a/bin/isabel/install_static_libs.sh b/bin/isabel/install_static_libs.sh
deleted file mode 100644
index 53a8479..0000000
--- a/bin/isabel/install_static_libs.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o pipefail
-
-apt-get update && apt-get install -y --no-install-recommends \
-  autoconf \
-  automake \
-  gettext \
-  libtool \
-  musl \
-  ninja-build \
-  python3 \
-  python3-venv
-
-case $TARGET in
-  aarch64-linux-musl)
-    CPU_FAMILY="aarch64"
-    CPU="aarch64"
-    ENDIAN="little"
-    ;;
-  x86_64-unknown-linux-musl)
-    CPU_FAMILY="x86_64"
-    CPU="x86_64"
-    ENDIAN="little"
-    ;;
-  *)
-    echo "Unknown target: $TARGET" >&2
-    exit 1
-    ;;
-esac
-
-rm -rf /var/lib/apt/lists/*
-
-python3 -m venv python
-PATH=/python/bin:$PATH
-pip3 install meson
-
-tee meson.cross <<EOF
-[binaries]
-c = '/musl/bin/${CROSS_PREFIX}gcc'
-cpp = '/musl/bin/${CROSS_PREFIX}g++'
-ar = '/musl/bin/${CROSS_PREFIX}gcc-ar'
-nm = '/musl/bin/${CROSS_PREFIX}gcc-nm'
-ld = '/musl/bin/${CROSS_PREFIX}ld'
-strip = '/musl/bin/${CROSS_PREFIX}strip'
-pkg-config = '/usr/bin/pkg-config'
-
-[host_machine]
-system = 'linux'
-cpu_family = '${CPU_FAMILY}'
-cpu = '${CPU}'
-endian = '${ENDIAN}'
-EOF
-
-FFI_VER="3.4.6"     FFI_SHA="b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e"
-EXPAT_VER="2.6.2"   EXPAT_SHA="d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3"
-GLIB_VER="2.80.3"   GLIB_SHA="3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417"
-DBUS_VER="1.15.8"   DBUS_SHA="84fc597e6ec82f05dc18a7d12c17046f95bad7be99fc03c15bc254c4701ed204"
-BLUEZ_VER="5.66"    BLUEZ_SHA="39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574"
-
-curl -sSOL https://github.com/libffi/libffi/releases/download/v${FFI_VER}/libffi-${FFI_VER}.tar.gz
-echo "${FFI_SHA}  libffi-${FFI_VER}.tar.gz" | sha256sum -c -
-tar xfz libffi-${FFI_VER}.tar.gz
-cd libffi-${FFI_VER}
-
-./configure --host=$TARGET --prefix=$PREFIX --disable-shared --enable-static
-make -j$(nproc) && make install
-cd .. && rm -rf libffi-${FFI_VER}.tar.gz libffi-${FFI_VER}
-
-
-EXPAT_TAG=R_$(printf ${EXPAT_VER} | tr . _)
-curl -sSOL https://github.com/libexpat/libexpat/releases/download/${EXPAT_TAG}/expat-${EXPAT_VER}.tar.gz
-echo "${EXPAT_SHA}  expat-${EXPAT_VER}.tar.gz" | sha256sum -c -
-tar xfz expat-${EXPAT_VER}.tar.gz
-cd expat-${EXPAT_VER}
-
-./configure --host=$TARGET --prefix=$PREFIX --disable-shared --enable-static
-make -j$(nproc) && make install
-cd .. && rm -rf expat-${EXPAT_VER}.tar.gz expat-${EXPAT_VER}
-
-
-GLIB_MAJOR_MINOR=$(echo $GLIB_VER | cut -d. -f1-2)
-curl -sSOL https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${GLIB_VER}.tar.xz
-echo "${GLIB_SHA}  glib-${GLIB_VER}.tar.xz" | sha256sum -c -
-tar xfJ glib-${GLIB_VER}.tar.xz
-cd glib-${GLIB_VER}
-
-pip3 install packaging
-meson setup --cross-file ../meson.cross --prefix $PREFIX --pkg-config-path $PKG_CONFIG_PATH \
-  --default-library static -Dlibmount=disabled -Dselinux=disabled \
-  -Dtests=false _build
-meson compile -C _build
-meson install -C _build
-cd .. && rm -rf glib-${GLIB_VER}.tar.xz glib-${GLIB_VER}
-
-
-curl -sSOL https://dbus.freedesktop.org/releases/dbus/dbus-${DBUS_VER}.tar.xz
-echo "${DBUS_SHA}  dbus-${DBUS_VER}.tar.xz" | sha256sum -c -
-tar xfJ dbus-${DBUS_VER}.tar.xz
-cd dbus-${DBUS_VER}
-
-meson setup --cross-file ../meson.cross --prefix $PREFIX --pkg-config-path $PKG_CONFIG_PATH \
-  --default-library static -Ddoxygen_docs=disabled -Dducktype_docs=disabled \
-  -Dmessage_bus=false -Dxml_docs=disabled _build
-meson compile -C _build
-meson install -C _build
-cd .. && rm -rf dbus-${DBUS_VER}.tar.gz dbus-${DBUS_VER}
-
-
-curl -sSOL https://www.kernel.org/pub/linux/bluetooth/bluez-${BLUEZ_VER}.tar.xz
-echo "${BLUEZ_SHA} bluez-${BLUEZ_VER}.tar.xz" | sha256sum -c -
-tar xfJ bluez-${BLUEZ_VER}.tar.xz
-cd bluez-${BLUEZ_VER}
-
-patch -p0 <<EOF
---- src/shared/util.c 2022-11-10 20:24:03.000000000 +0000
-+++ src/shared/util.c 2024-06-23 09:05:23.632007315 +0000
-@@ -28,6 +28,11 @@
- #include <sys/random.h>
- #endif
-
-+/* define MAX_INPUT for musl */
-+#ifndef MAX_INPUT
-+#define MAX_INPUT _POSIX_MAX_INPUT
-+#endif
-+
- #include "src/shared/util.h"
-
- void *util_malloc(size_t size)
-EOF
-
-./configure --host=$TARGET --prefix=$PREFIX --disable-shared --enable-static \
-  --disable-test --disable-monitor --disable-tools --disable-client --disable-systemd \
-  --disable-udev --disable-cups --disable-obex --enable-library --disable-manpages
-make -j$(nproc) && make install
-cd .. && rm -rf bluez-${BLUEZ_VER}.tar.xz bluez-${BLUEZ_VER}
diff --git a/bin/isabel/test.Dockerfile b/bin/isabel/test.Dockerfile
index dc3d118..f42befc 100644
--- a/bin/isabel/test.Dockerfile
+++ b/bin/isabel/test.Dockerfile
@@ -1,11 +1,6 @@
 ARG RUST_VERSION
 
-FROM ghcr.io/chipp/build.rust.x86_64_musl:${RUST_VERSION} AS libs_builder
-
-COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
-RUN chmod +x ./install_static_libs.sh && \
-  ./install_static_libs.sh && \
-  rm ./install_static_libs.sh
+FROM ghcr.io/chipp/bluez.static.x86_64_musl:5.66_3 AS libs_builder
 
 FROM ghcr.io/chipp/build.rust.x86_64_musl:${RUST_VERSION} AS builder
 
diff --git a/bin/isabel/test_libs/amd64.Dockerfile b/bin/isabel/test_libs/amd64.Dockerfile
deleted file mode 100644
index aca7837..0000000
--- a/bin/isabel/test_libs/amd64.Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-ARG RUST_VERSION
-
-FROM ghcr.io/chipp/build.rust.x86_64_musl:${RUST_VERSION}
-
-COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
-RUN chmod +x ./install_static_libs.sh && \
-  ./install_static_libs.sh && \
-  rm ./install_static_libs.sh
diff --git a/bin/isabel/test_libs/arm64.Dockerfile b/bin/isabel/test_libs/arm64.Dockerfile
deleted file mode 100644
index 854a439..0000000
--- a/bin/isabel/test_libs/arm64.Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-ARG RUST_VERSION
-
-FROM ghcr.io/chipp/build.rust.arm64_musl:${RUST_VERSION}
-
-COPY ./bin/isabel/install_static_libs.sh ./install_static_libs.sh
-RUN chmod +x ./install_static_libs.sh && \
-  ./install_static_libs.sh && \
-  rm ./install_static_libs.sh