From 66a2817f541ab73d9bd0529f71f151e5fbbc17ff Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Fri, 5 Sep 2025 09:22:17 -0500 Subject: [PATCH] Add architectures only to plucky --- Dockerfile | 9 +-------- Dockerfile.plucky | 2 +- jammy/armhf.sources | 6 ------ jammy/jammy.sources | 6 ------ jammy/riscv64.sources | 6 ------ plucky/arm64.sources => plucky-ports.sources | 0 plucky/armhf.sources | 6 ------ plucky/riscv64.sources | 6 ------ 8 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 jammy/armhf.sources delete mode 100644 jammy/jammy.sources delete mode 100644 jammy/riscv64.sources rename plucky/arm64.sources => plucky-ports.sources (100%) delete mode 100644 plucky/armhf.sources delete mode 100644 plucky/riscv64.sources diff --git a/Dockerfile b/Dockerfile index 5badf7b..28bb356 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,7 @@ FROM ubuntu:jammy -COPY jammy /etc/apt/sources.list.d -COPY toolchains /opt/toolchains - -RUN dpkg --add-architecture riscv64 -RUN dpkg --add-architecture arm64 -RUN dpkg --add-architecture armhf - RUN apt update -y | true -RUN apt install -y cmake build-essential libmbedtls-dev make wget curl crossbuild-essential-armhf crossbuild-essential-i386 crossbuild-essential-riscv64 crossbuild-essential-armhf crossbuild-essential-arm64 libmbedtls-dev:armhf libmbedtls-dev:arm64 libmbedtls-dev:riscv64 +RUN apt install -y cmake build-essential libmbedtls-dev make wget curl RUN curl https://git.tesseslanguage.com/api/packages/tesses50/debian/repository.key -o /etc/apt/keyrings/gitea-tesses50.asc RUN echo "deb [signed-by=/etc/apt/keyrings/gitea-tesses50.asc] https://git.tesseslanguage.com/api/packages/tesses50/debian jammy main" | tee -a /etc/apt/sources.list.d/gitea.list RUN apt update -y diff --git a/Dockerfile.plucky b/Dockerfile.plucky index 7c365fc..864d454 100644 --- a/Dockerfile.plucky +++ b/Dockerfile.plucky @@ -1,6 +1,6 @@ FROM ubuntu:plucky COPY toolchains /opt/toolchains -COPY plucky /etc/apt/sources.list.d +COPY plucky-ports.sources /etc/apt/sources.list.d/plucky-ports.sources RUN dpkg --add-architecture i386 RUN dpkg --add-architecture riscv64 RUN dpkg --add-architecture arm64 diff --git a/jammy/armhf.sources b/jammy/armhf.sources deleted file mode 100644 index a1b17a1..0000000 --- a/jammy/armhf.sources +++ /dev/null @@ -1,6 +0,0 @@ -Types: deb -URIs: http://ports.ubuntu.com/ubuntu-ports/ -Suites: jammy jammy-updates jammy-backports -Components: main universe restricted multiverse -Architectures: armhf -Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg \ No newline at end of file diff --git a/jammy/jammy.sources b/jammy/jammy.sources deleted file mode 100644 index 722ddd5..0000000 --- a/jammy/jammy.sources +++ /dev/null @@ -1,6 +0,0 @@ -Types: deb -URIs: http://ports.ubuntu.com/ubuntu-ports/ -Suites: jammy jammy-updates jammy-backports -Components: main universe restricted multiverse -Architectures: arm64 armhf riscv64 -Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg \ No newline at end of file diff --git a/jammy/riscv64.sources b/jammy/riscv64.sources deleted file mode 100644 index e87e5a8..0000000 --- a/jammy/riscv64.sources +++ /dev/null @@ -1,6 +0,0 @@ -Types: deb -URIs: http://ports.ubuntu.com/ubuntu-ports/ -Suites: jammy jammy-updates jammy-backports -Components: main universe restricted multiverse -Architectures: riscv64 -Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg \ No newline at end of file diff --git a/plucky/arm64.sources b/plucky-ports.sources similarity index 100% rename from plucky/arm64.sources rename to plucky-ports.sources diff --git a/plucky/armhf.sources b/plucky/armhf.sources deleted file mode 100644 index 31f2b40..0000000 --- a/plucky/armhf.sources +++ /dev/null @@ -1,6 +0,0 @@ -Types: deb -URIs: http://ports.ubuntu.com/ubuntu-ports/ -Suites: plucky plucky-updates plucky-backports -Components: main universe restricted multiverse -Architectures: armhf -Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg \ No newline at end of file diff --git a/plucky/riscv64.sources b/plucky/riscv64.sources deleted file mode 100644 index 2f67fa8..0000000 --- a/plucky/riscv64.sources +++ /dev/null @@ -1,6 +0,0 @@ -Types: deb -URIs: http://ports.ubuntu.com/ubuntu-ports/ -Suites: plucky plucky-updates plucky-backports -Components: main universe restricted multiverse -Architectures: riscv64 -Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg \ No newline at end of file