diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools')
3 files changed, 112 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch new file mode 100644 index 000000000..bbc53c6fe --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-parallel.patch @@ -0,0 +1,32 @@ +From 373eb51328b5e10529763cad441210e6b0efb24e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +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 <liezhi.yang@windriver.com> +--- + 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/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch new file mode 100644 index 000000000..a94549639 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix-symlink-creation-multiple-times.patch @@ -0,0 +1,46 @@ +From 05ab78e9183575e38f342e05a056cb7bcd1e52e1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +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 <hongxu.jia@windriver.com> +--- + 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/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb new file mode 100644 index 000000000..32e7bae58 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.4.bb @@ -0,0 +1,34 @@ +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" |