From patchwork Thu Oct 16 07:37:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Semkowicz X-Patchwork-Id: 72455 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 78B98CCD194 for ; Thu, 16 Oct 2025 07:44:40 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by mx.groups.io with SMTP id smtpd.web11.2960.1760600677527337715 for ; Thu, 16 Oct 2025 00:44:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@thaumatec-com.20230601.gappssmtp.com header.s=20230601 header.b=Xi0E88hN; spf=pass (domain: thaumatec.com, ip: 209.85.218.51, mailfrom: dse@thaumatec.com) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-b3f5e0e2bf7so75134666b.3 for ; Thu, 16 Oct 2025 00:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thaumatec-com.20230601.gappssmtp.com; s=20230601; t=1760600676; x=1761205476; 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; bh=9IxaRzKH7yuWwzGjR/lpfD1QJCjorLOgy5X8t8Dqh0M=; b=Xi0E88hNt43du4RXPeM9lVSAaDXRIo7OTyqhNymE9FS6mp4NpWPTLI+AO9JBf0Tx+f z1/a4jW4gV5W8LiuL0pKekYa3Jnw0e1x5I9SXUvnDle2ZHl0GLSyAgB+8dnNyPxEfNhh EThezuQOmoUvbeuGkWGi1oBFKqU64Q09wBmEuwZAYAB4kuOPLyaQwiliwdBh8DzA1xhX lahZvCk0p5Uz2DAwTAp2xS+FmQovtwXuhfHdNVYixcVTy1Az4gijoNykJ1jqR89sC/4t rkZXuaJjMZP7m+YARo88v6wB+kWB8j37wqzFn8HnXtGpTNbqHrgxp0blt5r+iWl+nKM5 EO0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760600676; x=1761205476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9IxaRzKH7yuWwzGjR/lpfD1QJCjorLOgy5X8t8Dqh0M=; b=knXKZOKRTFg5mVthklIfLkEVoShuouU+3v1ObP+9FNChcbFZg64FU3r61EygyjvVGg ZuhJljkieSvfXD7KNPCRjTJIxeNTzun8TwTAvJo7gwvCfaEJAQts8WZ1h7eDCPvytJL5 8iDeNIIoLta+iYH31iB6a5C0LsoA0gVCMeBEtK2yKhxJh7vDW3TMq88l98/torx3I+zl /Ijd2nHiO7d63DZY/f+SiJX30y2Yp1Q2poiBR5iZoNoYug77UMdz8WpxXlHm1d37BwyE yoKZKw4yyy0mWD1XtvYf8vixVCy+MVAjtOiQxx5kB0cU/UA9DvjYtqZznKpHkQ9txP/E fdVA== X-Gm-Message-State: AOJu0Yy/KyyH4wOIXJosMyTyK7OikWyZAgSbbrTsUehW2M3IlEj0o9/8 UFXqFCZI1ZKTw9i121V5djlT12hxDqbtWd+X3M1LiVUTw92LlfbvV0HpBJz7zwnJtj4vM7bDBn8 dE8m2 X-Gm-Gg: ASbGncuiAXLg9u69vKilg7gIf91N/sGZgzwBi0svL4gL8QHT5OlAWF3sjzOkVXgx2rc x+R71ot0svCLco4jmynKPtB0Dk4kPegXFZoZG4m4NyOBi1+ChrmCy8kC9ViSeNeL/mv1Cwj9Pe0 2MtvDKwS6IsYru8gXrDXqpZbbEUL5qe5WGA6z33x+ZOudRkrut+teGzoaHVzxBezHaw835PHRSq 8KILme0laetDP08yO5eutcK4nFbNMP1/4qWbcZBybMvCCrt01RVqJnaYP8eRUokBf6IEp8ZBnnB FraJyz5OYslYrFMeKv5lfXIO11ASFWsfjhKfDHMQfWwG1CHe0n6TtUtgT/YRUYcCLzgF/eCybao 3Az+bZhpMGB5mlR/9n9fSeout6rSmHu+VfEupIAJQV+GQc/qnmW6Xh8c4d4Xbxufb74uxxXRgIb dMwVA= X-Google-Smtp-Source: AGHT+IG8vUGfcnFjj35qklp9nOTfm6x+GExaLVLclkII/xnQukgNDvYrQunCLdIrhXbZFRPavCmsAQ== X-Received: by 2002:a17:906:84d:b0:b59:5520:533c with SMTP id a640c23a62f3a-b59552056ccmr1414061666b.40.1760600675852; Thu, 16 Oct 2025 00:44:35 -0700 (PDT) Received: from fedora ([185.186.156.117]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b5cba459ba2sm447667366b.34.2025.10.16.00.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Oct 2025 00:44:35 -0700 (PDT) From: Daniel Semkowicz To: openembedded-devel@lists.openembedded.org Cc: Daniel Semkowicz Subject: [meta-webserver][PATCH 1/3] cockpit: Remove old-bridge leftovers Date: Thu, 16 Oct 2025 09:37:43 +0200 Message-ID: <20251016074104.85537-2-dse@thaumatec.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251016074104.85537-1-dse@thaumatec.com> References: <20251016074104.85537-1-dse@thaumatec.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 Oct 2025 07:44:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120720 The old-bridge package config option was removed from the recipe, but the usage of this option was left in some places. Remove any reference to old-bridge. Only the Python bridge is currently supported by Cockpit. Signed-off-by: Daniel Semkowicz --- meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb index 986a924fb5..c9619d835a 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb @@ -12,11 +12,9 @@ SRC_URI += " \ " SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf" -inherit gettext pkgconfig autotools systemd features_check -inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)} +inherit gettext pkgconfig autotools systemd features_check python3targetconfig -DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-setuptools-native" -DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3-pip-native', d)}" +DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd python3-pip-native python3-setuptools-native" COMPATIBLE_HOST:libc-musl = "null" @@ -112,7 +110,7 @@ FILES:${PN}-bridge = " \ ${libexecdir}/cockpit-askpass \ ${PYTHON_SITEPACKAGES_DIR} \ " -RDEPENDS:${PN}-bridge = "${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3', d)}" +RDEPENDS:${PN}-bridge = "python3" FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" RDEPENDS:${PN}-desktop += "bash" From patchwork Thu Oct 16 07:37:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Semkowicz X-Patchwork-Id: 72456 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 7D5E1CCD183 for ; Thu, 16 Oct 2025 07:44:40 +0000 (UTC) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.groups.io with SMTP id smtpd.web10.2810.1760600678061776740 for ; Thu, 16 Oct 2025 00:44:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@thaumatec-com.20230601.gappssmtp.com header.s=20230601 header.b=DRy1ytja; spf=pass (domain: thaumatec.com, ip: 209.85.208.47, mailfrom: dse@thaumatec.com) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-63bd822b007so632939a12.2 for ; Thu, 16 Oct 2025 00:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thaumatec-com.20230601.gappssmtp.com; s=20230601; t=1760600676; x=1761205476; 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; bh=0+NtZuWJpvL9TYYgYzXNBv8k2zsNlIxcshfADytbbJY=; b=DRy1ytjaNVUUYzecS6ahwRBagb5/ecj6hp+cKLIc8FSDvD3khRBzun4KlK6hmPY7+6 m4EwG3xXxhSMKMGunDx6qpNo+Ck4ep/pERr+DJRy4QGskMD87PtVjB44lfwrHd+9wdvm mWLo7DW2C+0S+MN/TosWV0deOXvqYxW/i6v0641qoHSCamHqsGfwu4XDwRAkKHD1ynjY /3QTb1R2wapQqkmgh3j4Yvgf0jo1vujfq9aHf2MYdxTElcQwycMRS0kQykgh4UFujYX2 RjoHU8g7G8y37ggPSpSLrUn6/6LuAL0WXafTqUwxVhKpUvdGKXAqzAwGuKbMB5UyjfFS pU7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760600676; x=1761205476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0+NtZuWJpvL9TYYgYzXNBv8k2zsNlIxcshfADytbbJY=; b=V7ClRD3//5zq+tdd9NhBarwydCkYg48qA9kPcYGnMrcH3yNUpnMrgArTZAU8ug17i1 1LQfvEfXPLKZxUqCPO7G/Svc0FUJHYuhNc7hG17774mK4IirGNngMapdF3VpN/1R/Yyt QkXg7atms3MDQZ0sRbbuA2oczA9WOZaJSbj6L3SDYdLoWIot6orfTaanE0aGhL1Zyhy4 r2RDz4d8prbnVcy8/YBh3NqcueCq4IxMrDtf0J3nL/EcLmklrfMqE+EkPUqmS/pDtjY6 yAf1js/uv6mNKWnJj0PBqT/u/VkWBNPKC5BYk2dtYGvseG+1c8c2g5K5x2RG6KAcgNoJ xorw== X-Gm-Message-State: AOJu0Yz4UvejMDmomwV1tVzpTs1U5RH1AnTvxtQTjkt3YWmrnExzyF4g DYRU46KyLlglABS//ZbFlnC4Cht7xTEc+NU5KUXJ8TijqMXks63Zj+fkZTdjR5tU2JJAtFgY8uN YjCuG X-Gm-Gg: ASbGnctdJlypbF2J+6I+LjeUg1flzg709Ssb1LV+6nBGFNPR8NG1K53mDsUWmaTg5L2 ap/p2XYVNZQVVY4w8V6VW+RT3tHv0OWcf/LFeVh6if98/Bbhrz8g+P/OapBZnVeXkmW1/D11S9X gShm00gZOZorIZ72jUTbdNvlge8Fysf7czG8qbwBRY545ncVXRRhcXZYNnBMI6oPup5/sI8zSpD E2xH/Czngu5Gs2Qz0M5gnttTZx0Ntr97IgIMGnDLV8rPbTFvN2AK/COO100PO+78IyABCnPqYxQ mHWxn3BrGNzO50PHGlTeYdWuYYeyX/OkafjoJmT43vGLn87NXCNjhSXWo5ccm0hb2psD/U6mbjc LmGuNA3JtxS0LzN5fpVi2f4k7t2TL6CC/PbmlEFHsuOIO/yYYDihfdFzi6ef6f6TYslBV X-Google-Smtp-Source: AGHT+IEHFYBU7iyG+M6qKGBSClzvYTLSChXn9LLuK3fVqiJDFF/YZsx/xqLTYduASLr+YiWHDnjhlQ== X-Received: by 2002:a17:907:9486:b0:b2d:a873:38d with SMTP id a640c23a62f3a-b50abed1b44mr3579520866b.43.1760600676331; Thu, 16 Oct 2025 00:44:36 -0700 (PDT) Received: from fedora ([185.186.156.117]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b5cba459ba2sm447667366b.34.2025.10.16.00.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Oct 2025 00:44:36 -0700 (PDT) From: Daniel Semkowicz To: openembedded-devel@lists.openembedded.org Cc: Daniel Semkowicz Subject: [meta-webserver][PATCH 2/3] cockpit: Add runtime dependency on GNU Coreutils Date: Thu, 16 Oct 2025 09:37:44 +0200 Message-ID: <20251016074104.85537-3-dse@thaumatec.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251016074104.85537-1-dse@thaumatec.com> References: <20251016074104.85537-1-dse@thaumatec.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 Oct 2025 07:44:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120721 The BusyBox version of mv does not have the -Z flag for setting SELinux security context. This results in failure when the cockpit-certificate-helper script is executed. Depend the package on GNU Coreutils to make sure that the proper version of mv is installed. Signed-off-by: Daniel Semkowicz --- meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb index c9619d835a..522d129502 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb @@ -172,8 +172,8 @@ FILES:${PN} += " \ ${nonarch_libdir}/firewalld \ " RDEPENDS:${PN} += "${PN}-bridge" -# Needs bash for /usr/libexec/cockpit-certificate-helper -RDEPENDS:${PN} += "bash" +# Needs bash and mv for /usr/libexec/cockpit-certificate-helper +RDEPENDS:${PN} += "bash coreutils" do_install:append() { pkgdatadir=${datadir}/cockpit From patchwork Thu Oct 16 07:37:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Semkowicz X-Patchwork-Id: 72457 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 88D86CCD19E for ; Thu, 16 Oct 2025 07:44:40 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web10.2811.1760600678587118952 for ; Thu, 16 Oct 2025 00:44:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@thaumatec-com.20230601.gappssmtp.com header.s=20230601 header.b=zg68eKKn; spf=pass (domain: thaumatec.com, ip: 209.85.208.52, mailfrom: dse@thaumatec.com) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-63babfdb52cso632534a12.3 for ; Thu, 16 Oct 2025 00:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thaumatec-com.20230601.gappssmtp.com; s=20230601; t=1760600677; x=1761205477; 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; bh=DtvezvLO+BAl3ADefu/FfaUKHNPVQfvfom7eJrctG1U=; b=zg68eKKn9GyCFVJ3o6GgZEl/zs2wCEm2J/O04+aczVhgWuT3f5Trjtg8NJX9V/lvTX uaUKUmmBpd4EBSigZNFo7TGEDJApQ4Lj7KE1E9JgP01vNwJ/jxVAgEICIV/fDz8veLnb 1TmHPvDAVR6F0n1EPzrO7CSYvMzIEoKmyM7w6QQ+vG3+str7qNZoV+hVXmneXbQNawUz 8/inzHtJJDECgMDgZGbeB8YA191PpK40cAK1368XoW/RSh1s+tQJXlPm4UBBkO5Euciy uOZgOIq8GTK5GZAiNGEN2qCSCiiaEZFfS4t/cf0bPPqUm3+0iwVQ4+OjIPHDh56HX4o1 ClOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760600677; x=1761205477; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DtvezvLO+BAl3ADefu/FfaUKHNPVQfvfom7eJrctG1U=; b=RXpIs7O6fW/kbdzgcSFIavR78js5sn97tc0CejlxLSGWykkBvyoR8jW2dpjpqV4BBl mCzS8yJq2wI05KFMJWy0Xzo7khglxZVccOJZWBT8+meiBFJz5AfDAEADWNgv5ab43nTm sa15hDIA1jxTqoMC4pRafb951bIaTiFoet5Z2knzDwz64nkik+4h65KJ8Z4qzcWb9RFD 7w9hk+233WfALGUbW7PNYfl36Ksyxa98B/262tbrtc4I2aqfj4kxaA+RSpHDUl2XhmuX Qt4ZzQXnA8x1KqILhVM+PdIZUAncNil41JIW/U2FdjJ1vxecuUYEFvuD13LDusPMfqh9 DLTQ== X-Gm-Message-State: AOJu0YzBwt+AKgexcoOsgn7wBWU99ZLNfVNKbd/83m4oxBpSivNdt8de Rgt5o2FNDnWBYR9eurgPi0DaNJIFukiOinRnyjSVbhwqjld48ONkg1UAGxMyDZEJWlDJucVX1Fu HVkBh X-Gm-Gg: ASbGncuHwVHILvWauJySXeHr4EOjGmSGw8nc7yQggG93LBdVQkIaEaKoxv9r6zioscL 3IsR67nUqml3fBl5dmDbkr7DHlcbn3X5YD8lKyk1fPz+b6TN7hSnD6OZyy1SvXBa6BJvmJxW9df O9Wm6rsO5LX/fPWt61MCOvxqzTZ74j2eroo47LJ3JKMygY8K6KtEQ8mWD/IC0lEuk8eQycd/zWj Gadhgxy4Z7hC4kohUL06aUxmMnDfKFX5/LafSVkzWndBvdRDi0srfICyij4UltiW2e9IurJ02jz ubKbkKagcM79Xk16ohGSghaLODH1vnwVu1fv1RY8KCjyl1D//KqUg7sRiKWjj9x64HcOZpt5Vtl 6gAepckbQKNAv7IPYBBlJMSWc97GEWbQdNgL+KK0rxImPNc0SF11qF7pBic+CPYFfJvGF X-Google-Smtp-Source: AGHT+IEMaKSyMTPKCpq7aX6+cUWR9Q/z1EtBtqzMLbSlSf/5HT3O4z3sZL41+Hfu2IwKqOjIcK0MKQ== X-Received: by 2002:a17:907:9720:b0:b3e:b226:5bba with SMTP id a640c23a62f3a-b50aaa9c3f5mr3394937266b.15.1760600676952; Thu, 16 Oct 2025 00:44:36 -0700 (PDT) Received: from fedora ([185.186.156.117]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b5cba459ba2sm447667366b.34.2025.10.16.00.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Oct 2025 00:44:36 -0700 (PDT) From: Daniel Semkowicz To: openembedded-devel@lists.openembedded.org Cc: Daniel Semkowicz Subject: [meta-webserver][PATCH 3/3] cockpit: Upgrade to 349 Date: Thu, 16 Oct 2025 09:37:45 +0200 Message-ID: <20251016074104.85537-4-dse@thaumatec.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251016074104.85537-1-dse@thaumatec.com> References: <20251016074104.85537-1-dse@thaumatec.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 Oct 2025 07:44:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120722 Remove the patch with the fix that is already present in the new version. Signed-off-by: Daniel Semkowicz --- .../{cockpit_337.bb => cockpit_349.bb} | 3 +- ...am-Create-src-common-directory-befor.patch | 34 ------------------- 2 files changed, 1 insertion(+), 36 deletions(-) rename meta-webserver/recipes-webadmin/cockpit/{cockpit_337.bb => cockpit_349.bb} (97%) delete mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_349.bb similarity index 97% rename from meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb rename to meta-webserver/recipes-webadmin/cockpit/cockpit_349.bb index 522d129502..4726386f6c 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_349.bb @@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;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://0001-Makefile-common.am-Create-src-common-directory-befor.patch \ file://cockpit.pam \ " -SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf" +SRC_URI[sha256sum] = "2fa8eef40968135fb6df866a415eba8d4d5adbf4d44f293f28d4f3c841b301bb" inherit gettext pkgconfig autotools systemd features_check python3targetconfig diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch deleted file mode 100644 index 36cb6c09c7..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fb3b427bcbc17257ac8c38438a82435b2bd36e38 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 9 May 2025 16:17:05 -0700 -Subject: [PATCH] Makefile-common.am: Create src/common directory before - generating fail-html.c - -During parallel builds, its possible that /src/common directory is -not yet created and this codepath to generate fail-html.c is executed and -it will end in build failures - -Fixes - make[1]: Entering directory 'build/tmp/work/riscv64-yoe-linux/cockpit/337/build' - ../cockpit-337/tools/escape-to-c cockpit_webresponse_fail_html_text < ../cockpit-337/src/common/fail.html > src/common/fail-html.c.tmp && mv src/common/fail-html.c.tmp src/common/fail-html.c - /bin/bash: src/common/fail-html.c.tmp: No such file or directory - make[1]: *** [Makefile:6044: src/common/fail-html.c] Error 1 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/common/Makefile-common.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/common/Makefile-common.am b/src/common/Makefile-common.am -index ec4b30d..1d55576 100644 ---- a/src/common/Makefile-common.am -+++ b/src/common/Makefile-common.am -@@ -94,6 +94,7 @@ libcockpit_common_a_SOURCES = \ - # libcockpit-common.a static-links an HTML template to use on failures - nodist_libcockpit_common_a_SOURCES = src/common/fail-html.c - src/common/fail-html.c: src/common/fail.html -+ $(MKDIR_P) $(dir $@) - $(AM_V_GEN) $(top_srcdir)/tools/escape-to-c cockpit_webresponse_fail_html_text < $< > $@.tmp && mv $@.tmp $@ - CLEANFILES += src/common/fail-html.c - EXTRA_DIST += src/common/fail.html