<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 8, 2013 at 5:34 PM, Saul Wold <span dir="ltr"><<a href="mailto:sgw@linux.intel.com" target="_blank">sgw@linux.intel.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 05/08/2013 06:33 AM, Bogdan Marinescu wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
'fix_use_of_gcc.patch' was integrated in the main repository.<br>
<br>
Signed-off-by: Bogdan Marinescu <<a href="mailto:bogdan.a.marinescu@intel.com" target="_blank">bogdan.a.marinescu@intel.com</a>><br>
---<br>
.../btrfs-tools/btrfs-tools/<u></u>fix_use_of_gcc.patch | 31 --------------------<br>
.../btrfs-tools/<a href="http://btrfs-tools_git.bb" target="_blank">btrfs-tools_<u></u>git.bb</a> | 9 ++----<br>
2 files changed, 3 insertions(+), 37 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/btrfs-<u></u>tools/btrfs-tools/fix_use_of_<u></u>gcc.patch<br>
<br>
diff --git a/meta/recipes-devtools/btrfs-<u></u>tools/btrfs-tools/fix_use_of_<u></u>gcc.patch b/meta/recipes-devtools/btrfs-<u></u>tools/btrfs-tools/fix_use_of_<u></u>gcc.patch<br>
deleted file mode 100644<br>
index 7f6594a..0000000<br>
--- a/meta/recipes-devtools/btrfs-<u></u>tools/btrfs-tools/fix_use_of_<u></u>gcc.patch<br>
+++ /dev/null<br>
@@ -1,31 +0,0 @@<br>
-Nitin A Kamble <<a href="mailto:nitin.a.kamble@intel.com" target="_blank">nitin.a.kamble@intel.com</a>> 2011/06/09<br>
-Upstream-Status: Pending<br>
-<br>
-Avoid these kinds of errors while doing cross build:<br>
-<br>
-| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/<u></u>build0/tmp/sysroots/qemux86 -Wp,-MMD,./.btrfsctl.o.d,-MT,<u></u>btrfsctl.o -Wall -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -O2 -pipe -g -feliminate-unused-debug-types -c btrfsctl.c<br>
-| gcc -O2 -pipe -g -feliminate-unused-debug-types -o btrfsctl btrfsctl.o ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o root-tree.o dir-item.o file-item.o inode-item.o inode-map.o crc32c.o rbtree.o extent-cache.o extent_io.o volumes.o utils.o btrfs-list.o -Wl,-O1 -Wl,--as-needed -luuid<br>
-| /usr/bin/ld: i386 architecture of input file `btrfsctl.o' is incompatible with i386:x86-64 output<br>
-| /usr/bin/ld: i386 architecture of input file `ctree.o' is incompatible with i386:x86-64 output<br>
-<br>
-Index: git/Makefile<br>
-=============================<u></u>==============================<u></u>========<br>
---- git.orig/Makefile<br>
-+++ git/Makefile<br>
-@@ -41,13 +41,13 @@ btrfs: $(objects) btrfs.o btrfs_cmds.o s<br>
- $(objects) $(LDFLAGS) $(LIBS)<br>
-<br>
- calc-size: $(objects) calc-size.o<br>
-- gcc $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)<br>
-+ $(CC) $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)<br>
-<br>
- find-root: $(objects) find-root.o<br>
-- gcc $(CFLAGS) -o find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)<br>
-+ $(CC) $(CFLAGS) -o find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)<br>
-<br>
- restore: $(objects) restore.o<br>
-- gcc $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)<br>
-+ $(CC) $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)<br>
-<br>
- btrfsctl: $(objects) btrfsctl.o<br>
- $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)<br>
diff --git a/meta/recipes-devtools/btrfs-<u></u>tools/<a href="http://btrfs-tools_git.bb" target="_blank">btrfs-tools_git.bb</a> b/meta/recipes-devtools/btrfs-<u></u>tools/<a href="http://btrfs-tools_git.bb" target="_blank">btrfs-tools_git.bb</a><br>
index ef575ae..51c1b08 100644<br>
--- a/meta/recipes-devtools/btrfs-<u></u>tools/<a href="http://btrfs-tools_git.bb" target="_blank">btrfs-tools_git.bb</a><br>
+++ b/meta/recipes-devtools/btrfs-<u></u>tools/<a href="http://btrfs-tools_git.bb" target="_blank">btrfs-tools_git.bb</a><br>
@@ -12,17 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=<u></u>fcb02dc552a041dee27e4b85c73960<u></u>67"<br>
SECTION = "base"<br>
DEPENDS = "util-linux attr"<br>
<br>
-SRCREV = "<u></u>fdb6c0402337d9607c7a39155088ea<u></u>f033742752"<br>
+SRCREV = "<u></u>89fe5b5f666c247aa3173745fb87c7<u></u>10f3a71a4a"<br>
SRC_URI = "git://<a href="http://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git" target="_blank">git.kernel.org/pub/scm/<u></u>linux/kernel/git/mason/btrfs-<u></u>progs.git;protocol=git</a>"<br>
<br>
S = "${WORKDIR}/git"<br>
<br>
-PV = "0.19+git${SRCPV}"<br>
+PV = "0.20-rc1+git${SRCPV}"<br>
<br>
</blockquote>
<br></div></div>
Is there a reason we are moving to an "rc1" instead of waiting for the final version to be released?<br></blockquote><div><br></div><div style>This was the version suggested by the package reporting system.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Sau!<div class="HOEnZb"><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
-PR = "r6"<br>
-<br>
-SRC_URI += " file://fix_use_of_gcc.patch \<br>
- file://weak-defaults.patch \<br>
+SRC_URI += " file://weak-defaults.patch \<br>
file://fix_race_condition_<u></u>with_multithreaded_make.patch "<br>
<br>
SRC_URI[md5sum] = "<u></u>78b1700d318de8518abfaab71f99a8<u></u>85"<br>
<br>
</blockquote>
</div></div></blockquote></div><br></div></div>