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

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bsp/buildroot/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch → bsp/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
View File

@@ -1,28 +1,30 @@
From 2c2c2d992c3b298793983317588f73cf41675652 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 27 Jul 2016 22:49:58 +0200
Subject: [PATCH] Makefile.in: install static library and headers in
From ff93866eb119cedb791894814780c0e44db35715 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Fri, 10 Mar 2017 14:56:17 +0000
Subject: [PATCH] Makefile: install static library and headers in
install-static
Currently, the install-static target only installs the statically
compiled tools. However, some programs outside of btrfs-progs (for
example docker) link with the btrfs libraries. If such programs want
to link statically against the btrfs-progs library, then this library
example docker) link with the btrfs libraries. If such programs want to
link statically against the btrfs-progs library, then this library
should be installed by "install-static". Indeed, "make install" cannot
be used if the support for shared library is not enabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Gustavo: Rebase for btrfs-progs 4.7.2]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Vincent: Rebase for btrfs-progs 4.10]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Makefile.in | 6 +++++-
Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 19697ff..5870a58 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -219,7 +219,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz
diff --git a/Makefile b/Makefile
index 67fbc48..d9e34be 100644
--- a/Makefile
+++ b/Makefile
@@ -308,7 +308,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz test-cli
# NOTE: For static compiles, you need to have all the required libs
# static equivalent available
#
@@ -31,8 +33,8 @@ index 19697ff..5870a58 100644
version.h: version.sh version.h.in configure.ac
@echo " [SH] $@"
@@ -384,6 +384,10 @@ install-static: $(progs_static) $(INSTALLDIRS)
done
@@ -537,6 +537,10 @@ install-static: $(progs_static) $(INSTALLDIRS)
$(INSTALL) $(progs_static) $(DESTDIR)$(bindir)
# btrfsck is a link to btrfs in the src tree, make it so for installed file as well
$(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
+ $(INSTALL) -m755 -d $(DESTDIR)$(libdir)
@@ -43,5 +45,5 @@ index 19697ff..5870a58 100644
$(INSTALLDIRS):
@echo "Making install in $(patsubst install-%,%,$@)"
--
2.7.3
2.10.2

39
bsp/buildroot/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch Normal file
View File

@@ -0,0 +1,39 @@
From dda485a3d788c47bb6849218f695db7b51822872 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 31 Oct 2017 14:51:51 +0200
Subject: [PATCH] btrfs-progs: convert: add missing types header
Build with musl libc needs the sys/types.h header for the dev_t type,
since this header is not included indirectly. This fixes the following
build failure:
In file included from convert/source-fs.c:23:0:
./convert/source-fs.h:112:1: error: unknown type name ‘dev_t’
dev_t decode_dev(u32 dev);
^~~~~
convert/source-fs.c:31:1: error: unknown type name ‘dev_t’
dev_t decode_dev(u32 dev)
^~~~~
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: https://marc.info/?l=linux-btrfs&m=150945479718731&w=2
convert/source-fs.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/convert/source-fs.h b/convert/source-fs.h
index 23f33567b42d..4e5babefe6a2 100644
--- a/convert/source-fs.h
+++ b/convert/source-fs.h
@@ -19,6 +19,7 @@
#include "kerncompat.h"
#include <linux/kdev_t.h>
+#include <sys/types.h>
#include <pthread.h>
#define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
--
2.14.2

4
bsp/buildroot/package/btrfs-progs/btrfs-progs.hash
View File

@@ -1,2 +1,4 @@
# From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
sha256 464a9bfd2b5eda76b0246ee0a4043f4de8d17c10312bc8b84abc5fbf9317fede btrfs-progs-v4.9.1.tar.xz
sha256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 btrfs-progs-v4.13.3.tar.xz
# Locally computed
sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING

4
bsp/buildroot/package/btrfs-progs/btrfs-progs.mk
View File

@@ -4,12 +4,12 @@
#
################################################################################
BTRFS_PROGS_VERSION = 4.9.1
BTRFS_PROGS_VERSION = 4.13.3
BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs
BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz
BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib
BTRFS_PROGS_CONF_OPTS = --disable-backtrace
BTRFS_PROGS_LICENSE = GPLv2
BTRFS_PROGS_LICENSE = GPL-2.0
BTRFS_PROGS_LICENSE_FILES = COPYING
BTRFS_PROGS_INSTALL_STAGING = YES