blob: 1484b6acd1f800714df41a8e2c7b278b8ce8f4e2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
From 9ee5d9ca2e1ea709571613326b81e8e651fa9f00 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 7 Sep 2023 11:43:25 +0200
Subject: [PATCH] CMakeLists.txt: don't modify .gitconfig on build host nor try
to update git submodules
* bitbake fetcher will correctly handle safe.directory issues and
blazesym or libbpf submodules are managed by gitsm:// fetcher
we don't want to call git from CMake in do_configure
Upstream-Status: Pending
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
CMakeLists.txt | 62 --------------------------------------------------
1 file changed, 62 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfed06e5..ffd88043 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,68 +26,6 @@ endif()
enable_testing()
-execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE CONFIG_RESULT)
-if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
- message(WARNING "Failed to add root source directory to safe.directory")
-endif()
-
-# populate submodule blazesym
-if(NOT NO_BLAZESYM)
- execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/libbpf-tools/blazesym
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE CONFIG_RESULT)
- if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
- message(WARNING "Failed to add blazesym source directory to safe.directory")
- endif()
-
- execute_process(COMMAND git submodule update --init --recursive -- libbpf-tools/blazesym
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE UPDATE_RESULT)
- if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
- message(WARNING "Failed to update submodule blazesym")
- endif()
-endif()
-
-# populate submodules (libbpf)
-if(NOT CMAKE_USE_LIBBPF_PACKAGE)
- execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE CONFIG_RESULT)
- if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
- message(WARNING "Failed to add libbpf source directory to safe.directory")
- endif()
- execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}/libbpf-tools/bpftool
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE CONFIG_RESULT)
- if(CONFIG_RESULT AND NOT CONFIG_RESULT EQUAL 0)
- message(WARNING "Failed to add bpftool source directory to safe.directory")
- endif()
-
- if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
- execute_process(COMMAND git submodule update --init --recursive
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE UPDATE_RESULT)
- if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
- message(WARNING "Failed to update submodule libbpf")
- endif()
- else()
- execute_process(COMMAND git diff --shortstat ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/
- OUTPUT_VARIABLE DIFF_STATUS)
- if("${DIFF_STATUS}" STREQUAL "")
- execute_process(COMMAND git submodule update --init --recursive
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE UPDATE_RESULT)
- if(UPDATE_RESULT AND NOT UPDATE_RESULT EQUAL 0)
- message(WARNING "Failed to update submodule libbpf")
- endif()
- else()
- message(WARNING "submodule libbpf dirty, so no sync")
- endif()
- endif()
-endif()
-
# It's possible to use other kernel headers with
# KERNEL_INCLUDE_DIRS build variable, like:
# $ cd <kernel-dir>
|
