forked from bottlerocket-os/bottlerocket
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0003-ship-mkconst-and-schema-sources-for-runtime-use.patch
48 lines (39 loc) · 1.38 KB
/
0003-ship-mkconst-and-schema-sources-for-runtime-use.patch
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
From 859c79f5df14d9cff3383b6ee2709080f38b88c4 Mon Sep 17 00:00:00 2001
From: Ben Cressey <[email protected]>
Date: Sat, 10 Aug 2019 18:31:42 +0000
Subject: [PATCH 3/3] ship mkconst and schema sources for runtime use
`mkconst` needs to be compiled for the host architecture, but relies
on most of the sources in wicked and needs all of the same libraries.
This is a much greater dependency on the host OS than we care to take.
For now we punt the problem to runtime and expect `constants.xml` to
be created out-of-band.
Signed-off-by: Ben Cressey <[email protected]>
---
schema/Makefile.am | 2 +-
util/Makefile.am | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/schema/Makefile.am b/schema/Makefile.am
index 462dc04..03a4bcd 100644
--- a/schema/Makefile.am
+++ b/schema/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
wicked_schema_DATA = \
$(wicked_schema_files) \
- $(wicked_schema_built)
+ $(wicked_schema_sources)
wicked_schema_files = \
addrconf.xml \
diff --git a/util/Makefile.am b/util/Makefile.am
index 2af1435..bb9697e 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -2,7 +2,8 @@
CLEANFILES = *~
MAINTAINERCLEANFILES = Makefile.in
-noinst_PROGRAMS = mkconst schema2html
+wicked_sbin_PROGRAMS = mkconst
+noinst_PROGRAMS = schema2html
AM_CPPFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/include
--
2.21.0