Add a fix for the UUID linking
Verified the license remains the same after copyright year update
Signed-off-by: Derek Straka <de...@asterius.io>
---
.../xfsprogs/files/link_needed_libs.patch | 45 +++++++++++++++++-----
.../{xfsprogs_4.8.0.bb => xfsprogs_4.10.0.bb} | 9 ++---
2 files changed, 40 insertions(+), 14 deletions(-)
rename meta-filesystems/recipes-utils/xfsprogs/{xfsprogs_4.8.0.bb =>
xfsprogs_4.10.0.bb} (83%)
diff --git
a/meta-filesystems/recipes-utils/xfsprogs/files/link_needed_libs.patch
b/meta-filesystems/recipes-utils/xfsprogs/files/link_needed_libs.patch
index 18b95c1..1de634e 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/files/link_needed_libs.patch
+++ b/meta-filesystems/recipes-utils/xfsprogs/files/link_needed_libs.patch
@@ -1,7 +1,7 @@
-Index: xfsprogs-4.8.0/libxcmd/Makefile
+Index: xfsprogs-4.10.0/libxcmd/Makefile
===================================================================
---- xfsprogs-4.8.0.orig/libxcmd/Makefile
-+++ xfsprogs-4.8.0/libxcmd/Makefile
+--- xfsprogs-4.10.0.orig/libxcmd/Makefile
++++ xfsprogs-4.10.0/libxcmd/Makefile
@@ -30,10 +30,21 @@ LCFLAGS += -DENABLE_EDITLINE
LTLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
endif
@@ -25,10 +25,10 @@ Index: xfsprogs-4.8.0/libxcmd/Makefile
+ $(INSTALL_LTLIB_DEV)
-include .ltdep
-Index: xfsprogs-4.8.0/libxfs/Makefile
+Index: xfsprogs-4.10.0/libxfs/Makefile
===================================================================
---- xfsprogs-4.8.0.orig/libxfs/Makefile
-+++ xfsprogs-4.8.0/libxfs/Makefile
+--- xfsprogs-4.10.0.orig/libxfs/Makefile
++++ xfsprogs-4.10.0/libxfs/Makefile
@@ -137,6 +137,7 @@ include $(BUILDRULES)
install: default
@@ -37,10 +37,10 @@ Index: xfsprogs-4.8.0/libxfs/Makefile
install-headers: $(addsuffix -hdrs, $(PKGHFILES))
-Index: xfsprogs-4.8.0/libxlog/Makefile
+Index: xfsprogs-4.10.0/libxlog/Makefile
===================================================================
---- xfsprogs-4.8.0.orig/libxlog/Makefile
-+++ xfsprogs-4.8.0/libxlog/Makefile
+--- xfsprogs-4.10.0.orig/libxlog/Makefile
++++ xfsprogs-4.10.0/libxlog/Makefile
@@ -19,6 +19,10 @@ default: ltdepend $(LTLIBRARY)
include $(BUILDRULES)
@@ -53,3 +53,30 @@ Index: xfsprogs-4.8.0/libxlog/Makefile
+ $(INSTALL_LTLIB_DEV)
-include .ltdep
+Index: xfsprogs-4.10.0/io/Makefile
+===================================================================
+--- xfsprogs-4.10.0.orig/io/Makefile
++++ xfsprogs-4.10.0/io/Makefile
+@@ -13,7 +13,7 @@
+ getrusage.c imap.c link.c mmap.c open.c parent.c pread.c prealloc.c \
+ pwrite.c reflink.c seek.c shutdown.c sync.c truncate.c utimes.c
+
+-LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBPTHREAD)
++LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBUUID) $(LIBPTHREAD)
+ LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE)
+ LLDFLAGS = -static-libtool-libs
+
+Index: xfsprogs-4.10.0/quota/Makefile
+===================================================================
+--- xfsprogs-4.10.0.orig/quota/Makefile
++++ xfsprogs-4.10.0/quotq/Makefile
+@@ -14,7 +14,7 @@
+ PCFILES = darwin.c freebsd.c irix.c linux.c
+ LSRCFILES = $(shell echo $(PCFILES) | sed -e "s/$(PKG_PLATFORM).c//g")
+
+-LLDLIBS = $(LIBXCMD)
++LLDLIBS = $(LIBXCMD) $(LIBUUID)
+ LTDEPENDENCIES = $(LIBXCMD)
+ LLDFLAGS = -static
+
+
diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb
b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.10.0.bb
similarity index 83%
rename from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb
rename to meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.10.0.bb
index b4c50a2..f7e10cd 100644
--- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb
+++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.10.0.bb
@@ -3,18 +3,19 @@ HOMEPAGE = "http://oss.sgi.com/projects/xfs";
SECTION = "base"
LICENSE = "GPLv2 & LGPLv2.1"
LICENSE_libhandle = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://doc/COPYING;md5=dbdb5f4329b7e7145de650e9ecd4ac2a"
+LIC_FILES_CHKSUM = "file://doc/COPYING;md5=102f7fec3d53c7c8f0b7baf9bf9d76a8"
DEPENDS = "util-linux util-linux-native"
SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz
\
file://link_needed_libs.patch \
"
-SRC_URI[md5sum] = "4f047bc9a28b48a95c6db0ad5ce4dbcb"
-SRC_URI[sha256sum] =
"82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9"
+SRC_URI[md5sum] = "ddbb04493addf014db07a7e2b96b2804"
+SRC_URI[sha256sum] =
"d8cb9ab2c686699d37914354ce3992b4aff3677093cbce06ad18bf798da8a8a7"
inherit autotools-brokensep
PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle"
+DEPENDS += "util-linux"
RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair"
@@ -54,5 +55,3 @@ do_configure_prepend () {
do_install_append() {
oe_runmake 'DESTDIR=${D}' install install-dev
}
-
-PNBLACKLIST[xfsprogs] ?= "Fails to build with RSS
http://errors.yoctoproject.org/Errors/Details/130663/";
--
2.7.4
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
