Compare commits

...

3 Commits

4 changed files with 19 additions and 6 deletions

View File

@ -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" 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}" 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" HOSTTOOLS_NONFATAL += "inkscape"
# #

View File

@ -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"} : ${REALMFS_BUILDER_BASE:="/usr/share/realmfs-builder"}
source ${REALMFS_BUILDER_BASE}/common.inc source ${REALMFS_BUILDER_BASE}/common.inc
@ -153,6 +156,7 @@ try_config() {
} }
WORKDIR="$(pwd)/realmfs" WORKDIR="$(pwd)/realmfs"
BUILDFILE=""
DO_TAR=0 DO_TAR=0
DO_XZ=0 DO_XZ=0

View File

@ -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" REALMFS_BUILDER_BASE="/usr/share/realmfs-builder"

View File

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