Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / 9c8f253e311762b742bf15b1f271008ccaecfc65 / . / third_party / swtpm / patches / 0001-bazel-compat-glib.h-glib-glib.h.patch
blob: de98cd38b50ddc21a0566947d3324849cda91c96 [file] [log] [blame]
Serge Bazanski72c1f2b2024-06-04 13:42:48 +0000[diff] [blame]1From c7932ca7f91b92002048e0e59470b0af6156aa8d Mon Sep 17 00:00:00 2001
2From: Serge Bazanski <serge@monogon.tech>
3Date: Tue, 4 Jun 2024 11:59:31 +0200
4Subject: [PATCH 1/4] bazel compat: <glib.h> -> "glib/glib.h"
5
6---
7 src/swtpm/cuse_tpm.c | 2 +-
8 src/swtpm/threadpool.c | 2 +-
9 src/swtpm_localca/swtpm_localca.c | 2 +-
10 src/swtpm_localca/swtpm_localca.h | 2 +-
11 src/swtpm_localca/swtpm_localca_utils.h | 2 +-
12 src/swtpm_setup/swtpm.c | 2 +-
13 src/swtpm_setup/swtpm.h | 2 +-
14 src/swtpm_setup/swtpm_setup.c | 6 +++---
15 src/swtpm_setup/swtpm_setup.h | 2 +-
16 src/swtpm_setup/swtpm_setup_utils.c | 2 +-
17 src/swtpm_setup/swtpm_setup_utils.h | 2 +-
18 src/utils/swtpm_utils.c | 2 +-
19 src/utils/swtpm_utils.h | 2 +-
20 13 files changed, 15 insertions(+), 15 deletions(-)
21
22diff --git a/src/swtpm/cuse_tpm.c b/src/swtpm/cuse_tpm.c
23index 5977b63..4bcc503 100644
24--- a/src/swtpm/cuse_tpm.c
25+++ b/src/swtpm/cuse_tpm.c
26@@ -56,7 +56,7 @@
27
28 #include <fuse/cuse_lowlevel.h>
29
30-#include <glib.h>
31+#include "glib/glib.h"
32
33 #include <libtpms/tpm_library.h>
34 #include <libtpms/tpm_tis.h>
35diff --git a/src/swtpm/threadpool.c b/src/swtpm/threadpool.c
36index 770c16a..95d0085 100644
37--- a/src/swtpm/threadpool.c
38+++ b/src/swtpm/threadpool.c
39@@ -37,7 +37,7 @@
40
41 #include <stdbool.h>
42
43-#include <glib.h>
44+#include "glib/glib.h"
45
46 #include "threadpool.h"
47
48diff --git a/src/swtpm_localca/swtpm_localca.c b/src/swtpm_localca/swtpm_localca.c
49index 3a9fa6f..2842f22 100644
50--- a/src/swtpm_localca/swtpm_localca.c
51+++ b/src/swtpm_localca/swtpm_localca.c
52@@ -22,7 +22,7 @@
53 #include <sys/stat.h>
54 #include <sys/types.h>
55
56-#include <glib.h>
57+#include "glib/glib.h"
58
59 #include <gmp.h>
60
61diff --git a/src/swtpm_localca/swtpm_localca.h b/src/swtpm_localca/swtpm_localca.h
62index c1cb19f..e203a4d 100644
63--- a/src/swtpm_localca/swtpm_localca.h
64+++ b/src/swtpm_localca/swtpm_localca.h
65@@ -10,7 +10,7 @@
66 #ifndef SWTPM_LOCALCA_H
67 #define SWTPM_LOCALCA_H
68
69-#include <glib.h>
70+#include "glib/glib.h"
71
72 extern gchar *gl_LOGFILE;
73
74diff --git a/src/swtpm_localca/swtpm_localca_utils.h b/src/swtpm_localca/swtpm_localca_utils.h
75index 2fd33b8..487738a 100644
76--- a/src/swtpm_localca/swtpm_localca_utils.h
77+++ b/src/swtpm_localca/swtpm_localca_utils.h
78@@ -10,7 +10,7 @@
79 #ifndef SWTPM_LOCALCA_UTILS_H
80 #define SWTPM_LOCALCA_UTILS_H
81
82-#include <glib.h>
83+#include "glib/glib.h"
84
85 gchar *get_config_value(gchar **config_file_lines, const gchar *varname, const gchar *fallback);
86 int get_config_envvars(gchar **config_file_lines, gchar ***env);
87diff --git a/src/swtpm_setup/swtpm.c b/src/swtpm_setup/swtpm.c
88index 822215e..66eac0b 100644
89--- a/src/swtpm_setup/swtpm.c
90+++ b/src/swtpm_setup/swtpm.c
91@@ -21,7 +21,7 @@
92 #include <sys/wait.h>
93 #include <unistd.h>
94
95-#include <glib.h>
96+#include "glib/glib.h"
97
98 #include <openssl/bn.h>
99 #include <openssl/evp.h>
100diff --git a/src/swtpm_setup/swtpm.h b/src/swtpm_setup/swtpm.h
101index 2f81dce..1377d38 100644
102--- a/src/swtpm_setup/swtpm.h
103+++ b/src/swtpm_setup/swtpm.h
104@@ -10,7 +10,7 @@
105 #ifndef SWTPM_SETUP_SWTPM_H
106 #define SWTPM_SETUP_SWTPM_H
107
108-#include <glib.h>
109+#include "glib/glib.h"
110 #include <pwd.h>
111
112 #include <openssl/sha.h>
113diff --git a/src/swtpm_setup/swtpm_setup.c b/src/swtpm_setup/swtpm_setup.c
114index 8f87ad4..96e8b9f 100644
115--- a/src/swtpm_setup/swtpm_setup.c
116+++ b/src/swtpm_setup/swtpm_setup.c
117@@ -23,9 +23,9 @@
118 #include <sys/types.h>
119 #include <sys/wait.h>
120
121-#include <glib.h>
122-#include <glib/gstdio.h>
123-#include <glib/gprintf.h>
124+#include "glib/glib.h"
125+#include "glib/gstdio.h"
126+#include "glib/gprintf.h"
127
128 #include <glib-object.h>
129 #include <json-glib/json-glib.h>
130diff --git a/src/swtpm_setup/swtpm_setup.h b/src/swtpm_setup/swtpm_setup.h
131index 913b36f..b87e501 100644
132--- a/src/swtpm_setup/swtpm_setup.h
133+++ b/src/swtpm_setup/swtpm_setup.h
134@@ -10,7 +10,7 @@
135 #ifndef SWTPM_SETUP_H
136 #define SWTPM_SETUP_H
137
138-#include <glib.h>
139+#include "glib/glib.h"
140
141 extern gchar *gl_LOGFILE;
142
143diff --git a/src/swtpm_setup/swtpm_setup_utils.c b/src/swtpm_setup/swtpm_setup_utils.c
144index 923e175..eddae73 100644
145--- a/src/swtpm_setup/swtpm_setup_utils.c
146+++ b/src/swtpm_setup/swtpm_setup_utils.c
147@@ -17,7 +17,7 @@
148 #include <sys/utsname.h>
149 #include <unistd.h>
150
151-#include <glib.h>
152+#include "glib/glib.h"
153
154 #include "swtpm_conf.h"
155 #include "swtpm_utils.h"
156diff --git a/src/swtpm_setup/swtpm_setup_utils.h b/src/swtpm_setup/swtpm_setup_utils.h
157index d074d3a..6c4be5e 100644
158--- a/src/swtpm_setup/swtpm_setup_utils.h
159+++ b/src/swtpm_setup/swtpm_setup_utils.h
160@@ -10,7 +10,7 @@
161 #ifndef SWTPM_SETUP_UTILS_H
162 #define SWTPM_SETUP_UTILS_H
163
164-#include <glib.h>
165+#include "glib/glib.h"
166
167 gchar *get_config_value(gchar **config_file_lines, const gchar *configname);
168 int create_config_files(gboolean overwrite, gboolean root_flag,
169diff --git a/src/utils/swtpm_utils.c b/src/utils/swtpm_utils.c
170index 35a4243..db32615 100644
171--- a/src/utils/swtpm_utils.c
172+++ b/src/utils/swtpm_utils.c
173@@ -20,7 +20,7 @@
174 #include <string.h>
175 #include <unistd.h>
176
177-#include <glib.h>
178+#include "glib/glib.h"
179
180 #include "swtpm_utils.h"
181
182diff --git a/src/utils/swtpm_utils.h b/src/utils/swtpm_utils.h
183index 22f1f4b..78ef97b 100644
184--- a/src/utils/swtpm_utils.h
185+++ b/src/utils/swtpm_utils.h
186@@ -12,7 +12,7 @@
187
188 #include <pwd.h>
189
190-#include <glib.h>
191+#include "glib/glib.h"
192
193 #define min(X,Y) ((X) < (Y) ? (X) : (Y))
194 #define ARRAY_LEN(a) (sizeof(a) / sizeof((a)[0]))
195--
1962.42.0
197