Commit e208bb62 authored by jan.koester's avatar jan.koester
Browse files

test

parent be76c04a

build-chroot.sh

+17 −2
Changes for build-chroot.sh: 17 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#   CONTAINERD_SRC containerd checkout       (default: ../containerd if it exists, else a clone of CONTAINERD_REPO)

#   ISCSID_SRC    iscsid checkout            (default: ../iscsid if it exists, else a clone of ISCSID_REPO)

#   UPSD_SRC      upsd checkout              (default: ../upsd if it exists, else a clone of UPSD_REPO)

#   FIREWALLD_SRC firewalld checkout         (default: ../firewalld if it exists, else a clone of FIREWALLD_REPO)

#   MAKEPLUS_REPO makeplus git repository    (default: git@git.tuxist.de:tuxist/makeplus.git)

#   MAKEPLUS_REF  makeplus branch/tag        (default: the repository's default branch)

#   CMAKE_REF     cmake git tag              (default: v4.4.3)
@@ -95,6 +96,9 @@ fi 
if [[ -z ${UPSD_SRC:-} && -f $SYSTEMPP_SRC/../upsd/CMakeLists.txt ]]; then

    UPSD_SRC="$(realpath "$SYSTEMPP_SRC/../upsd")"

fi

if [[ -z ${FIREWALLD_SRC:-} && -f $SYSTEMPP_SRC/../firewalld/CMakeLists.txt ]]; then

    FIREWALLD_SRC="$(realpath "$SYSTEMPP_SRC/../firewalld")"

fi

if [[ -z ${WEBCTL_SRC:-} && -f $SYSTEMPP_SRC/../webctl/CMakeLists.txt ]]; then

    WEBCTL_SRC="$(realpath "$SYSTEMPP_SRC/../webctl")"

fi
@@ -118,6 +122,7 @@ STORAGED_REPO="${STORAGED_REPO:-git@git.tuxist.de:tuxist/storaged.git}" 
CONTAINERD_REPO="${CONTAINERD_REPO:-git@git.tuxist.de:tuxist/containerd.git}"

ISCSID_REPO="${ISCSID_REPO:-git@tuxist.de:tuxist/iscsid.git}"

UPSD_REPO="${UPSD_REPO:-git@git.tuxist.de:tuxist/upsd.git}"

FIREWALLD_REPO="${FIREWALLD_REPO:-git@git.tuxist.de:tuxist/firewalld.git}"

WEBCTL_REPO="${WEBCTL_REPO:-git@git.tuxist.de:tuxist/webctl.git}"

TUXIST_GIT="${TUXIST_GIT:-https://git.tuxist.de/git}"

# Specs whose local sources live in a differently named files/<dir>
@@ -1046,6 +1051,7 @@ KERNEL_OPTIONS="SYSFB SYSFB_SIMPLEFB DRM DRM_SIMPLEDRM DRM_FBDEV_EMULATION FB FB 
    BPF_JIT_ALWAYS_ON XDP_SOCKETS BPF_STREAM_PARSER

    FUNCTION_TRACER DYNAMIC_FTRACE FTRACE_SYSCALLS BPF_LSM IKHEADERS

    NVME_HWMON SENSORS_DRIVETEMP

    NF_TABLES_INET NF_TABLES_IPV4 NF_TABLES_IPV6

    FW_LOADER_COMPRESS FW_LOADER_COMPRESS_ZSTD

    MODULE_COMPRESS MODULE_COMPRESS_ZSTD MODULE_COMPRESS_ALL MODULE_DECOMPRESS

    USB_STORAGE USB_UAS EXFAT_FS NTFS3_FS FAT_FS VFAT_FS NLS NLS_CODEPAGE_437 NLS_ISO8859_1 NLS_UTF8"
@@ -1083,7 +1089,9 @@ KERNEL_OPTIONS_OFF="DEBUG_INFO_NONE" 
# syslite's .netdev devices (webctl's network page; modprobe.d from syslite

