Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
jbnadal
@@ -0,0 +1,35 @@
|
||||
From b5baf15b36107925186d89af9097b4b8e2d7cad6 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Wed, 21 Sep 2016 08:38:21 +0200
|
||||
Subject: [PATCH] MCONFIG.in: handle CLOCK_GETTIME_LIB
|
||||
|
||||
Commit 62bc243f1bfe623312a350e4cd0d2e17a69aac45 ("fuse2fs: might need
|
||||
librt") added a check for the clock_gettime() to verify whether linking
|
||||
with the librt library is needed or not to use this function.
|
||||
|
||||
However, this commit forgot the change in MCONFIG.in that allows to
|
||||
define the make variable CLOCK_GETTIME_LIB from the CLOCK_GETTIME_LIB
|
||||
variable substituted by the configure script. Due to this, from a make
|
||||
perspective $(CLOCK_GETTIME_LIB) is always empty, and we get link
|
||||
failure on platforms where clock_gettime() is available in librt.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
MCONFIG.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/MCONFIG.in b/MCONFIG.in
|
||||
index e82963d..9ba9ce2 100644
|
||||
--- a/MCONFIG.in
|
||||
+++ b/MCONFIG.in
|
||||
@@ -125,6 +125,7 @@ LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@
|
||||
LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
|
||||
LIBINTL = @LIBINTL@
|
||||
SYSLIBS = @LIBS@
|
||||
+CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@
|
||||
DEPLIBSS = $(LIB)/libss@LIB_EXT@
|
||||
DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
|
||||
DEPLIBUUID = @DEPLIBUUID@
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
From 14d9e94315cd8144ac72d368c45e70869a66799c Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Thu, 9 Jun 2016 07:47:03 -0300
|
||||
Subject: [PATCH] fuse2fs: might need librt
|
||||
|
||||
It uses clock_gettime() which in older glibc versions is in librt.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
[yann.morin.1998@free.fr: properly expand it in the Makefile]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
Patch status: sent to linux-ext4 ML
|
||||
|
||||
configure.ac | 5 +++++
|
||||
misc/Makefile.in | 3 ++-
|
||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 67d7231..a387dfd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1162,6 +1162,11 @@ if test "$ac_cv_func_dlopen" = yes ; then
|
||||
fi
|
||||
AC_SUBST(MAGIC_LIB)
|
||||
dnl
|
||||
+dnl Check to see if librt is required for clock_gettime() (glibc < 2.17)
|
||||
+dnl
|
||||
+AC_CHECK_LIB(rt, clock_gettime, [CLOCK_GETTIME_LIB=-lrt])
|
||||
+AC_SUBST(CLOCK_GETTIME_LIB)
|
||||
+dnl
|
||||
dnl Check to see if the FUSE library is -lfuse or -losxfuse
|
||||
dnl
|
||||
FUSE_CMT=
|
||||
diff --git a/misc/Makefile.in b/misc/Makefile.in
|
||||
index 43e3c7e..070a6e3 100644
|
||||
--- a/misc/Makefile.in
|
||||
+++ b/misc/Makefile.in
|
||||
@@ -387,7 +387,8 @@ fuse2fs: $(FUSE2FS_OBJS) $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) \
|
||||
$(LIBEXT2FS)
|
||||
$(E) " LD $@"
|
||||
$(Q) $(CC) $(ALL_LDFLAGS) -o fuse2fs $(FUSE2FS_OBJS) $(LIBS) \
|
||||
- $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
|
||||
+ $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL) \
|
||||
+ $(CLOCK_GETTIME_LIB)
|
||||
|
||||
journal.o: $(srcdir)/../debugfs/journal.c
|
||||
$(E) " CC $@"
|
||||
diff --git a/misc/Makefile.in b/misc/Makefile.in
|
||||
index 43e3c7e..070a6e3 100644
|
||||
--- a/misc/Makefile.in
|
||||
+++ b/misc/Makefile.in
|
||||
@@ -32,6 +32,8 @@
|
||||
|
||||
@FUSE_CMT@FUSE_PROG= fuse2fs
|
||||
|
||||
+CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@
|
||||
+
|
||||
SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
|
||||
$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
|
||||
USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From ff6147dd7197519e561e796d56545c4e11eb43fa Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Wed, 22 Jun 2016 20:55:35 -0300
|
||||
Subject: [PATCH e2fsprogs] fuse2fs: needs SYSLIBS
|
||||
|
||||
It otherwise leads to build failure when using an unbundled libintl.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Status: sent to ML http://marc.info/?l=linux-ext4&m=146664003825136&w=2
|
||||
|
||||
misc/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/misc/Makefile.in b/misc/Makefile.in
|
||||
index f67c9c7..e487692 100644
|
||||
--- a/misc/Makefile.in
|
||||
+++ b/misc/Makefile.in
|
||||
@@ -389,7 +389,7 @@ fuse2fs: $(FUSE2FS_OBJS) $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) \
|
||||
$(E) " LD $@"
|
||||
$(Q) $(CC) $(ALL_LDFLAGS) -o fuse2fs $(FUSE2FS_OBJS) $(LIBS) \
|
||||
$(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL) \
|
||||
- $(CLOCK_GETTIME_LIB)
|
||||
+ $(CLOCK_GETTIME_LIB) $(SYSLIBS)
|
||||
|
||||
journal.o: $(srcdir)/../debugfs/journal.c
|
||||
$(E) " CC $@"
|
||||
--
|
||||
2.7.3
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
config BR2_PACKAGE_E2FSPROGS
|
||||
bool "e2fsprogs"
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
depends on BR2_USE_MMU # util-linux/libblkid
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
|
||||
@@ -100,7 +99,3 @@ config BR2_PACKAGE_E2FSPROGS_UUIDGEN
|
||||
default y
|
||||
|
||||
endif
|
||||
|
||||
comment "e2fsprogs needs a toolchain w/ wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.1/sha256sums.asc
|
||||
sha256 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d e2fsprogs-1.43.1.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.3/sha256sums.asc
|
||||
sha256 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37 e2fsprogs-1.43.3.tar.xz
|
||||
|
||||
@@ -4,23 +4,16 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
E2FSPROGS_VERSION = 1.43.1
|
||||
E2FSPROGS_VERSION = 1.43.3
|
||||
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
|
||||
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
|
||||
E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
|
||||
E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet)
|
||||
E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
|
||||
E2FSPROGS_INSTALL_STAGING = YES
|
||||
E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
|
||||
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
|
||||
# we don't have a host-util-linux
|
||||
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
|
||||
|
||||
# For 0002-fuse2fs-might-need-librt.patch
|
||||
# host-gettext for the gettext macro file needed at autoreconf time
|
||||
E2FSPROGS_AUTORECONF = YES
|
||||
E2FSPROGS_DEPENDENCIES += host-gettext
|
||||
HOST_E2FSPROGS_DEPENDENCIES += host-gettext
|
||||
|
||||
# e4defrag doesn't build on older systems like RHEL5.x, and we don't
|
||||
# need it on the host anyway.
|
||||
# Disable fuse2fs as well to avoid carrying over deps, and it's unused
|
||||
@@ -57,14 +50,27 @@ endif
|
||||
# for util/subst.c to build properly.
|
||||
E2FSPROGS_CONF_ENV += BUILD_CFLAGS="-DHAVE_SYS_STAT_H"
|
||||
|
||||
# Disable use of the host magic.h, as on older hosts (e.g. RHEL 5)
|
||||
# it doesn't provide definitions expected by e2fsprogs support lib.
|
||||
HOST_E2FSPROGS_CONF_ENV += \
|
||||
ac_cv_header_magic_h=no \
|
||||
ac_cv_lib_magic_magic_file=no
|
||||
|
||||
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
|
||||
# util-linux libuuid pulls in libintl if needed, so ensure we also
|
||||
# link against it, otherwise static linking fails
|
||||
E2FSPROGS_CONF_ENV += LIBS=-lintl
|
||||
endif
|
||||
|
||||
E2FSPROGS_MAKE_OPTS = \
|
||||
LDCONFIG=true
|
||||
E2FSPROGS_MAKE_OPTS = LDCONFIG=true
|
||||
E2FSPROGS_INSTALL_STAGING_OPTS = \
|
||||
DESTDIR=$(STAGING_DIR) \
|
||||
LDCONFIG=true \
|
||||
install-libs
|
||||
E2FSPROGS_INSTALL_TARGET_OPTS = \
|
||||
DESTDIR=$(TARGET_DIR) \
|
||||
LDCONFIG=true \
|
||||
install
|
||||
|
||||
define HOST_E2FSPROGS_INSTALL_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
|
||||
|
||||
Reference in New Issue
Block a user