meta-citadel/conf/distro/citadel-distro.conf

@@ -5,11 +5,6 @@ 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"
 #

meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb

@@ -10,14 +10,7 @@ inherit cargo systemd gsettings pkgconfig
 #
 SRCREV = "421b0e27d777c418a26016bd8065715823504637"
 
-# get git repo owner from citadel to find the correct citadel-tools repo path
-python () {
-    import subprocess
-    git_owner = subprocess.check_output(['git', 'remote', 'get-url', 'origin']).strip().decode('utf-8').split('/')[0].split(':')[1]
-    d.setVar("GIT_REPO_OWNER", git_owner)
-}
-
-GIT_URI = "git://git.subgraph.com/${GIT_REPO_OWNER}/citadel-tools.git;protocol=https;branch=master"
+GIT_URI = "git://git.subgraph.com/brl/citadel-tools.git;protocol=https;branch=master"
 
 # If Cargo.lock changes in citadel-tools, this needs to be updated.
 # cargo bitbake does not support workspaces so as a workaround first

realmfs-builder/stage-one.sh

@@ -1,7 +1,4 @@
-#!/usr/bin/env bash
-set -o errexit
-set -o nounset
-set -o xtrace
+#!/bin/bash
 
 : ${REALMFS_BUILDER_BASE:="/usr/share/realmfs-builder"}
 source ${REALMFS_BUILDER_BASE}/common.inc
@@ -156,7 +153,6 @@ try_config() {
 }
     
 WORKDIR="$(pwd)/realmfs"
-BUILDFILE=""
 
 DO_TAR=0
 DO_XZ=0

realmfs-builder/stage-two.sh

@@ -1,7 +1,4 @@
-#!/usr/bin/env bash
-set -o errexit
-set -o nounset
-set -o xtrace
+#!/bin/bash
 
 REALMFS_BUILDER_BASE="/usr/share/realmfs-builder"
 

scripts/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm-20240513-slim
+FROM debian:buster
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -14,6 +14,7 @@ RUN apt update && apt install -y gawk \
     chrpath \
     socat \
     cpio \
+    python \
     python3 \
     python3-pip \
     python3-pexpect \
@@ -24,12 +25,10 @@ RUN apt update && apt install -y gawk \
     libgmp-dev \
     libmpc-dev \
     libelf-dev \
-    vim \
+    nano \
     sudo \
     debootstrap \
-    file \
-    liblz4-tool \
-    zstd \
+    inkscape \
     xwayland
 
 # python