From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../shared-mime-info/shared-mime-info.inc | 37 ------------------- .../shared-mime-info/install-data-hook.patch | 25 ------------- .../shared-mime-info/parallelmake.patch | 33 ----------------- .../shared-mime-info/shared-mime-info_1.10.bb | 7 ---- .../shared-mime-info/shared-mime-info_git.bb | 43 ++++++++++++++++++++++ 5 files changed, 43 insertions(+), 102 deletions(-) delete mode 100644 poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc delete mode 100644 poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch delete mode 100644 poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch delete mode 100644 poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb create mode 100644 poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb (limited to 'poky/meta/recipes-support/shared-mime-info') diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc deleted file mode 100644 index 3fe1a445b0..0000000000 --- a/poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Shared MIME type database and specification" -HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info" -SECTION = "base" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" - -SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz" - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--disable-update-mimedb" - -FILES_${PN} += "${datadir}/mime" -FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" - -# freedesktop.org.xml is only required when updating the mime database, -# package it separately -PACKAGES =+ "shared-mime-info-data" -FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" -RDEPENDS_shared-mime-info-data = "shared-mime-info" - -do_install () { - autotools_do_install - - update-mime-database ${D}${datadir}/mime -} - -do_install_class-native () { - autotools_do_install - - ${B}/update-mime-database ${D}${datadir}/mime -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch deleted file mode 100644 index 262ff7562c..0000000000 --- a/poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch +++ /dev/null @@ -1,25 +0,0 @@ -fix shared-mime-info build race condition - -The definition of install-data-hook in Makefile.am leads -to multiple, overlapping, executions of install-binPROGRAMS -target. We modify the definition to avoid that. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater - -Index: shared-mime-info-1.9/Makefile.am -=================================================================== ---- shared-mime-info-1.9.orig/Makefile.am -+++ shared-mime-info-1.9/Makefile.am -@@ -50,7 +50,9 @@ else - update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" - endif - --install-data-hook: install-binPROGRAMS -+# do NOT make this dependent on anything! -+# -+install-data-hook: - if ENABLE_UPDATE_MIMEDB - $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" - endif diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch deleted file mode 100644 index fea34a55a2..0000000000 --- a/poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch +++ /dev/null @@ -1,33 +0,0 @@ -The Makefile used by shared-mime-info is one big race with the SUBDIRS -option and the dependency specifically calling make all combining to -create multiple make instances all of which may try and build targets -like update-mime-database. - -This patch removes those options meaning make can correctly identify -dependencies and stop itself racing itself. - -RP 10/10/2011 - -Upstream-Status: Pending -Signed-off-by: Constantin Musca - -Index: shared-mime-info-1.9/Makefile.am -=================================================================== ---- shared-mime-info-1.9.orig/Makefile.am -+++ shared-mime-info-1.9/Makefile.am -@@ -1,5 +1,3 @@ --SUBDIRS=. po -- - AM_CPPFLAGS = $(ALL_CFLAGS) - - packagesdir = $(datadir)/mime/packages -@@ -81,8 +79,7 @@ endif - - all: $(defaultmakedeps) - --create-pot: -- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot -+create-pot: po - - local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) - if CROSS_COMPILING diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb deleted file mode 100644 index 9fc210b718..0000000000 --- a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb +++ /dev/null @@ -1,7 +0,0 @@ -require shared-mime-info.inc - -SRC_URI += "file://parallelmake.patch \ - file://install-data-hook.patch" - -SRC_URI[md5sum] = "418c2ced9dc4dd5ca8b06a755e6d64e9" -SRC_URI[sha256sum] = "c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf" diff --git a/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb new file mode 100644 index 0000000000..7a060b09ad --- /dev/null +++ b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb @@ -0,0 +1,43 @@ +SUMMARY = "Shared MIME type database and specification" +HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info" +SECTION = "base" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libxml2 itstool-native glib-2.0 shared-mime-info-native" + +SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https" +SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a" +PV = "1.15" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "Release-(?P(\d+(\-\d+)+))" +UPSTREAM_VERSION_UNKNOWN = "1" + +inherit autotools pkgconfig gettext python3native mime + +EXTRA_OECONF = "--disable-update-mimedb" + +FILES_${PN} += "${datadir}/mime" +FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" + +# freedesktop.org.xml is only required when updating the mime database, +# package it separately +PACKAGES =+ "shared-mime-info-data" +FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" +RDEPENDS_shared-mime-info-data = "shared-mime-info" + +do_install () { + autotools_do_install + + update-mime-database ${D}${datadir}/mime +} + +do_install_class-native () { + autotools_do_install + + ${B}/update-mime-database ${D}${datadir}/mime +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3