From 531b6173893ab5cbe163a071a5fea0ae39c81cbf Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 3 Jun 2016 12:14:45 +0300 Subject: btrfs-tools: update to 4.5.3 Drop fix-symlink-creation-multiple-times.patch (merged upstream). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../fix-symlink-creation-multiple-times.patch | 46 ---------------------- .../btrfs-tools/btrfs-tools_4.4.bb | 34 ---------------- .../btrfs-tools/btrfs-tools_4.5.3.bb | 33 ++++++++++++++++ 3 files changed, 33 insertions(+), 80 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch deleted file mode 100644 index a945496399..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 05ab78e9183575e38f342e05a056cb7bcd1e52e1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 18 Feb 2016 20:41:28 -0500 -Subject: [PATCH] btrfs-progs: fix symlink creation multiple times - -The rule to create symlink in Makefile caused parallel issue: -$ make -j 40 DESTDIR=/image install BUILD_VERBOSE=1 -... - 1 [LN] libbtrfs.so.0 - 2 [LN] libbtrfs.so - 3 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0 - 4 ln -s -f libbtrfs.so.0.1 libbtrfs.so.0 - 5 ln -s -f libbtrfs.so.0.1 libbtrfs.so - 6 ln -s -f libbtrfs.so.0.1 libbtrfs.so -... - -It failed occasionally: -... -|symlinkat: couldn't stat 'git/libbtrfs.so' even though symlink -creation succeeded (No such file or directory). -|ln: failed to create symbolic link 'libbtrfs.so': No such file or directory -... - -Upstream-Status: Submitted [linux-btrfs@vger.kernel.org] -Signed-off-by: Hongxu Jia ---- - Makefile.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 1f4002e..16eeaf9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -236,8 +236,7 @@ $(libs_static): $(libbtrfs_objects) - - $(lib_links): - @echo " [LN] $@" -- $(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so.0 -- $(Q)$(LN_S) -f libbtrfs.so.0.1 libbtrfs.so -+ $(Q)$(LN_S) -f libbtrfs.so.0.1 $@ - - # keep intermediate files from the below implicit rules around - .PRECIOUS: $(addsuffix .o,$(progs)) --- -1.9.1 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb deleted file mode 100644 index 32e7bae587..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Checksumming Copy on Write Filesystem utilities" -DESCRIPTION = "Btrfs is a new copy on write filesystem for Linux aimed at \ -implementing advanced features while focusing on fault tolerance, repair and \ -easy administration. \ -This package contains utilities (mkfs, fsck, btrfsctl) used to work with \ -btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3." - -HOMEPAGE = "https://btrfs.wiki.kernel.org" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" -SECTION = "base" -DEPENDS = "util-linux attr e2fsprogs lzo acl" -RDEPENDS_${PN} = "libgcc" - -SRCREV = "21258fab2caeade405a15ba932d373b364aa6e8c" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ - file://fix-parallel.patch \ - file://fix-symlink-creation-multiple-times.patch \ -" - -inherit autotools-brokensep pkgconfig - -EXTRA_OECONF += "--disable-documentation" -EXTRA_OECONF_append_libc-musl = " --disable-backtrace " - - -do_configure_prepend() { - sh autogen.sh -} - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb new file mode 100644 index 0000000000..50fe66ea74 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.5.3.bb @@ -0,0 +1,33 @@ +SUMMARY = "Checksumming Copy on Write Filesystem utilities" +DESCRIPTION = "Btrfs is a new copy on write filesystem for Linux aimed at \ +implementing advanced features while focusing on fault tolerance, repair and \ +easy administration. \ +This package contains utilities (mkfs, fsck, btrfsctl) used to work with \ +btrfs and an utility (btrfs-convert) to make a btrfs filesystem from an ext3." + +HOMEPAGE = "https://btrfs.wiki.kernel.org" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" +SECTION = "base" +DEPENDS = "util-linux attr e2fsprogs lzo acl" +RDEPENDS_${PN} = "libgcc" + +SRCREV = "b72438362b2dbce880cefe9427ffe0947a94e060" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ + file://fix-parallel.patch \ +" + +inherit autotools-brokensep pkgconfig + +EXTRA_OECONF += "--disable-documentation" +EXTRA_OECONF_append_libc-musl = " --disable-backtrace " + + +do_configure_prepend() { + sh autogen.sh +} + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg