Skip to contentSkip to conversation

btrfs-tools: upgrade 5.15.1 -> 5.16

PATCH Superseded Wang Mingyu 4 participants 8 messages Jan 17, 2022 – Jan 18, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs-tools: upgrade 5.15.1 -> 5.16

Changelog:
=========
- rescue: new subcommand clear-uuid-tree to fix failed mount due to bad uuid subvolume keys, caught by tree-checker
- fi du: skip inaccessible files
- prop: properly resolve to symlink targets
- send, receive: fix crash after parent subvolume lookup errors
- build:
fix build on 5.12+ kernels due to changes in linux/kernel.h fix build on musl with old kernel headers
- other:
error handling fixes, cleanups, refactoring
extent tree v2 preparatory work
lots of RST documentation updates (last release with asciidoc sources),
https://btrfs.readthedocs.io

---
 ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++------
 .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb}     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} (98%)
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +4 -6
index be942388a5..bd69bfc9cd 100644
@@ -1,4 +1,4 @@
-From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 2001
+From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <[email protected]>
 Date: Fri, 18 Jun 2021 11:10:36 -0400
 Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+
@@ -21,22 +21,20 @@ exists, and is valid to include.
 Upstream-Status: Inappropriate [mips64 + musl + libc-headers]
 
 Signed-off-by: Bruce Ashfield <[email protected]>
+
 ---
  kerncompat.h | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/kerncompat.h b/kerncompat.h
-index df167fe6..254235bd 100644
+index 6ca1526e..15995bb4 100644
 --- a/kerncompat.h
 +++ b/kerncompat.h
 @@ -30,6 +30,7 @@
  #include <linux/types.h>
- #include <linux/kernel.h>
+ #include <linux/const.h>
  #include <stdint.h>
 +#include <linux/const.h>
  
  #include <features.h>
  
--- 
-2.25.1
-
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb
index 3cf216724e..4c358a248b 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-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
            "
-SRCREV = "c0ad9bde429196db7e8710ea1abfab7a2bca2e43"
+SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 hdparm: upgrade 9.62 -> 9.63

Changelog:
=========
new --sanitize-overwrite-passes flag
applied "Plurals patch"

---
 meta/recipes-extended/hdparm/{hdparm_9.62.bb => hdparm_9.63.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/hdparm/{hdparm_9.62.bb => hdparm_9.63.bb} (94%)
meta/recipes-extended/hdparm/hdparm_9.63.bb renamed from meta/recipes-extended/hdparm/hdparm_9.62.bb +1 -1
similarity index 94%
rename from meta/recipes-extended/hdparm/hdparm_9.62.bb
rename to meta/recipes-extended/hdparm/hdparm_9.63.bb
index 61bb44ff38..e286610d6a 100644
@@ -26,7 +26,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \
            file://wiper.sh-fix-stat-path.patch \
           "
 
-SRC_URI[sha256sum] = "2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f"
+SRC_URI[sha256sum] = "70785deaebba5877a89c123568b41dee990da55fc51420f13f609a1072899691"
 
 EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"'
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 libsdl2: upgrade 2.0.18 -> 2.0.20

In reply to Wang Mingyu

0001-Fix-build-against-wayland-1.20.patch
removed since it is included in 2.0.20

License-Update: year updated to 2022.

Changelog:
=========
General:

SDL_RenderGeometryRaw() takes a pointer to SDL_Color, not int. You can cast color data in SDL_PIXELFORMAT_RGBA32 format (SDL_PIXELFORMAT_ABGR8888 on little endian systems) for this parameter. Improved accuracy of horizontal and vertical line drawing when using OpenGL or OpenGLES
Added the hint SDL_HINT_RENDER_LINE_METHOD to control the method of line drawing used, to select speed, correctness, and compatibility. Fixed hotplug controller detection, broken in 2.0.18

---
 .../0001-Fix-build-against-wayland-1.20.patch | 45 -------------------
 .../{libsdl2_2.0.18.bb => libsdl2_2.0.20.bb}  |  7 ++-
 2 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-build-against-wayland-1.20.patch
 rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.18.bb => libsdl2_2.0.20.bb} (93%)
