From 038b25817b4ffc2a78eab6d350c61e8d26627366 Mon Sep 17 00:00:00 2001 From: isa Date: Wed, 3 Jul 2024 13:59:46 -0400 Subject: [PATCH 1/3] Update Dockerfile to build the current version of citadel --- scripts/docker/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index e2e8e4a..c99312a 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:bookworm-20240513-slim ENV DEBIAN_FRONTEND noninteractive @@ -14,7 +14,6 @@ RUN apt update && apt install -y gawk \ chrpath \ socat \ cpio \ - python \ python3 \ python3-pip \ python3-pexpect \ @@ -25,10 +24,12 @@ RUN apt update && apt install -y gawk \ libgmp-dev \ libmpc-dev \ libelf-dev \ - nano \ + vim \ sudo \ debootstrap \ - inkscape \ + file \ + liblz4-tool \ + zstd \ xwayland # python -- 2.45.2 From 956661945e54fe72f5d8002127e3abdaeabf34f5 Mon Sep 17 00:00:00 2001 From: isa Date: Wed, 3 Jul 2024 14:00:33 -0400 Subject: [PATCH 2/3] Improve build to fail hard if error occurs --- realmfs-builder/stage-one.sh | 6 +++++- realmfs-builder/stage-two.sh | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/realmfs-builder/stage-one.sh b/realmfs-builder/stage-one.sh index 1bab589..d993130 100755 --- a/realmfs-builder/stage-one.sh +++ b/realmfs-builder/stage-one.sh @@ -1,4 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash +set -o errexit +set -o nounset +set -o xtrace : ${REALMFS_BUILDER_BASE:="/usr/share/realmfs-builder"} source ${REALMFS_BUILDER_BASE}/common.inc @@ -153,6 +156,7 @@ try_config() { } WORKDIR="$(pwd)/realmfs" +BUILDFILE="" DO_TAR=0 DO_XZ=0 diff --git a/realmfs-builder/stage-two.sh b/realmfs-builder/stage-two.sh index 4babc7c..eac86d8 100755 --- a/realmfs-builder/stage-two.sh +++ b/realmfs-builder/stage-two.sh @@ -1,4 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash +set -o errexit +set -o nounset +set -o xtrace REALMFS_BUILDER_BASE="/usr/share/realmfs-builder" -- 2.45.2 From 68dc48bcf7e7a0c0afc34cc5368558e0b611549b Mon Sep 17 00:00:00 2001 From: isa Date: Thu, 11 Jul 2024 13:15:59 -0400 Subject: [PATCH 3/3] Add subgraph mirror server --- meta-citadel/conf/distro/citadel-distro.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-citadel/conf/distro/citadel-distro.conf b/meta-citadel/conf/distro/citadel-distro.conf index fed38c8..0b54442 100644 --- a/meta-citadel/conf/distro/citadel-distro.conf +++ b/meta-citadel/conf/distro/citadel-distro.conf @@ -5,6 +5,11 @@ DISTRO_VERSION = "1.0" CITADEL_DEFAULT_DISTRO_FEATURES = "acl alsa argp bluetooth ext2 largefile systemd usbhost wifi xattr pci x11 usrmerge wayland opengl pam polkit seccomp" DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${CITADEL_DEFAULT_DISTRO_FEATURES}" +PREMIRRORS:prepend = "\ + git://.*/.* https://mirror.subgraph.com/ \ + ftp://.*/.* https://mirror.subgraph.com/ \ + http://.*/.* https://mirror.subgraph.com/ \ + https://.*/.* https://mirror.subgraph.com/" HOSTTOOLS_NONFATAL += "inkscape" # -- 2.45.2