xfsprogs: bump version to 4.3.0

PATCH New Vicente Olivert Riera 2 participants 2 messages Nov 25, 2015

Share & tools

Vicente Olivert Riera

author

2015-11-25 11:19 UTC #0 lore raw

PATCH 1/1 xfsprogs: bump version to 4.3.0

- Bump version to 4.3.0
- Update hash value
- Add new mandatory blkid dependency
- Remove upstreamed patch:
0001-xfsprogs-replaces-static-with-static-libtool-libs.patch
- Add new patch which has been sent upstream:
0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 ...o-not-do-dynamic-linking-of-libtool-libra.patch |  40 +++++++
 ...-replaces-static-with-static-libtool-libs.patch | 129 ---------------------
 package/xfsprogs/Config.in                         |   1 +
 package/xfsprogs/xfsprogs.hash                     |   4 +-
 package/xfsprogs/xfsprogs.mk                       |   2 +-
 5 files changed, 44 insertions(+), 132 deletions(-)
 create mode 100644 package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
 delete mode 100644 package/xfsprogs/0001-xfsprogs-replaces-static-with-static-libtool-libs.patch

package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch new file +40 -0

new file mode 100644
index 0000000..3f79dbb
@@ -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 <[email protected]>
+
+From a406326f724006d62085a0aeae1072b4145caa9d Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <[email protected]>
+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 <[email protected]>
+---
+ 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
+

package/xfsprogs/0001-xfsprogs-replaces-static-with-static-libtool-libs.patch deleted +0 ~~-129~~

129 lines not on this page · raw message

package/xfsprogs/Config.in +1 -0

index 0998637..2c24cbb 100644
@@ -12,6 +12,7 @@ config BR2_PACKAGE_XFSPROGS
 	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

package/xfsprogs/xfsprogs.hash +2 -2

index 3fb02df..d0ff1f3 100644
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature:
-#   ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-3.1.11.tar.gz.sig
-sha256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be xfsprogs-3.1.11.tar.gz
+#   ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-4.3.0.tar.gz.sig
+sha256 3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c  xfsprogs-4.3.0.tar.gz

package/xfsprogs/xfsprogs.mk +1 -1

index 209a49b..30c4777 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XFSPROGS_VERSION = 3.1.11
+XFSPROGS_VERSION = 4.3.0
 XFSPROGS_SITE = ftp://oss.sgi.com/projects/xfs/cmd_tars
 
 XFSPROGS_DEPENDENCIES = util-linux

Signature · 1 line

2.4.10

Thomas Petazzoni

Applied

2015-11-25 14:31 UTC #1 lore raw

PATCH 1/1 xfsprogs: bump version to 4.3.0

Dear Vicente Olivert Riera,

Quoted 9 lines · Vicente Olivert Riera

- Bump version to 4.3.0
- Update hash value
- Add new mandatory blkid dependency
- Remove upstreamed patch:
0001-xfsprogs-replaces-static-with-static-libtool-libs.patch
- Add new patch which has been sent upstream:
0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
Signed-off-by Vicente Olivert Riera <[email protected]>

Quoted 9 lines

---
 ...o-not-do-dynamic-linking-of-libtool-libra.patch |  40 +++++++
 ...-replaces-static-with-static-libtool-libs.patch | 129 ---------------------
 package/xfsprogs/Config.in                         |   1 +
 package/xfsprogs/xfsprogs.hash                     |   4 +-
 package/xfsprogs/xfsprogs.mk                       |   2 +-
 5 files changed, 44 insertions(+), 132 deletions(-)
 create mode 100644 package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
 delete mode 100644 package/xfsprogs/0001-xfsprogs-replaces-static-with-static-libtool-libs.patch

Applied to next, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com