meta/recipes-graphics/libsdl2/libsdl2/0001-Fix-build-against-wayland-1.20.patch deleted +0 -45
deleted file mode 100644
index 8923334e27..0000000000
@@ -1,45 +0,0 @@
-From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001
-From: David Redondo <[email protected]>
-Date: Fri, 10 Dec 2021 16:22:34 +0100
-Subject: [PATCH] Fix build against wayland 1.20
-
-Fixes #5088
-
-Upstream-Status: Backport [https://github.com/libsdl-org/SDL/pull/5092]
-
----
- src/video/wayland/SDL_waylanddyn.h | 2 ++
- src/video/wayland/SDL_waylandsym.h | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
-index 13b0884..2268555 100644
---- a/src/video/wayland/SDL_waylanddyn.h
-+++ b/src/video/wayland/SDL_waylanddyn.h
-@@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
- #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
- #define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag)
- #define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag)
-+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
-+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
- 
- #define wl_seat_interface (*WAYLAND_wl_seat_interface)
- #define wl_surface_interface (*WAYLAND_wl_surface_interface)
-diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
-index d6e6a76..32e47d2 100644
---- a/src/video/wayland/SDL_waylandsym.h
-+++ b/src/video/wayland/SDL_waylandsym.h
-@@ -84,6 +84,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18)
- SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *))
- SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *))
- 
-+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
-+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...))
-+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version,  uint32_t flags, union wl_argument *args))
-+
- SDL_WAYLAND_INTERFACE(wl_seat_interface)
- SDL_WAYLAND_INTERFACE(wl_surface_interface)
- SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
--- 
-2.7.4
-
meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb +3 -4
similarity index 93%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.18.bb
rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.20.bb
index 6c949d9604..90724ab8b7 100644
@@ -8,7 +8,7 @@ BUGTRACKER = "http://bugzilla.libsdl.org/"
 SECTION = "libs"
 
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=095c2687a3c3908e26984eaa8ec2d770"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315"
 
 # arm-neon adds MIT license
 LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', '& MIT', '', d)}"
@@ -17,14 +17,13 @@ LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'f
 PROVIDES = "virtual/libsdl2"
 
 SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
-           file://0001-Fix-build-against-wayland-1.20.patch \
            file://optional-libunwind-generic.patch \
            file://0001-sdlchecks.cmake-pass-cflags-to-the-appropriate-cmake.patch \
-"
+           "
 
 S = "${WORKDIR}/SDL2-${PV}"
 
-SRC_URI[sha256sum] = "94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c"
+SRC_URI[sha256sum] = "c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06"
 
 inherit cmake lib_package binconfig-disabled pkgconfig
 
Signature · 1 line
2.25.1
#3 lore raw

PATCH 1/1 mesa: upgrade 21.3.3 -> 21.3.4

In reply to Wang Mingyu

Changelog:
==========
Bug fixes
---------
i965: gen5 exposes EXT_texture_integer incorrectly
[radeonsi, regression, bisected]: Rendering issues with Factorio mesa >= 21.x (with llvmpipe) will break the game JVGS
Panfrost - RK3399 - FACTORIO - glitches everywhere
Baldurs Gate 3 (Patch 6) - ribbon-like artifacts on textures
Game Starsector crashes under certain circumstances with mesa 21.3.+ FreeSpace models incorrectly rendered on Polaris cards, causing system freeze Incomplete evaluation of nested DEFINE macros
[r300g, bisected] piglit glsl-fs-discard-04 fails
Panfrost G52 Firefox terrible glitches on youtube playback

