meta-openembedded: subtree update:7c02c7d411..713e70bd25
Adam Miartus (1):
toybox: bump version to 0.8.3
Adrian Bunk (7):
libhandy: Remove, moved to OE-core
unicode-ucd: Stop broken license downloading
python3-docutils: Remove, moved to OE-core
python3-dbusmock: Remove, moved to OE-core
python3-cython: Remove, moved to OE-core
python3-pyparsing: Remove, moved to OE-core
postfix: Upgrade 3.4.10 -> 3.4.12
Alistair Francis (1):
openocd: Update libjaylink
Andreas Müller (4):
libusb-compat: upgrade 0.1.5 -> 0.1.7
hidapi: upgrade 0.7.99+ -> 0.9.0
gexiv2: upgrade 0.12.0 -> 0.12.1
thunar: upgrade 1.8.14 -> 1.8.15
Andrew Geissler (1):
nlohmann-json: backport gcc10 fix
Armin Kuster (1):
tremor: update SRC_URI as project moved to gitlab
Beniamin Sandu (1):
rasdaemon: create recipe for version 0.6.5
Changqing Li (1):
apache2: fix service start fail
Christoph Steiger (1):
python-periphery: Add python-mmap to RDEPENDS
Denys Dmytriyenko (2):
python3-pycryptodome(x): moved to OE-Core, remove from meta-python
python3-pyelftools: moved to OE-Core, remove from meta-python
Domarys Correa (18):
python3-argh: Add recipe version 0.26.2
python3-graphviz: Add recipe version 0.14
python3-aiohttp-jinja2: Add recipe version 1.2.0
python3-py-ubjson: Add recipe version 0.16.1
python3-trafaret: Add recipe version 2.0.2
python3-trafaret-config: Add recipe version 2.0.2
python3-txaio: Add recipe version 20.4.1
python3-u-msgpack-python: Add recipe version 2.6.0
python3-xmodem: Add recipe version 0.4.6
python3-multidict: Update 4.7.4 -> 4.7.5
python3-lz4: Add recipe version 3.0.2
python3-autobahn: Add recipe version 20.4.3
python3-snappy: Add recipe version 0.5.4
python3-cbor2: Add recipe version 5.1.0
python3-pathtools3: Add recipe version 0.2.1
python3-watchdog: Add recipe version 0.10.2
python3-jinja2: Update 2.11.1 -> 2.11.2
python3-ansicolors: Add recipe version 1.1.8
Emmanuel Roullit (1):
appstream-glib: update 0.7.16 -> 0.7.17
Honggyu Kim (1):
uftrace: add PV to update the package version
Kai Kang (4):
garcon: 0.6.4 -> 0.7.0
xfconf: 4.14.2 -> 4.14.3
thunar: 1.8.12 -> 1.8.14
catfish: 1.4.11 -> 1.4.13
Khem Raj (5):
gtkwave: Disable mime update during install
netplan: Depend on systemd if it is in distro
postfix: Upgrade to 3.4.10 and compile with -fcommon
uim: Add patch to fix -fno-common link error
safec: Update to latest on 3.5.1 release tags
Leon Anavi (17):
transmission: Add version 2.94
pamela: Upgrade 0.3.0 -> 1.0.0
python3-absl: Upgrade to 0.9.0
python3-gmqtt: Upgrade to 0.6.5
python3-appdirs: Upgrade to 1.4.4
python3-aiofiles: Upgrade to 0.5.0
python3-markdown: Upgrade to 3.2.2
python3-luma-core: Upgrade to 1.14.0
python3-pandas: Upgrade 1.0.1 -> 1.0.3
python3-parallax: Upgrade 1.0.5 -> 1.0.6
python3-openpyxl: Upgrade 2.6.3 -> 3.0.3
python3-setuptools-scm: Upgrade 3.3.3 -> 3.5.0
python3-toml: Extend with native build variants
python3-zipp: Upgrade 0.6.0 -> 3.1.0
python3-ujson: Upgrade 1.35 -> 2.0.3
python3-webcolors: Upgrade 1.8.1 -> 1.11.1
python3-pid: Upgrade 2.2.5 -> 3.0.3
Michael Haener (2):
cockpit: upgrade 218 -> 219
cockpit: rt-deps for storaged
Paul Barker (1):
mplayer-common: Drop obsolete recipe
Pierre-Jean Texier (4):
iwd: upgrade 1.6 -> 1.7
librsync: upgrade 2.3.0 -> 2.3.1
ser2net: fix upstream check URL
ser2net: upgrade 4.1.5 -> 4.1.8
Robert P. J. Day (1):
meta-python: delete superfluous python-mako.inc
Sean Nyekjaer (2):
gpsd: fix build on aarch64
gpsd: mark CLEANBROKEN
Trevor Gamblin (2):
meta-python: add self as maintainer
python3-iso8601: add python3-numbers to RDEPENDS
Wang Mingyu (6):
modemmanager: upgrade 1.12.8 -> 1.12.10
python3-pyroute2: upgrade 0.5.11 -> 0.5.12
jansson: upgrade 2.12 -> 2.13.1
openldap: upgrade 2.4.49 -> 2.4.50
python3-pycparser: upgrade 2.19 -> 2.20
cryptsetup: upgrade 2.3.1 -> 2.3.2
William A. Kennington III (1):
cli11: upgrade 1.8.0 -> 1.9.0
Yanfei Xu (1):
turbostat: fix the build failure for new v5.7-rc6 kernel
Yi Zhao (3):
libldb: upgrade 1.5.6 -> 1.5.7
samba: upgrade 4.10.13 -> 4.10.15
apache2: create log/run directory via pkg_postinst
Zang Ruochen (2):
dnsmasq: upgrade 2.80 -> 2.81
fetchmail: upgrade 6.4.3 -> 6.4.4
Zheng Ruoqin (3):
dstat: Fix runtime error that depend python.
kea: upgrade 1.7.6 -> 1.7.7
libqmi: upgrade 1.24.8 -> 1.24.12
Change-Id: Ib7baf9b4dadc540df133bcd2d18d5b446b3e2e89
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb
similarity index 93%
rename from meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_218.bb
rename to meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_219.bb
index 0de787f..62b7a18 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 @@
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 @@
PACKAGECONFIG[pcp] = "--enable-pcp,--disable-pcp,pcp"
PACKAGECONFIG[dashboard] = "--enable-ssh,--disable-ssh,libssh"
+PACKAGECONFIG[storaged] = ",,,udisks2"
PACKAGES =+ " \
${PN}-pcp \
@@ -85,7 +85,6 @@
${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 @@
# 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 b967b1c..0000000
--- 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
-