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

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bsp/buildroot/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
View File

@@ -1,12 +1,4 @@
mdrestore: do not do dynamic linking of libtool libraries
This patch has been sent upstream:
http://oss.sgi.com/pipermail/xfs/2015-November/045136.html
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
From a406326f724006d62085a0aeae1072b4145caa9d Mon Sep 17 00:00:00 2001
From 770902a0a29fb4ac62358f7eacb3a83d0d9af1c7 Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Wed, 25 Nov 2015 10:50:00 +0000
Subject: [PATCH] mdrestore: do not do dynamic linking of libtool libraries
@@ -18,6 +10,7 @@ linking for libuuid only. Otherwise the build will fail like this:
ld: attempted static link of dynamic object `/usr/lib/libuuid.so'
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
[Sent upstream: http://oss.sgi.com/pipermail/xfs/2015-November/045136.html]
---
mdrestore/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -36,5 +29,5 @@ index 5171306..1b34a0e 100644
default: depend $(LTCOMMAND)
--
2.4.10
2.7.4

20
bsp/buildroot/package/xfsprogs/0002-no-crc32-checks.patch → bsp/buildroot/package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch
View File

@@ -1,4 +1,7 @@
libxfs: do not try to run the crc32selftest
From 3a77dfc54271059dcac305384bf6ace34fe1f3d3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 18 Dec 2016 15:37:27 +0100
Subject: [PATCH] libxfs: do not try to run the crc32selftest
Even though the crc32selftest is natively compiled (because it is to be
executed), it fails in cross-compilation as the host may lack the
@@ -14,11 +17,15 @@ Note that there's a remaining bug-in-hiding, because the crc32 table
generator is natively built, but with the target CFLAGS.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
libxfs/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -durN xfsprogs-4.3.0.orig/libxfs/Makefile xfsprogs-4.3.0/libxfs/Makefile
--- xfsprogs-4.3.0.orig/libxfs/Makefile 2015-09-22 03:42:41.000000000 +0200
+++ xfsprogs-4.3.0/libxfs/Makefile 2015-12-07 18:45:27.190082913 +0100
@@ -105,9 +105,9 @@
diff --git a/libxfs/Makefile b/libxfs/Makefile
index 62608bd..e021625 100644
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -112,9 +112,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT)
# don't try linking xfs_repair with a debug libxfs.
DEBUG = -DNDEBUG
@@ -30,3 +37,6 @@ diff -durN xfsprogs-4.3.0.orig/libxfs/Makefile xfsprogs-4.3.0/libxfs/Makefile
crc32table.h: gen_crc32table.c
@echo " [CC] gen_crc32table"
--
2.7.4

12
bsp/buildroot/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch
View File

@@ -1,4 +1,4 @@
From 5b3dd8eb1f7720c68dab032c3d89d4e3102d6347 Mon Sep 17 00:00:00 2001
From b981adb6769f6b7d80f6c98627391398a007a25b Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 15 Dec 2015 20:51:35 -0300
Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC
@@ -8,16 +8,14 @@ When cross-compiling CFLAGS might not be suitable for the host
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Status: reported http://oss.sgi.com/bugzilla/show_bug.cgi?id=1132
libxfs/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libxfs/Makefile b/libxfs/Makefile
index ecf1921..3979077 100644
index e021625..ad76a04 100644
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY)
@@ -118,7 +118,7 @@ default: ltdepend $(LTLIBRARY)
crc32table.h: gen_crc32table.c
@echo " [CC] gen_crc32table"
@@ -26,7 +24,7 @@ index ecf1921..3979077 100644
@echo " [GENERATE] $@"
$(Q) ./gen_crc32table > crc32table.h
@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c
@@ -129,7 +129,7 @@ crc32table.h: gen_crc32table.c
# disk.
crc32selftest: gen_crc32table.c crc32table.h crc32.c
@echo " [TEST] CRC32"
@@ -36,5 +34,5 @@ index ecf1921..3979077 100644
# set up include/xfs header directory
--
2.4.10
2.7.4

53
bsp/buildroot/package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch Normal file
View File

@@ -0,0 +1,53 @@
From 1e9bb2fba94bc508659f1667bf95501324849bb9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Sun, 26 Feb 2017 12:04:54 +0100
Subject: [PATCH] build: add EXTRALIBS to link with
When doing a uClibc static build, the build fails to link:
http://autobuild.buildroot.org/results/503/50314716a9f72e8bb238e52e9dc342c68f7e0b8b/build-end.log
The cause is due to:
- xfsprogs links dome programs with util-linux' libblkid
- util-linux' libblkid is linked to util-linux' libuuid
- util-linux' libuuid uses i18n functions when locales are enabled
- uClibc does not provide i18n functions
- i18n functions are provided by libintl from libintl from gettext
util-linux installs pkg-config files for thos two libs. However,
xfsprogs does not use pkg-config to find libblkid or libuuid, thus it
misses the Libs.private field from libuid.
In this case, it is necessary to pass LIBS=-lintl at configure time, so
that configure correctly finds libblkid.
Still, this is not enough, because the build will not use LIBS during
the link phase.
We fix that last bit by adding EXTRALIBS to the libraries to link with,
so that it is possible to pass EXTRALIBS=-lintl at build time:
$ ./configure [...] LIBS=-lintl
$ make EXTRALIBS=-lintl
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Waldemar Brodkorb <wbx@openadk.org>
---
include/buildmacros | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/buildmacros b/include/buildmacros
index a7c5d8a..dd62d80 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -11,7 +11,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules
LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS)
LTLDFLAGS += $(LOADERFLAGS)
-LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
+LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) $(EXTRALIBS)
MAKEOPTS = --no-print-directory Q=$(Q)
SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
--
2.7.4

11
bsp/buildroot/package/xfsprogs/Config.in
View File

@@ -1,15 +1,12 @@
comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCLIBC_HAS_OBSOLETE_BSD_SIGNAL enabled"
depends on BR2_PACKAGE_XFSPROGS
comment "xfsprogs needs a toolchain w/ wchar"
comment "xfsprogs needs a glibc or uClibc toolchain w/ threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_XFSPROGS
bool "xfsprogs"
depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR # util-linux
depends on !BR2_TOOLCHAIN_USES_MUSL
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID

4
bsp/buildroot/package/xfsprogs/xfsprogs.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated after checking pgp signature:
# ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.7.0.tar.gz.sig
sha256 88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 xfsprogs-4.7.0.tar.gz
# https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.sign
sha256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 xfsprogs-4.8.0.tar.xz

22
bsp/buildroot/package/xfsprogs/xfsprogs.mk
View File

@@ -4,8 +4,9 @@
#
################################################################################
XFSPROGS_VERSION = 4.7.0
XFSPROGS_SITE = ftp://oss.sgi.com/projects/xfs/cmd_tars
XFSPROGS_VERSION = 4.8.0
XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
XFSPROGS_DEPENDENCIES = util-linux
@@ -17,6 +18,23 @@ XFSPROGS_CONF_OPTS = \
INSTALL_GROUP=root \
--enable-static
# xfsprogs links some of its programs to libs from util-linux, which use
# i18n functions. For shared-only builds, that's automatically pulled in.
# Static builds need some help, though...
#
# No need to depend on gettext in this case: xfsprogs does not use it for
# itself; util-linux does need it and has it in its own dependencies.
#
# xfsprogs' buildsystem uses hand-made Makefiles, not automake, and they
# do not use the LIBS variable set by configure. So we use EXTRALIBS that
# is added by our patch.
#
# It is not needed to propagate the EXTRALIBS to the install step.
ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS)$(BR2_NEEDS_GETTEXT_IF_LOCALE),yy)
XFSPROGS_CONF_OPTS += LIBS=-lintl
XFSPROGS_MAKE_OPTS = EXTRALIBS=-lintl
endif
XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
$(eval $(autotools-package))