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 93198e356..2f920b417 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" | |||
6 | 6 | ||
7 | SRC_URI += " \ | 7 | SRC_URI += " \ |
8 | https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ | 8 | https://github.com/cockpit-project/cockpit/releases/download/${PV}/cockpit-${PV}.tar.xz \ |
9 | file://0001-remove-tests-dep-on-gobject-intro.patch \ | ||
10 | file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ | ||
11 | file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ | 9 | file://0001-Warn-not-error-if-xsltproc-is-not-found.patch \ |
12 | file://cockpit.pam \ | 10 | file://cockpit.pam \ |
13 | " | 11 | " |
14 | SRC_URI[sha256sum] = "dde91a157ee8514112334653fa2775a99d71bd1b604067a48eaf7411114d19de" | 12 | SRC_URI[sha256sum] = "3f8e369b21dbe9f5e05ac6ffd8c7a58ad5759065bea29b3b14c937a17f030eb5" |
15 | 13 | ||
16 | inherit gettext pkgconfig autotools systemd features_check | 14 | inherit gettext pkgconfig autotools systemd features_check |
17 | 15 | ||
@@ -92,7 +90,10 @@ FILES:${PN}-storaged = " \ | |||
92 | ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ | 90 | ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ |
93 | " | 91 | " |
94 | 92 | ||
95 | FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" | 93 | FILES:${PN}-networkmanager = " \ |
94 | ${datadir}/cockpit/networkmanager \ | ||
95 | ${datadir}/metainfo/org.cockpit-project.cockpit-networkmanager.metainfo.xml \ | ||
96 | " | ||
96 | RDEPENDS:${PN}-networkmanager = "networkmanager" | 97 | RDEPENDS:${PN}-networkmanager = "networkmanager" |
97 | 98 | ||
98 | FILES:${PN}-machines = " \ | 99 | FILES:${PN}-machines = " \ |
@@ -130,6 +131,8 @@ FILES:${PN}-ws = " \ | |||
130 | ${systemd_system_unitdir}/cockpit.service \ | 131 | ${systemd_system_unitdir}/cockpit.service \ |
131 | ${systemd_system_unitdir}/cockpit-motd.service \ | 132 | ${systemd_system_unitdir}/cockpit-motd.service \ |
132 | ${systemd_system_unitdir}/cockpit.socket \ | 133 | ${systemd_system_unitdir}/cockpit.socket \ |
134 | ${systemd_system_unitdir}/cockpit-session.socket \ | ||
135 | ${systemd_system_unitdir}/cockpit-session@.service \ | ||
133 | ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ | 136 | ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ |
134 | ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ | 137 | ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ |
135 | ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ | 138 | ${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 b3b0988b1..db583cfd2 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 @@ | |||
1 | From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001 | 1 | From 7c1f95995ce9180221bac03b7b1e1696b8a79de7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 7 Sep 2022 11:12:28 -0700 | 3 | Date: Wed, 7 Sep 2022 11:12:28 -0700 |
4 | Subject: [PATCH] Warn not error if xsltproc is not found | 4 | Subject: [PATCH] Warn not error if xsltproc is not found |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | configure.ac | 2 +- | 10 | configure.ac | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 12 | ||
12 | diff --git a/configure.ac b/configure.ac | 13 | diff --git a/configure.ac b/configure.ac |
13 | index 7659f41..537203e 100644 | 14 | index 6896c19..2a1fb52 100644 |
14 | --- a/configure.ac | 15 | --- a/configure.ac |
15 | +++ b/configure.ac | 16 | +++ b/configure.ac |
16 | @@ -177,7 +177,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) | 17 | @@ -182,7 +182,7 @@ AC_SUBST([systemdunitdir], [$systemdunitdir]) |
17 | # package as xgettext, and we find them by PATH, so just check for the one. | 18 | # package as xgettext, and we find them by PATH, so just check for the one. |
18 | AC_PATH_PROG([XGETTEXT], [xsltproc], [no]) | 19 | AC_PATH_PROG([XGETTEXT], [xgettext], [no]) |
19 | if test "$XGETTEXT" = "no"; then | 20 | if test "$XGETTEXT" = "no"; then |
20 | - AC_MSG_ERROR([Please install gettext tools]) | 21 | - AC_MSG_ERROR([Please install gettext tools]) |
21 | + AC_MSG_WARN([Please install gettext tools]) | 22 | + AC_MSG_WARN([Please install gettext tools]) |
22 | fi | 23 | fi |
23 | 24 | ||
24 | # ssh-add | 25 | # ssh-add |
25 | -- | ||
26 | 2.37.3 | ||
27 | |||
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 b633cb0cf..000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 788aace494f79e8201b18ebcdf1592b5030c5295 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Freihofer <adrian.freihofer@siemens.com> | ||
3 | Date: Wed, 4 Dec 2019 17:23:46 +0100 | ||
4 | Subject: [PATCH] remove tests dep on gobject-intro | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | src/ws/Makefile-ws.am | 54 --------------------------------------------------- | ||
10 | 1 file changed, 54 deletions(-) | ||
11 | |||
12 | --- a/src/ws/Makefile-ws.am | ||
13 | +++ b/src/ws/Makefile-ws.am | ||
14 | @@ -58,46 +58,6 @@ pam_cockpit_cert_so_LDFLAGS = -shared | ||
15 | pam_cockpit_cert_so_SOURCES = src/ws/pam_cockpit_cert.c | ||
16 | |||
17 | # ----------------------------------------------------------------------------- | ||
18 | -# test-server: server for running the html/browser unit tests against | ||
19 | - | ||
20 | -check_PROGRAMS += test-server | ||
21 | - | ||
22 | -test_server_CPPFLAGS = $(libcockpit_ws_a_CPPFLAGS) $(TEST_CPP) | ||
23 | -test_server_LDADD = $(libcockpit_ws_a_LIBS) $(TEST_LIBS) | ||
24 | - | ||
25 | -test_server_SOURCES = \ | ||
26 | - src/ws/mock-service.c \ | ||
27 | - src/ws/mock-service.h \ | ||
28 | - src/ws/test-server.c \ | ||
29 | - $(NULL) | ||
30 | - | ||
31 | -test_server_CPPFLAGS += -I$(top_builddir)/src/ws | ||
32 | -nodist_test_server_SOURCES = $(GDBUS_CODEGEN_GENERATED) | ||
33 | - | ||
34 | -BUILT_SOURCES += $(GDBUS_CODEGEN_GENERATED) | ||
35 | -CLEANFILES += $(GDBUS_CODEGEN_GENERATED) | ||
36 | -GDBUS_CODEGEN_GENERATED = \ | ||
37 | - src/ws/mock-dbus-tests.h \ | ||
38 | - src/ws/mock-dbus-tests.c \ | ||
39 | - $(NULL) | ||
40 | - | ||
41 | -EXTRA_DIST += $(GDBUS_CODEGEN_XML) | ||
42 | -GDBUS_CODEGEN_XML = $(srcdir)/src/ws/com.redhat.Cockpit.DBusTests.xml | ||
43 | - | ||
44 | -GDBUS_CODEGEN_INVOCATION = \ | ||
45 | - $(AM_V_GEN) gdbus-codegen \ | ||
46 | - --interface-prefix com.redhat.Cockpit.DBusTests \ | ||
47 | - --c-namespace Test \ | ||
48 | - --c-generate-object-manager \ | ||
49 | - $(NULL) | ||
50 | - | ||
51 | -src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) | ||
52 | - $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $< | ||
53 | - | ||
54 | -src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) | ||
55 | - $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $< | ||
56 | - | ||
57 | -# ----------------------------------------------------------------------------- | ||
58 | # Unit tests | ||
59 | |||
60 | 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 1e5cf09d1..000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 1edf0756bf4fd002f5b60cf2b86d4b97a00aff20 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Haener <michael.haener@siemens.com> | ||
3 | Date: Wed, 25 Mar 2020 08:32:07 +0100 | ||
4 | Subject: [PATCH] fix(makefile): use copy rule for unmodified files | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | pkg/Makefile.am | 27 +++++++++++++++++++++++++++ | ||
10 | 1 file changed, 27 insertions(+) | ||
11 | |||
12 | --- a/pkg/Makefile.am | ||
13 | +++ b/pkg/Makefile.am | ||
14 | @@ -7,6 +7,33 @@ TESTS += $(pkg_TESTS) | ||
15 | %.metainfo.xml: %.metainfo.xml.in | ||
16 | $(AM_V_GEN) mkdir -p $(dir $@) && msgfmt --xml -d $(top_srcdir)/po --template $< --output $@ | ||
17 | |||
18 | +dist/playground/hammer.gif: pkg/playground/hammer.gif | ||
19 | + $(COPY_RULE) | ||
20 | + | ||
21 | +dist/sosreport/sosreport.png: pkg/sosreport/sosreport.png | ||
22 | + $(COPY_RULE) | ||
23 | + | ||
24 | +dist/apps/default.png: pkg/apps/default.png | ||
25 | + $(COPY_RULE) | ||
26 | + | ||
27 | +dist/storaged/images/storage-array.png: pkg/storaged/images/storage-array.png | ||
28 | + $(COPY_RULE) | ||
29 | + | ||
30 | +dist/storaged/images/storage-disk.png: pkg/storaged/images/storage-disk.png | ||
31 | + $(COPY_RULE) | ||
32 | + | ||
33 | +dist/shell/images/server-error.png: pkg/shell/images/server-error.png | ||
34 | + $(COPY_RULE) | ||
35 | + | ||
36 | +dist/shell/images/server-large.png: pkg/shell/images/server-large.png | ||
37 | + $(COPY_RULE) | ||
38 | + | ||
39 | +dist/shell/images/server-small.png: pkg/shell/images/server-small.png | ||
40 | + $(COPY_RULE) | ||
41 | + | ||
42 | +dist/shell/index.html: pkg/shell/index.html | ||
43 | + $(COPY_RULE) | ||
44 | + | ||
45 | metainfodir = ${datarootdir}/metainfo | ||
46 | nodist_metainfo_DATA = \ | ||
47 | pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ | ||