update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
From 3bcb00e27ab09c433fdfecace0d48a6a7ed55ea8 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Fri, 22 Apr 2016 23:14:32 +0200
|
||||
Subject: [PATCH] Remove incorrect dependency from install-data-hook
|
||||
|
||||
Having install-binPROGRAMS as a dependency of install-data-hook is not
|
||||
correct, as it causes the installation of programs to be executed
|
||||
twice, and those two installations are racing with each other, causing
|
||||
random installation failures.
|
||||
|
||||
In addition, this dependency is not needed: the install-data-hook
|
||||
calls the update-mime-database program in one of two ways:
|
||||
|
||||
- When cross-compiling, using the program pointed by
|
||||
UPDATE_MIME_DATABASE, which is already built, and is not installed
|
||||
by install-binPROGRAMS.
|
||||
|
||||
- When compiling natively, suing the update-mime-database from the
|
||||
build directory, so there is no need to depend on
|
||||
install-binPROGRAMS.
|
||||
|
||||
This patch is similar to the patch used by the Yocto Project at
|
||||
http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 6fc4f73..c318dc3 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -52,7 +52,7 @@ else
|
||||
update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)"
|
||||
endif
|
||||
|
||||
-install-data-hook: install-binPROGRAMS
|
||||
+install-data-hook:
|
||||
if ENABLE_UPDATE_MIMEDB
|
||||
$(update_mime_database) -V "$(DESTDIR)$(datadir)/mime"
|
||||
endif
|
||||
--
|
||||
2.6.4
|
||||
|
||||
17
bsp/buildroot-2017.02.11/package/shared-mime-info/Config.in
Normal file
17
bsp/buildroot-2017.02.11/package/shared-mime-info/Config.in
Normal file
@@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_SHARED_MIME_INFO
|
||||
bool "shared-mime-info"
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
||||
depends on BR2_USE_MMU # glib2
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
The shared-mime-info package contains the core
|
||||
database of common types and the update-mime-database
|
||||
command used to extend it.
|
||||
|
||||
https://freedesktop.org/wiki/Software/shared-mime-info/
|
||||
|
||||
comment "shared-mime-info needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9 shared-mime-info-1.8.tar.xz
|
||||
@@ -0,0 +1,34 @@
|
||||
################################################################################
|
||||
#
|
||||
# shared-mime-info
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SHARED_MIME_INFO_VERSION = 1.8
|
||||
SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.xz
|
||||
SHARED_MIME_INFO_SITE = https://people.freedesktop.org/~hadess
|
||||
SHARED_MIME_INFO_INSTALL_STAGING = YES
|
||||
SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
|
||||
SHARED_MIME_INFO_DEPENDENCIES = host-shared-mime-info libxml2 libglib2
|
||||
SHARED_MIME_INFO_CONF_OPTS = \
|
||||
--disable-update-mimedb \
|
||||
--disable-default-make-check
|
||||
HOST_SHARED_MIME_INFO_CONF_OPTS = \
|
||||
--disable-update-mimedb \
|
||||
--disable-default-make-check
|
||||
SHARED_MIME_INFO_LICENSE = GPLv2
|
||||
SHARED_MIME_INFO_LICENSE_FILES = COPYING
|
||||
|
||||
HOST_SHARED_MIME_INFO_DEPENDENCIES = \
|
||||
host-pkgconf host-intltool host-libxml2 host-libglib2
|
||||
|
||||
define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
|
||||
$(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime
|
||||
$(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
# shared-mime-info for the host
|
||||
SHARED_MIME_INFO_HOST_BINARY = $(HOST_DIR)/usr/bin/update-mime-database
|
||||
Reference in New Issue
Block a user