diff options
author | Petr Gotthard <petr.gotthard@advantech.cz> | 2023-04-13 20:01:34 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-04-14 08:44:20 -0700 |
commit | e64fda2f961fee477350fcc3c90d374ca1545831 (patch) | |
tree | ab5de0fbd3111a7a69f28f6445694bcdeae76eea /meta-webserver | |
parent | 18ef546186b58412aa74cb8c12f1d1747f91c392 (diff) | |
download | meta-openembedded-e64fda2f961fee477350fcc3c90d374ca1545831.tar.gz |
cockpit: upgrade 276 -> 289
Changes are described for each release in the blog:
https://cockpit-project.org/blog/cockpit-277.html
https://cockpit-project.org/blog/cockpit-278.html
https://cockpit-project.org/blog/cockpit-279.html
https://cockpit-project.org/blog/cockpit-280.html
https://cockpit-project.org/blog/cockpit-281.html
https://cockpit-project.org/blog/cockpit-282.html
https://cockpit-project.org/blog/cockpit-283.html
https://cockpit-project.org/blog/cockpit-284.html
https://cockpit-project.org/blog/cockpit-285.html
https://cockpit-project.org/blog/cockpit-286.html
https://cockpit-project.org/blog/cockpit-287.html
https://cockpit-project.org/blog/cockpit-288.html
https://cockpit-project.org/blog/cockpit-289.html
Signed-off-by: Petr Gotthard <petr.gotthard@advantech.cz>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r-- | meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb (renamed from meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb) | 11 | ||||
-rw-r--r-- | meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch | 12 | ||||
-rw-r--r-- | meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch | 60 | ||||
-rw-r--r-- | meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch | 47 |
4 files changed, 12 insertions, 118 deletions
diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb index 93198e3569..2f920b417f 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_289.bb @@ -6,12 +6,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-remove-tests-dep-on-gobject-intro.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 \ " -SRC_URI[sha256sum] = "dde91a157ee8514112334653fa2775a99d71bd1b604067a48eaf7411114d19de" +SRC_URI[sha256sum] = "3f8e369b21dbe9f5e05ac6ffd8c7a58ad5759065bea29b3b14c937a17f030eb5" inherit gettext pkgconfig autotools systemd features_check @@ -92,7 +90,10 @@ FILES:${PN}-storaged = " \ ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ " -FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" +FILES:${PN}-networkmanager = " \ + ${datadir}/cockpit/networkmanager \ + ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \ +" RDEPENDS:${PN}-networkmanager = "networkmanager" FILES:${PN}-machines = " \ @@ -130,6 +131,8 @@ FILES:${PN}-ws = " \ ${systemd_system_unitdir}/cockpit.service \ ${systemd_system_unitdir}/cockpit-motd.service \ ${systemd_system_unitdir}/cockpit.socket \ + ${systemd_system_unitdir}/cockpit-session.socket \ + ${systemd_system_unitdir}/cockpit-session@.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ 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 b3b0988b12..db583cfd29 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 @@ -1,27 +1,25 @@ -From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001 +From 7c1f95995ce9180221bac03b7b1e1696b8a79de7 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 +index 6896c19..2a1fb52 100644 --- a/configure.ac +++ b/configure.ac -@@ -177,7 +177,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) +@@ -182,7 +182,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]) + AC_PATH_PROG([XGETTEXT], [xgettext], [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 - diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch deleted file mode 100644 index b633cb0cf3..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer <adrian.freihofer@siemens.com> -Date: Wed, 4 Dec 2019 17:23:46 +0100 -Subject: [PATCH] remove tests dep on gobject-intro - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ws/Makefile-ws.am | 54 --------------------------------------------------- - 1 file changed, 54 deletions(-) - ---- a/src/ws/Makefile-ws.am -+++ b/src/ws/Makefile-ws.am -@@ -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 -- --check_PROGRAMS += test-server -- --test_server_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS) $(TEST_CPP) --test_server_LDADD = $(libcockpit_ws_a_LIBS) $(TEST_LIBS) -- --test_server_SOURCES = \ -- src/ws/mock-service.c \ -- src/ws/mock-service.h \ -- src/ws/test-server.c \ -- $(NULL) -- --test_server_CPPFLAGS += -I$(top_builddir)/src/ws --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) -- --EXTRA_DIST += $(GDBUS_CODEGEN_XML) --GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml -- --GDBUS_CODEGEN_INVOCATION = \ -- $(AM_V_GEN) gdbus-codegen \ -- --interface-prefix com.redhat.Cockpit.DBusTests \ -- --c-namespace Test \ -- --c-generate-object-manager \ -- $(NULL) -- --src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $< -- --src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) -- $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $< -- --# ----------------------------------------------------------------------------- - # Unit tests - - check_SCRIPTS += src/ws/mock-cat-with-init diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch deleted file mode 100644 index 1e5cf09d16..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1edf0756bf4fd002f5b60cf2b86d4b97a00aff20 Mon Sep 17 00:00:00 2001 -From: Michael Haener <michael.haener@siemens.com> -Date: Wed, 25 Mar 2020 08:32:07 +0100 -Subject: [PATCH] fix(makefile): use copy rule for unmodified files - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - pkg/Makefile.am | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - ---- a/pkg/Makefile.am -+++ b/pkg/Makefile.am -@@ -7,6 +7,33 @@ TESTS += $(pkg_TESTS) - %.metainfo.xml: %.metainfo.xml.in - $(AM_V_GEN) mkdir -p $(dir $@) && msgfmt --xml -d $(top_srcdir)/po --template $< --output $@ - -+dist/playground/hammer.gif: pkg/playground/hammer.gif -+ $(COPY_RULE) -+ -+dist/sosreport/sosreport.png: pkg/sosreport/sosreport.png -+ $(COPY_RULE) -+ -+dist/apps/default.png: pkg/apps/default.png -+ $(COPY_RULE) -+ -+dist/storaged/images/storage-array.png: pkg/storaged/images/storage-array.png -+ $(COPY_RULE) -+ -+dist/storaged/images/storage-disk.png: pkg/storaged/images/storage-disk.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-error.png: pkg/shell/images/server-error.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-large.png: pkg/shell/images/server-large.png -+ $(COPY_RULE) -+ -+dist/shell/images/server-small.png: pkg/shell/images/server-small.png -+ $(COPY_RULE) -+ -+dist/shell/index.html: pkg/shell/index.html -+ $(COPY_RULE) -+ - metainfodir = ${datarootdir}/metainfo - nodist_metainfo_DATA = \ - pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ |