From 7be157321702a2b10604e31bf31620cd8eaeac72 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Sep 2022 08:55:40 -0700 Subject: cockpit: Update to 276 Specify --with-admin-group and no error on xsltproc Signed-off-by: Khem Raj --- .../recipes-webadmin/cockpit/cockpit_220.bb | 191 -------------------- .../recipes-webadmin/cockpit/cockpit_276.bb | 194 +++++++++++++++++++++ ...1-Warn-not-error-if-xsltproc-is-not-found.patch | 27 +++ .../0001-remove-tests-dep-on-gobject-intro.patch | 77 +++----- ...kefile-use-copy-rule-for-unmodified-files.patch | 12 +- 5 files changed, 255 insertions(+), 246 deletions(-) delete mode 100644 meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb create mode 100644 meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb create mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb deleted file mode 100644 index c08de89316..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb +++ /dev/null @@ -1,191 +0,0 @@ -SUMMARY = "Admin interface for Linux machines" -DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser" - -LICENSE = "LGPL-2.1-only" -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://cockpit.pam \ - " -SRC_URI[md5sum] = "beb88d8e70ee1da6ebd917c956217803" -SRC_URI[sha256sum] = "afc82acc8ef9d51e0f34265a07a2f059f5b71a1df721b299e657a40a098cbb7f" - -inherit gettext pkgconfig autotools systemd features_check - -DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" - -COMPATIBLE_HOST:libc-musl = "null" - -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-cockpit-ws-instance-user=${COCKPIT_WS_USER_GROUP} \ - --with-cockpit-ws-instance-group=${COCKPIT_WS_USER_GROUP} \ - --disable-doc \ - --with-systemdunitdir=${systemd_system_unitdir} \ -" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ -" - -PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" -PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" -PACKAGECONFIG[storaged] = ",,,udisks2" -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" - -PACKAGES =+ " \ - ${PN}-pcp \ - ${PN}-realmd \ - ${PN}-tuned \ - ${PN}-shell \ - ${PN}-systemd \ - ${PN}-users \ - ${PN}-kdump \ - ${PN}-sosreport \ - ${PN}-storaged \ - ${PN}-networkmanager \ - ${PN}-machines \ - ${PN}-selinux \ - ${PN}-playground \ - ${PN}-docker \ - ${PN}-dashboard \ - ${PN}-bridge \ - ${PN}-ws \ - ${PN}-desktop \ -" -SYSTEMD_PACKAGES = "${PN}-ws" - -FILES:${PN}-pcp = " \ - ${libexecdir}/cockpit-pcp \ - ${datadir}/cockpit/pcp \ - ${localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit \ -" -FILES:${PN}-realmd = "${datadir}/cockpit/realmd" -FILES:${PN}-tuned = "${datadir}/cockpit/tuned" -FILES:${PN}-shell = "${datadir}/cockpit/shell" -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 \ -" -FILES:${PN}-sosreport = " \ - ${datadir}/cockpit/sosreport \ - ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \ - ${datadir}/pixmaps/cockpit-sosreport.png \ -" -FILES:${PN}-storaged = " \ - ${datadir}/cockpit/storaged \ - ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ -" - -FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" -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 \ -" -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" - -FILES:${PN}-bridge = " \ - ${bindir}/cockpit-bridge \ - ${libexec}/cockpit-askpass \ -" -RDEPENDS:${PN}-bridge = "" - -FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" -RDEPENDS:${PN}-desktop += "bash" - -FILES:${PN}-ws = " \ - ${sysconfdir}/cockpit/ws-certs.d \ - ${sysconfdir}/pam.d/cockpit \ - ${sysconfdir}/issue.d/cockpit.issue \ - ${sysconfdir}/motd.d/cockpit \ - ${datadir}/cockpit/motd/update-motd \ - ${datadir}/cockpit/motd/inactive.motd \ - ${systemd_system_unitdir}/cockpit.service \ - ${systemd_system_unitdir}/cockpit-motd.service \ - ${systemd_system_unitdir}/cockpit.socket \ - ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ - ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ - ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ - ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.service \ - ${systemd_system_unitdir}/cockpit-wsinstance-https-factory.socket \ - ${systemd_system_unitdir}/cockpit-wsinstance-https-factory@.service \ - ${systemd_system_unitdir}/cockpit-wsinstance-https@.socket \ - ${systemd_system_unitdir}/cockpit-wsinstance-https@.service \ - ${systemd_system_unitdir}/system-cockpithttps.slice \ - ${libdir}/tmpfiles.d/cockpit-tempfiles.conf \ - ${sbindir}/remotectl \ - ${libdir}/security/pam_ssh_add.so \ - ${libdir}/security/pam_cockpit_cert.so \ - ${libexecdir}/cockpit-ws \ - ${libexecdir}/cockpit-wsinstance-factory \ - ${libexecdir}/cockpit-tls \ - ${libexecdir}/cockpit-session \ - ${localstatedir}/lib/cockpit \ - ${datadir}/cockpit/static \ - ${datadir}/cockpit/branding \ -" -CONFFILES:${PN}-ws += " \ - ${sysconfdir}/issue.d/cockpit.issue \ - ${sysconfdir}/motd.d/cockpit \ -" -RDEPENDS:${PN}-ws += "openssl-bin" -SYSTEMD_SERVICE:${PN}-ws = "cockpit.socket" - -FILES:${PN} += " \ - ${datadir}/cockpit/base1 \ - ${sysconfdir}/cockpit/machines.d \ - ${datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ - ${datadir}/cockpit/ssh \ - ${libexecdir}/cockpit-ssh \ - ${datadir}/cockpit \ - ${datadir}/metainfo/cockpit.appdata.xml \ - ${datadir}/pixmaps/cockpit.png \ - ${nonarch_libdir}/tmpfiles.d \ - ${nonarch_libdir}/firewalld \ -" -RDEPENDS:${PN} += "${PN}-bridge" - -do_install:append() { - pkgdatadir=${datadir}/cockpit - - chmod 4750 ${D}${libexecdir}/cockpit-session - - install -d "${D}${sysconfdir}/pam.d" - install -p -m 0644 ${WORKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit - - # provided by firewalld - rm -rf ${D}${libdir}/firewalld - - if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then - for filename in ${FILES:${PN}-storaged} - do - rm -rf ${D}$filename - done - fi -} diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb new file mode 100644 index 0000000000..93198e3569 --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_276.bb @@ -0,0 +1,194 @@ +SUMMARY = "Admin interface for Linux machines" +DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser" + +LICENSE = "LGPL-2.1-only" +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" + +inherit gettext pkgconfig autotools systemd features_check + +DEPENDS += "glib-2.0-native intltool-native gnutls virtual/gettext json-glib krb5 libpam systemd" + +COMPATIBLE_HOST:libc-musl = "null" + +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} \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ +" + +PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" +PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" +PACKAGECONFIG[storaged] = ",,,udisks2" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" + +PACKAGES =+ " \ + ${PN}-pcp \ + ${PN}-realmd \ + ${PN}-tuned \ + ${PN}-shell \ + ${PN}-systemd \ + ${PN}-users \ + ${PN}-kdump \ + ${PN}-sosreport \ + ${PN}-storaged \ + ${PN}-networkmanager \ + ${PN}-machines \ + ${PN}-selinux \ + ${PN}-playground \ + ${PN}-docker \ + ${PN}-dashboard \ + ${PN}-bridge \ + ${PN}-ws \ + ${PN}-desktop \ +" +SYSTEMD_PACKAGES = "${PN}-ws" + +FILES:${PN}-pcp = " \ + ${libexecdir}/cockpit-pcp \ + ${datadir}/cockpit/pcp \ + ${localstatedir}/lib/pcp/config/pmlogconf/tools/cockpit \ +" +FILES:${PN}-realmd = "${datadir}/cockpit/realmd" +FILES:${PN}-tuned = "${datadir}/cockpit/tuned" +FILES:${PN}-shell = "${datadir}/cockpit/shell" +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 \ +" +FILES:${PN}-sosreport = " \ + ${datadir}/cockpit/sosreport \ + ${datadir}/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml \ + ${datadir}/pixmaps/cockpit-sosreport.png \ +" +FILES:${PN}-storaged = " \ + ${datadir}/cockpit/storaged \ + ${datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml \ +" + +FILES:${PN}-networkmanager = "${datadir}/cockpit/networkmanager" +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 \ +" +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" + +FILES:${PN}-bridge = " \ + ${bindir}/cockpit-bridge \ + ${libexec}/cockpit-askpass \ +" +RDEPENDS:${PN}-bridge = "" + +FILES:${PN}-desktop = "${libexecdir}/cockpit-desktop" +RDEPENDS:${PN}-desktop += "bash" + +FILES:${PN}-ws = " \ + ${sysconfdir}/cockpit/ws-certs.d \ + ${sysconfdir}/pam.d/cockpit \ + ${sysconfdir}/issue.d/cockpit.issue \ + ${sysconfdir}/motd.d/cockpit \ + ${datadir}/cockpit/motd/update-motd \ + ${datadir}/cockpit/motd/inactive.motd \ + ${systemd_system_unitdir}/cockpit.service \ + ${systemd_system_unitdir}/cockpit-motd.service \ + ${systemd_system_unitdir}/cockpit.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-http.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-http.service \ + ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-http-redirect.service \ + ${systemd_system_unitdir}/cockpit-wsinstance-https-factory.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-https-factory@.service \ + ${systemd_system_unitdir}/cockpit-wsinstance-https@.socket \ + ${systemd_system_unitdir}/cockpit-wsinstance-https@.service \ + ${systemd_system_unitdir}/system-cockpithttps.slice \ + ${libdir}/tmpfiles.d/cockpit-tempfiles.conf \ + ${sbindir}/remotectl \ + ${libdir}/security/pam_ssh_add.so \ + ${libdir}/security/pam_cockpit_cert.so \ + ${libexecdir}/cockpit-ws \ + ${libexecdir}/cockpit-wsinstance-factory \ + ${libexecdir}/cockpit-tls \ + ${libexecdir}/cockpit-session \ + ${localstatedir}/lib/cockpit \ + ${datadir}/cockpit/static \ + ${datadir}/cockpit/branding \ +" +CONFFILES:${PN}-ws += " \ + ${sysconfdir}/issue.d/cockpit.issue \ + ${sysconfdir}/motd.d/cockpit \ +" +RDEPENDS:${PN}-ws += "openssl-bin" +SYSTEMD_SERVICE:${PN}-ws = "cockpit.socket" + +FILES:${PN} += " \ + ${datadir}/cockpit/base1 \ + ${sysconfdir}/cockpit/machines.d \ + ${datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy \ + ${datadir}/cockpit/ssh \ + ${libexecdir}/cockpit-ssh \ + ${datadir}/cockpit \ + ${datadir}/metainfo/cockpit.appdata.xml \ + ${datadir}/pixmaps/cockpit.png \ + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/firewalld \ +" +RDEPENDS:${PN} += "${PN}-bridge" +# Needs bash for /usr/libexec/cockpit-certificate-helper +RDEPENDS:${PN} += "bash" + +do_install:append() { + pkgdatadir=${datadir}/cockpit + + chmod 4750 ${D}${libexecdir}/cockpit-session + + install -d "${D}${sysconfdir}/pam.d" + install -p -m 0644 ${WORKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit + + # provided by firewalld + rm -rf ${D}${libdir}/firewalld + + if ! ${@bb.utils.contains('PACKAGECONFIG', 'storaged', 'true', 'false', d)}; then + for filename in ${FILES:${PN}-storaged} + do + rm -rf ${D}$filename + done + fi +} 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 new file mode 100644 index 0000000000..b3b0988b12 --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-Warn-not-error-if-xsltproc-is-not-found.patch @@ -0,0 +1,27 @@ +From 588bb5cb248aaeaf0fea33084229c99ad1574291 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + 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 index 2242190a38..8f70fe9434 100644 --- 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 @@ -7,71 +7,52 @@ Subject: [PATCH] remove tests dep on gobject-intro src/ws/Makefile-ws.am | 54 --------------------------------------------------- 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 +++ 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 - # ---------------------------------------------------------------------------------------------------- - --noinst_PROGRAMS += test-server + # ----------------------------------------------------------------------------- +-# test-server: server for running the html/browser unit tests against +- -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) +- +-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) - --# 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 +-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 \ -- --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 = \ -- src/ws/mock-service.c \ -- src/ws/mock-service.h \ -- src/ws/test-server.c \ -- $(NULL) -- --nodist_test_server_SOURCES = \ -- $(GDBUS_CODEGEN_GENERATED) \ - $(NULL) - --test_server_CFLAGS = \ -- -I$(builddir)/src/ws \ -- -I$(top_srcdir)/src/ws \ -- -DG_LOG_DOMAIN=\"test-server\" \ -- $(GIO_CFLAGS) \ -- $(COCKPIT_WS_CFLAGS) \ -- $(NULL) +-src/ws/mock-dbus-tests.h: $(GDBUS_CODEGEN_XML) +- $(GDBUS_CODEGEN_INVOCATION) --header --output $@ $< - --test_server_LDADD = \ -- $(libcockpit_ws_LIBS) \ -- $(GIO_LIBS) \ -- -lpam \ -- $(NULL) +-src/ws/mock-dbus-tests.c: $(GDBUS_CODEGEN_XML) +- $(GDBUS_CODEGEN_INVOCATION) --body --output $@ $< - - WS_CHECKS = \ - test-base64 \ - test-creds \ --- -2.11.0 - +-# ----------------------------------------------------------------------------- + # 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 index a1ea9bcfdc..48702c3d1e 100644 --- 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 @@ -7,13 +7,11 @@ Subject: [PATCH] fix(makefile): use copy rule for unmodified files pkg/Makefile.am | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -diff --git a/pkg/Makefile.am b/pkg/Makefile.am -index 192b785..03b9787 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am -@@ -13,6 +13,33 @@ playground_DATA = \ - dist/playground/extra.de.po: pkg/playground/extra.de.po - $(COPY_RULE) +@@ -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) @@ -43,5 +41,5 @@ index 192b785..03b9787 100644 + $(COPY_RULE) + metainfodir = ${datarootdir}/metainfo - metainfo_DATA = pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ - pkg/kdump/org.cockpit-project.cockpit-kdump.metainfo.xml \ + nodist_metainfo_DATA = \ + pkg/sosreport/org.cockpit-project.cockpit-sosreport.metainfo.xml \ -- cgit v1.2.3-54-g00ecf