Skip to content

Commit 1cfb954

Browse files
authored
Merge pull request #3183 from flatcar/chewi/overlaybd-pin-tcmu
sys-fs/overlaybd: Update patches following upstream merge and pin TCMU
2 parents 3e9383d + 69c544f commit 1cfb954

File tree

4 files changed

+12
-73
lines changed

4 files changed

+12
-73
lines changed

sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/overlaybd-cross.patch

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,3 @@ Signed-off-by: James Le Cuirot <[email protected]>
126126
if(BUILD_TESTING)
127127
--
128128
2.49.0
129-
130-
131-
From 32a592ef523a14600ce658a695d827724aeb66c9 Mon Sep 17 00:00:00 2001
132-
From: Krzesimir Nowak <[email protected]>
133-
Date: Fri, 8 Aug 2025 16:47:58 +0200
134-
Subject: [PATCH] Patch libtcmu after fetching to fix memory issues
135-
136-
---
137-
CMake/Findtcmu.cmake | 1 +
138-
1 file changed, 1 insertion(+)
139-
140-
diff --git a/CMake/Findtcmu.cmake b/CMake/Findtcmu.cmake
141-
index 6e8f0ef..5865a9b 100644
142-
--- a/CMake/Findtcmu.cmake
143-
+++ b/CMake/Findtcmu.cmake
144-
@@ -5,6 +5,7 @@ FetchContent_Declare(
145-
tcmu
146-
GIT_REPOSITORY https://github.com/data-accelerator/photon-libtcmu.git
147-
GIT_TAG main
148-
+ PATCH_COMMAND patch -p1 -i @FILESDIR@/tcmu-fix.patch
149-
)
150-
151-
if(BUILD_TESTING)
152-
--
153-
2.49.1
154-
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/CMake/Findtcmu.cmake
2+
+++ b/CMake/Findtcmu.cmake
3+
@@ -4,7 +4,7 @@ set(FETCHCONTENT_QUIET false)
4+
FetchContent_Declare(
5+
tcmu
6+
GIT_REPOSITORY https://github.com/data-accelerator/photon-libtcmu.git
7+
- GIT_TAG main
8+
+ GIT_TAG 813fd65361bb2f348726b9c41478a44211847614
9+
)
10+
11+
if(BUILD_TESTING)

sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/files/tcmu-fix.patch

Lines changed: 0 additions & 46 deletions
This file was deleted.

sdk_container/src/third_party/coreos-overlay/sys-fs/overlaybd/overlaybd-9999.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ PATCHES=(
4949

5050
src_prepare() {
5151
cmake_src_prepare
52-
sed -i "s:@FILESDIR@:${FILESDIR}:g" CMake/Findphoton.cmake CMake/Findtcmu.cmake || die
52+
sed -i "s:@FILESDIR@:${FILESDIR}:g" CMake/Findphoton.cmake || die
5353
}
5454

5555
src_configure() {

0 commit comments

Comments
 (0)