From ca6ad4a53ba79201ea481c7f16c7f0c638fc0b3d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Oct 2016 16:38:50 +0300 Subject: btrfs-tools: update to 4.8.1 Remove fix-parallel.patch as version.h is now generated by autoconf in configure() Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../btrfs-tools/btrfs-tools/fix-parallel.patch | 32 --------------------- .../btrfs-tools/btrfs-tools_4.7.1.bb | 33 ---------------------- .../btrfs-tools/btrfs-tools_4.8.1.bb | 32 +++++++++++++++++++++ 3 files changed, 32 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb (limited to 'meta') diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch deleted file mode 100644 index bbc53c6fe1..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 11 Feb 2015 22:08:41 -0800 -Subject: [PATCH] Makefile: fix for parallel build - -Fixed: -mkfs.c:300:46: error: 'BTRFS_BUILD_VERSION' undeclared (first use in this function) - fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION); - -Upstream-Status: Pending - -Signed-off-by: Robert Yang ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 860a390..8a6fbd7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -142,7 +142,7 @@ else - check_echo = true - endif - --%.o.d: %.c -+%.o.d: %.c version.h - $(Q)$(CC) -MM -MG -MF $@ -MT $(@:.o.d=.o) -MT $(@:.o.d=.static.o) -MT $@ $(CFLAGS) $< - - .c.o: --- -1.7.9.5 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb deleted file mode 100644 index becf093967..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.7.1.bb +++ /dev/null @@ -1,33 +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 = "6819fbcdcab63c2d95da1a2997e37be9a71ca533" -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" diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb new file mode 100644 index 0000000000..b06fd4adcc --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.8.1.bb @@ -0,0 +1,32 @@ +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 = "d8d0a60406b14b140e83a8c0d5eaedb5dca44092" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ +" + +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