Changes
-------
pan/bi: Fix load_const of 1-bit booleans
gallium/util: Add pixel->blocks box helper
lima,panfrost: Correct pixel vs block mismatches
radv: Set optimal copy alignment to 1.
microsoft/compiler: Fix dxil_nir_create_bare_samplers()
ir3/ra: Fix logic bug in compress_regs_left
ir3: Bump type mismatch penalty to 3
aco: don't allow SDWA on VOP3P instructions
aco: validate VOP3P opsel correctly
tu: fix workaround for depth bounds test without depth test intel/genxml/gen4-5: fix more Raster Operation in BLT to be a uint
crocus: fail resource allocation properly.
freedreno/afuc: Disable the disassembler on 32-bit builds.
i915g: Turn off FP16 in the vertex shaders.
r300: Fix omod failing to increase the number of channels stored.
nir_to_tgsi: Fix a bug in TXP detection after backend lowering. pick_status.json: Update to 8a78706643ecad8a1f303cc9358873abc29978b4 pick_status.json: Mark 00bea38242d97e7ace1954f1bc7d32cbf0ce3ee0 as denominated pick_status.json: Mark 2a0253b9b5d21c7571555abe3a1d851468a18740 as denominated
r300: fix handling swizzle in transform_source_conflicts intel/compiler/test: Fix build with GCC 7
i965: Disable EXT_texture_integer on Gfx4 and Gfx5
Revert "anv: Stop doing too much per-sample shading"
anv: don't leave anv_batch fields undefined
anv: limit compiler valid color outputs using NIR variables intel/dev: fixup chv workaround
etnaviv: initialize vertex attributes on context reset
etnaviv: drm: fix size limit in etna_cmd_stream_realloc
etnaviv: drm: properly handle reviving BOs via a lookup
zink: fix -Warray-bounds warning
radv: fix xfb query copy param ordering
zink: always unset vertex shader variant key data when changing last vertex stage
zink: add extra synchronization for buffer descriptor binds
zink: use device-local heap for sparse backing allocations
r300: Remove broken optimization in rc_transform_KILL
radeonsi/gfx8: use the proper dcc clear size
vbo/dlist: fix loopback crash
vbo/dlist: add vertices to incomplete primitives
radeonsi/gfx10: fix si_texture_get_offset for mipmapped tex
glapi: should not add alias function to static_data.py
aco: remove pack_half_2x16(a, 0) optimization
intel/fs: OpImageQueryLod does not support arrayed images as an operand
v3dv: Hotfix: Rename remaining V3DV_HAS_SURFACE->V3DV_USE_WSI_PLATFORM
radv: add drirc radv_disable_htile_layers and enable it for F1 2021
iris: unref syncobjs and free r/w dependencies array for slab entries
mesa: free idalloc storage for display lists
mesa: free vbo_save_vertex_list store prims
glsl/glcpp: make sure to expand new token after concatenation
venus: subtract appended header size in vn_CreatePipelineCache
Fix compilation on armv7l with gcc 11.2.0

---
 .../mesa/{mesa-gl_21.3.3.bb => mesa-gl_21.3.4.bb}               | 0
 meta/recipes-graphics/mesa/mesa.inc                             | 2 +-
 meta/recipes-graphics/mesa/{mesa_21.3.3.bb => mesa_21.3.4.bb}   | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_21.3.3.bb => mesa-gl_21.3.4.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_21.3.3.bb => mesa_21.3.4.bb} (100%)
meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb renamed from meta/recipes-graphics/mesa/mesa-gl_21.3.3.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_21.3.3.bb
rename to meta/recipes-graphics/mesa/mesa-gl_21.3.4.bb
meta/recipes-graphics/mesa/mesa.inc +1 -1
index 7f47f18591..71cc3b4617 100644
@@ -23,7 +23,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \
            "
 
-SRC_URI[sha256sum] = "ad7f4613ea7c5d08d9fcb5025270199e6ceb9aa99fd72ee572b70342240a8121"
+SRC_URI[sha256sum] = "77104fd4a93bce69da3b0982f8ee88ba7c4fb98cfc491a669894339cdcd4a67d"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
meta/recipes-graphics/mesa/mesa_21.3.4.bb renamed from meta/recipes-graphics/mesa/mesa_21.3.3.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_21.3.3.bb
rename to meta/recipes-graphics/mesa/mesa_21.3.4.bb
Signature · 1 line
2.25.1
#4 lore raw
In reply to Wang Mingyu
Quoted 67 lines · wangmy

Changelog:
=========
- rescue: new subcommand clear-uuid-tree to fix failed mount due to bad uuid subvolume keys, caught by tree-checker
- fi du: skip inaccessible files
- prop: properly resolve to symlink targets
- send, receive: fix crash after parent subvolume lookup errors
- build:
fix build on 5.12+ kernels due to changes in linux/kernel.h fix build on musl with old kernel headers
- other:
error handling fixes, cleanups, refactoring
extent tree v2 preparatory work
lots of RST documentation updates (last release with asciidoc sources),
https://btrfs.readthedocs.io

