From 17f7b41d39b040c79ce6126adb83955a8ed29319 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Mon, 23 Dec 2024 20:10:55 +0900 Subject: [PATCH 1/3] packaging: raspbian: Add raspbian\bookworm package Signed-off-by: Hiroshi Hatake --- packaging/distros/raspbian/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packaging/distros/raspbian/Dockerfile b/packaging/distros/raspbian/Dockerfile index 03ca9708772..1b3e3408f8b 100644 --- a/packaging/distros/raspbian/Dockerfile +++ b/packaging/distros/raspbian/Dockerfile @@ -34,6 +34,19 @@ RUN apt-get update && \ libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ apt-get install -y --reinstall lsb-base lsb-release +# raspbian/bookworm base image +FROM balenalib/rpi-raspbian:bookworm as raspbian-bookworm-base +ENV DEBIAN_FRONTEND noninteractive + +# hadolint ignore=DL3008,DL3015 +RUN apt-get update && \ + apt-get install -y curl ca-certificates build-essential \ + cmake make bash sudo wget unzip dh-make \ + libsystemd-dev zlib1g-dev flex bison \ + libssl3 libssl-dev libpq-dev postgresql-server-dev-all \ + libsasl2-2 libsasl2-dev libyaml-dev pkg-config && \ + apt-get install -y --reinstall lsb-base lsb-release + # Common build for all distributions now # hadolint ignore=DL3006 FROM $BASE_BUILDER as builder From d484c5eebb6a851d74dc85696e3b48e46d2e3777 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Mon, 23 Dec 2024 20:11:45 +0900 Subject: [PATCH 2/3] packaging: Update disto table for supported distros & versions Signed-off-by: Hiroshi Hatake --- packaging/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packaging/README.md b/packaging/README.md index 70361050cf7..440e2c1047f 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -27,6 +27,8 @@ The [`distros`](./distros/) directory contains OCI container definitions used to | Debian | 11 | arm64v8 | debian/bullseye.arm64v8 | | Debian | 10 | x86_64 | debian/buster | | Debian | 10 | arm64v8 | debian/buster.arm64v8 | +| Ubuntu | 24.04 / Noble Numbat | x86_64 | ubuntu/24.04 | +| Ubuntu | 24.04 / Noble Numbat | arm64v8 | ubuntu/24.04.arm64v8 | | Ubuntu | 22.04 / Jammy Jellyfish | x86_64 | ubuntu/22.04 | | Ubuntu | 22.04 / Jammy Jellyfish | arm64v8 | ubuntu/22.04.arm64v8 | | Ubuntu | 20.04 / Focal Fossa | x86_64 | ubuntu/20.04 | @@ -34,6 +36,7 @@ The [`distros`](./distros/) directory contains OCI container definitions used to | Ubuntu | 18.04 / Bionic Beaver | x86_64 | ubuntu/18.04 | | Ubuntu | 18.04 / Bionic Beaver | arm64v8 | ubuntu/18.04.arm64v8 | | Ubuntu | 16.04 / Xenial Xerus | x86_64 | ubuntu/16.04 | +| Raspbian | 12 / Bookworm | arm32v7 | raspbian/bookworm | | Raspbian | 11 / Bullseye | arm32v7 | raspbian/bullseye | | Raspbian | 10 / Buster | arm32v7 | raspbian/buster | From 0117e73c84de5a3d6ea00d50d8439eb31aaa4ac5 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Mon, 23 Dec 2024 20:16:16 +0900 Subject: [PATCH 3/3] packaging: Add raspbian/bookworm definition for building config Signed-off-by: Hiroshi Hatake --- packaging/build-config.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/build-config.json b/packaging/build-config.json index 27b5d2e8671..58c9607ac4f 100644 --- a/packaging/build-config.json +++ b/packaging/build-config.json @@ -107,6 +107,10 @@ { "target": "raspbian/bullseye", "type": "deb" + }, + { + "target": "raspbian/bookworm", + "type": "deb" } ], "windows_targets" : [