Skip to content

Commit

Permalink
Update to bookworm (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
@PeterJohnson
PeterJohnson authored Nov 30, 2024
1 parent 8cda58e commit a33260f
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 deletions.
20 changes: 10 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ build/cross: build/base
cd systemcore-cross-ubuntu && \
docker build -t ${DOCKER_USER}/systemcore-cross-ubuntu:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
cd raspbian-cross-ubuntu && \
docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
cd aarch64-cross-ubuntu && \
docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .
docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=base .

build/minimal-base:
cd ubuntu-minimal-base && \
Expand All @@ -41,9 +41,9 @@ build/minimal-cross: build/minimal-base
cd systemcore-cross-ubuntu && \
docker build -t ${DOCKER_USER}/systemcore-cross-ubuntu-minimal:2025-${UBUNTU} -f Dockerfile.2025 --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
cd raspbian-cross-ubuntu && \
docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
docker build -t ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
cd aarch64-cross-ubuntu && \
docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU} -f Dockerfile.bullseye --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .
docker build -t ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bookworm-${UBUNTU} -f Dockerfile.bookworm --build-arg UBUNTU=${UBUNTU} --build-arg TYPE=minimal-base .

build/opensdk:
cd opensdk/ubuntu && \
Expand All @@ -58,17 +58,17 @@ push/base:
push/cross: push/base
docker push ${DOCKER_USER}/roborio-cross-ubuntu:2025-${UBUNTU}
docker push ${DOCKER_USER}/systemcore-cross-ubuntu:2025-${UBUNTU}
docker push ${DOCKER_USER}/raspbian-cross-ubuntu:bullseye-${UBUNTU}
docker push ${DOCKER_USER}/aarch64-cross-ubuntu:bullseye-${UBUNTU}
docker push ${DOCKER_USER}/raspbian-cross-ubuntu:bookworm-${UBUNTU}
docker push ${DOCKER_USER}/aarch64-cross-ubuntu:bookworm-${UBUNTU}

push/minimal-base:
docker push ${DOCKER_USER}/ubuntu-minimal-base:${UBUNTU}

push/minimal-cross: push/minimal-base
docker push ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU}
docker push ${DOCKER_USER}/systemcore-cross-ubuntu-minimal:2025-${UBUNTU}
docker push ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU}
docker push ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU}
docker push ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bookworm-${UBUNTU}
docker push ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bookworm-${UBUNTU}

push/opensdk:
docker push ${DOCKER_USER}/opensdk-ubuntu:${OPENSDK_UBUNTU}
Expand All @@ -78,7 +78,7 @@ push/opensdk:
save/minimal-cross:
docker save ${DOCKER_USER}/roborio-cross-ubuntu-minimal:2025-${UBUNTU} | gzip > roborio.tar.gz
docker save ${DOCKER_USER}/systemcore-cross-ubuntu-minimal:2025-${UBUNTU} | gzip > systemcore.tar.gz
docker save ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > raspbian.tar.gz
docker save ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bullseye-${UBUNTU} | gzip > aarch64.tar.gz
docker save ${DOCKER_USER}/raspbian-cross-ubuntu-minimal:bookworm-${UBUNTU} | gzip > raspbian.tar.gz
docker save ${DOCKER_USER}/aarch64-cross-ubuntu-minimal:bookworm-${UBUNTU} | gzip > aarch64.tar.gz

include cross-ubuntu-py/py.mk
2 changes: 1 addition & 1 deletion aarch64-cross-ubuntu/Dockerfile.bullseye → aarch64-cross-ubuntu/Dockerfile.bookworm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ ARG TYPE=base
FROM wpilib/ubuntu-${TYPE}:${UBUNTU}

# Install toolchain
RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'

WORKDIR /
10 changes: 5 additions & 5 deletions cross-ubuntu-py/os-release-aarch64
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PRETTY_NAME="Raspbian GNU/Linux 11 (bullseye)"
PRETTY_NAME="Raspbian GNU/Linux 12 (bookworm)"
NAME="Raspbian GNU/Linux"
VERSION_ID="11"
VERSION="11 (bullseye)"
VERSION_CODENAME=bullseye
VERSION_ID="12"
VERSION="12 (bookworm)"
VERSION_CODENAME=bookworm
ID=raspbian
ID_LIKE=debian
HOME_URL="http://www.raspbian.org/"
SUPPORT_URL="http://www.raspbian.org/RaspbianForums"
BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"
BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"
10 changes: 5 additions & 5 deletions cross-ubuntu-py/os-release-raspbian
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PRETTY_NAME="Raspbian GNU/Linux 11 (bullseye)"
PRETTY_NAME="Raspbian GNU/Linux 12 (bookworm)"
NAME="Raspbian GNU/Linux"
VERSION_ID="11"
VERSION="11 (bullseye)"
VERSION_CODENAME=bullseye
VERSION_ID="12"
VERSION="12 (bookworm)"
VERSION_CODENAME=bookworm
ID=raspbian
ID_LIKE=debian
HOME_URL="http://www.raspbian.org/"
SUPPORT_URL="http://www.raspbian.org/RaspbianForums"
BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"
BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"
12 changes: 6 additions & 6 deletions cross-ubuntu-py/py.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ YEAR?=2025
DOCKER_USER?=wpilib

TYPE_RASPBIAN=raspbian
VERSION_RASPBIAN=bullseye
TARGET_HOST_RASPBIAN=armv6-bullseye-linux-gnueabihf
AC_TARGET_HOST_RASPBIAN=armv7l-bullseye-linux-gnueabihf
VERSION_RASPBIAN=bookworm
TARGET_HOST_RASPBIAN=armv6-bookworm-linux-gnueabihf
AC_TARGET_HOST_RASPBIAN=armv7l-bookworm-linux-gnueabihf

TYPE_AARCH64=aarch64
VERSION_AARCH64=bullseye
TARGET_HOST_AARCH64=aarch64-bullseye-linux-gnu
AC_TARGET_HOST_AARCH64=aarch64-bullseye-linux-gnu
VERSION_AARCH64=bookworm
TARGET_HOST_AARCH64=aarch64-bookworm-linux-gnu
AC_TARGET_HOST_AARCH64=aarch64-bookworm-linux-gnu

TYPE_ROBORIO=roborio
VERSION_ROBORIO=2025
Expand Down
2 changes: 1 addition & 1 deletion raspbian-cross-ubuntu/Dockerfile.bullseye → raspbian-cross-ubuntu/Dockerfile.bookworm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}


# Install toolchain
RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'

WORKDIR /

0 comments on commit a33260f

Please sign in to comment.