rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bsp/buildroot/package/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch Normal file
View File

@@ -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

2
bsp/buildroot/package/shared-mime-info/shared-mime-info.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180 shared-mime-info-1.5.tar.xz
sha256 b2f8f85b6467933824180d0252bbcaee523f550a8fbc95cc4391bd43c03bc34c shared-mime-info-1.6.tar.xz

13
bsp/buildroot/package/shared-mime-info/shared-mime-info.mk
View File

@@ -4,23 +4,24 @@
#
################################################################################
SHARED_MIME_INFO_VERSION = 1.5
SHARED_MIME_INFO_VERSION = 1.6
SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.xz
SHARED_MIME_INFO_SITE = http://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
SHARED_MIME_INFO_MAKE = $(MAKE1)
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
HOST_SHARED_MIME_INFO_CONF_OPTS = --disable-update-mimedb
HOST_SHARED_MIME_INFO_MAKE = $(MAKE1)
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