From ba6fbd90c746c6c0f8d3e6c6b6d14b5ab90f9c29 Mon Sep 17 00:00:00 2001 From: Michael Haener Date: Thu, 14 May 2020 20:57:32 +0200 Subject: cockpit: upgrade 218 -> 219 Signed-off-by: Michael Haener Signed-off-by: Khem Raj --- .../recipes-webadmin/cockpit/cockpit_218.bb | 178 --------------------- .../recipes-webadmin/cockpit/cockpit_219.bb | 177 ++++++++++++++++++++ ...all-fix-metainfo.xml-ownership-on-install.patch | 30 ---- 3 files changed, 177 insertions(+), 208 deletions(-) delete mode 100644 meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb create mode 100644 meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb delete mode 100644 meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb deleted file mode 100644 index 0de787fd91..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb +++ /dev/null @@ -1,178 +0,0 @@ -SUMMARY = "Admin interface for Linux machines" -DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser" - -LICENSE = "LGPLv2.1" -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://0003-install-fix-metainfo.xml-ownership-on-install.patch \ - file://cockpit.pam \ - " -SRC_URI[md5sum] = "e69b0b8a75a5d55ddfd9817d857c71af" -SRC_URI[sha256sum] = "5f242cefccd7f1120c9e0310581aa51dbe941d9c4a6d8375c45057dcbb6f2fbb" - -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[pcp] = "--enable-pcp,--disable-pcp,pcp" -PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" - -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 \ -" -RDEPENDS_${PN}-storaged = "udisks2" - -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 \ -" -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 -} diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb new file mode 100644 index 0000000000..e23b63ea21 --- /dev/null +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb @@ -0,0 +1,177 @@ +SUMMARY = "Admin interface for Linux machines" +DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser" + +LICENSE = "LGPLv2.1" +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] = "285383b8744dab93ac8814e5a23e2c3e" +SRC_URI[sha256sum] = "111d477e54737f15467c365fa670f9ac1919be30ad0c93661692467ecd7f12fb" + +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[pcp] = "--enable-pcp,--disable-pcp,pcp" +PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" + +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 \ +" +RDEPENDS_${PN}-storaged = "udisks2" + +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 \ +" +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 +} diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch b/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch deleted file mode 100644 index b967b1c0ad..0000000000 --- a/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e56f2b294ca8c805bfd3d715d523bef188c54cb1 Mon Sep 17 00:00:00 2001 -From: Emmanuel Roullit -Date: Sat, 2 May 2020 14:05:35 +0200 -Subject: [PATCH] install: fix metainfo.xml ownership on install - -Signed-off-by: Emmanuel Roullit ---- - Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index d9f918e99..9a23e0a7b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -226,10 +226,10 @@ maintainer-clean-local:: - - install-data-local:: $(WEBPACK_INSTALL) - $(MKDIR_P) $(DESTDIR)$(pkgdatadir) -- tar -cf - $^ | tar -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf - -+ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf - - install-data-local:: $(WEBPACK_DEBUG) - $(MKDIR_P) $(DESTDIR)$(debugdir)$(pkgdatadir) -- tar -cf - $^ | tar -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf - -+ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf - - uninstall-local:: - find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type f -exec rm -f {} \; - find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type d -empty -delete --- -2.17.1 - -- cgit 1.2.3-korg