2 files changed, 60 insertions, 31 deletions

diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
index 6a5eb4e66e..986a924fb5 100644
--- a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb
+++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb
@@ -7,9 +7,10 @@ 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] = "a87d090c930e2058bb3e970ca7f2bafe678687966b5c0b8b42a802977e391ce9"
+SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf"
 
 inherit gettext pkgconfig autotools systemd features_check
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'old-bridge', '', 'python3targetconfig', d)}
@@ -24,29 +25,23 @@ RDEPENDS:${PN} += "glib-networking"
 REQUIRED_DISTRO_FEATURES = "systemd pam"
 
 COCKPIT_USER_GROUP ?= "root"
-COCKPIT_WS_USER_GROUP ?= "${COCKPIT_USER_GROUP}"
 
 EXTRA_AUTORECONF = "-I tools"
 EXTRA_OECONF = " \
-    --with-cockpit-user=${COCKPIT_USER_GROUP} \
-    --with-cockpit-group=${COCKPIT_USER_GROUP} \
     --with-admin-group=${COCKPIT_USER_GROUP} \
-    --with-cockpit-ws-instance-user=${COCKPIT_WS_USER_GROUP} \
-    --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \
     --disable-doc \
     --with-systemdunitdir=${systemd_system_unitdir} \
+    --with-pamdir=${base_libdir}/security \
 "
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \
-    old-bridge \
 "
 
-PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
-PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
-PACKAGECONFIG[storaged] = ",,,udisks2"
-PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
-PACKAGECONFIG[old-bridge] = "--enable-old-bridge"
+PACKAGECONFIG[pcp] = ",,pcp"
+PACKAGECONFIG[dashboard] = ",,libssh"
+PACKAGECONFIG[storaged] = ",,udisks2"
+PACKAGECONFIG[polkit] = ",,polkit"
 
 PACKAGES =+ " \
     ${PN}-pcp \
@@ -59,10 +54,8 @@ PACKAGES =+ " \
     ${PN}-sosreport \
     ${PN}-storaged \
     ${PN}-networkmanager \
-    ${PN}-machines \
     ${PN}-selinux \
     ${PN}-playground \
-    ${PN}-docker \
     ${PN}-dashboard \
     ${PN}-packagekit \
     ${PN}-apps \
@@ -84,37 +77,30 @@ FILES:${PN}-systemd = "${datadir}/cockpit/systemd"
 FILES:${PN}-users = "${datadir}/cockpit/users"
 FILES:${PN}-kdump = " \
     ${datadir}/cockpit/kdump \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-kdump.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_kdump.metainfo.xml \
 "
 FILES:${PN}-sosreport = " \
     ${datadir}/cockpit/sosreport \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_sosreport.metainfo.xml \
     ${datadir}/pixmaps/cockpit-sosreport.png \
+    ${datadir}/icons/hicolor/64x64/apps/cockpit-sosreport.png \
 "
 FILES:${PN}-storaged = " \
     ${datadir}/cockpit/storaged \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_storaged.metainfo.xml \
 "
 
 FILES:${PN}-networkmanager = " \
     ${datadir}/cockpit/networkmanager \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_networkmanager.metainfo.xml \
 "
 RDEPENDS:${PN}-networkmanager = "networkmanager"
 
-FILES:${PN}-machines = " \
-    ${datadir}/cockpit/machines \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-machines.metainfo.xml \
-"
 FILES:${PN}-selinux = " \
     ${datadir}/cockpit/selinux \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-selinux.metainfo.xml \
+    ${datadir}/metainfo/org.cockpit_project.cockpit_selinux.metainfo.xml \
 "
 FILES:${PN}-playground = "${datadir}/cockpit/playground"
-FILES:${PN}-docker = " \
-    ${datadir}/cockpit/docker \
-    ${datadir}/metainfo/org.cockpit-project.cockpit-docker.metainfo.xml \
-"
 FILES:${PN}-dashboard = "${datadir}/cockpit/dashboard"
 ALLOW_EMPTY:${PN}-dashboard = "1"
 
@@ -152,10 +138,13 @@ FILES:${PN}-ws = " \
     ${systemd_system_unitdir}/cockpit-wsinstance-https@.socket \
     ${systemd_system_unitdir}/cockpit-wsinstance-https@.service \
     ${systemd_system_unitdir}/system-cockpithttps.slice \
+    ${systemd_system_unitdir}/cockpit-session-socket-user.service \
+    ${systemd_system_unitdir}/cockpit-wsinstance-socket-user.service \
+    ${systemd_system_unitdir}/cockpit-issue.service \
     ${libdir}/tmpfiles.d/cockpit-tempfiles.conf \
     ${sbindir}/remotectl \
-    ${libdir}/security/pam_ssh_add.so \
-    ${libdir}/security/pam_cockpit_cert.so \
+    ${base_libdir}/security/pam_ssh_add.so \
+    ${base_libdir}/security/pam_cockpit_cert.so \
     ${libexecdir}/cockpit-ws \
     ${libexecdir}/cockpit-wsinstance-factory \
     ${libexecdir}/cockpit-tls \
@@ -178,7 +167,8 @@ FILES:${PN} += " \
     ${datadir}/cockpit/ssh \
     ${libexecdir}/cockpit-ssh \
     ${datadir}/cockpit \
-    ${datadir}/metainfo/cockpit.appdata.xml \
+    ${datadir}/icons/hicolor/128x128/apps/cockpit.png \
+    ${datadir}/metainfo/org.cockpit_project.cockpit.appdata.xml \
     ${datadir}/pixmaps/cockpit.png \
     ${nonarch_libdir}/tmpfiles.d \
     ${nonarch_libdir}/firewalld \
@@ -196,7 +186,12 @@ do_install:append() {
     install -p -m 0644 ${UNPACKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit
 
     # provided by firewalld
-    rm -rf ${D}${libdir}/firewalld
+    rm -rf ${D}${libdir}/firewalld \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/*/*/*/*/__pycache__ \
+    ${D}${PYTHON_SITEPACKAGES_DIR}/${BP}.dist-info/direct_url.json
 
     if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then
         for filename in ${FILES:${PN}-storaged}
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
new file mode 100644
index 0000000000..36cb6c09c7
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch
@@ -0,0 +1,34 @@
+From fb3b427bcbc17257ac8c38438a82435b2bd36e38 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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 <build>/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 <raj.khem@gmail.com>
+---
+ 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