Integrate zosstorage build path and runtime orchestration
Summary: * add openssh-client to the builder image and mount host SSH keys into the dev container when available * switch RFS to git builds, register the zosstorage source, and document the extra Rust component * wire zosstorage into the build: add build_zosstorage(), ship the binary in the initramfs, and extend component validation * refresh kernel configuration to 6.12.49 while dropping Xen guest selections and enabling counted-by support * tighten runtime configs: use cached mycelium key path, add zosstorage zinit unit, bootstrap ovsdb-server, and enable openvswitch module * adjust the network health check ping invocation and fix the RFS pack-tree --debug flag order * update NOTES changelog, README component list, and introduce a runit helper for qemu/cloud-hypervisor testing * add ovsdb init script wiring under config/zinit/init and ensure zosstorage is available before mycelium
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 6.12.44 Kernel Configuration
|
||||
# Linux/x86 6.12.49 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Alpine 14.2.0) 14.2.0"
|
||||
CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.2.1 20250813"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
CONFIG_GCC_VERSION=140200
|
||||
CONFIG_GCC_VERSION=150201
|
||||
CONFIG_CLANG_VERSION=0
|
||||
CONFIG_AS_IS_GNU=y
|
||||
CONFIG_AS_VERSION=24400
|
||||
CONFIG_AS_VERSION=24500
|
||||
CONFIG_LD_IS_BFD=y
|
||||
CONFIG_LD_VERSION=24400
|
||||
CONFIG_LD_VERSION=24500
|
||||
CONFIG_LLD_VERSION=0
|
||||
CONFIG_RUSTC_VERSION=109000
|
||||
CONFIG_RUSTC_LLVM_VERSION=200108
|
||||
CONFIG_RUSTC_VERSION=108900
|
||||
CONFIG_RUSTC_LLVM_VERSION=200107
|
||||
CONFIG_CC_CAN_LINK=y
|
||||
CONFIG_CC_CAN_LINK_STATIC=y
|
||||
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
|
||||
@@ -20,6 +20,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
|
||||
CONFIG_TOOLS_SUPPORT_RELR=y
|
||||
CONFIG_CC_HAS_ASM_INLINE=y
|
||||
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
||||
CONFIG_CC_HAS_COUNTED_BY=y
|
||||
CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
|
||||
CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
|
||||
CONFIG_PAHOLE_VERSION=130
|
||||
@@ -368,23 +369,10 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
|
||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||
CONFIG_HYPERVISOR_GUEST=y
|
||||
CONFIG_PARAVIRT=y
|
||||
CONFIG_PARAVIRT_XXL=y
|
||||
# CONFIG_PARAVIRT_DEBUG is not set
|
||||
CONFIG_PARAVIRT_SPINLOCKS=y
|
||||
CONFIG_X86_HV_CALLBACK_VECTOR=y
|
||||
CONFIG_XEN=y
|
||||
CONFIG_XEN_PV=y
|
||||
CONFIG_XEN_512GB=y
|
||||
CONFIG_XEN_PV_SMP=y
|
||||
CONFIG_XEN_PV_DOM0=y
|
||||
CONFIG_XEN_PVHVM=y
|
||||
CONFIG_XEN_PVHVM_SMP=y
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_SAVE_RESTORE=y
|
||||
# CONFIG_XEN_DEBUG_FS is not set
|
||||
CONFIG_XEN_PVH=y
|
||||
CONFIG_XEN_DOM0=y
|
||||
CONFIG_XEN_PV_MSR_SAFE=y
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_KVM_GUEST=y
|
||||
CONFIG_ARCH_CPUIDLE_HALTPOLL=y
|
||||
CONFIG_PVH=y
|
||||
@@ -528,7 +516,7 @@ CONFIG_HOTPLUG_CPU=y
|
||||
CONFIG_LEGACY_VSYSCALL_XONLY=y
|
||||
# CONFIG_LEGACY_VSYSCALL_NONE is not set
|
||||
CONFIG_CMDLINE_BOOL=y
|
||||
CONFIG_CMDLINE="intel_iommu=on kvm-intel.nested=1 console=ttyS1,115200n8 console=tty1 consoleblank=0 earlyprintk=serial,ttyS1,115200n8 loglevel=7"
|
||||
CONFIG_CMDLINE="consoleblank=0 earlyprintk=serial loglevel=7"
|
||||
# CONFIG_CMDLINE_OVERRIDE is not set
|
||||
CONFIG_MODIFY_LDT_SYSCALL=y
|
||||
# CONFIG_STRICT_SIGALTSTACK_SIZE is not set
|
||||
@@ -573,6 +561,7 @@ CONFIG_MITIGATION_SRBDS=y
|
||||
CONFIG_MITIGATION_SSB=y
|
||||
CONFIG_MITIGATION_ITS=y
|
||||
CONFIG_MITIGATION_TSA=y
|
||||
CONFIG_MITIGATION_VMSCAPE=y
|
||||
CONFIG_ARCH_HAS_ADD_PAGES=y
|
||||
|
||||
#
|
||||
@@ -737,7 +726,6 @@ CONFIG_INTEL_IDLE=y
|
||||
#
|
||||
CONFIG_PCI_DIRECT=y
|
||||
CONFIG_PCI_MMCONFIG=y
|
||||
CONFIG_PCI_XEN=y
|
||||
CONFIG_MMCONF_FAM10H=y
|
||||
# CONFIG_PCI_CNB20LE_QUIRK is not set
|
||||
# CONFIG_ISA_BUS is not set
|
||||
@@ -1959,7 +1947,6 @@ CONFIG_FIB_RULES=y
|
||||
CONFIG_NET_9P=m
|
||||
CONFIG_NET_9P_FD=m
|
||||
CONFIG_NET_9P_VIRTIO=m
|
||||
CONFIG_NET_9P_XEN=m
|
||||
# CONFIG_NET_9P_RDMA is not set
|
||||
# CONFIG_NET_9P_DEBUG is not set
|
||||
# CONFIG_CAIF is not set
|
||||
@@ -2009,7 +1996,6 @@ CONFIG_PCI_QUIRKS=y
|
||||
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
|
||||
CONFIG_PCI_STUB=m
|
||||
# CONFIG_PCI_PF_STUB is not set
|
||||
CONFIG_XEN_PCIDEV_FRONTEND=m
|
||||
CONFIG_PCI_ATS=y
|
||||
CONFIG_PCI_LOCKLESS_CONFIG=y
|
||||
CONFIG_PCI_IOV=y
|
||||
@@ -2127,7 +2113,6 @@ CONFIG_ALLOW_DEV_COREDUMP=y
|
||||
# CONFIG_DEBUG_DEVRES is not set
|
||||
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
|
||||
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
|
||||
CONFIG_SYS_HYPERVISOR=y
|
||||
CONFIG_GENERIC_CPU_DEVICES=y
|
||||
CONFIG_GENERIC_CPU_AUTOPROBE=y
|
||||
CONFIG_GENERIC_CPU_VULNERABILITIES=y
|
||||
@@ -2397,8 +2382,6 @@ CONFIG_CDROM_PKTCDVD=m
|
||||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
CONFIG_XEN_BLKDEV_FRONTEND=m
|
||||
CONFIG_XEN_BLKDEV_BACKEND=m
|
||||
CONFIG_VIRTIO_BLK=m
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
# CONFIG_BLK_DEV_UBLK is not set
|
||||
@@ -2602,7 +2585,6 @@ CONFIG_SCSI_FLASHPOINT=y
|
||||
# CONFIG_SCSI_MYRB is not set
|
||||
# CONFIG_SCSI_MYRS is not set
|
||||
CONFIG_VMWARE_PVSCSI=m
|
||||
CONFIG_XEN_SCSI_FRONTEND=m
|
||||
CONFIG_HYPERV_STORAGE=m
|
||||
CONFIG_LIBFC=m
|
||||
CONFIG_LIBFCOE=m
|
||||
@@ -3408,8 +3390,6 @@ CONFIG_IEEE802154_ATUSB=m
|
||||
# CONFIG_WWAN is not set
|
||||
# end of Wireless WAN
|
||||
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
CONFIG_XEN_NETDEV_BACKEND=m
|
||||
CONFIG_VMXNET3=m
|
||||
CONFIG_FUJITSU_ES=m
|
||||
CONFIG_HYPERV_NET=m
|
||||
@@ -3583,9 +3563,6 @@ CONFIG_N_GSM=m
|
||||
CONFIG_NOZOMI=m
|
||||
# CONFIG_NULL_TTY is not set
|
||||
CONFIG_HVC_DRIVER=y
|
||||
CONFIG_HVC_IRQ=y
|
||||
CONFIG_HVC_XEN=y
|
||||
CONFIG_HVC_XEN_FRONTEND=y
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
|
||||
# CONFIG_TTY_PRINTK is not set
|
||||
@@ -3636,7 +3613,6 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m
|
||||
CONFIG_TCG_NSC=m
|
||||
CONFIG_TCG_ATMEL=m
|
||||
CONFIG_TCG_INFINEON=m
|
||||
CONFIG_TCG_XEN=m
|
||||
CONFIG_TCG_CRB=m
|
||||
# CONFIG_TCG_VTPM_PROXY is not set
|
||||
# CONFIG_TCG_TIS_ST33ZP24_I2C is not set
|
||||
@@ -4412,7 +4388,6 @@ CONFIG_INTEL_MEI_WDT=m
|
||||
CONFIG_NI903X_WDT=m
|
||||
CONFIG_NIC7018_WDT=m
|
||||
CONFIG_MEN_A21_WDT=m
|
||||
CONFIG_XEN_WDT=m
|
||||
|
||||
#
|
||||
# PCI-based Watchdog Cards
|
||||
@@ -4868,7 +4843,6 @@ CONFIG_DRM_CIRRUS_QEMU=m
|
||||
# CONFIG_TINYDRM_REPAPER is not set
|
||||
# CONFIG_TINYDRM_ST7586 is not set
|
||||
# CONFIG_TINYDRM_ST7735R is not set
|
||||
# CONFIG_DRM_XEN_FRONTEND is not set
|
||||
CONFIG_DRM_VBOXVIDEO=m
|
||||
# CONFIG_DRM_GUD is not set
|
||||
# CONFIG_DRM_SSD130X is not set
|
||||
@@ -4920,7 +4894,6 @@ CONFIG_FB_EFI=y
|
||||
# CONFIG_FB_UDL is not set
|
||||
# CONFIG_FB_IBM_GXT4500 is not set
|
||||
# CONFIG_FB_VIRTUAL is not set
|
||||
CONFIG_XEN_FBDEV_FRONTEND=m
|
||||
# CONFIG_FB_METRONOME is not set
|
||||
# CONFIG_FB_MB862XX is not set
|
||||
CONFIG_FB_HYPERV=m
|
||||
@@ -5132,7 +5105,6 @@ CONFIG_SND_PCMCIA=y
|
||||
# CONFIG_SND_SOC is not set
|
||||
CONFIG_SND_X86=y
|
||||
# CONFIG_HDMI_LPE_AUDIO is not set
|
||||
# CONFIG_SND_XEN_FRONTEND is not set
|
||||
CONFIG_SND_VIRTIO=m
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
@@ -5349,7 +5321,6 @@ CONFIG_USB_R8A66597_HCD=m
|
||||
# CONFIG_USB_HCD_BCMA is not set
|
||||
# CONFIG_USB_HCD_SSB is not set
|
||||
# CONFIG_USB_HCD_TEST_MODE is not set
|
||||
# CONFIG_USB_XEN_HCD is not set
|
||||
|
||||
#
|
||||
# USB Device Class drivers
|
||||
@@ -6024,41 +5995,6 @@ CONFIG_HYPERV_UTILS=m
|
||||
CONFIG_HYPERV_BALLOON=m
|
||||
# end of Microsoft Hyper-V guest support
|
||||
|
||||
#
|
||||
# Xen driver support
|
||||
#
|
||||
CONFIG_XEN_BALLOON=y
|
||||
CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
|
||||
CONFIG_XEN_DEV_EVTCHN=m
|
||||
CONFIG_XEN_BACKEND=y
|
||||
CONFIG_XENFS=m
|
||||
CONFIG_XEN_COMPAT_XENFS=y
|
||||
CONFIG_XEN_SYS_HYPERVISOR=y
|
||||
CONFIG_XEN_XENBUS_FRONTEND=y
|
||||
CONFIG_XEN_GNTDEV=m
|
||||
CONFIG_XEN_GRANT_DEV_ALLOC=m
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_SWIOTLB_XEN=y
|
||||
CONFIG_XEN_PCI_STUB=y
|
||||
CONFIG_XEN_PCIDEV_BACKEND=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVCALLS_BACKEND is not set
|
||||
CONFIG_XEN_SCSI_BACKEND=m
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
CONFIG_XEN_ACPI_PROCESSOR=m
|
||||
CONFIG_XEN_MCE_LOG=y
|
||||
CONFIG_XEN_HAVE_PVMMU=y
|
||||
CONFIG_XEN_EFI=y
|
||||
CONFIG_XEN_AUTO_XLATE=y
|
||||
CONFIG_XEN_ACPI=y
|
||||
CONFIG_XEN_SYMS=y
|
||||
CONFIG_XEN_HAVE_VPMU=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
# CONFIG_XEN_VIRTIO is not set
|
||||
# end of Xen driver support
|
||||
|
||||
# CONFIG_GREYBUS is not set
|
||||
# CONFIG_COMEDI is not set
|
||||
CONFIG_STAGING=y
|
||||
|
||||
@@ -70,5 +70,8 @@ stage1:evdev
|
||||
stage1:serio_raw
|
||||
stage1:serio
|
||||
|
||||
# zos core networking is with openvswitch vxlan over mycelium
|
||||
openvswitch
|
||||
|
||||
# Keep stage2 empty; we only use stage1 in this build
|
||||
# stage2: (intentionally unused)
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
# Git repositories to clone and build
|
||||
git zinit https://github.com/threefoldtech/zinit master build_zinit
|
||||
git mycelium https://github.com/threefoldtech/mycelium v0.6.1 build_mycelium
|
||||
|
||||
git zosstorage git@git.ourworld.tf:delandtj/zosstorage main build_zosstorage
|
||||
git rfs https://github.com/threefoldtech/rfs development build_rfs
|
||||
# Pre-built releases to download
|
||||
release rfs https://github.com/threefoldtech/rfs/releases/download/v2.0.6/rfs v2.0.6 install_rfs
|
||||
# release rfs https://github.com/threefoldtech/rfs/releases/download/v2.0.6/rfs v2.0.6 install_rfs
|
||||
release corex https://github.com/threefoldtech/corex/releases/download/2.1.4/corex-2.1.4-amd64-linux-static 2.1.4 install_corex rename=corex
|
||||
32
config/zinit/init/ovs-dbserver.sh
Normal file
32
config/zinit/init/ovs-dbserver.sh
Normal file
@@ -0,0 +1,32 @@
|
||||
#!/bin/bash
|
||||
# Simple script to create OVS database and start ovsdb-server
|
||||
|
||||
# Configuration
|
||||
DATABASE=${DATABASE:-"/etc/openvswitch/conf.db"}
|
||||
DBSCHEMA="/usr/share/openvswitch/vswitch.ovsschema"
|
||||
DB_SOCKET=${DB_SOCKET:-"/var/run/openvswitch/db.sock"}
|
||||
RUNDIR="/var/run/openvswitch"
|
||||
|
||||
# Create run directory
|
||||
mkdir -p "$RUNDIR"
|
||||
|
||||
# Create database if it doesn't exist
|
||||
if [ ! -e "$DATABASE" ]; then
|
||||
echo "Creating database: $DATABASE"
|
||||
ovsdb-tool create "$DATABASE" "$DBSCHEMA"
|
||||
fi
|
||||
|
||||
# Check if database needs conversion
|
||||
if [ "$(ovsdb-tool needs-conversion "$DATABASE" "$DBSCHEMA")" = "yes" ]; then
|
||||
echo "Converting database: $DATABASE"
|
||||
ovsdb-tool convert "$DATABASE" "$DBSCHEMA"
|
||||
fi
|
||||
|
||||
# Start ovsdb-server
|
||||
echo "Starting ovsdb-server..."
|
||||
exec ovsdb-server \
|
||||
--remote=punix:"$DB_SOCKET" \
|
||||
--remote=db:Open_vSwitch,Open_vSwitch,manager_options \
|
||||
--pidfile \
|
||||
--detach \
|
||||
"$DATABASE"
|
||||
@@ -1,7 +1,8 @@
|
||||
exec: /usr/bin/mycelium --key-file /tmp/mycelium_priv_key.bin
|
||||
exec: /usr/bin/mycelium --key-file /var/cache/etc/mycelium_priv_key.bin
|
||||
--tun-name my0 --silent --peers tcp://188.40.132.242:9651 tcp://136.243.47.186:9651
|
||||
tcp://185.69.166.7:9651 tcp://185.69.166.8:9651 tcp://65.21.231.58:9651 tcp://65.109.18.113:9651
|
||||
tcp://209.159.146.190:9651 tcp://5.78.122.16:9651 tcp://5.223.43.251:9651 tcp://142.93.217.194:9651
|
||||
after:
|
||||
- network
|
||||
- udev-rfs
|
||||
- udev-rfs
|
||||
- zosstorage
|
||||
@@ -3,4 +3,4 @@ after:
|
||||
- depmod
|
||||
- udevd
|
||||
- udev-trigger
|
||||
test: ping www.google.com
|
||||
test: ping -c1 www.google.com
|
||||
|
||||
4
config/zinit/ovs-dbserver.yaml
Normal file
4
config/zinit/ovs-dbserver.yaml
Normal file
@@ -0,0 +1,4 @@
|
||||
exec: /etc/zinit/init/ovsdb-server.sh
|
||||
oneshot: true
|
||||
after:
|
||||
- zossstorage
|
||||
4
config/zinit/zosstorage.yaml
Normal file
4
config/zinit/zosstorage.yaml
Normal file
@@ -0,0 +1,4 @@
|
||||
exec: /usr/bin/zosstorage -l debug
|
||||
oneshot: true
|
||||
after:
|
||||
- rfs-modules
|
||||
Reference in New Issue
Block a user