Commit 7a127499 authored by jan.koester's avatar jan.koester
Browse files

test

parent 565d2565

build-chroot.sh

+16 −5
Changes for build-chroot.sh: 16 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#   STORAGED_SRC  storaged checkout          (default: ../storaged if it exists, else a clone of STORAGED_REPO)

#   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)

#   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)
@@ -83,6 +84,9 @@ fi 
if [[ -z ${ISCSID_SRC:-} && -f $SYSTEMPP_SRC/../iscsid/CMakeLists.txt ]]; then

    ISCSID_SRC="$(realpath "$SYSTEMPP_SRC/../iscsid")"

fi

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

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

fi

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

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

fi
@@ -105,6 +109,7 @@ ADCONNECT_REPO="${ADCONNECT_REPO:-git@git.tuxist.de:tuxist/adconnect.git}" 
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}"

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>
@@ -1062,9 +1067,9 @@ KERNEL_OPTIONS_OFF="DEBUG_INFO_NONE" 
# targets (LIO over configfs); the md RAID levels storaged sets up (0, 1,

# 10, 4/5/6) and device-mapper for its LVM; bonding and bridging for

# syslite's .netdev devices (webctl's network page; modprobe.d from syslite

# keeps bonding from making a bond0 of its own), wireguard; veth pairs for

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

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

# 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.

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
@@ -1076,7 +1081,7 @@ KERNEL_MODULES="DRM_AMDGPU DRM_RADEON DRM_NOUVEAU DRM_I915 DRM_XE 
    INTEL_MEI INTEL_MEI_ME I2C_I801 USB_PRINTER

    SMB_SERVER NFSD CONFIGFS_FS TARGET_CORE TCM_IBLOCK TCM_FILEIO ISCSI_TARGET

    BLK_DEV_MD MD_RAID0 MD_RAID1 MD_RAID10 MD_RAID456 BLK_DEV_DM

    BONDING BRIDGE WIREGUARD VETH NET_CLS_BPF NET_ACT_BPF NET_SCH_INGRESS

    BONDING BRIDGE VLAN_8021Q WIREGUARD VETH NET_CLS_BPF NET_ACT_BPF NET_SCH_INGRESS

    SCSI_ISCSI_ATTRS ISCSI_TCP

    SCSI_MPT3SAS MEGARAID_SAS SCSI_HPSA SCSI_SMARTPQI SCSI_AACRAID VMD

    MMC MMC_BLOCK MMC_SDHCI MMC_SDHCI_PCI MMC_SDHCI_ACPI"
@@ -1242,6 +1247,12 @@ stage_sources() { 
                              fetch_git "$WORK/src/iscsid" "$ISCSID_REPO"

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

                          fi; continue ;;

                upsd)     if [[ -n ${UPSD_SRC:-} ]]; then

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

                          else

                              fetch_git "$WORK/src/upsd" "$UPSD_REPO"

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

                          fi; continue ;;

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

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

                          else
@@ -1287,7 +1298,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 tinyxml2 snmpdd ntpplus containerd webctl limine perl rsync

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

    fenriros-installer dwarves kernel systrace}"



# rpmbuild's automatic Provides/Requires (libc.so.1()(64bit), ...) need