# keeps bonding from making a bond0 of its own), 802.1Q VLANs, wireguard;

# veth pairs for containerd's containers; tc for BPF (cls_bpf, act_bpf,

# the ingress/clsact qdisc); the software iSCSI initiator iscsid drives.

# the ingress/clsact qdisc); the software iSCSI initiator iscsid drives;

# nf_tables for firewalld (inet tables, conntrack, NAT, masquerade,

# reject, log, limit), which nfnetlink loads on its first request.

KERNEL_MODULES="DRM_AMDGPU DRM_RADEON DRM_NOUVEAU DRM_I915 DRM_XE

    R8169 E100 E1000 E1000E IGB IGC IGBVF IXGBE IXGBEVF I40E ICE AQTION

    8139TOO FORCEDETH SKY2 TIGON3
@@ -1097,6 +1105,7 @@ KERNEL_MODULES="DRM_AMDGPU DRM_RADEON DRM_NOUVEAU DRM_I915 DRM_XE 
    BLK_DEV_MD MD_RAID0 MD_RAID1 MD_RAID10 MD_RAID456 BLK_DEV_DM

    BONDING BRIDGE VLAN_8021Q WIREGUARD VETH NET_CLS_BPF NET_ACT_BPF NET_SCH_INGRESS

    SCSI_ISCSI_ATTRS ISCSI_TCP

    NF_TABLES NFT_CT NFT_NAT NFT_MASQ NFT_REJECT NFT_LOG NFT_LIMIT

    SCSI_MPT3SAS MEGARAID_SAS SCSI_HPSA SCSI_SMARTPQI SCSI_AACRAID VMD

    MMC MMC_BLOCK MMC_SDHCI MMC_SDHCI_PCI MMC_SDHCI_ACPI"

# the kernel's request_module() helper: fresh's modprobe (-q, aliases from
@@ -1267,6 +1276,12 @@ stage_sources() { 
                              fetch_git "$WORK/src/upsd" "$UPSD_REPO"

                              tar_tree "$WORK/src/upsd" "$srcdir/$f" "$name-$version"

                          fi; continue ;;

                firewalld) if [[ -n ${FIREWALLD_SRC:-} ]]; then

                              tar_tree "$FIREWALLD_SRC" "$srcdir/$f" "$name-$version"

                          else

                              fetch_git "$WORK/src/firewalld" "$FIREWALLD_REPO"

                              tar_tree "$WORK/src/firewalld" "$srcdir/$f" "$name-$version"

                          fi; continue ;;

                containerd) if [[ -n ${CONTAINERD_SRC:-} ]]; then

                              tar_tree "$CONTAINERD_SRC" "$srcdir/$f" "$name-$version"

                          else
@@ -1318,7 +1333,7 @@ stage_sources() { 
PACKAGES="${PACKAGES:-zlib zstd popt lua file systempp libressl libelf rpm fresh makeplus libbpf bpftool ninja cmake python3 llvm-project

    ca-certificates ncurses libjson-c libbrotli libcmdplus libuuidp libnetplus libhtmlpp libconfplus libhttppp libparitypp

    libauthdb-client libsmtppp liblzma libxml2 libarchive glib2 curl libsolv librepo fmt toml11 libsmartcols dnf5 createrepo_c 

    fenriros-release proxyplus openssh dosfstools e2fsprogs gptfdisk syslite sharedd adconnect storaged iscsid upsd tinyxml2 snmpdd ntpplus containerd webctl limine perl rsync

    fenriros-release proxyplus openssh dosfstools e2fsprogs gptfdisk syslite sharedd adconnect storaged iscsid upsd firewalld tinyxml2 snmpdd ntpplus containerd webctl limine perl rsync

    nasm libwebp x264 x265 libaom ffmpeg

    fenriros-installer dwarves kernel systrace}"