---
 ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++------
 .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb}     |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} (98%)
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +4 -6
index be942388a5..bd69bfc9cd 100644
@@ -1,4 +1,4 @@
-From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 2001
+From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <[email protected]>
 Date: Fri, 18 Jun 2021 11:10:36 -0400
 Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+
@@ -21,22 +21,20 @@ exists, and is valid to include.
 Upstream-Status: Inappropriate [mips64 + musl + libc-headers]
 
 Signed-off-by: Bruce Ashfield <[email protected]>
+
 ---
  kerncompat.h | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/kerncompat.h b/kerncompat.h
-index df167fe6..254235bd 100644
+index 6ca1526e..15995bb4 100644
 --- a/kerncompat.h
 +++ b/kerncompat.h
 @@ -30,6 +30,7 @@
  #include <linux/types.h>
- #include <linux/kernel.h>
+ #include <linux/const.h>
  #include <stdint.h>
 +#include <linux/const.h>
 
  #include <features.h>
 
--- 
-2.25.1
-
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb +0 -0
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb
index 3cf216724e..4c358a248b 100644

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b · line 25

Quoted 8 lines
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb +1 -1
@@ -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-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
            "
-SRCREV = "c0ad9bde429196db7e8710ea1abfab7a2bca2e43"
+SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \

This didn't work when it was last sent and still doesn't:

https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/4646
https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/4914
https://autobuilder.yoctoproject.org/typhoon/#/builders/111/builds/2590
https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/4624
https://autobuilder.yoctoproject.org/typhoon/#/builders/103/builds/3508
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/4616
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/4631
https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/4583
https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/4583

Seems to be something centos host specific.

Cheers,

Richard

#5 lore raw
In reply to Wang Mingyu
Quoted 57 lines · wangmy

Changelog:
=========
 - rescue: new subcommand clear-uuid-tree to fix failed mount due to bad uuid
   subvolume keys, caught by tree-checker
 - fi du: skip inaccessible files
 - prop: properly resolve to symlink targets
 - send, receive: fix crash after parent subvolume lookup errors
 - build:
   fix build on 5.12+ kernels due to changes in linux/kernel.h fix build on musl with old kernel headers
 - other:
   error handling fixes, cleanups, refactoring
   extent tree v2 preparatory work
   lots of RST documentation updates (last release with asciidoc sources),
   https://btrfs.readthedocs.io

---
 ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++---- --
 .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb}     |  2 +-

 2 files changed, 5 insertions(+), 7 deletions(-)

 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} (98%)

(quoted diff) +0 -0

btrfs-tools-include-linux-const.h-to-fix-build-with-.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch
index be942388a5..bd69bfc9cd 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00

2001
+From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <[email protected]>
 Date: Fri, 18 Jun 2021 11:10:36 -0400
 Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+

(quoted diff) +0 -0
@@ -21,22 +21,20 @@ exists, and is valid to include.

 Upstream-Status: Inappropriate [mips64 + musl + libc-headers]

+
 ---
  kerncompat.h | 1 +

  1 file changed, 1 insertion(+)


 diff --git a/kerncompat.h b/kerncompat.h

meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +1 -1
-index df167fe6..254235bd 100644
+index 6ca1526e..15995bb4 100644
Quoted 8 lines

 --- a/kerncompat.h
 +++ b/kerncompat.h
 @@ -30,6 +30,7 @@
  #include <linux/types.h>
- #include <linux/kernel.h>
+ #include <linux/const.h>
  #include <stdint.h>
 +#include <linux/const.h>

This patch should be removed.

https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git/commit/kerncompat.h?id=b28f7bd9bba6f65258da48955154794f466b4104

Thanks,

Anuj

Quoted 41 lines


  #include <features.h>

---
-2.25.1

meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +0 -1
-
meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb +0 -0
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb
index 3cf216724e..4c358a248b 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-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
            "

meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb +1 -1
-SRCREV = "c0ad9bde429196db7e8710ea1abfab7a2bca2e43"
+SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8"

 S = "${WORKDIR}/git"

 PACKAGECONFIG ??= " \

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

#6 lore raw

Hello,

Quoted 69 lines · Anuj Mittal
Quoted 57 lines · wangmy

Changelog:
=========
 - rescue: new subcommand clear-uuid-tree to fix failed mount due to bad uuid
   subvolume keys, caught by tree-checker
 - fi du: skip inaccessible files
 - prop: properly resolve to symlink targets
 - send, receive: fix crash after parent subvolume lookup errors
 - build:
   fix build on 5.12+ kernels due to changes in linux/kernel.h fix build on musl with old kernel headers
 - other:
   error handling fixes, cleanups, refactoring
   extent tree v2 preparatory work
   lots of RST documentation updates (last release with asciidoc sources),
   https://btrfs.readthedocs.io

---
 ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++---- --
 .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb}     |  2 +-

 2 files changed, 5 insertions(+), 7 deletions(-)

 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} (98%)

(quoted diff) +0 -0

btrfs-tools-include-linux-const.h-to-fix-build-with-.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch
index be942388a5..bd69bfc9cd 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00

2001
+From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <[email protected]>
 Date: Fri, 18 Jun 2021 11:10:36 -0400
 Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+

(quoted diff) +0 -0
@@ -21,22 +21,20 @@ exists, and is valid to include.

 Upstream-Status: Inappropriate [mips64 + musl + libc-headers]

+
 ---
  kerncompat.h | 1 +

  1 file changed, 1 insertion(+)


 diff --git a/kerncompat.h b/kerncompat.h

meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +1 -1
-index df167fe6..254235bd 100644
+index 6ca1526e..15995bb4 100644
Quoted 8 lines

 --- a/kerncompat.h
 +++ b/kerncompat.h
 @@ -30,6 +30,7 @@
  #include <linux/types.h>
- #include <linux/kernel.h>
+ #include <linux/const.h>
  #include <stdint.h>
 +#include <linux/const.h>

This patch should be removed.

Quoted 2 lines

https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git/commit/kerncompat.h?id=b28f7bd9bba6f65258da48955154794f466b4104

I guess we actually need to backport this one:
https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58

It should fix the issue as reported in https://github.com/kdave/btrfs-progs/pull/433

Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw
Quoted 72 lines · Alexandre Belloni

Hello,

Quoted 69 lines · Anuj Mittal
Quoted 57 lines · wangmy

Changelog:
=========
 - rescue: new subcommand clear-uuid-tree to fix failed mount due to bad uuid
   subvolume keys, caught by tree-checker
 - fi du: skip inaccessible files
 - prop: properly resolve to symlink targets
 - send, receive: fix crash after parent subvolume lookup errors
 - build:
   fix build on 5.12+ kernels due to changes in linux/kernel.h fix build on musl with old kernel headers
 - other:
   error handling fixes, cleanups, refactoring
   extent tree v2 preparatory work
   lots of RST documentation updates (last release with asciidoc sources),
   https://btrfs.readthedocs.io

---
 ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++---- --
 .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb}     |  2 +-

 2 files changed, 5 insertions(+), 7 deletions(-)

 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} (98%)

(quoted diff) +0 -0

btrfs-tools-include-linux-const.h-to-fix-build-with-.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch
index be942388a5..bd69bfc9cd 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- include-linux-const.h-to-fix-build-with-.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00

2001
+From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <[email protected]>
 Date: Fri, 18 Jun 2021 11:10:36 -0400
 Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+

(quoted diff) +0 -0
@@ -21,22 +21,20 @@ exists, and is valid to include.

 Upstream-Status: Inappropriate [mips64 + musl + libc-headers]

+
 ---
  kerncompat.h | 1 +

  1 file changed, 1 insertion(+)


 diff --git a/kerncompat.h b/kerncompat.h

meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +1 -1
-index df167fe6..254235bd 100644
+index 6ca1526e..15995bb4 100644
Quoted 8 lines

 --- a/kerncompat.h
 +++ b/kerncompat.h
 @@ -30,6 +30,7 @@
  #include <linux/types.h>
- #include <linux/kernel.h>
+ #include <linux/const.h>
  #include <stdint.h>
 +#include <linux/const.h>

This patch should be removed.

Quoted 7 lines
Quoted 2 lines

https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git/commit/kerncompat.h?id=b28f7bd9bba6f65258da48955154794f466b4104

I guess we actually need to backport this one:
https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58

It should fix the issue as reported in https://github.com/kdave/btrfs-progs/pull/433

FWIW I had tried this patch again with the patch dropped as you mentioned.

Cheers,

Richard