From 58e2d23c2cab715dc070b2c2ee23c660b9ef6115 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Sat, 11 Jan 2025 07:05:05 +0000 Subject: [PATCH 1/6] sys-kernel/coreos-sources: Update from 6.6.69 to 6.6.71 --- changelog/updates/2025-01-11-linux-6.6.71-update.md | 1 + .../{hv-daemons-6.6.69.ebuild => hv-daemons-6.6.71.ebuild} | 0 ...{coreos-kernel-6.6.69.ebuild => coreos-kernel-6.6.71.ebuild} | 0 ...oreos-modules-6.6.69.ebuild => coreos-modules-6.6.71.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...oreos-sources-6.6.69.ebuild => coreos-sources-6.6.71.ebuild} | 0 6 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2025-01-11-linux-6.6.71-update.md rename sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/{hv-daemons-6.6.69.ebuild => hv-daemons-6.6.71.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-6.6.69.ebuild => coreos-kernel-6.6.71.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-6.6.69.ebuild => coreos-modules-6.6.71.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-6.6.69.ebuild => coreos-sources-6.6.71.ebuild} (100%) diff --git a/changelog/updates/2025-01-11-linux-6.6.71-update.md b/changelog/updates/2025-01-11-linux-6.6.71-update.md new file mode 100644 index 00000000000..1c920309f7b --- /dev/null +++ b/changelog/updates/2025-01-11-linux-6.6.71-update.md @@ -0,0 +1 @@ +- Linux ([6.6.71](https://lwn.net/Articles/1004703) (includes [6.6.70](https://lwn.net/Articles/1004551))) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.69.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.71.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.69.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/hv-daemons/hv-daemons-6.6.71.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.69.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.71.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.69.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.71.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.69.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.71.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.69.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.71.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 33dda6cf160..595db40f258 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 -DIST patch-6.6.69.xz 3648052 BLAKE2B 97849245e0c3e40ddc9ab93c5078aecd6cc9ccb6361554f5b1de953898d0839b28c5a4ed7357d34e5801ee54d2fe97318a66bb66212e7defc7875a4508f80e6f SHA512 91e4f596c21243285ab9f8a07995fe7bdf8056699db68cf4a7ca29c135d4c9efd029d58e69770e7c3d3216d5f26e81eab7fe2f4bd6939d20af955c4d41003624 +DIST patch-6.6.71.xz 3704792 BLAKE2B 252817fe0f0039f41a76f60d744ad849e863b22ac7cb8ddde9677972d83db9893a13e3d004b24d1c3467e925eae3519604d95314f169eb38c23ab6f2110ec150 SHA512 4c5c68b651e11e7580ed240dea2a26a6b402956eeeae4f9aca7ff0d135481bbd908f5138a6edd05964dc1e7d90d7dbbf32858753d5b7d5afe34d285e65f05089 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.69.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.71.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.69.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.71.ebuild From 1a7b995a089fd58c77b11d273b0feceb47d10566 Mon Sep 17 00:00:00 2001 From: Jan Bronicki Date: Fri, 10 Jan 2025 12:23:08 +0100 Subject: [PATCH 2/6] Add port forwarding as multiple use parameters Add mention in the changelog Update changelog/changes/2025-01-10-qemu-startup-script-port-forwarding.md Co-authored-by: Mathieu Tortuyaux Update build_library/qemu_template.sh Co-authored-by: Mathieu Tortuyaux Adjust to review comments Review adjustments --- build_library/qemu_template.sh | 18 ++++++++++++++++-- ...1-10-qemu-startup-script-port-forwarding.md | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 changelog/changes/2025-01-10-qemu-startup-script-port-forwarding.md diff --git a/build_library/qemu_template.sh b/build_library/qemu_template.sh index 967b95d1010..af0a46ab743 100755 --- a/build_library/qemu_template.sh +++ b/build_library/qemu_template.sh @@ -19,6 +19,7 @@ IGNITION_CONFIG_FILE="" CONFIG_IMAGE="" SWTPM_DIR= SAFE_ARGS=0 +FORWARDED_PORTS="" USAGE="Usage: $0 [-a authorized_keys] [--] [qemu options...] Options: -i FILE File containing an Ignition config @@ -28,6 +29,7 @@ Options: -a FILE SSH public keys for login access. [~/.ssh/id_{dsa,rsa}.pub] -p PORT The port on localhost to map to the VM's sshd. [2222] -I FILE Set a custom image file. + -f PORT Forward host_port:guest_port. -M MB Set VM memory in MBs. -T DIR Add a software TPM2 device through swtpm which stores secrets and the control socket to the given directory. This may need @@ -84,6 +86,9 @@ while [ $# -ge 1 ]; do -p|-ssh-port) SSH_PORT="$2" shift 2 ;; + -f|-forward-port) + FORWARDED_PORTS="${FORWARDED_PORTS} $2" + shift 2 ;; -s|-safe) SAFE_ARGS=1 shift ;; @@ -203,6 +208,15 @@ if [ -z "${CONFIG_IMAGE}" ]; then fi fi +# Process port forwards +QEMU_FORWARDED_PORTS="" +for port in ${FORWARDED_PORTS}; do + host_port=${port%:*} + guest_port=${port#*:} + QEMU_FORWARDED_PORTS="${QEMU_FORWARDED_PORTS},hostfwd=tcp::${host_port}-:${guest_port}" +done +QEMU_FORWARDED_PORTS="${QEMU_FORWARDED_PORTS#,}" + # Start assembling our default command line arguments if [ "${SAFE_ARGS}" -eq 1 ]; then # Disable KVM, for testing things like UEFI which don't like it @@ -288,7 +302,7 @@ case "${VM_BOARD}" in qemu-system-x86_64 \ -name "$VM_NAME" \ -m ${VM_MEMORY} \ - -netdev user,id=eth0,hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ + -netdev user,id=eth0,${QEMU_FORWARDED_PORTS},hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ -device virtio-net-pci,netdev=eth0 \ -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \ "$@" @@ -297,7 +311,7 @@ case "${VM_BOARD}" in qemu-system-aarch64 \ -name "$VM_NAME" \ -m ${VM_MEMORY} \ - -netdev user,id=eth0,hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ + -netdev user,id=eth0,${QEMU_FORWARDED_PORTS},hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ -device virtio-net-device,netdev=eth0 \ -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \ "$@" diff --git a/changelog/changes/2025-01-10-qemu-startup-script-port-forwarding.md b/changelog/changes/2025-01-10-qemu-startup-script-port-forwarding.md new file mode 100644 index 00000000000..302b4d84c11 --- /dev/null +++ b/changelog/changes/2025-01-10-qemu-startup-script-port-forwarding.md @@ -0,0 +1 @@ +- Added support for multiple port forwarding parameters in the QEMU startup script. Users can now specify multiple port forwards using the `-f` option. ([flatcar/scripts#2575](https://github.com/flatcar/scripts/pull/2575)) From b60a57436b1854ea1973c81e96e19e927fd7b96f Mon Sep 17 00:00:00 2001 From: flatcar-ci Date: Mon, 13 Jan 2025 21:00:29 +0000 Subject: [PATCH 3/6] New version: main-4214.0.0-nightly-20250113-2100 --- sdk_container/.repo/manifests/version.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/.repo/manifests/version.txt b/sdk_container/.repo/manifests/version.txt index b4d98054b8d..c6f30e945d7 100644 --- a/sdk_container/.repo/manifests/version.txt +++ b/sdk_container/.repo/manifests/version.txt @@ -1,4 +1,4 @@ -FLATCAR_VERSION=4211.0.0+nightly-20250110-2100 -FLATCAR_VERSION_ID=4211.0.0 -FLATCAR_BUILD_ID="nightly-20250110-2100" -FLATCAR_SDK_VERSION=4211.0.0+nightly-20250110-2100 +FLATCAR_VERSION=4214.0.0+nightly-20250113-2100 +FLATCAR_VERSION_ID=4214.0.0 +FLATCAR_BUILD_ID="nightly-20250113-2100" +FLATCAR_SDK_VERSION=4214.0.0+nightly-20250113-2100 From 80e36c717811d7281e193afebec46aee18f05f05 Mon Sep 17 00:00:00 2001 From: flatcar-ci Date: Tue, 14 Jan 2025 21:00:36 +0000 Subject: [PATCH 4/6] New version: main-4215.0.0-nightly-20250114-2100 --- sdk_container/.repo/manifests/version.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/.repo/manifests/version.txt b/sdk_container/.repo/manifests/version.txt index c6f30e945d7..d59fca6480a 100644 --- a/sdk_container/.repo/manifests/version.txt +++ b/sdk_container/.repo/manifests/version.txt @@ -1,4 +1,4 @@ -FLATCAR_VERSION=4214.0.0+nightly-20250113-2100 -FLATCAR_VERSION_ID=4214.0.0 -FLATCAR_BUILD_ID="nightly-20250113-2100" -FLATCAR_SDK_VERSION=4214.0.0+nightly-20250113-2100 +FLATCAR_VERSION=4215.0.0+nightly-20250114-2100 +FLATCAR_VERSION_ID=4215.0.0 +FLATCAR_BUILD_ID="nightly-20250114-2100" +FLATCAR_SDK_VERSION=4215.0.0+nightly-20250114-2100 From 0f0fa2ff7ada6b4a767a8deac943f224595bdee9 Mon Sep 17 00:00:00 2001 From: Jan Bronicki Date: Wed, 15 Jan 2025 13:59:54 +0100 Subject: [PATCH 5/6] fix: Dynamically create netdev arguments to correctly include commas docs: Add entrance to the changelog about the fix Update changelog/changes/2025-01-15-qemu-startup-script-comma-fix.md Co-authored-by: Mathieu Tortuyaux --- build_library/qemu_template.sh | 4 ++-- .../bugfixes/2025-01-15-qemu-startup-script-comma-fix.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog/bugfixes/2025-01-15-qemu-startup-script-comma-fix.md diff --git a/build_library/qemu_template.sh b/build_library/qemu_template.sh index af0a46ab743..4e2d5266f3d 100755 --- a/build_library/qemu_template.sh +++ b/build_library/qemu_template.sh @@ -302,7 +302,7 @@ case "${VM_BOARD}" in qemu-system-x86_64 \ -name "$VM_NAME" \ -m ${VM_MEMORY} \ - -netdev user,id=eth0,${QEMU_FORWARDED_PORTS},hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ + -netdev user,id=eth0${QEMU_FORWARDED_PORTS:+,}${QEMU_FORWARDED_PORTS},hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ -device virtio-net-pci,netdev=eth0 \ -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \ "$@" @@ -311,7 +311,7 @@ case "${VM_BOARD}" in qemu-system-aarch64 \ -name "$VM_NAME" \ -m ${VM_MEMORY} \ - -netdev user,id=eth0,${QEMU_FORWARDED_PORTS},hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ + -netdev user,id=eth0${QEMU_FORWARDED_PORTS:+,}${QEMU_FORWARDED_PORTS},hostfwd=tcp::"${SSH_PORT}"-:22,hostname="${VM_NAME}" \ -device virtio-net-device,netdev=eth0 \ -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 \ "$@" diff --git a/changelog/bugfixes/2025-01-15-qemu-startup-script-comma-fix.md b/changelog/bugfixes/2025-01-15-qemu-startup-script-comma-fix.md new file mode 100644 index 00000000000..04e2658ecab --- /dev/null +++ b/changelog/bugfixes/2025-01-15-qemu-startup-script-comma-fix.md @@ -0,0 +1 @@ +- Fixed creating netdev arguments to correctly include commas when no port forwards are passed ([flatcar/scripts#2581](https://github.com/flatcar/scripts/pull/2581)) From cc1d4cdb340c5429618320c3bce48a4a85379aa9 Mon Sep 17 00:00:00 2001 From: flatcar-ci Date: Wed, 15 Jan 2025 21:00:28 +0000 Subject: [PATCH 6/6] New version: main-4216.0.0-nightly-20250115-2100 --- sdk_container/.repo/manifests/version.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/.repo/manifests/version.txt b/sdk_container/.repo/manifests/version.txt index d59fca6480a..135046985a7 100644 --- a/sdk_container/.repo/manifests/version.txt +++ b/sdk_container/.repo/manifests/version.txt @@ -1,4 +1,4 @@ -FLATCAR_VERSION=4215.0.0+nightly-20250114-2100 -FLATCAR_VERSION_ID=4215.0.0 -FLATCAR_BUILD_ID="nightly-20250114-2100" -FLATCAR_SDK_VERSION=4215.0.0+nightly-20250114-2100 +FLATCAR_VERSION=4216.0.0+nightly-20250115-2100 +FLATCAR_VERSION_ID=4216.0.0 +FLATCAR_BUILD_ID="nightly-20250115-2100" +FLATCAR_SDK_VERSION=4216.0.0+nightly-20250115-2100