mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 16:27:27 +00:00
Code Issues Projects Releases Wiki Activity

cockpit: Update to 276

Browse Source 
Specify --with-admin-group and no error on xsltproc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2022-09-07 08:55:40 -07:00
parent 1274e2772e
commit 7be1573217
4 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb → meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb
+5 -2
View File
@@ -8,10 +8,10 @@ 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-remove-tests-dep-on-gobject-intro.patch \ file://0001-remove-tests-dep-on-gobject-intro.patch \
file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \
file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \
file://cockpit.pam \ file://cockpit.pam \
" "
SRC_URI[md5sum] = "beb88d8e70ee1da6ebd917c956217803" SRC_URI[sha256sum] = "dde91a157ee8514112334653fa2775a99d71bd1b604067a48eaf7411114d19de"
SRC_URI[sha256sum] = "afc82acc8ef9d51e0f34265a07a2f059f5b71a1df721b299e657a40a098cbb7f"
inherit gettext pkgconfig autotools systemd features_check inherit gettext pkgconfig autotools systemd features_check
@@ -30,6 +30,7 @@ EXTRA_AUTORECONF = "-I tools"
EXTRA_OECONF = " \ EXTRA_OECONF = " \
--with-cockpit-user=${COCKPIT_USER_GROUP} \ --with-cockpit-user=${COCKPIT_USER_GROUP} \
--with-cockpit-group=${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-user=${COCKPIT_WS_USER_GROUP} \
--with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \ --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \
--disable-doc \ --disable-doc \
@@ -170,6 +171,8 @@ FILES:${PN} += " \
${nonarch_libdir}/firewalld \ ${nonarch_libdir}/firewalld \
" "
RDEPENDS:${PN} += "${PN}-bridge" RDEPENDS:${PN} += "${PN}-bridge"
# Needs bash for /usr/libexec/cockpit-certificate-helper
RDEPENDS:${PN} += "bash"
do_install:append() { do_install:append() {
pkgdatadir=${datadir}/cockpit pkgdatadir=${datadir}/cockpit
meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch
+27
View File
@@ -0,0 +1,27 @@
From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 7 Sep 2022 11:12:28 -0700
Subject: [PATCH] Warn not error if xsltproc is not found
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7659f41..537203e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir])
# package as xgettext, and we find them by PATH, so just check for the one.
AC_PATH_PROG([XGETTEXT], [xsltproc], [no])
if test "$XGETTEXT" = "no"; then
- AC_MSG_ERROR([Please install gettext tools])
+ AC_MSG_WARN([Please install gettext tools])
fi
# ssh-add
--
2.37.3
meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch
+32 -51
View File
@@ -7,43 +7,18 @@ Subject: [PATCH] remove tests dep on gobject-intro
src/ws/Makefile-ws.am | 54 --------------------------------------------------- src/ws/Makefile-ws.am | 54 ---------------------------------------------------
1 file changed, 54 deletions(-) 1 file changed, 54 deletions(-)
diff --git a/src/ws/Makefile-ws.am b/src/ws/Makefile-ws.am
index 009130941..34e13d7fe 100644
--- a/src/ws/Makefile-ws.am --- a/src/ws/Makefile-ws.am
+++ b/src/ws/Makefile-ws.am +++ b/src/ws/Makefile-ws.am
@@ -246,60 +246,6 @@ EXTRA_DIST += \ @@ -58,46 +58,6 @@ pam_cockpit_cert_so_LDFLAGS = -shared
pam_cockpit_cert_so_SOURCES = src/ws/pam_cockpit_cert.c
# ---------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------
-# test-server: server for running the html/browser unit tests against
-noinst_PROGRAMS += test-server -
-check_PROGRAMS += test-server -check_PROGRAMS += test-server
- -
-GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml -test_server_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS) $(TEST_CPP)
- -test_server_LDADD = $(libcockpit_ws_a_LIBS) $(TEST_LIBS)
-GDBUS_CODEGEN_GENERATED = \
- src/ws/mock-dbus-tests.h \
- src/ws/mock-dbus-tests.c \
- $(NULL)
-
-# FIXME: --header/--body and --output are only available from GLib 2.56.
-# just use --generate-c-code and a bit of dependency ugliness for now
-GDBUS_CODEGEN_INVOCATION = \
- $(AM_V_GEN) gdbus-codegen \
- --interface-prefix com.redhat.Cockpit.DBusTests \
- --c-namespace Test \
- --c-generate-object-manager \
- --generate-c-code src/ws/mock-dbus-tests \
- $(GDBUS_CODEGEN_XML)
-
-BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED)
-CLEANFILES += $(GDBUS_CODEGEN_GENERATED)
-EXTRA_DIST += $(GDBUS_CODEGEN_XML)
-
-src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML)
- $(GDBUS_CODEGEN_INVOCATION)
-
-src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) src/ws/mock-dbus-tests.h
- $(GDBUS_CODEGEN_INVOCATION)
- -
-test_server_SOURCES = \ -test_server_SOURCES = \
- src/ws/mock-service.c \ - src/ws/mock-service.c \
@@ -51,27 +26,33 @@ index 009130941..34e13d7fe 100644
- src/ws/test-server.c \ - src/ws/test-server.c \
- $(NULL) - $(NULL)
- -
-nodist_test_server_SOURCES = \ -test_server_CPPFLAGS += -I$(top_builddir)/src/ws
- $(GDBUS_CODEGEN_GENERATED) \ -nodist_test_server_SOURCES = $(GDBUS_CODEGEN_GENERATED)
-
-BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED)
-CLEANFILES += $(GDBUS_CODEGEN_GENERATED)
-GDBUS_CODEGEN_GENERATED = \
- src/ws/mock-dbus-tests.h \
- src/ws/mock-dbus-tests.c \
- $(NULL) - $(NULL)
- -
-test_server_CFLAGS = \ -EXTRA_DIST += $(GDBUS_CODEGEN_XML)
- -I$(builddir)/src/ws \ -GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml
- -I$(top_srcdir)/src/ws \ -
- -DG_LOG_DOMAIN=\"test-server\" \ -GDBUS_CODEGEN_INVOCATION = \
- $(GIO_CFLAGS) \ - $(AM_V_GEN) gdbus-codegen \
- $(COCKPIT_WS_CFLAGS) \ - --interface-prefix com.redhat.Cockpit.DBusTests \
- --c-namespace Test \
- --c-generate-object-manager \
- $(NULL) - $(NULL)
- -
-test_server_LDADD = \ -src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML)
- $(libcockpit_ws_LIBS) \ - $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $<
- $(GIO_LIBS) \
- -lpam \
- $(NULL)
- -
WS_CHECKS = \ -src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML)
test-base64 \ - $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $<
test-creds \ -
-- -# -----------------------------------------------------------------------------
2.11.0 # Unit tests
check_SCRIPTS += src/ws/mock-cat-with-init
meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch
+5 -7
View File
@@ -7,13 +7,11 @@ Subject: [PATCH] fix(makefile): use copy rule for unmodified files
pkg/Makefile.am | 27 +++++++++++++++++++++++++++ pkg/Makefile.am | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+) 1 file changed, 27 insertions(+)
diff --git a/pkg/Makefile.am b/pkg/Makefile.am
index 192b785..03b9787 100644
--- a/pkg/Makefile.am --- a/pkg/Makefile.am
+++ b/pkg/Makefile.am +++ b/pkg/Makefile.am
@@ -13,6 +13,33 @@ playground_DATA = \ @@ -7,6 +7,33 @@ TESTS += $(pkg_TESTS)
dist/playground/extra.de.po: pkg/playground/extra.de.po %.metainfo.xml: %.metainfo.xml.in
$(COPY_RULE) $(AM_V_GEN) mkdir -p $(dir $@) && msgfmt --xml -d $(top_srcdir)/po --template $< --output $@
+dist/playground/hammer.gif: pkg/playground/hammer.gif +dist/playground/hammer.gif: pkg/playground/hammer.gif
+ $(COPY_RULE) + $(COPY_RULE)
@@ -43,5 +41,5 @@ index 192b785..03b9787 100644
+ $(COPY_RULE) + $(COPY_RULE)
+ +
metainfodir = ${datarootdir}/metainfo metainfodir = ${datarootdir}/metainfo
metainfo_DATA = pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ nodist_metainfo_DATA = \
pkg/kdump/org.cockpit-project.cockpit-kdump.metainfo.xml \ pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \