From patchwork Thu Jul 30 18:02:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93942 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A05D7C55171 for ; Thu, 30 Jul 2026 18:03:05 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.18149.1785434581639889074 for ; Thu, 30 Jul 2026 11:03:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=Nn76ZOOS; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2cf50c6f235so1129155ad.0 for ; Thu, 30 Jul 2026 11:03:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785434581; x=1786039381; darn=lists.openembedded.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=6apwJl9JDIV5XE7EMUs505Pj7iEl9jysGOE8QkmLLn4=; b=Nn76ZOOSCc+oyQED0R2XTMVD+8ArPfxT8dZi/mpSzoUPY59lk95W4fFD8uLmpcj+B7 qzyJDNzpSgp6R6Cw8B7FE6KLduwfSEWhq3fpN//XlOgAU3b98FJ6aPi+nyzAC0ZIGa2Q H+CyPrncAe3BWWL/Jc9UYMC74tJz5HR6XeNws8CcwPgt/Ga2K2hBvjFhOgFeS2cEVp3T t4KjKFDxtCw7ApLHasPhORv/oDsVFD9Z6XSY3q2nR4d2Qc77y7Kh7jfFa1qaUQ9c1SDz JYHzdds/X5/ebf6zx30TaGsHFGxkhTGxzsrSfUgL/aVhWCUqGza7pCqsJVbK5TGYFSnZ Lg1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785434581; x=1786039381; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=6apwJl9JDIV5XE7EMUs505Pj7iEl9jysGOE8QkmLLn4=; b=HmdbT4pq4MbXPdlw0rFBo3dcPbPaXIKg9XP3ppln4NJpAGr6l90s7wqC1RX9xIGVT9 x+5DZv8k1usiKTVA4ciW/47m0JceMtml1fYba85YkvNQ1hX56bJW4MLnyqAosuDOCWBq NTfBTP+4kXEzrQwWk6nmO3xEmjF0pzP1ifsN6SLjkaX6kViZomPNhACSUZAo+bm7hVd8 T9GPMvUIbpVdIlJXNSwWNK2e24AjkhX8MgJXpwGZ43pu42lQurKXlIa+WIaBbSRulmS5 ciwQvq/4TerqNiiMoxTIg2gEg6PTwQqtO9wgcZ2rlsAISssCbJaCiE+1OUq3/+OHJzo8 UDyQ== X-Gm-Message-State: AOJu0Yw8pnFhW6VO+ztidwD7Qk1iuddKi1goe315/B/SjWBPlEvS7/TP hegswdJxr4NZSbsXtBKT8RDPOuQEAzxMkW00S045phOPiQNKIWp3bF2XkA76FOBg X-Gm-Gg: AR+sD12WF//41fClpN5PmDG4/+7o2UNxw6B3AGhJfXCyk9pWehj/r2OeOq0cEUDm0V9 HcdyVtixQ8spSyznsvIgV7dho6g+IHySjRCN3O8/VO4Ni5JitCJ9t7lF6ZNYc7tpw5vrpR7cvgI Ap4zDMyx/zPAoKGh8x+m7SXOzYS+IaB3uBM5EHkToJmdpZa9dLAGS7QjFUTgQf3W+hqysErGlex WUpLNrhP0EZBNlHDOb7cm8XyVyURnVLdZFWNuO4P3Pcwz34AM2h+XUFP2RtW/0Qwqr86O24avk2 tGsejduzcj1uRra4cjT1/Edoo8UQwIzDeq6/4H37FpY861t3iI3lN6XE+VcYvTgFjv3exRX/D0f v8zWxV5vDROnhOa6yEzL//f8MD4mzl5z5WGq+J/YNPJAEDjoU691TiQYtB5LQOtpT8mMtObo2Qt s1w/AZ+mgmwjr9b/+JHEHuxfzX5wB0bScD063EAVdLLDkk5iH9phnfyOrD47Li8L9XMODcSpnRq GAdGXCJlfMOY0OpXr1LLKV9VL3CBaWqgA2RnawBCdpicImYiJ+pPDOzQk6vbHuQcUha7zKfRxvq TrRfgsMp7FcooHzVIpWEebLCasEBvMMD7ihRYu9M2BOkzIgTm7BFPuxdVxzwIyGnJhMjFDpT3se 7iGZlECWX2q0wEg== X-Received: by 2002:a17:90b:4acc:b0:37e:b6a:6cdf with SMTP id 98e67ed59e1d1-38fa7efea94mr852808a91.20.1785434580733; Thu, 30 Jul 2026 11:03:00 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13e7265010esm24015408c88.6.2026.07.30.11.02.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 11:03:00 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-webserver][PATCH 1/4] cockpit: upgrade 352 -> 364 Date: Thu, 30 Jul 2026 11:02:53 -0700 Message-ID: <20260730180257.3733387-1-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 30 Jul 2026 18:03:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128573 Upstream changes (release notes): * 353: Networking - suggest prefix length and gateway address; bug fixes. * 354: Convert documentation to AsciiDoc; work around Firefox 146/147 bug; bug fixes. * 355: ws - remove obsolete pam_cockpit_cert module; shell - add StartTransientUnit as a sudo alternative. * 356: systemd - allow editing timers created by Cockpit; convert license headers to SPDX format. * 357: lib - use browser context menu on shift; bridge - support Python 3.14 on old kernels. * 358: Networking - add Wi-Fi support; Cockpit Client updated to GTK 4. * 359: Bug fixes and translation updates. * 360: ws - CVE-2026-4631 (be more explicit when handling hostnames on cli); ws - support loading a custom login page. * 361: Remove all "Mount" actions in Anaconda mode; dependency updates. * 362: Fix arbitrary code execution via specially crafted logs page link (CVE-2026-4802); bug fixes. * 363: Translation updates. * 364: Bug fixes and translation updates. cockpit 356 converted all license headers to SPDX format, moving the LGPL-2.1 text from COPYING to LICENSES/LGPL-2.1.txt. Update LIC_FILES_CHKSUM path accordingly (md5 is unchanged). Refresh 0001-Warn-not-error-if-xsltproc-is-not-found.patch: the configure.ac context shifted (-61 lines); same MSG_ERROR → MSG_WARN change preserved. Signed-off-by: Khem Raj --- .../cockpit/{cockpit_352.bb => cockpit_364.bb} | 4 ++-- .../0001-Warn-not-error-if-xsltproc-is-not-found.patch | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) rename meta-webserver/recipes-webadmin/cockpit/{cockpit_352.bb => cockpit_364.bb} (97%) diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_352.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_364.bb similarity index 97% rename from meta-webserver/recipes-webadmin/cockpit/cockpit_352.bb rename to meta-webserver/recipes-webadmin/cockpit/cockpit_364.bb index 6b1fdcaeb1..07e2b9d163 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_352.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_364.bb @@ -2,14 +2,14 @@ SUMMARY = "Admin interface for Linux machines" DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1.txt;md5=4fbd65380cdd255951079008b364516c" SRC_URI += " \ https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ file://cockpit.pam \ " -SRC_URI[sha256sum] = "72098a51f85c4a63f2e276af119920a5faca978b57652df562b409b5941b5146" +SRC_URI[sha256sum] = "514cea072e1ef137323ab92bdb07a66bbb5106ecd584e7a046294cf0170cb690" inherit gettext pkgconfig autotools systemd features_check python3targetconfig diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch index db583cfd29..b8e812f0ae 100644 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch @@ -3,6 +3,8 @@ From: Khem Raj Date: Wed, 7 Sep 2022 11:12:28 -0700 Subject: [PATCH] Warn not error if xsltproc is not found +Refreshed for cockpit 364 (context shifted; same intent preserved). + Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Khem Raj @@ -11,10 +13,10 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 6896c19..2a1fb52 100644 +index 0d12145..36cb2c4 100644 --- a/configure.ac +++ b/configure.ac -@@ -182,7 +182,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) +@@ -121,7 +121,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) # package as xgettext, and we find them by PATH, so just check for the one. AC_PATH_PROG([XGETTEXT], [xgettext], [no]) if test "$XGETTEXT" = "no"; then From patchwork Thu Jul 30 18:02:54 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9179AC5516E for ; Thu, 30 Jul 2026 18:03:05 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.17841.1785434582928337347 for ; Thu, 30 Jul 2026 11:03:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=DweIyK8j; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-38f620399a0so161477a91.2 for ; Thu, 30 Jul 2026 11:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785434582; x=1786039382; darn=lists.openembedded.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=lhPgCIA+4l10mjkhtaR2VUZuGbqOAfOw1yQhFEndYR4=; b=DweIyK8jyZSQSOBbc0wYKxGo2x9FLK7mh8RHwlpfTvIwbUfkiGV+On8GLSDFG5g0aN KVTmngZvVA1sCarj91K9fqFxcXRxskPKaakMS2v3nF3R+HJ2gfdoTxG+97o9q3yYvF61 u0xDxoz/U1g21MCav8ALt0nrRv57VDPtZYjps95VChkmXaYWsnNEhTDUPyTl64JzFPQK JqYKVImQhQOXl4OeRfychnMHa+qpF8D7Dotf1h2pdi12DQVDf9AlR+O/khP78UT+UZzF ox6jC8gtiwLei5WJfEFqeyn7W1qADXmpRdumSn3E6TycNdr+o/QFsw9NbrySPyS174fk WjJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785434582; x=1786039382; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=lhPgCIA+4l10mjkhtaR2VUZuGbqOAfOw1yQhFEndYR4=; b=qiUZRx1VLL6++HCKJVJ36VArigIDw8XukCmjR8VXk0JhTB+FiL/Hz2CYEJIaXiFnOv 6Dh3ogCMdVI0dZSkbU+iFWm2U6mob4XP4ncjJD4N073KEhHqPLBPYG5nVEjzCiUGIlI8 eNAX+iECef7sR47ZyJuf3GGP5EBC3Fq3LNzY5imWUhYQwfanBvudNYxVfB0JkNR2bkxm q0RZxQbGk5y7uFPi4VdDETAoAlNPGl3qHRavC+bgpp9ed7xr3fgOaxnGhtK5hMnaWwXL EFBDMqAP2nNL08nLmUIzzhTBVVVv3a7qfHQpqbisG9OuX8fPMHn5WGjj/HSj7zhDkd6n zGdg== X-Gm-Message-State: AOJu0YxbFcAnrVYilvcJG0xuNYRfcpJ5bTshPoj/iBqrH/ixe41ADtzz BGirA1Tq25jAbbK4eH7eYSRqyZdmjA0DT4Z8QPmvuwzdjCvv5srLd/OWB/htyeKk X-Gm-Gg: AR+sD13vaQf1AdAbR64MqAmlbdZcS+bmAAG5oPV/tK0iYaHuRqeXcSXcb6m4W5pmyan p2XxBdRl0SsgK2FtD/oek55tH/kcpSE2L3JQtCoJppTVMcQYis5cKL6j9X5NxQHRTSrTMORV8TD ejQ2icHThK2hM2G0hehkuHVHNjNk3zDxIwclWdGz/tshOdmAokmwLEjguIrqFfkrQH8pjyPPzyZ hJokc1k3miEAJcCSY7N/kA5W51B8ZN5Eu+usGfdlt+kZOQ9M+4yJwWortsQhbffKPvZKKlaOZJW 1G9E0vhY/5ctknHbVlbTSyZQaGU2avxyz0HaRTBIaB8vXA4pp542ZcX+ZS/tn+Vvp66S2SXeWXk g3gWKfILKcDrMC739bgIcGa7d4TQrt/mL6RefOx8r3u6oOAw3+b1xX1rZozLZt1RM3MaFfqwIre mBuzMCvW5S1T4XYEpVMDob3n4DGHsBX8xknGDiVujoHL99sfbVsliWVZdQGHcs4UEqAgy3LuQ74 dyUoalUyCVKBTBuA4kMG8czQYY2AYuwPmrROCC4+E4EzCp7fEadKViRt1P5vVNMoGPd0WzqJKPy zv8JPDb9ldQrhSda3yptdco2O/J4POCUGDCRLs2S8DoXwXzjZ59wmH6Qzr9qdv+deYpHR7bE58B ztA== X-Received: by 2002:a17:90b:1dd0:b0:381:6c5:3f63 with SMTP id 98e67ed59e1d1-38fa7dcb02bmr864248a91.6.1785434581967; Thu, 30 Jul 2026 11:03:01 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13e7265010esm24015408c88.6.2026.07.30.11.03.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 11:03:01 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-webserver][PATCH 2/4] netdata: upgrade 1.47.5 -> 2.10.4 Date: Thu, 30 Jul 2026 11:02:54 -0700 Message-ID: <20260730180257.3733387-2-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730180257.3733387-1-khem.raj@oss.qualcomm.com> References: <20260730180257.3733387-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 30 Jul 2026 18:03:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128574 Major version jump (1.x → 2.x series). Key upstream changes: * 2.x dropped the legacy Netdata Cloud Agent-Cloud-Link (ACLK) and merged cloud-connectivity into the main binary; ENABLE_ACLK and ENABLE_CLOUD cmake options removed. OpenSSL and libcurl are now mandatory build dependencies (no longer optional via PACKAGECONFIG). * Improved database engine, new collectors (systemd-units, OTel, scripts plugin), and expanded Go plugin with SNMP overhaul. * 2.10.x stabilization: fix ZFS-related crashes, eBPF shared-memory pool leak, SNMP counter wrapping, database engine memory safety. * 2.10.4: larger patch for stability, memory safety, and crash resilience across database engine, streaming, and collectors; backports new macOS hardware sensor collectors. Recipe changes: * Add curl and openssl to mandatory DEPENDS (both now REQUIRED by cmake); remove PACKAGECONFIG[openssl] and PACKAGECONFIG[cloud]. * Remove webui_v0/v1/v2 PACKAGECONFIG entries and associated do_install block (the webui architecture changed in 2.x). * Remove -DENABLE_ACLK=OFF from EXTRA_OECMAKE (option no longer exists); keep -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF. * Refresh 0002-Do-not-hardcode-systemd-unit-directories.patch for 2.10.4 (the BUILD_FOR_PACKAGING/systemd service install blocks shifted ~1119 lines; same substitution preserved). * 2.x vendors its own libsensors copy which needs flex/bison to generate its config lexer/parser at build time; add flex-native and bison-native to DEPENDS. * Protobuf detection now runs unconditionally (used by several 2.x exporters/collectors even with the remote-write exporter disabled); add protobuf and protobuf-native to DEPENDS and point cmake at the native protoc via Protobuf_PROTOC_EXECUTABLE. * Disable several 2.x features that reach out to the network at configure time and cannot work in an offline build: - ENABLE_PLUGIN_OTEL / ENABLE_PLUGIN_OTEL_SIGNAL_VIEWER (pull in Rust/Corrosion via CMake FetchContent) - ENABLE_PLUGIN_SCRIPTS (requires Go, same as ENABLE_PLUGIN_GO) - ENABLE_ML (FetchContent-downloads dlib) - ENABLE_LIBBACKTRACE (ExternalProject-downloads libbacktrace) - ENABLE_DASHBOARD, now exposed as PACKAGECONFIG[dashboard] and off by default (the local agent dashboard isn't shipped in the release tarball; enabling it makes cmake fetch it from app.netdata.cloud at configure time) * BUILD_FOR_PACKAGING=ON now also installs sysusers.d/tmpfiles.d snippets under ${nonarch_libdir}; remove them in do_install since user creation is handled by useradd.bbclass and tmpfiles by our own netdata-volatiles.conf, avoiding an "installed but not shipped" QA failure from duplicate/unmanaged files. * Fix three new-in-2.x reproducibility leaks that embed host build paths into the packages (buildpaths QA, an error in oe-core's default ERROR_QA): - Add 0003-Do-not-record-the-configure-command-line-in-the-binar.patch: 2.x bakes the full cmake invocation into config.h for "netdata -W buildinfo"; the collected flags include --sysroot= and -ffile-prefix-map= and so leak ${WORKDIR} into the binary. - Add 0004-libsensors-do-not-emit-line-directives-in-generated-s.patch: pass bison -l / flex -L so the generated conf-parse.[ch] and conf-lex.c do not carry absolute #line paths (these live in file contents, so -ffile-prefix-map cannot rewrite them). - Remove the shipped build-info-cmake-cache.gz in do_install: it is a gzipped CMakeCache.txt kept only for buildinfo reporting and is full of host paths. Verified with buildpaths promoted back to ERROR_QA: netdata builds and packages with no buildpaths diagnostics and no /home path remains anywhere under the package tree. Signed-off-by: Khem Raj --- ...ot-hardcode-systemd-unit-directories.patch | 20 +++--- ...-configure-command-line-in-the-binar.patch | 31 ++++++++ ...-emit-line-directives-in-generated-s.patch | 40 +++++++++++ .../{netdata_1.47.5.bb => netdata_2.10.4.bb} | 71 +++++++++++-------- 4 files changed, 124 insertions(+), 38 deletions(-) create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0003-Do-not-record-the-configure-command-line-in-the-binar.patch create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0004-libsensors-do-not-emit-line-directives-in-generated-s.patch rename meta-webserver/recipes-webadmin/netdata/{netdata_1.47.5.bb => netdata_2.10.4.bb} (68%) diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0002-Do-not-hardcode-systemd-unit-directories.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0002-Do-not-hardcode-systemd-unit-directories.patch index 143caf89cb..15668c121b 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata/0002-Do-not-hardcode-systemd-unit-directories.patch +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0002-Do-not-hardcode-systemd-unit-directories.patch @@ -3,26 +3,28 @@ From: Enguerrand de Ribaucourt Date: Tue, 1 Oct 2024 17:01:33 +0200 Subject: [PATCH] Do not hardcode systemd unit directories +Refreshed for netdata v2.10.4 (context shifted; same intent preserved). + Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Enguerrand de Ribaucourt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: netdata-v1.47.3/CMakeLists.txt -=================================================================== ---- netdata-v1.47.3.orig/CMakeLists.txt -+++ netdata-v1.47.3/CMakeLists.txt -@@ -2531,7 +2531,7 @@ if(BUILD_FOR_PACKAGING) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6dafd9..530298e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3642,7 +3642,7 @@ if(BUILD_FOR_PACKAGING) install(FILES ${CMAKE_BINARY_DIR}/system/systemd/netdata.service COMPONENT netdata - DESTINATION lib/systemd/system) + DESTINATION $ENV{systemd_system_unitdir}) - install(DIRECTORY - COMPONENT netdata - DESTINATION usr/lib/systemd/journald@netdata.conf.d) -@@ -2620,11 +2620,11 @@ if(NOT OS_WINDOWS) + install(FILES + ${CMAKE_BINARY_DIR}/system/systemd/sysusers/netdata.conf + COMPONENT user +@@ -3739,11 +3739,11 @@ if(NOT OS_WINDOWS) install(FILES ${CMAKE_BINARY_DIR}/system/systemd/netdata-updater.service COMPONENT netdata diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0003-Do-not-record-the-configure-command-line-in-the-binar.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0003-Do-not-record-the-configure-command-line-in-the-binar.patch new file mode 100644 index 0000000000..4d0b81a0f3 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0003-Do-not-record-the-configure-command-line-in-the-binar.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Jul 2026 20:00:00 +0000 +Subject: [PATCH] Do not record the configure command line in the binary + +The CONFIGURE_COMMAND string is baked into config.h and reported by +"netdata -W buildinfo". In a cross build the collected flags contain +--sysroot=, -ffile-prefix-map= and similar arguments that carry absolute +host build paths, so the resulting binary embeds the build directory. +That makes the build unreproducible and trips OE's buildpaths QA check. + +The string is purely informational, so report it as unavailable rather +than leaking the build environment into the shipped binary. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3397,7 +3397,7 @@ + "-DCMAKE_SHARED_LINKER_FLAGS='${CMAKE_SHARED_LINKER_FLAGS}'" + ) + +-string(JOIN " " CONFIGURE_COMMAND "cmake" ${CONFIGURE_OPTIONS}) ++set(CONFIGURE_COMMAND "unavailable (stripped for reproducible builds)") + + if (NOT NETDATA_USER) + set(NETDATA_USER "netdata") diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0004-libsensors-do-not-emit-line-directives-in-generated-s.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0004-libsensors-do-not-emit-line-directives-in-generated-s.patch new file mode 100644 index 0000000000..9d3cee4c37 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0004-libsensors-do-not-emit-line-directives-in-generated-s.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 29 Jul 2026 20:10:00 +0000 +Subject: [PATCH] libsensors: do not emit #line directives in generated sources + +bison and flex embed the absolute path of both the input grammar and the +generated output into #line directives. Those paths live in the file +contents rather than in debug info, so -ffile-prefix-map cannot rewrite +them, and the generated conf-parse.[ch]/conf-lex.c shipped in the debug +source package end up referencing the host build directory. That makes +the build unreproducible and trips OE's buildpaths QA check. + +Pass -l (bison) and -L (flex) to suppress the #line directives. The only +effect is that compiler diagnostics for the generated parser point at the +generated file instead of the grammar, which is an acceptable trade for a +vendored parser that is not being developed here. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Khem Raj +--- + src/collectors/debugfs.plugin/libsensors/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/src/collectors/debugfs.plugin/libsensors/CMakeLists.txt ++++ b/src/collectors/debugfs.plugin/libsensors/CMakeLists.txt +@@ -16,12 +16,12 @@ + + # Generate Bison parser + bison_target(LibsensorsParser vendored/lib/conf-parse.y ${CMAKE_CURRENT_BINARY_DIR}/conf-parse.c +- COMPILE_FLAGS "-p sensors_yy --defines=${CMAKE_CURRENT_BINARY_DIR}/conf-parse.h" ++ COMPILE_FLAGS "-p sensors_yy -l --defines=${CMAKE_CURRENT_BINARY_DIR}/conf-parse.h" + ) + + # Generate Flex scanner + flex_target(LibsensorsLexer vendored/lib/conf-lex.l ${CMAKE_CURRENT_BINARY_DIR}/conf-lex.c +- COMPILE_FLAGS "-Psensors_yy -Cfe -8" ++ COMPILE_FLAGS "-Psensors_yy -Cfe -8 -L" + ) + + # Add dependency to ensure correct build order diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.47.5.bb b/meta-webserver/recipes-webadmin/netdata/netdata_2.10.4.bb similarity index 68% rename from meta-webserver/recipes-webadmin/netdata/netdata_1.47.5.bb rename to meta-webserver/recipes-webadmin/netdata/netdata_2.10.4.bb index f18c979685..709538b1d4 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.47.5.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_2.10.4.bb @@ -6,10 +6,16 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" DEPENDS += "\ + bison-native \ + curl \ + flex-native \ json-c \ libuv \ libyaml \ lz4 \ + openssl \ + protobuf \ + protobuf-native \ util-linux \ zlib \ " @@ -17,11 +23,13 @@ DEPENDS += "\ SRC_URI = "\ https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ file://0002-Do-not-hardcode-systemd-unit-directories.patch \ + file://0003-Do-not-record-the-configure-command-line-in-the-binar.patch \ + file://0004-libsensors-do-not-emit-line-directives-in-generated-s.patch \ file://netdata.conf \ file://netdata-volatiles.conf \ ${@bb.utils.contains('PACKAGECONFIG', 'go', 'file://go.d.conf', '', d)} \ " -SRC_URI[sha256sum] = "8073eee2392f92daa1f8bb5cf13fb988b8c3b52ff9574b50706ff69bdbdb51ce" +SRC_URI[sha256sum] = "d1ae949863925d626b1d42a53000bcca2c239718e0b0ddc6a3f3f5029b21cdfe" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P(?!1\.99)\d+(?:\.\d+)*)" @@ -63,10 +71,8 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata \ ${@bb.utils.contains('PACKAGECONFIG','docker','--groups docker','',d)} --user-group netdata" -PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[brotli] = ",,brotli" -PACKAGECONFIG[cloud] = "-DENABLE_CLOUD=ON,-DENABLE_CLOUD=OFF," -PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" PACKAGECONFIG[freeipmi] = "-DENABLE_PLUGIN_FREEIPMI=ON,-DENABLE_PLUGIN_FREEIPMI=OFF,freeipmi" PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,libmnl" # needs meta-virtualization @@ -75,14 +81,28 @@ PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups" PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd" PACKAGECONFIG[docker] = ",,virtual/docker, virtual/docker" PACKAGECONFIG[go] = "-DENABLE_PLUGIN_GO=ON, -DENABLE_PLUGIN_GO=OFF" -# WebUI (packageconfig not set: v0, v1 & v2) -PACKAGECONFIG[webui_v0] = ",,,,,webui_v1 webui_v2" -PACKAGECONFIG[webui_v1] = ",,,,,webui_v0 webui_v2" -PACKAGECONFIG[webui_v2] = ",,,,,webui_v0 webui_v1" - -# ebpf doesn't compile (or detect) the cross compilation well -EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DBUILD_FOR_PACKAGING=${@bb.utils.contains('DISTRO_FEATURES','systemd','ON','OFF',d)} \ - -DENABLE_ACLK=OFF -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'" +# The local agent dashboard is not shipped in the release tarball; enabling it +# makes CMake download https://app.netdata.cloud/agent.tar.gz at configure +# time, which cannot work in an offline build. Off by default. +PACKAGECONFIG[dashboard] = "-DENABLE_DASHBOARD=ON,-DENABLE_DASHBOARD=OFF" + +# ebpf doesn't compile (or detect) the cross compilation well. +# Several 2.x features fetch sources at configure time, which cannot work in +# an offline build, so they are disabled here: +# - ENABLE_PLUGIN_OTEL / ENABLE_PLUGIN_OTEL_SIGNAL_VIEWER pull Rust/Corrosion +# via CMake FetchContent. +# - ENABLE_PLUGIN_SCRIPTS requires Go (as does ENABLE_PLUGIN_GO). +# - ENABLE_ML FetchContent-downloads dlib. +# - ENABLE_LIBBACKTRACE ExternalProject-downloads libbacktrace. +# Protobuf is detected unconditionally and needs the native protoc. +EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF \ + -DENABLE_PLUGIN_OTEL=OFF -DENABLE_PLUGIN_OTEL_SIGNAL_VIEWER=OFF \ + -DENABLE_PLUGIN_SCRIPTS=OFF \ + -DENABLE_ML=OFF \ + -DENABLE_LIBBACKTRACE=OFF \ + -DProtobuf_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \ + -DBUILD_FOR_PACKAGING=${@bb.utils.contains('DISTRO_FEATURES','systemd','ON','OFF',d)} \ + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'" do_compile:append() { # Go dependencies are protected with read-only permissions, but would prevent cleaning @@ -127,23 +147,16 @@ do_install:append() { install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata - # webUI - if "${@bb.utils.contains('PACKAGECONFIG', 'webui_v0', 'true', 'false', d)}"; then - rm -rf ${D}${datadir}/netdata/web/v1 - rm -rf ${D}${datadir}/netdata/web/v2 - install -m 0644 ${D}${datadir}/netdata/web/v0/index.html ${D}${datadir}/netdata/web/ - fi - if "${@bb.utils.contains('PACKAGECONFIG', 'webui_v1', 'true', 'false', d)}"; then - rm -rf ${D}${datadir}/netdata/web/v0 - rm -rf ${D}${datadir}/netdata/web/v2 - install -m 0644 ${D}${datadir}/netdata/web/v1/index.html ${D}${datadir}/netdata/web/ - fi - if "${@bb.utils.contains('PACKAGECONFIG', 'webui_v2', 'true', 'false', d)}"; then - rm -rf ${D}${datadir}/netdata/web/v0 - rm -rf ${D}${datadir}/netdata/web/v1 - install -m 0644 ${D}${datadir}/netdata/web/v2/index.html ${D}${datadir}/netdata/web/ - fi - chown -R netdata:netdata ${D}${datadir}/netdata/web + # BUILD_FOR_PACKAGING installs its own sysusers.d/tmpfiles.d snippets, but + # user creation is handled by useradd.bbclass and tmpfiles by our own + # netdata-volatiles.conf above, so drop the upstream ones to avoid + # shipping duplicate/unmanaged files. + rm -rf ${D}${nonarch_libdir}/sysusers.d ${D}${nonarch_libdir}/tmpfiles.d + + # 2.x ships a gzipped copy of CMakeCache.txt purely so that + # "netdata -W buildinfo" can report it; it is full of host build paths. + # It carries no runtime value in a cross build, so drop it. + rm -f ${D}${datadir}/netdata/build-info-cmake-cache.gz } FILES:${PN} += "\ From patchwork Thu Jul 30 18:02:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93941 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8124CC5516D for ; Thu, 30 Jul 2026 18:03:05 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.18151.1785434584048547549 for ; Thu, 30 Jul 2026 11:03:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=luY5qUl3; spf=pass (domain: gmail.com, ip: 209.85.215.180, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-c9c26a5fb98so762292a12.0 for ; Thu, 30 Jul 2026 11:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785434583; x=1786039383; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=u4YsMcBDw5PCJMXM8xz+HIBRR+5yluk3YkW0OG0wSQU=; b=luY5qUl37EL5U+rnH6dFcqTd1Df1bjUmAL4MXyaYzWkolcwvpXS+Vyg6Dosvg1zONO nzfRqEXIEyzcYY12H0m6afsbd+jCZquU16DvhMPvtIFtchsOgIgX0TbWprgp4e/XhGOC GdCfWcxFPv9Nspp+sG8sG5mOhcbWNS4QzOVGa1p/nO8yGjWRn8p0k98IitFhJ+jBX6mM bV/xm8zXKbUZhBkLamwludQIXT0lOkHD83j+wuLs5QK9ixJ3edL/tQSMd7lXIRkWJWP2 10ud+OPuVj1Rp65w8oRLX93p64TfO4ZPd3QNqJxOVrdQkIgzNhbJuKmY6bcIdU+Ec+jK 72/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785434583; x=1786039383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=u4YsMcBDw5PCJMXM8xz+HIBRR+5yluk3YkW0OG0wSQU=; b=pb6JS0dNMdKdsfN64HlOThp9gepHyH77hyDggSCQCR8kqcM95aqC7XSI+5gRUkLw4Q N8tcTwcFd2yvzp53ndQdQKTP2yhWIuEnD5yNd0msBLvAdqDdFd5EO9mNYFGG+WF10Enm QYmJMecFszNjLN7/DUeEyDAO1cFoWW/FgPe6ADebDf7tWGqEqUx5xHXx2qlxpGO9DgA6 5ZACW84uKWIFeAmEjDkQvIAWTIn1nVkdmHeTxStiKMJa76do0q4QEDHwqXOaBtknG6F7 jvRcpfMm2Qi11hghYf9oA2/5hdYV0EIkkG/Qemk+ANUzClIpYi8SjHNwkPUyxz4i3pAj kFFw== X-Gm-Message-State: AOJu0YyPqVTvevgAHWkRtqanvCJDOG8DqHeLtKVZpjhdA9I4/cn2b5Pi vMXja72Tj76K2TZ6ciPrfWk7bm2EWy4Bj22nDMuMNrmscsc62qZw5Po/6aNeBLmY X-Gm-Gg: AR+sD131nGC/a/8SejX7jwtpw9XVacpjqDTdqvLtkGhPDdxvxSSsOGRyxxVLnxHvmGl mf7QoZR0uOZR5ovbn6qwVNRaAr4kwIhzDms5t94wSGEMd5BYpgv2RHsIy5OcL1jOdFrJQHU+Pfk zg08VwHXseYoZjkpSwyrTcH3Sqhv7CP/3PQYqkKN9ybm3NobHBjNabVb7Xz/cm5wf6fUj0bUShs uZyoDfOgej0YUJ2AhrgAQ4okmVBy0sV7bPI5kuxt87QbabXIBTgaZ0fL7irxCKBmItAiHM9vkKJ NTF1gahfQjJ+0jkKNhSav9XfnX21uaGFcKAm+5OnlVCwHV2L6Mu79Rj5cGJG4XSLPURp2JrvmRc Twr9iKto2h9l0TD748Jm2N75GZEx+B8IRE2blsTbgUKhQL50ET6r5XwSuP/wXYGb4uRit2ucXOl InHASoB5kbQCqpljQWzBTjqOoZvowbUUnsAawl/2VZktpHCqogpyC7npkhjRTjlz3aWZQDwa/8J 588fm9RnQJ/QOYmPHMrTQvdKCecfk8A8sV2kLlknTx+H3nH+J9qsE3qeuYNvi5TigbKcppkUBdn Yn8XpqwqL9EOyRjgMTOabtuuiFs0UNVpuOB27guxTSrsHP0RR/VBSNSYLqQvJLxRwcm1y3nVR3x cPg== X-Received: by 2002:a05:6300:6bc6:20b0:3c3:7195:fd47 with SMTP id adf61e73a8af0-3c90d9624e1mr687062637.24.1785434583023; Thu, 30 Jul 2026 11:03:03 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13e7265010esm24015408c88.6.2026.07.30.11.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 11:03:02 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-webserver][PATCH 3/4] webmin: upgrade 2.641 -> 2.653 Date: Thu, 30 Jul 2026 11:02:55 -0700 Message-ID: <20260730180257.3733387-3-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730180257.3733387-1-khem.raj@oss.qualcomm.com> References: <20260730180257.3733387-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 30 Jul 2026 18:03:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128575 Upstream changes: * 2.650: new Systemd Services, GRUB 2, and Kea DHCP modules; WebSocket proxy support in Servers Index; Alpine Linux support; Let's Encrypt IP-based certificate support; editable SSH public keys in Users and Groups. * 2.651: Certbot certificate request/renewal fixes; fix live activation of Linux bond interfaces. * 2.652: global per-user ACL to block URL downloads from non-public IPs; fix hex HTML entity recognition; fix session checks with HMAC session keys; fix Usermin switching to use one-time login URLs. * 2.653: fix missing xmlrpc-lib.pl; fix partially installed Debian package listing; Authentic theme improvements. Recipe changes: * Drop init-exclude.patch: both hunks (init/index.cgi commented-out runlevel loop and init/init-lib.pl exclude= support) are now incorporated in upstream webmin 2.653. * Refresh net-generic.patch: upstream added alpine-linux to the os_support line in net/module.info; refresh the patch context. * Refresh net-lib.pl.patch: context shifted by 4 lines with fuzz 1; refreshed against 2.653 (same fallback to debian-linux-lib.pl). * Remove webmin-openrc-init from do_install: webmin 2.653 ships a new webmin-openrc-init script that references /sbin/openrc-run, which is not available on systemd-based distros; remove the file to avoid an unresolvable RDEPENDS QA failure. Signed-off-by: Khem Raj --- .../webmin/files/net-generic.patch | 24 +++++++++++++------ .../webmin/files/net-lib.pl.patch | 8 ++++--- .../{webmin_2.641.bb => webmin_2.653.bb} | 4 ++-- 3 files changed, 24 insertions(+), 12 deletions(-) rename meta-webserver/recipes-webadmin/webmin/{webmin_2.641.bb => webmin_2.653.bb} (98%) diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index cd9a522bb6..30f1d3dcc4 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch @@ -1,20 +1,30 @@ Add support for configuring network interfaces on a generic linux system +Refreshed for webmin 2.653 (upstream added alpine-linux to os_support). + Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton +--- + net/generic-linux-lib.pl | 2 ++ + net/module.info | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/net/generic-linux-lib.pl b/net/generic-linux-lib.pl +new file mode 100644 +--- /dev/null ++++ b/net/generic-linux-lib.pl +@@ -0,0 +1,2 @@ ++do 'linux-lib.pl'; ++ +diff --git a/net/module.info b/net/module.info --- a/net/module.info +++ b/net/module.info @@ -1,6 +1,6 @@ name=Networking category=net --os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux -+os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux +-os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux alpine-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux ++os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux alpine-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux desc=Network Configuration longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts. readonly=1 ---- /dev/null -+++ b/net/generic-linux-lib.pl -@@ -0,0 +1,2 @@ -+do 'linux-lib.pl'; -+ diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch b/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch index 949525dfd7..cacd8c94f2 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch @@ -3,15 +3,17 @@ Upstream-Status: Inappropriate [config] XXX: need to work out a better fix. Signed-off-by: Dexuan Cui +--- + net/net-lib.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/net-lib.pl +++ b/net/net-lib.pl -@@ -38,7 +38,7 @@ elsif ($gconfig{'os_type'} eq 'debian-li - $net_mode = "netplan"; +@@ -42,7 +42,7 @@ elsif ($auto_net_mode eq "dhcpcd") { + $net_mode = "dhcpcd"; } else { - do "$gconfig{'os_type'}-lib.pl"; + do "debian-linux-lib.pl"; $net_mode = $gconfig{'os_type'}; } - diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_2.641.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.653.bb similarity index 98% rename from meta-webserver/recipes-webadmin/webmin/webmin_2.641.bb rename to meta-webserver/recipes-webadmin/webmin/webmin_2.653.bb index b513ec14e6..a46c3aad16 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_2.641.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.653.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0a6446108c96d0819d21e40b48109507" SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://setup.sh \ - file://init-exclude.patch \ file://net-generic.patch \ file://remove-startup-option.patch \ file://disable-version-check.patch \ @@ -19,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://mysql-config-fix.patch \ file://webmin.service \ " -SRC_URI[sha256sum] = "220015eaff2b666b9bbdf2ce2bc676de72d33e5cc5f35b800b0fa14934bdb95a" +SRC_URI[sha256sum] = "9acc680d3d45cee876f36fc8810ce68bb6e44a0365e245a4298a180e0d016696" UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" UPSTREAM_CHECK_REGEX = "webmin-(?P\d+(\.\d+)+).tar.gz" @@ -91,6 +90,7 @@ do_install() { | tar --no-same-owner -xpf - -C ${D}${libexecdir}/webmin rm -f ${D}${libexecdir}/webmin/webmin-init + rm -f ${D}${libexecdir}/webmin/webmin-openrc-init rm -f ${D}${libexecdir}/webmin/ajaxterm/ajaxterm/configure.initd.gentoo rm -rf ${D}${libexecdir}/webmin/patches From patchwork Thu Jul 30 18:02:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 93940 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82380C5516F for ; Thu, 30 Jul 2026 18:03:05 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.17843.1785434585151689778 for ; Thu, 30 Jul 2026 11:03:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20251104 header.b=EDxgqJXX; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2d02b4c3601so827755ad.3 for ; Thu, 30 Jul 2026 11:03:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785434584; x=1786039384; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=q3TYEB8quEUgNPbnUDsKarul1pe8moIDUSxGG65M9KY=; b=EDxgqJXXFdRFPHr6bBOx47IL1FS02spklg778JttZh6GBKLgWJlej9Ya6KbuMLp1dD +DD9juwJOtSXgvWSA9r34GjnbW0G7ziJDsiB6vATM9n15uKnc5GEMXmdFbPxacnCJ420 4x6KccQbC2E/LXdxTj0i98EzNguKOCEPuFdgajNJty5i3GzM2G26KlzVZ+468aAUUkhd 66XeKXW9ZuHNTrlfITKyAfFnUHRjpSRUjw6SUGbdW/Aq9adkRDb/b0N8+y/3nDrCnavr mfw8tqY1XINQtKX/Eon6AHNvx9fOkOaVLBXiVn1HsLA7GdE1ckMdb4Z4yd7GJhh5dGhS UK4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785434584; x=1786039384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=q3TYEB8quEUgNPbnUDsKarul1pe8moIDUSxGG65M9KY=; b=le1VxfBdVvZ9rjZszHC7LgVdNAGM36/dxsstnYNilMelKnGgZIl3SO9hYsUd/QrZMK NugCCfhJZbadqCyhoKG6IGbE1YuMYhvXnDjS9cTF3CgH0rsPVKC9znOSMGCOL67YB4Jc qU31W2AIiqe06tu6c7ZnZ/KgeeFkhYYBLkf1Xm6cm7hVNRYlAUmoX4MOalzGFIMBzALM sEe0fp4urML0R5lSCzEM6aYnYgnmfHeIcFqsPyEv9AxBsuweuecawAGs6XvxtT/LJGkh GT2Lgs+JpWC35g7QxCOCuFKyrMJ10hBo6EqqQRBA+WAzzsc5sqMPaPdXe5aWwHLh3Kdu 3sAg== X-Gm-Message-State: AOJu0Yz9TWcteZwMJIGw7plIqRJ7wV8i1DZ4J5T8JwjJ1keoAJXQwCvs fhXUsWhw99opHUx7pAQCOS9ZCX2R6KfASzGV/MDtQEQQv0Diazbbn+k5dDyjzViG X-Gm-Gg: AR+sD13A+1E0k7QQ7hJAPi0qIyGSrRZbz04Ud1fiOFxEPoIg9Q/PCgX47V+J9eOvuOe 9Lq+GtVDSELahoCQ9FHYB5Dss6laBnajZW7jbtrOkYbbkbt9WVs320qNuPxfvdhfO6BLhG+zjGM 5ON2XfZIjY037R3VOdMFpqszFj5IJQAh9VV9a/s/wSnKkopNy6MVVVpQrU4CKrAKpI5sn/4Fi1X GeU5Fc2TJfdKPla7ijoMgufnV6+OEFEK51j9GYRJNJXDG1gSoE8dYsnsIHiuzeNktoFi/yguQ16 9wyXpehTQfXIlQRO6sWyDnR2XhOKHeaFlCld7lqtcGLw1y08i9wwJldGGCrHtxQmZozK/WW4+DY ETw9k8hXsS0mAY4D5vn9rVUoWVgtE5ICvPAsaioGNsoQi9lS29IL+0bES71t0xPHouhzYNgCcr3 NJnPoGJi+beyxv2indCGrRDEICF31EPoPClsEiYFlh2euLsoeJZe6pQcaLCTH03tzS7Z7/yHI25 35SJCE4c5IFM4G8RBZPCsYgVqXVZWKtAMeoH9aLFKcUrkJGI5ML5AFnDphyQw9vsX7aT9Ltwm/i xG1vKKhGD6gwnNxqWI7XghaM1vqxOcKTHtlhPDB/vJoLjmg53EyvBF5PSIPvPGsxclTGdtkAWn0 1ceKN6E1gib4R X-Received: by 2002:a17:90b:5403:b0:381:11eb:d78e with SMTP id 98e67ed59e1d1-38f9bdaf18cmr3159795a91.14.1785434584217; Thu, 30 Jul 2026 11:03:04 -0700 (PDT) Received: from apollo.localdomain ([208.95.233.74]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13e7265010esm24015408c88.6.2026.07.30.11.03.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 11:03:03 -0700 (PDT) From: Khem Raj X-Google-Original-From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-webserver][PATCH 4/4] apache-websocket: update to latest master (0ee34c7 -> 18ad4ae) Date: Thu, 30 Jul 2026 11:02:56 -0700 Message-ID: <20260730180257.3733387-4-khem.raj@oss.qualcomm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730180257.3733387-1-khem.raj@oss.qualcomm.com> References: <20260730180257.3733387-1-khem.raj@oss.qualcomm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 30 Jul 2026 18:03:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/128576 Advance the pinned SRCREV to the current tip of jchampio's master. The latest tagged release is still 0.1.2 (already reflected in PV), and the 23 new commits are entirely test-infrastructure work: porting the test suite from Python 2 to Python 3/asyncio/websockets and adding coverage for the module APIs. None of them touch the module sources that get built and installed, so the shipped mod_websocket.so is functionally unchanged; this simply keeps the git-tracking recipe on the current tip. Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index b93fa2d186..533d3e3969 100644 --- a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -13,7 +13,7 @@ RDEPENDS:${PN} += "apache2" # fork contains patches from the modules ML and fixes CVE compliance issues SRC_URI = "git://github.com/jchampio/apache-websocket.git;branch=master;protocol=https" -SRCREV = "0ee34c77fc78ff08fd548706300b80a7bc7874e4" +SRCREV = "18ad4ae2fc99381b8d75785f492a479f789b322b" PV = "0.1.2+git"