Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
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: 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
|
||||
|
||||
As explained in commit ece49daeff1a3cad765e106d678c608925c9d768, use
|
||||
-static-libtool-libs instead of -static to allow fallback to the dynamic
|
||||
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>
|
||||
---
|
||||
mdrestore/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mdrestore/Makefile b/mdrestore/Makefile
|
||||
index 5171306..1b34a0e 100644
|
||||
--- a/mdrestore/Makefile
|
||||
+++ b/mdrestore/Makefile
|
||||
@@ -10,7 +10,7 @@ CFILES = xfs_mdrestore.c
|
||||
|
||||
LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
|
||||
LTDEPENDENCIES = $(LIBXFS)
|
||||
-LLDFLAGS = -static
|
||||
+LLDFLAGS = -static-libtool-libs
|
||||
|
||||
default: depend $(LTCOMMAND)
|
||||
|
||||
--
|
||||
2.4.10
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
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
|
||||
required headers, like uuid/uuid.h (e.g. in a minimal environment).
|
||||
|
||||
Moreover, running the crc32selftest natively is completely wrong,
|
||||
because it passing on the host does not mean it would still pass n the
|
||||
target (because endianness or bitness or alignment differences).
|
||||
|
||||
So, just disable running the crc32selftest altogether.
|
||||
|
||||
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>
|
||||
|
||||
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 @@
|
||||
# don't try linking xfs_repair with a debug libxfs.
|
||||
DEBUG = -DNDEBUG
|
||||
|
||||
-LDIRT = gen_crc32table crc32table.h crc32selftest
|
||||
+LDIRT = gen_crc32table crc32table.h
|
||||
|
||||
-default: crc32selftest ltdepend $(LTLIBRARY)
|
||||
+default: ltdepend $(LTLIBRARY)
|
||||
|
||||
crc32table.h: gen_crc32table.c
|
||||
@echo " [CC] gen_crc32table"
|
||||
@@ -0,0 +1,40 @@
|
||||
From 5b3dd8eb1f7720c68dab032c3d89d4e3102d6347 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
|
||||
|
||||
When cross-compiling CFLAGS might not be suitable for the host
|
||||
(BUILD_CC) compiler since it might contain arch-specific options.
|
||||
|
||||
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
|
||||
--- a/libxfs/Makefile
|
||||
+++ b/libxfs/Makefile
|
||||
@@ -111,7 +111,7 @@ default: crc32selftest ltdepend $(LTLIBRARY)
|
||||
|
||||
crc32table.h: gen_crc32table.c
|
||||
@echo " [CC] gen_crc32table"
|
||||
- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
|
||||
+ $(Q) $(BUILD_CC) -o gen_crc32table $<
|
||||
@echo " [GENERATE] $@"
|
||||
$(Q) ./gen_crc32table > crc32table.h
|
||||
|
||||
@@ -122,7 +122,7 @@ crc32table.h: gen_crc32table.c
|
||||
# disk.
|
||||
crc32selftest: gen_crc32table.c crc32table.h crc32.c
|
||||
@echo " [TEST] CRC32"
|
||||
- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
+ $(Q) $(BUILD_CC) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
$(Q) ./$@
|
||||
|
||||
# set up include/xfs header directory
|
||||
--
|
||||
2.4.10
|
||||
|
||||
19
deprecated/firmware/buildroot/package/xfsprogs/Config.in
Normal file
19
deprecated/firmware/buildroot/package/xfsprogs/Config.in
Normal file
@@ -0,0 +1,19 @@
|
||||
|
||||
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"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_XFSPROGS
|
||||
bool "xfsprogs"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
|
||||
help
|
||||
The XFS file system utilities and libraries
|
||||
|
||||
http://oss.sgi.com/projects/xfs/
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated after checking pgp signature:
|
||||
# ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.3.0.tar.gz.sig
|
||||
sha256 3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c xfsprogs-4.3.0.tar.gz
|
||||
22
deprecated/firmware/buildroot/package/xfsprogs/xfsprogs.mk
Normal file
22
deprecated/firmware/buildroot/package/xfsprogs/xfsprogs.mk
Normal file
@@ -0,0 +1,22 @@
|
||||
################################################################################
|
||||
#
|
||||
# xfsprogs
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XFSPROGS_VERSION = 4.3.0
|
||||
XFSPROGS_SITE = ftp://oss.sgi.com/projects/xfs/cmd_tars
|
||||
|
||||
XFSPROGS_DEPENDENCIES = util-linux
|
||||
|
||||
XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes
|
||||
XFSPROGS_CONF_OPTS = \
|
||||
--enable-lib64=no \
|
||||
--enable-gettext=no \
|
||||
INSTALL_USER=root \
|
||||
INSTALL_GROUP=root \
|
||||
--enable-static
|
||||
|
||||
XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user