MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-10-22 23:13:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cockpit: Upgrade to 349

Browse Source 
Remove the patch with the fix that is already present in the new
version.

Signed-off-by: Daniel Semkowicz <dse@thaumatec.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Daniel Semkowicz 2025-10-16 09:37:45 +02:00 committed by Khem Raj
parent d8d4b7ab88
commit 6a5ffc3466
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-webserver/recipes-webadmin/cockpit/cockpit_337.bb → meta-webserver/recipes-webadmin/cockpit/cockpit_349.bb
View File

@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI += " \ SRC_URI += " \
https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ 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-Warn-not-error-if-xsltproc-is-not-found.patch \
file://0001-Makefile-common.am-Create-src-common-directory-befor.patch \
file://cockpit.pam \ file://cockpit.pam \
" "
SRC_URI[sha256sum] = "df51ef5920fae69e1b435f657376aa93772c0c1720b954a3bac10ebba26bfedf" SRC_URI[sha256sum] = "2fa8eef40968135fb6df866a415eba8d4d5adbf4d44f293f28d4f3c841b301bb"
inherit gettext pkgconfig autotools systemd features_check python3targetconfig inherit gettext pkgconfig autotools systemd features_check python3targetconfig

34
meta-webserver/recipes-webadmin/cockpit/files/0001-Makefile-common.am-Create-src-common-directory-befor.patch
View File

@ -1,34 +0,0 @@
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