summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorMichael Haener <michael.haener@siemens.com>2020-05-14 20:57:32 +0200
committerKhem Raj <raj.khem@gmail.com>2020-05-14 12:51:26 -0700
commitba6fbd90c746c6c0f8d3e6c6b6d14b5ab90f9c29 (patch)
treefc3138a0cd5e20758143d0eb4c7086ead6af2b3b /meta-webserver
parent03fd716100d872c155cb3294da21424054b0d991 (diff)
downloadmeta-openembedded-ba6fbd90c746c6c0f8d3e6c6b6d14b5ab90f9c29.tar.gz
cockpit: upgrade 218 -> 219
Signed-off-by: Michael Haener <michael.haener@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb (renamed from meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb)5
-rw-r--r--meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch30
2 files changed, 2 insertions, 33 deletions
diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb
index 0de787fd9..e23b63ea2 100644
--- a/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb
+++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb
@@ -8,11 +8,10 @@ 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 \ 9 file://0001-remove-tests-dep-on-gobject-intro.patch \
10 file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \ 10 file://0002-fix-makefile-use-copy-rule-for-unmodified-files.patch \
11 file://0003-install-fix-metainfo.xml-ownership-on-install.patch \
12 file://cockpit.pam \ 11 file://cockpit.pam \
13 " 12 "
14SRC_URI[md5sum] = "e69b0b8a75a5d55ddfd9817d857c71af" 13SRC_URI[md5sum] = "285383b8744dab93ac8814e5a23e2c3e"
15SRC_URI[sha256sum] = "5f242cefccd7f1120c9e0310581aa51dbe941d9c4a6d8375c45057dcbb6f2fbb" 14SRC_URI[sha256sum] = "111d477e54737f15467c365fa670f9ac1919be30ad0c93661692467ecd7f12fb"
16 15
17inherit gettext pkgconfig autotools systemd features_check 16inherit gettext pkgconfig autotools systemd features_check
18 17
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 b967b1c0a..000000000
--- a/meta-webserver/recipes-webadmin/cockpit/files/0003-install-fix-metainfo.xml-ownership-on-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From e56f2b294ca8c805bfd3d715d523bef188c54cb1 Mon Sep 17 00:00:00 2001
2From: Emmanuel Roullit <emmanuel.roullit@gmail.com>
3Date: Sat, 2 May 2020 14:05:35 +0200
4Subject: [PATCH] install: fix metainfo.xml ownership on install
5
6Signed-off-by: Emmanuel Roullit <emmanuel.roullit@gmail.com>
7---
8 Makefile.am | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/Makefile.am b/Makefile.am
12index d9f918e99..9a23e0a7b 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -226,10 +226,10 @@ maintainer-clean-local::
16
17 install-data-local:: $(WEBPACK_INSTALL)
18 $(MKDIR_P) $(DESTDIR)$(pkgdatadir)
19- tar -cf - $^ | tar -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf -
20+ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(pkgdatadir) --strip-components=1 -xvf -
21 install-data-local:: $(WEBPACK_DEBUG)
22 $(MKDIR_P) $(DESTDIR)$(debugdir)$(pkgdatadir)
23- tar -cf - $^ | tar -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf -
24+ tar -cf - $^ | tar --no-same-owner -C $(DESTDIR)$(debugdir)$(pkgdatadir) --strip-components=1 -xvf -
25 uninstall-local::
26 find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type f -exec rm -f {} \;
27 find $(DESTDIR)$(pkgdatadir) -ignore_readdir_race -type d -empty -delete
28--
292.17.1
30