diff options
Diffstat (limited to 'meta-openembedded/meta-webserver')
| -rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb | 10 | ||||
| -rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb (renamed from meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb) | 14 | ||||
| -rw-r--r-- | meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch | 30 |
3 files changed, 20 insertions, 34 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb index 5200111520..a7083d80e9 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb @@ -214,3 +214,13 @@ RDEPENDS_${PN}-scripts += "perl ${PN}" RDEPENDS_${PN}-dev = "perl" BBCLASSEXTEND = "native" + +pkg_postinst_${PN}() { + if [ -z "$D" ]; then + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb index 0de787fd91..62b7a188b9 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb @@ -8,11 +8,10 @@ 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" +SRC_URI[md5sum] = "285383b8744dab93ac8814e5a23e2c3e" +SRC_URI[sha256sum] = "111d477e54737f15467c365fa670f9ac1919be30ad0c93661692467ecd7f12fb" inherit gettext pkgconfig autotools systemd features_check @@ -39,6 +38,7 @@ EXTRA_OECONF = " \ PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp" PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh" +PACKAGECONFIG[storaged] = ",,,udisks2" PACKAGES =+ " \ ${PN}-pcp \ @@ -85,7 +85,6 @@ 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" @@ -175,4 +174,11 @@ do_install_append() { # 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-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch deleted file mode 100644 index b967b1c0ad..0000000000 --- a/meta-openembedded/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 <emmanuel.roullit@gmail.com> -Date: Sat, 2 May 2020 14:05:35 +0200 -Subject: [PATCH] install: fix metainfo.xml ownership on install - -Signed-off-by: Emmanuel Roullit <emmanuel.roullit@gmail.com> ---- - 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 - |