Skip to contentSkip to conversation

btrfs-tools: upgrade 6.1.3 -> 6.2.1

PATCH In review [email protected] 3 participants 3 messages Mar 16, 2023 – Mar 17, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs-tools: upgrade 6.1.3 -> 6.2.1

From: Wang Mingyu <[email protected]>

Changelog:
=========
* fix build with crypto libraries
* CI images updated, build tests extended

---
 .../btrfs-tools/{btrfs-tools_6.1.3.bb => btrfs-tools_6.2.1.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.1.3.bb => btrfs-tools_6.2.1.bb} (98%)
meta/recipes-devtools/btrfs-tools/btrfs-tools_6.2.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.2.1.bb
index b4dfc5b3f3..a6ff87a90c 100644
@@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            file://0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch \
            "
-SRCREV = "908b4b4450320e30fdef693f09b42f4eb93702c3"
+SRCREV = "366cd079bc43241b27e0838be0c5369aa00716f8"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
Signature · 1 line
2.34.1
#1 lore raw

Hello,

This fails on the AB for edgerouter-alt and meta-intel:

https://autobuilder.yoctoproject.org/typhoon/#/builders/111/builds/4406/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/100/builds/4205/steps/13/logs/stdio

| gcc  -isystem/home/pokybuild/yocto-worker/edgerouter-alt/build/build/tmp/work/x86_64-linux/btrfs-tools-native/6.2.1-r0/recipe-sysroot-native/usr/include -O2 -pipe -std=gnu11 -D_GNU_SOURCE -fPIC -fvisibility=hidden -I./libbtrfsutil    -o libbtrfsutil/stubs.o -c libbtrfsutil/stubs.c -o libbtrfsutil/stubs.o
| In file included from crypto/blake2b-round.h:140,
|                  from crypto/blake2b-sse2.c:33:
| crypto/blake2b-sse2.c: In function ‘blake2b_compress_sse2’:
| crypto/blake2b-load-sse41.h:21:25: error: incompatible type for argument 1 of ‘_mm_unpacklo_epi64’
|    21 | b0 = _mm_unpacklo_epi64(m0, m1); \
|       |                         ^~
|       |                         |
|       |                         uint64_t {aka long unsigned int}
| crypto/blake2b-round.h:146:3: note: in expansion of macro ‘LOAD_MSG_0_1’
|   146 |   LOAD_MSG_ ##r ##_1(b0, b1); \
|       |   ^~~~~~~~~
| crypto/blake2b-sse2.c:80:3: note: in expansion of macro ‘ROUND’
|    80 |   ROUND( 0 );
|       |   ^~~~~
| In file included from crypto/blake2b-sse2.c:25:
| /usr/lib/gcc/x86_64-redhat-linux/11/include/emmintrin.h:1046:29: note: expected ‘__m128i’ but argument is of type ‘uint64_t’ {aka ‘long unsigned int’}
|  1046 | _mm_unpacklo_epi64 (__m128i __A, __m128i __B)
|       |                     ~~~~~~~~^~~
| In file included from crypto/blake2b-round.h:140,
|                  from crypto/blake2b-sse2.c:33:
Quoted 42 lines · wangmy

From: Wang Mingyu <[email protected]>

Changelog:
=========
* fix build with crypto libraries
* CI images updated, build tests extended

---
 .../btrfs-tools/{btrfs-tools_6.1.3.bb => btrfs-tools_6.2.1.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.1.3.bb => btrfs-tools_6.2.1.bb} (98%)
meta/recipes-devtools/btrfs-tools/btrfs-tools_6.2.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.2.1.bb
index b4dfc5b3f3..a6ff87a90c 100644
@@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            file://0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch \
            "
-SRCREV = "908b4b4450320e30fdef693f09b42f4eb93702c3"
+SRCREV = "366cd079bc43241b27e0838be0c5369aa00716f8"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
Signature · 11 lines
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178664): https://lists.openembedded.org/g/openembedded-core/message/178664
Mute This Topic: https://lists.openembedded.org/mt/97641211/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

FWIW it also fails compiling with clang compiler

https://errors.yoctoproject.org/Errors/Details/698109/

Quoted 82 lines · Alexandre Belloni via lists.openembedded.org

Hello,

This fails on the AB for edgerouter-alt and meta-intel:

https://autobuilder.yoctoproject.org/typhoon/#/builders/111/builds/4406/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/100/builds/4205/steps/13/logs/stdio

| gcc  -isystem/home/pokybuild/yocto-worker/edgerouter-alt/build/build/tmp/work/x86_64-linux/btrfs-tools-native/6.2.1-r0/recipe-sysroot-native/usr/include -O2 -pipe -std=gnu11 -D_GNU_SOURCE -fPIC -fvisibility=hidden -I./libbtrfsutil    -o libbtrfsutil/stubs.o -c libbtrfsutil/stubs.c -o libbtrfsutil/stubs.o
| In file included from crypto/blake2b-round.h:140,
|                  from crypto/blake2b-sse2.c:33:
| crypto/blake2b-sse2.c: In function ‘blake2b_compress_sse2’:
| crypto/blake2b-load-sse41.h:21:25: error: incompatible type for argument 1 of ‘_mm_unpacklo_epi64’
|    21 | b0 = _mm_unpacklo_epi64(m0, m1); \
|       |                         ^~
|       |                         |
|       |                         uint64_t {aka long unsigned int}
| crypto/blake2b-round.h:146:3: note: in expansion of macro ‘LOAD_MSG_0_1’
|   146 |   LOAD_MSG_ ##r ##_1(b0, b1); \
|       |   ^~~~~~~~~
| crypto/blake2b-sse2.c:80:3: note: in expansion of macro ‘ROUND’
|    80 |   ROUND( 0 );
|       |   ^~~~~
| In file included from crypto/blake2b-sse2.c:25:
| /usr/lib/gcc/x86_64-redhat-linux/11/include/emmintrin.h:1046:29: note: expected ‘__m128i’ but argument is of type ‘uint64_t’ {aka ‘long unsigned int’}
|  1046 | _mm_unpacklo_epi64 (__m128i __A, __m128i __B)
|       |                     ~~~~~~~~^~~
| In file included from crypto/blake2b-round.h:140,
|                  from crypto/blake2b-sse2.c:33:
Quoted 30 lines · wangmy

From: Wang Mingyu <[email protected]>

Changelog:
=========
* fix build with crypto libraries
* CI images updated, build tests extended

---
 .../btrfs-tools/{btrfs-tools_6.1.3.bb => btrfs-tools_6.2.1.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.1.3.bb => btrfs-tools_6.2.1.bb} (98%)
meta/recipes-devtools/btrfs-tools/btrfs-tools_6.2.1.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb +1 -2
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.2.1.bb
index b4dfc5b3f3..a6ff87a90c 100644
@@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            file://0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch \
            "
-SRCREV = "908b4b4450320e30fdef693f09b42f4eb93702c3"
+SRCREV = "366cd079bc43241b27e0838be0c5369aa00716f8"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
--
Quoted 6 lines

2.34.1

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#178735): https://lists.openembedded.org/g/openembedded-core/message/178735
Mute This Topic: https://lists.openembedded.org/mt/97641211/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-