diff options
Diffstat (limited to 'meta-oe/recipes-extended/fwts')
-rw-r--r-- | meta-oe/recipes-extended/fwts/fwts/jsonc.patch | 66 | ||||
-rw-r--r-- | meta-oe/recipes-extended/fwts/fwts/subdir.patch | 893 | ||||
-rw-r--r-- | meta-oe/recipes-extended/fwts/fwts_git.bb | 9 |
3 files changed, 3 insertions, 965 deletions
diff --git a/meta-oe/recipes-extended/fwts/fwts/jsonc.patch b/meta-oe/recipes-extended/fwts/fwts/jsonc.patch deleted file mode 100644 index 42602bfca..000000000 --- a/meta-oe/recipes-extended/fwts/fwts/jsonc.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | From patchwork Mon Jan 13 09:56:02 2014 | ||
2 | Content-Type: text/plain; charset="utf-8" | ||
3 | MIME-Version: 1.0 | ||
4 | Content-Transfer-Encoding: 7bit | ||
5 | Subject: [RESEND-2] updated automake files for libjson-c (LP: #1268005) | ||
6 | From: Colin King <colin.king@canonical.com> | ||
7 | X-Patchwork-Id: 309769 | ||
8 | Message-Id: <1389606962-12027-1-git-send-email-colin.king@canonical.com> | ||
9 | To: fwts-devel@lists.ubuntu.com | ||
10 | Date: Mon, 13 Jan 2014 09:56:02 +0000 | ||
11 | |||
12 | From: Colin Ian King <colin.king@canonical.com> | ||
13 | |||
14 | This enables builds with json-c 0.11. Thanks to Jeffrey Bastian for this | ||
15 | fix. | ||
16 | |||
17 | Signed-off-by: Jeffrey Bastian <jbastian@redhat.com> | ||
18 | Signed-off-by: Colin Ian King <colin.king@canonical.com> | ||
19 | Acked-by: Alex Hung <alex.hung@canonical.com> | ||
20 | |||
21 | From http://patchwork.ozlabs.org/patch/309769/mbox/ | ||
22 | Upstream-status: Submitted | ||
23 | |||
24 | --- | ||
25 | src/Makefile.am | 2 +- | ||
26 | src/lib/src/Makefile.am | 2 +- | ||
27 | src/utilities/Makefile.am | 2 +- | ||
28 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
29 | |||
30 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
31 | index df685d5..d65b066 100644 | ||
32 | --- a/src/Makefile.am | ||
33 | +++ b/src/Makefile.am | ||
34 | @@ -87,7 +87,7 @@ fwts_SOURCES = main.c \ | ||
35 | uefi/securebootcert/securebootcert.c \ | ||
36 | uefi/uefivarinfo/uefivarinfo.c | ||
37 | |||
38 | -fwts_LDFLAGS = -ljson -lm | ||
39 | +fwts_LDFLAGS = -ljson -ljson-c -lm | ||
40 | |||
41 | fwts_LDADD = \ | ||
42 | -Llib/src -lfwts \ | ||
43 | diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am | ||
44 | index d708f34..a07d5e2 100644 | ||
45 | --- a/src/lib/src/Makefile.am | ||
46 | +++ b/src/lib/src/Makefile.am | ||
47 | @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ | ||
48 | pkglib_LTLIBRARIES = libfwts.la | ||
49 | |||
50 | libfwts_la_LDFLAGS = \ | ||
51 | - -lm -lpcre -lpthread -ljson \ | ||
52 | + -lm -lpcre -lpthread -ljson -ljson-c \ | ||
53 | -version-info 1:0:0 \ | ||
54 | -L$(top_srcdir)/src/acpica/source/compiler \ | ||
55 | -lfwtsiasl | ||
56 | diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am | ||
57 | index 427c44f..cc2e115 100644 | ||
58 | --- a/src/utilities/Makefile.am | ||
59 | +++ b/src/utilities/Makefile.am | ||
60 | @@ -2,5 +2,5 @@ AM_CPPFLAGS = -Wall -Werror -Wextra | ||
61 | |||
62 | bin_PROGRAMS = kernelscan | ||
63 | kernelscan_SOURCES = kernelscan.c | ||
64 | -kernelscan_LDFLAGS = -ljson -lpcre | ||
65 | +kernelscan_LDFLAGS = -ljson -ljson-c -lpcre | ||
66 | |||
diff --git a/meta-oe/recipes-extended/fwts/fwts/subdir.patch b/meta-oe/recipes-extended/fwts/fwts/subdir.patch deleted file mode 100644 index e7024d755..000000000 --- a/meta-oe/recipes-extended/fwts/fwts/subdir.patch +++ /dev/null | |||
@@ -1,893 +0,0 @@ | |||
1 | From patchwork Mon Jan 13 18:37:47 2014 | ||
2 | Content-Type: text/plain; charset="utf-8" | ||
3 | MIME-Version: 1.0 | ||
4 | Content-Transfer-Encoding: 7bit | ||
5 | Subject: fwts: add subdir-objects as required now by automake 1.14 (LP: | ||
6 | #1268685) | ||
7 | From: Colin King <colin.king@canonical.com> | ||
8 | X-Patchwork-Id: 310322 | ||
9 | Message-Id: <1389638267-31474-1-git-send-email-colin.king@canonical.com> | ||
10 | To: fwts-devel@lists.ubuntu.com | ||
11 | Date: Mon, 13 Jan 2014 18:37:47 +0000 | ||
12 | |||
13 | From: Colin Ian King <colin.king@canonical.com> | ||
14 | |||
15 | automake now requires subdir-objects. To get fwts to build we now require | ||
16 | each object to have their lib name prefixed to stop per-object name clashes | ||
17 | since we build ACPICA twice in two different build configurations. | ||
18 | |||
19 | I also used the opportunity to use the full path name of the C sources as | ||
20 | I was finding the substitutions a little annoying. Also tidied up the | ||
21 | formatting too. | ||
22 | |||
23 | Signed-off-by: Colin Ian King <colin.king@canonical.com> | ||
24 | Acked-by: Alex Hung <alex.hung@canonical.com> | ||
25 | |||
26 | From http://patchwork.ozlabs.org/patch/310322/mbox/ | ||
27 | Upstream-Status: Submitted | ||
28 | |||
29 | --- | ||
30 | configure.ac | 3 +- | ||
31 | src/Makefile.am | 4 +- | ||
32 | src/acpica/Makefile.am | 381 ++++++++++++++++----------------- | ||
33 | src/acpica/source/compiler/Makefile.am | 347 +++++++++++++++--------------- | ||
34 | src/lib/src/Makefile.am | 2 + | ||
35 | 5 files changed, 365 insertions(+), 372 deletions(-) | ||
36 | |||
37 | diff --git a/configure.ac b/configure.ac | ||
38 | index c0411c1..5a31434 100644 | ||
39 | --- a/configure.ac | ||
40 | +++ b/configure.ac | ||
41 | @@ -1,5 +1,5 @@ | ||
42 | AC_INIT([fwts],[0.1],[colin.king@canonical.com]) | ||
43 | - AM_INIT_AUTOMAKE([-Wall -Werror foreign]) | ||
44 | + AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) | ||
45 | m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) | ||
46 | AC_CANONICAL_HOST | ||
47 | AC_CONFIG_MACRO_DIR([m4]) | ||
48 | @@ -8,6 +8,7 @@ | ||
49 | AC_PROG_YACC | ||
50 | AC_PROG_LIBTOOL | ||
51 | AC_C_INLINE | ||
52 | + AM_PROG_CC_C_O | ||
53 | AC_CHECK_FUNCS([localtime_r]) | ||
54 | AC_CHECK_FUNCS([dup2]) | ||
55 | AC_CHECK_FUNCS([getcwd]) | ||
56 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
57 | index df685d5..76841e0 100644 | ||
58 | --- a/src/Makefile.am | ||
59 | +++ b/src/Makefile.am | ||
60 | @@ -5,7 +5,7 @@ | ||
61 | # ... because the libs in this bundled acpica/ depend on lib/ (libfwts.so), | ||
62 | # but libfwts.so depends on libraries produced by acpica/source/compiler. | ||
63 | SUBDIRS = acpica/source/compiler lib acpica | ||
64 | - | ||
65 | + | ||
66 | AM_CPPFLAGS = \ | ||
67 | -I$(top_srcdir)/src/lib/include \ | ||
68 | -I$(top_srcdir)/src/acpica/source/include \ | ||
69 | @@ -15,6 +15,8 @@ AM_CPPFLAGS = \ | ||
70 | |||
71 | bin_PROGRAMS = fwts | ||
72 | |||
73 | +fwts_CPPFLAGS = $(AM_CPPFLAGS) | ||
74 | + | ||
75 | # | ||
76 | # fwts main + tests | ||
77 | # | ||
78 | diff --git a/src/acpica/Makefile.am b/src/acpica/Makefile.am | ||
79 | index d4fc5dd..41bda7d 100644 | ||
80 | --- a/src/acpica/Makefile.am | ||
81 | +++ b/src/acpica/Makefile.am | ||
82 | @@ -1,28 +1,21 @@ | ||
83 | # Nb. the top-level Makefile builds source/compiler for us now... | ||
84 | ## SUBDIRS = source/compiler | ||
85 | |||
86 | -ACPICA_SRC = source | ||
87 | -ACPICA_COMMON = $(ACPICA_SRC)/common | ||
88 | -ACPICA_CORE = $(ACPICA_SRC) | ||
89 | -ACPICA_TOOLS = $(ACPICA_SRC)/tools | ||
90 | -ACPICA_OSL = $(ACPICA_SRC)/os_specific/service_layers | ||
91 | -ACPICA_COMP = $(ACPICA_SRC)/components | ||
92 | - | ||
93 | # | ||
94 | # -DACPI_EXEC_APP is specific to making ACPICA for the fwts method test | ||
95 | # | ||
96 | AM_CPPFLAGS = \ | ||
97 | -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_EXEC_APP \ | ||
98 | -I$(top_srcdir)/src/lib/include \ | ||
99 | - -I$(ACPICA_SRC)/include \ | ||
100 | + -Isource/include \ | ||
101 | -Wall -fno-strict-aliasing | ||
102 | |||
103 | # | ||
104 | # We rename some of the functions so we can override them in fwts. This | ||
105 | # is a hack, I feel dirty now. | ||
106 | # | ||
107 | -osunixxf_munged.c: $(ACPICA_OSL)/osunixxf.c | ||
108 | - cat $(ACPICA_OSL)/osunixxf.c | \ | ||
109 | +osunixxf_munged.c: source/os_specific/service_layers/osunixxf.c | ||
110 | + cat source/os_specific/service_layers/osunixxf.c | \ | ||
111 | sed 's/^AcpiOsPrintf/__AcpiOsPrintf/' | \ | ||
112 | sed 's/^AcpiOsReadPort/__AcpiOsReadPort/' | \ | ||
113 | sed 's/^AcpiOsReadPciConfiguration/__AcpiOsReadPciConfiguration/' | \ | ||
114 | @@ -35,14 +28,13 @@ osunixxf_munged.c: $(ACPICA_OSL)/osunixxf.c | ||
115 | sed 's/^AcpiOsSleep/__AcpiOsSleep/' | \ | ||
116 | sed 's/^AcpiOsExecute/__AcpiOsExecute/' \ | ||
117 | > osunixxf_munged.c | ||
118 | - | ||
119 | # | ||
120 | # Force maximum loop iterations to be just 128 instead of 0xffff | ||
121 | # because we really don't want to wait until the sun turns into | ||
122 | # a lump of coal before we complete a blocked operation | ||
123 | # | ||
124 | -dscontrol_munged.c: $(ACPICA_COMP)/dispatcher/dscontrol.c | ||
125 | - cat $(ACPICA_COMP)/dispatcher/dscontrol.c | \ | ||
126 | +dscontrol_munged.c: source/components/dispatcher/dscontrol.c | ||
127 | + cat source/components/dispatcher/dscontrol.c | \ | ||
128 | sed 's/ACPI_MAX_LOOP_ITERATIONS/0x0080/' \ | ||
129 | > dscontrol_munged.c | ||
130 | |||
131 | @@ -53,195 +45,196 @@ BUILT_SOURCES = osunixxf_munged.c dscontrol_munged.c | ||
132 | # | ||
133 | CLEANFILES = osunixxf_munged.c \ | ||
134 | dscontrol_munged.c \ | ||
135 | - $(ACPICA_SRC)/compiler/aslcompiler.output \ | ||
136 | - $(ACPICA_SRC)/compiler/dtparser.output \ | ||
137 | - $(ACPICA_SRC)/compiler/dtparser.y.h \ | ||
138 | - $(ACPICA_SRC)/compiler/prparser.output \ | ||
139 | - $(ACPICA_SRC)/compiler/prparser.y.h \ | ||
140 | - $(ACPICA_SRC)/compiler/prparserlex.c \ | ||
141 | - $(ACPICA_SRC)/compiler/prparserparse.c | ||
142 | + source/compiler/aslcompiler.output \ | ||
143 | + source/compiler/dtparser.output \ | ||
144 | + source/compiler/dtparser.y.h \ | ||
145 | + source/compiler/prparser.output \ | ||
146 | + source/compiler/prparser.y.h \ | ||
147 | + source/compiler/prparserlex.c \ | ||
148 | + source/compiler/prparserparse.c | ||
149 | |||
150 | pkglib_LTLIBRARIES = libfwtsacpica.la | ||
151 | |||
152 | libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0 | ||
153 | +libfwtsacpica_la_CPPFLAGS = $(AM_CPPFLAGS) | ||
154 | |||
155 | # | ||
156 | # fwts acpica library sources | ||
157 | # | ||
158 | -libfwtsacpica_la_SOURCES = \ | ||
159 | - fwts_acpica.c \ | ||
160 | - osunixxf_munged.c \ | ||
161 | - dscontrol_munged.c \ | ||
162 | - $(ACPICA_COMP)/debugger/dbcmds.c \ | ||
163 | - $(ACPICA_COMP)/debugger/dbdisply.c \ | ||
164 | - $(ACPICA_COMP)/debugger/dbexec.c \ | ||
165 | - $(ACPICA_COMP)/debugger/dbfileio.c \ | ||
166 | - $(ACPICA_COMP)/debugger/dbhistry.c \ | ||
167 | - $(ACPICA_COMP)/debugger/dbinput.c \ | ||
168 | - $(ACPICA_COMP)/debugger/dbstats.c \ | ||
169 | - $(ACPICA_COMP)/debugger/dbutils.c \ | ||
170 | - $(ACPICA_COMP)/debugger/dbxface.c \ | ||
171 | - $(ACPICA_COMP)/debugger/dbmethod.c \ | ||
172 | - $(ACPICA_COMP)/debugger/dbnames.c \ | ||
173 | - $(ACPICA_COMP)/debugger/dbconvert.c \ | ||
174 | - $(ACPICA_COMP)/disassembler/dmbuffer.c \ | ||
175 | - $(ACPICA_COMP)/disassembler/dmnames.c \ | ||
176 | - $(ACPICA_COMP)/disassembler/dmobject.c \ | ||
177 | - $(ACPICA_COMP)/disassembler/dmopcode.c \ | ||
178 | - $(ACPICA_COMP)/disassembler/dmresrc.c \ | ||
179 | - $(ACPICA_COMP)/disassembler/dmresrcl.c \ | ||
180 | - $(ACPICA_COMP)/disassembler/dmresrcs.c \ | ||
181 | - $(ACPICA_COMP)/disassembler/dmutils.c \ | ||
182 | - $(ACPICA_COMP)/disassembler/dmwalk.c \ | ||
183 | - $(ACPICA_COMP)/disassembler/dmresrcl2.c \ | ||
184 | - $(ACPICA_COMP)/disassembler/dmdeferred.c \ | ||
185 | - $(ACPICA_COMP)/dispatcher/dsfield.c \ | ||
186 | - $(ACPICA_COMP)/dispatcher/dsinit.c \ | ||
187 | - $(ACPICA_COMP)/dispatcher/dsmethod.c \ | ||
188 | - $(ACPICA_COMP)/dispatcher/dsmthdat.c \ | ||
189 | - $(ACPICA_COMP)/dispatcher/dsobject.c \ | ||
190 | - $(ACPICA_COMP)/dispatcher/dsutils.c \ | ||
191 | - $(ACPICA_COMP)/dispatcher/dswexec.c \ | ||
192 | - $(ACPICA_COMP)/dispatcher/dswload.c \ | ||
193 | - $(ACPICA_COMP)/dispatcher/dswscope.c \ | ||
194 | - $(ACPICA_COMP)/dispatcher/dswstate.c \ | ||
195 | - $(ACPICA_COMP)/dispatcher/dsargs.c \ | ||
196 | - $(ACPICA_COMP)/dispatcher/dswload2.c \ | ||
197 | - $(ACPICA_COMP)/dispatcher/dsopcode.c \ | ||
198 | - $(ACPICA_COMP)/events/evevent.c \ | ||
199 | - $(ACPICA_COMP)/events/evgpe.c \ | ||
200 | - $(ACPICA_COMP)/events/evgpeblk.c \ | ||
201 | - $(ACPICA_COMP)/events/evgpeinit.c \ | ||
202 | - $(ACPICA_COMP)/events/evgpeutil.c \ | ||
203 | - $(ACPICA_COMP)/events/evxfgpe.c \ | ||
204 | - $(ACPICA_COMP)/events/evmisc.c \ | ||
205 | - $(ACPICA_COMP)/events/evregion.c \ | ||
206 | - $(ACPICA_COMP)/events/evrgnini.c \ | ||
207 | - $(ACPICA_COMP)/events/evsci.c \ | ||
208 | - $(ACPICA_COMP)/events/evxface.c \ | ||
209 | - $(ACPICA_COMP)/events/evxfevnt.c \ | ||
210 | - $(ACPICA_COMP)/events/evxfregn.c \ | ||
211 | - $(ACPICA_COMP)/events/evglock.c \ | ||
212 | - $(ACPICA_COMP)/events/evhandler.c \ | ||
213 | - $(ACPICA_COMP)/executer/exfield.c \ | ||
214 | - $(ACPICA_COMP)/executer/exfldio.c \ | ||
215 | - $(ACPICA_COMP)/executer/exmisc.c \ | ||
216 | - $(ACPICA_COMP)/executer/exmutex.c \ | ||
217 | - $(ACPICA_COMP)/executer/exnames.c \ | ||
218 | - $(ACPICA_COMP)/executer/exoparg1.c \ | ||
219 | - $(ACPICA_COMP)/executer/exoparg2.c \ | ||
220 | - $(ACPICA_COMP)/executer/exoparg3.c \ | ||
221 | - $(ACPICA_COMP)/executer/exoparg6.c \ | ||
222 | - $(ACPICA_COMP)/executer/exprep.c \ | ||
223 | - $(ACPICA_COMP)/executer/exregion.c \ | ||
224 | - $(ACPICA_COMP)/executer/exresnte.c \ | ||
225 | - $(ACPICA_COMP)/executer/exresolv.c \ | ||
226 | - $(ACPICA_COMP)/executer/exresop.c \ | ||
227 | - $(ACPICA_COMP)/executer/exstore.c \ | ||
228 | - $(ACPICA_COMP)/executer/exstoren.c \ | ||
229 | - $(ACPICA_COMP)/executer/exstorob.c \ | ||
230 | - $(ACPICA_COMP)/executer/exsystem.c \ | ||
231 | - $(ACPICA_COMP)/executer/exutils.c \ | ||
232 | - $(ACPICA_COMP)/executer/exconvrt.c \ | ||
233 | - $(ACPICA_COMP)/executer/excreate.c \ | ||
234 | - $(ACPICA_COMP)/executer/exdump.c \ | ||
235 | - $(ACPICA_COMP)/executer/exdebug.c \ | ||
236 | - $(ACPICA_COMP)/executer/exconfig.c \ | ||
237 | - $(ACPICA_COMP)/hardware/hwacpi.c \ | ||
238 | - $(ACPICA_COMP)/hardware/hwgpe.c \ | ||
239 | - $(ACPICA_COMP)/hardware/hwpci.c \ | ||
240 | - $(ACPICA_COMP)/hardware/hwregs.c \ | ||
241 | - $(ACPICA_COMP)/hardware/hwsleep.c \ | ||
242 | - $(ACPICA_COMP)/hardware/hwvalid.c \ | ||
243 | - $(ACPICA_COMP)/hardware/hwxface.c \ | ||
244 | - $(ACPICA_COMP)/hardware/hwxfsleep.c \ | ||
245 | - $(ACPICA_COMP)/hardware/hwesleep.c \ | ||
246 | - $(ACPICA_COMP)/namespace/nsaccess.c \ | ||
247 | - $(ACPICA_COMP)/namespace/nsalloc.c \ | ||
248 | - $(ACPICA_COMP)/namespace/nsdump.c \ | ||
249 | - $(ACPICA_COMP)/namespace/nsdumpdv.c \ | ||
250 | - $(ACPICA_COMP)/namespace/nseval.c \ | ||
251 | - $(ACPICA_COMP)/namespace/nsinit.c \ | ||
252 | - $(ACPICA_COMP)/namespace/nsload.c \ | ||
253 | - $(ACPICA_COMP)/namespace/nsnames.c \ | ||
254 | - $(ACPICA_COMP)/namespace/nsobject.c \ | ||
255 | - $(ACPICA_COMP)/namespace/nsparse.c \ | ||
256 | - $(ACPICA_COMP)/namespace/nspredef.c \ | ||
257 | - $(ACPICA_COMP)/namespace/nsrepair.c \ | ||
258 | - $(ACPICA_COMP)/namespace/nsrepair2.c \ | ||
259 | - $(ACPICA_COMP)/namespace/nssearch.c \ | ||
260 | - $(ACPICA_COMP)/namespace/nsutils.c \ | ||
261 | - $(ACPICA_COMP)/namespace/nswalk.c \ | ||
262 | - $(ACPICA_COMP)/namespace/nsxfeval.c \ | ||
263 | - $(ACPICA_COMP)/namespace/nsxfname.c \ | ||
264 | - $(ACPICA_COMP)/namespace/nsxfobj.c \ | ||
265 | - $(ACPICA_COMP)/namespace/nsconvert.c \ | ||
266 | - $(ACPICA_COMP)/namespace/nsprepkg.c \ | ||
267 | - $(ACPICA_COMP)/namespace/nsarguments.c \ | ||
268 | - $(ACPICA_COMP)/parser/psargs.c \ | ||
269 | - $(ACPICA_COMP)/parser/psloop.c \ | ||
270 | - $(ACPICA_COMP)/parser/psopcode.c \ | ||
271 | - $(ACPICA_COMP)/parser/psparse.c \ | ||
272 | - $(ACPICA_COMP)/parser/psscope.c \ | ||
273 | - $(ACPICA_COMP)/parser/pstree.c \ | ||
274 | - $(ACPICA_COMP)/parser/psutils.c \ | ||
275 | - $(ACPICA_COMP)/parser/pswalk.c \ | ||
276 | - $(ACPICA_COMP)/parser/psxface.c \ | ||
277 | - $(ACPICA_COMP)/parser/psopinfo.c \ | ||
278 | - $(ACPICA_COMP)/parser/psobject.c \ | ||
279 | - $(ACPICA_COMP)/resources/rsaddr.c \ | ||
280 | - $(ACPICA_COMP)/resources/rscalc.c \ | ||
281 | - $(ACPICA_COMP)/resources/rscreate.c \ | ||
282 | - $(ACPICA_COMP)/resources/rsdump.c \ | ||
283 | - $(ACPICA_COMP)/resources/rsio.c \ | ||
284 | - $(ACPICA_COMP)/resources/rsinfo.c \ | ||
285 | - $(ACPICA_COMP)/resources/rsirq.c \ | ||
286 | - $(ACPICA_COMP)/resources/rslist.c \ | ||
287 | - $(ACPICA_COMP)/resources/rsmemory.c \ | ||
288 | - $(ACPICA_COMP)/resources/rsmisc.c \ | ||
289 | - $(ACPICA_COMP)/resources/rsutils.c \ | ||
290 | - $(ACPICA_COMP)/resources/rsxface.c \ | ||
291 | - $(ACPICA_COMP)/resources/rsserial.c \ | ||
292 | - $(ACPICA_COMP)/resources/rsdumpinfo.c \ | ||
293 | - $(ACPICA_COMP)/tables/tbfadt.c \ | ||
294 | - $(ACPICA_COMP)/tables/tbfind.c \ | ||
295 | - $(ACPICA_COMP)/tables/tbinstal.c \ | ||
296 | - $(ACPICA_COMP)/tables/tbutils.c \ | ||
297 | - $(ACPICA_COMP)/tables/tbxface.c \ | ||
298 | - $(ACPICA_COMP)/tables/tbxfroot.c \ | ||
299 | - $(ACPICA_COMP)/tables/tbxfload.c \ | ||
300 | - $(ACPICA_COMP)/tables/tbprint.c \ | ||
301 | - $(ACPICA_COMP)/utilities/utaddress.c \ | ||
302 | - $(ACPICA_COMP)/utilities/utalloc.c \ | ||
303 | - $(ACPICA_COMP)/utilities/utcache.c \ | ||
304 | - $(ACPICA_COMP)/utilities/utcopy.c \ | ||
305 | - $(ACPICA_COMP)/utilities/utdebug.c \ | ||
306 | - $(ACPICA_COMP)/utilities/utdelete.c \ | ||
307 | - $(ACPICA_COMP)/utilities/uteval.c \ | ||
308 | - $(ACPICA_COMP)/utilities/utglobal.c \ | ||
309 | - $(ACPICA_COMP)/utilities/utids.c \ | ||
310 | - $(ACPICA_COMP)/utilities/utinit.c \ | ||
311 | - $(ACPICA_COMP)/utilities/utlock.c \ | ||
312 | - $(ACPICA_COMP)/utilities/utmath.c \ | ||
313 | - $(ACPICA_COMP)/utilities/utmisc.c \ | ||
314 | - $(ACPICA_COMP)/utilities/utmutex.c \ | ||
315 | - $(ACPICA_COMP)/utilities/utobject.c \ | ||
316 | - $(ACPICA_COMP)/utilities/utresrc.c \ | ||
317 | - $(ACPICA_COMP)/utilities/utstate.c \ | ||
318 | - $(ACPICA_COMP)/utilities/uttrack.c \ | ||
319 | - $(ACPICA_COMP)/utilities/utosi.c \ | ||
320 | - $(ACPICA_COMP)/utilities/utxferror.c \ | ||
321 | - $(ACPICA_COMP)/utilities/utxface.c \ | ||
322 | - $(ACPICA_COMP)/utilities/utdecode.c \ | ||
323 | - $(ACPICA_COMP)/utilities/utexcep.c \ | ||
324 | - $(ACPICA_COMP)/utilities/utpredef.c \ | ||
325 | - $(ACPICA_COMP)/utilities/utstring.c \ | ||
326 | - $(ACPICA_COMP)/utilities/utownerid.c \ | ||
327 | - $(ACPICA_COMP)/utilities/utxfinit.c \ | ||
328 | - $(ACPICA_COMP)/utilities/uterror.c \ | ||
329 | - $(ACPICA_COMP)/utilities/utbuffer.c \ | ||
330 | - $(ACPICA_COMMON)/acgetline.c \ | ||
331 | - $(ACPICA_SRC)/tools/acpiexec/aehandlers.c | ||
332 | +libfwtsacpica_la_SOURCES = \ | ||
333 | + fwts_acpica.c \ | ||
334 | + osunixxf_munged.c \ | ||
335 | + dscontrol_munged.c \ | ||
336 | + source/components/debugger/dbcmds.c \ | ||
337 | + source/components/debugger/dbdisply.c \ | ||
338 | + source/components/debugger/dbexec.c \ | ||
339 | + source/components/debugger/dbfileio.c \ | ||
340 | + source/components/debugger/dbhistry.c \ | ||
341 | + source/components/debugger/dbinput.c \ | ||
342 | + source/components/debugger/dbstats.c \ | ||
343 | + source/components/debugger/dbutils.c \ | ||
344 | + source/components/debugger/dbxface.c \ | ||
345 | + source/components/debugger/dbmethod.c \ | ||
346 | + source/components/debugger/dbnames.c \ | ||
347 | + source/components/debugger/dbconvert.c \ | ||
348 | + source/components/disassembler/dmbuffer.c \ | ||
349 | + source/components/disassembler/dmnames.c \ | ||
350 | + source/components/disassembler/dmobject.c \ | ||
351 | + source/components/disassembler/dmopcode.c \ | ||
352 | + source/components/disassembler/dmresrc.c \ | ||
353 | + source/components/disassembler/dmresrcl.c \ | ||
354 | + source/components/disassembler/dmresrcs.c \ | ||
355 | + source/components/disassembler/dmutils.c \ | ||
356 | + source/components/disassembler/dmwalk.c \ | ||
357 | + source/components/disassembler/dmresrcl2.c \ | ||
358 | + source/components/disassembler/dmdeferred.c \ | ||
359 | + source/components/dispatcher/dsfield.c \ | ||
360 | + source/components/dispatcher/dsinit.c \ | ||
361 | + source/components/dispatcher/dsmethod.c \ | ||
362 | + source/components/dispatcher/dsmthdat.c \ | ||
363 | + source/components/dispatcher/dsobject.c \ | ||
364 | + source/components/dispatcher/dsutils.c \ | ||
365 | + source/components/dispatcher/dswexec.c \ | ||
366 | + source/components/dispatcher/dswload.c \ | ||
367 | + source/components/dispatcher/dswscope.c \ | ||
368 | + source/components/dispatcher/dswstate.c \ | ||
369 | + source/components/dispatcher/dsargs.c \ | ||
370 | + source/components/dispatcher/dswload2.c \ | ||
371 | + source/components/dispatcher/dsopcode.c \ | ||
372 | + source/components/events/evevent.c \ | ||
373 | + source/components/events/evgpe.c \ | ||
374 | + source/components/events/evgpeblk.c \ | ||
375 | + source/components/events/evgpeinit.c \ | ||
376 | + source/components/events/evgpeutil.c \ | ||
377 | + source/components/events/evxfgpe.c \ | ||
378 | + source/components/events/evmisc.c \ | ||
379 | + source/components/events/evregion.c \ | ||
380 | + source/components/events/evrgnini.c \ | ||
381 | + source/components/events/evsci.c \ | ||
382 | + source/components/events/evxface.c \ | ||
383 | + source/components/events/evxfevnt.c \ | ||
384 | + source/components/events/evxfregn.c \ | ||
385 | + source/components/events/evglock.c \ | ||
386 | + source/components/events/evhandler.c \ | ||
387 | + source/components/executer/exfield.c \ | ||
388 | + source/components/executer/exfldio.c \ | ||
389 | + source/components/executer/exmisc.c \ | ||
390 | + source/components/executer/exmutex.c \ | ||
391 | + source/components/executer/exnames.c \ | ||
392 | + source/components/executer/exoparg1.c \ | ||
393 | + source/components/executer/exoparg2.c \ | ||
394 | + source/components/executer/exoparg3.c \ | ||
395 | + source/components/executer/exoparg6.c \ | ||
396 | + source/components/executer/exprep.c \ | ||
397 | + source/components/executer/exregion.c \ | ||
398 | + source/components/executer/exresnte.c \ | ||
399 | + source/components/executer/exresolv.c \ | ||
400 | + source/components/executer/exresop.c \ | ||
401 | + source/components/executer/exstore.c \ | ||
402 | + source/components/executer/exstoren.c \ | ||
403 | + source/components/executer/exstorob.c \ | ||
404 | + source/components/executer/exsystem.c \ | ||
405 | + source/components/executer/exutils.c \ | ||
406 | + source/components/executer/exconvrt.c \ | ||
407 | + source/components/executer/excreate.c \ | ||
408 | + source/components/executer/exdump.c \ | ||
409 | + source/components/executer/exdebug.c \ | ||
410 | + source/components/executer/exconfig.c \ | ||
411 | + source/components/hardware/hwacpi.c \ | ||
412 | + source/components/hardware/hwgpe.c \ | ||
413 | + source/components/hardware/hwpci.c \ | ||
414 | + source/components/hardware/hwregs.c \ | ||
415 | + source/components/hardware/hwsleep.c \ | ||
416 | + source/components/hardware/hwvalid.c \ | ||
417 | + source/components/hardware/hwxface.c \ | ||
418 | + source/components/hardware/hwxfsleep.c \ | ||
419 | + source/components/hardware/hwesleep.c \ | ||
420 | + source/components/namespace/nsaccess.c \ | ||
421 | + source/components/namespace/nsalloc.c \ | ||
422 | + source/components/namespace/nsdump.c \ | ||
423 | + source/components/namespace/nsdumpdv.c \ | ||
424 | + source/components/namespace/nseval.c \ | ||
425 | + source/components/namespace/nsinit.c \ | ||
426 | + source/components/namespace/nsload.c \ | ||
427 | + source/components/namespace/nsnames.c \ | ||
428 | + source/components/namespace/nsobject.c \ | ||
429 | + source/components/namespace/nsparse.c \ | ||
430 | + source/components/namespace/nspredef.c \ | ||
431 | + source/components/namespace/nsrepair.c \ | ||
432 | + source/components/namespace/nsrepair2.c \ | ||
433 | + source/components/namespace/nssearch.c \ | ||
434 | + source/components/namespace/nsutils.c \ | ||
435 | + source/components/namespace/nswalk.c \ | ||
436 | + source/components/namespace/nsxfeval.c \ | ||
437 | + source/components/namespace/nsxfname.c \ | ||
438 | + source/components/namespace/nsxfobj.c \ | ||
439 | + source/components/namespace/nsconvert.c \ | ||
440 | + source/components/namespace/nsprepkg.c \ | ||
441 | + source/components/namespace/nsarguments.c \ | ||
442 | + source/components/parser/psargs.c \ | ||
443 | + source/components/parser/psloop.c \ | ||
444 | + source/components/parser/psopcode.c \ | ||
445 | + source/components/parser/psparse.c \ | ||
446 | + source/components/parser/psscope.c \ | ||
447 | + source/components/parser/pstree.c \ | ||
448 | + source/components/parser/psutils.c \ | ||
449 | + source/components/parser/pswalk.c \ | ||
450 | + source/components/parser/psxface.c \ | ||
451 | + source/components/parser/psopinfo.c \ | ||
452 | + source/components/parser/psobject.c \ | ||
453 | + source/components/resources/rsaddr.c \ | ||
454 | + source/components/resources/rscalc.c \ | ||
455 | + source/components/resources/rscreate.c \ | ||
456 | + source/components/resources/rsdump.c \ | ||
457 | + source/components/resources/rsio.c \ | ||
458 | + source/components/resources/rsinfo.c \ | ||
459 | + source/components/resources/rsirq.c \ | ||
460 | + source/components/resources/rslist.c \ | ||
461 | + source/components/resources/rsmemory.c \ | ||
462 | + source/components/resources/rsmisc.c \ | ||
463 | + source/components/resources/rsutils.c \ | ||
464 | + source/components/resources/rsxface.c \ | ||
465 | + source/components/resources/rsserial.c \ | ||
466 | + source/components/resources/rsdumpinfo.c \ | ||
467 | + source/components/tables/tbfadt.c \ | ||
468 | + source/components/tables/tbfind.c \ | ||
469 | + source/components/tables/tbinstal.c \ | ||
470 | + source/components/tables/tbutils.c \ | ||
471 | + source/components/tables/tbxface.c \ | ||
472 | + source/components/tables/tbxfroot.c \ | ||
473 | + source/components/tables/tbxfload.c \ | ||
474 | + source/components/tables/tbprint.c \ | ||
475 | + source/components/utilities/utaddress.c \ | ||
476 | + source/components/utilities/utalloc.c \ | ||
477 | + source/components/utilities/utcache.c \ | ||
478 | + source/components/utilities/utcopy.c \ | ||
479 | + source/components/utilities/utdebug.c \ | ||
480 | + source/components/utilities/utdelete.c \ | ||
481 | + source/components/utilities/uteval.c \ | ||
482 | + source/components/utilities/utglobal.c \ | ||
483 | + source/components/utilities/utids.c \ | ||
484 | + source/components/utilities/utinit.c \ | ||
485 | + source/components/utilities/utlock.c \ | ||
486 | + source/components/utilities/utmath.c \ | ||
487 | + source/components/utilities/utmisc.c \ | ||
488 | + source/components/utilities/utmutex.c \ | ||
489 | + source/components/utilities/utobject.c \ | ||
490 | + source/components/utilities/utresrc.c \ | ||
491 | + source/components/utilities/utstate.c \ | ||
492 | + source/components/utilities/uttrack.c \ | ||
493 | + source/components/utilities/utosi.c \ | ||
494 | + source/components/utilities/utxferror.c \ | ||
495 | + source/components/utilities/utxface.c \ | ||
496 | + source/components/utilities/utdecode.c \ | ||
497 | + source/components/utilities/utexcep.c \ | ||
498 | + source/components/utilities/utpredef.c \ | ||
499 | + source/components/utilities/utstring.c \ | ||
500 | + source/components/utilities/utownerid.c \ | ||
501 | + source/components/utilities/utxfinit.c \ | ||
502 | + source/components/utilities/uterror.c \ | ||
503 | + source/components/utilities/utbuffer.c \ | ||
504 | + source/common/acgetline.c \ | ||
505 | + source/tools/acpiexec/aehandlers.c | ||
506 | |||
507 | libfwtsacpica_la_LIBADD = \ | ||
508 | -L$(top_srcdir)/src/lib/src -lfwts -lrt | ||
509 | diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am | ||
510 | index a117577..b690888 100644 | ||
511 | --- a/src/acpica/source/compiler/Makefile.am | ||
512 | +++ b/src/acpica/source/compiler/Makefile.am | ||
513 | @@ -2,20 +2,10 @@ | ||
514 | # We need to build this as a separate shared library with the iasl functionality built in. We | ||
515 | # just export the fwts_* interface. | ||
516 | # | ||
517 | -AM_CPPFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -D_LINUX -DACPI_ASL_COMPILER $(CFLAGS) -I$(top_srcdir)/src/acpica/source/include | ||
518 | +AUTOMAKE_OPTIONS = subdir-objects | ||
519 | |||
520 | -ACPICA_COMPILER = . | ||
521 | -ACPICA_COMMON = ../common | ||
522 | -ACPICA_COMPONENTS = ../components | ||
523 | -ACPICA_UTILS = $(ACPICA_COMPONENTS)/utilities | ||
524 | -ACPICA_NAMESPACE = $(ACPICA_COMPONENTS)/namespace | ||
525 | -ACPICA_PARSER = $(ACPICA_COMPONENTS)/parser | ||
526 | -ACPICA_DISPATCHER = $(ACPICA_COMPONENTS)/dispatcher | ||
527 | -ACPICA_EXECUTER = $(ACPICA_COMPONENTS)/executer | ||
528 | -ACPICA_DEBUGGER = $(ACPICA_COMPONENTS)/debugger | ||
529 | -ACPICA_DISASSEMBLER = $(ACPICA_COMPONENTS)/disassembler | ||
530 | -ACPICA_TABLES = $(ACPICA_COMPONENTS)/tables | ||
531 | -ACPICA_SERVICE = ../os_specific/service_layers | ||
532 | +AM_CPPFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -D_LINUX \ | ||
533 | + -DACPI_ASL_COMPILER $(CFLAGS) -I$(top_srcdir)/src/acpica/source/include | ||
534 | |||
535 | AM_YFLAGS = -v -d -y | ||
536 | |||
537 | @@ -50,9 +40,12 @@ prparserlex.c: prparser.l | ||
538 | |||
539 | pkglib_LTLIBRARIES = libfwtsiasl.la | ||
540 | |||
541 | -BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \ | ||
542 | - dtparserparse.c dtparserlex.c \ | ||
543 | - prparserparse.c prparserlex.c | ||
544 | +BUILT_SOURCES = aslcompilerparse.c \ | ||
545 | + aslcompilerlex.c \ | ||
546 | + dtparserparse.c \ | ||
547 | + dtparserlex.c \ | ||
548 | + prparserparse.c \ | ||
549 | + prparserlex.c | ||
550 | |||
551 | # | ||
552 | # Just export fwts specific API so we don't clash with core ACPICA library | ||
553 | @@ -60,165 +53,167 @@ BUILT_SOURCES = aslcompilerparse.c aslcompilerlex.c \ | ||
554 | libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -lpthread -version-info 1:0:0 | ||
555 | |||
556 | CLEANFILES = y.output y.tab.c y.tab.h aslcompiler.y.h \ | ||
557 | - aslcompilerparse.c aslcompilerlex.c \ | ||
558 | + aslcompilerparse.c aslcompilerlex.c \ | ||
559 | dtparserparse.c dtparserlex.c | ||
560 | |||
561 | -libfwtsiasl_la_SOURCES = \ | ||
562 | - $(ACPICA_COMPILER)/aslcompile.c \ | ||
563 | - $(ACPICA_COMPILER)/aslcompilerlex.c \ | ||
564 | - $(ACPICA_COMPILER)/aslcompilerparse.c \ | ||
565 | - $(ACPICA_COMPILER)/aslanalyze.c \ | ||
566 | - $(ACPICA_COMPILER)/aslcodegen.c \ | ||
567 | - $(ACPICA_COMPILER)/aslerror.c \ | ||
568 | - $(ACPICA_COMPILER)/aslfiles.c \ | ||
569 | - $(ACPICA_COMPILER)/aslfold.c \ | ||
570 | - $(ACPICA_COMPILER)/asllength.c \ | ||
571 | - $(ACPICA_COMPILER)/asllisting.c \ | ||
572 | - $(ACPICA_COMPILER)/aslload.c \ | ||
573 | - $(ACPICA_COMPILER)/asllookup.c \ | ||
574 | - $(ACPICA_COMPILER)/aslmap.c \ | ||
575 | - $(ACPICA_COMPILER)/aslopcodes.c \ | ||
576 | - $(ACPICA_COMPILER)/asloperands.c \ | ||
577 | - $(ACPICA_COMPILER)/aslopt.c \ | ||
578 | - $(ACPICA_COMPILER)/aslpredef.c \ | ||
579 | - $(ACPICA_COMPILER)/aslresource.c \ | ||
580 | - $(ACPICA_COMPILER)/aslrestype1.c \ | ||
581 | - $(ACPICA_COMPILER)/aslrestype1i.c \ | ||
582 | - $(ACPICA_COMPILER)/aslrestype2.c \ | ||
583 | - $(ACPICA_COMPILER)/aslrestype2d.c \ | ||
584 | - $(ACPICA_COMPILER)/aslrestype2e.c \ | ||
585 | - $(ACPICA_COMPILER)/aslrestype2q.c \ | ||
586 | - $(ACPICA_COMPILER)/aslrestype2w.c \ | ||
587 | - $(ACPICA_COMPILER)/aslstartup.c \ | ||
588 | - $(ACPICA_COMPILER)/aslstubs.c \ | ||
589 | - $(ACPICA_COMPILER)/asltransform.c \ | ||
590 | - $(ACPICA_COMPILER)/asltree.c \ | ||
591 | - $(ACPICA_COMPILER)/aslutils.c \ | ||
592 | - $(ACPICA_COMPILER)/aslbtypes.c \ | ||
593 | - $(ACPICA_COMPILER)/aslwalks.c \ | ||
594 | - $(ACPICA_COMPILER)/asluuid.c \ | ||
595 | - $(ACPICA_COMPILER)/aslmethod.c \ | ||
596 | - $(ACPICA_COMPILER)/aslhex.c \ | ||
597 | - $(ACPICA_COMPILER)/aslnamesp.c \ | ||
598 | - $(ACPICA_COMPILER)/aslfileio.c \ | ||
599 | - $(ACPICA_COMPILER)/asllistsup.c \ | ||
600 | - $(ACPICA_COMPILER)/asloffset.c \ | ||
601 | - $(ACPICA_COMPILER)/aslxref.c \ | ||
602 | - $(ACPICA_COMPILER)/aslprepkg.c \ | ||
603 | - $(ACPICA_COMPILER)/dtfield.c \ | ||
604 | - $(ACPICA_COMPILER)/dtio.c \ | ||
605 | - $(ACPICA_COMPILER)/dtsubtable.c \ | ||
606 | - $(ACPICA_COMPILER)/dttemplate.c \ | ||
607 | - $(ACPICA_COMPILER)/dttable.c \ | ||
608 | - $(ACPICA_COMPILER)/dtutils.c \ | ||
609 | - $(ACPICA_COMPILER)/dtexpress.c \ | ||
610 | - $(ACPICA_COMPILER)/dtcompile.c \ | ||
611 | - $(ACPICA_COMPILER)/dtparserparse.c \ | ||
612 | - $(ACPICA_COMPILER)/dtparserlex.c \ | ||
613 | - $(ACPICA_COMPILER)/prparserparse.c \ | ||
614 | - $(ACPICA_COMPILER)/prparserlex.c \ | ||
615 | - $(ACPICA_COMPILER)/prscan.c \ | ||
616 | - $(ACPICA_COMPILER)/aslrestype2s.c \ | ||
617 | - $(ACPICA_COMPILER)/prmacros.c \ | ||
618 | - $(ACPICA_COMPILER)/prutils.c \ | ||
619 | - $(ACPICA_COMPILER)/prexpress.c \ | ||
620 | - $(ACPICA_UTILS)/utalloc.c \ | ||
621 | - $(ACPICA_UTILS)/utcache.c \ | ||
622 | - $(ACPICA_UTILS)/utcopy.c \ | ||
623 | - $(ACPICA_UTILS)/utdebug.c \ | ||
624 | - $(ACPICA_UTILS)/utdelete.c \ | ||
625 | - $(ACPICA_UTILS)/utglobal.c \ | ||
626 | - $(ACPICA_UTILS)/utinit.c \ | ||
627 | - $(ACPICA_UTILS)/utlock.c \ | ||
628 | - $(ACPICA_UTILS)/utobject.c \ | ||
629 | - $(ACPICA_UTILS)/utmisc.c \ | ||
630 | - $(ACPICA_UTILS)/utmath.c \ | ||
631 | - $(ACPICA_UTILS)/utmutex.c \ | ||
632 | - $(ACPICA_UTILS)/utresrc.c \ | ||
633 | - $(ACPICA_UTILS)/utstate.c \ | ||
634 | - $(ACPICA_UTILS)/utxface.c \ | ||
635 | - $(ACPICA_UTILS)/utxferror.c \ | ||
636 | - $(ACPICA_UTILS)/utdecode.c \ | ||
637 | - $(ACPICA_UTILS)/utpredef.c \ | ||
638 | - $(ACPICA_UTILS)/utstring.c \ | ||
639 | - $(ACPICA_UTILS)/utaddress.c \ | ||
640 | - $(ACPICA_UTILS)/utownerid.c \ | ||
641 | - $(ACPICA_UTILS)/utexcep.c \ | ||
642 | - $(ACPICA_NAMESPACE)/nsaccess.c \ | ||
643 | - $(ACPICA_NAMESPACE)/nsalloc.c \ | ||
644 | - $(ACPICA_NAMESPACE)/nsdump.c \ | ||
645 | - $(ACPICA_NAMESPACE)/nsnames.c \ | ||
646 | - $(ACPICA_NAMESPACE)/nsobject.c \ | ||
647 | - $(ACPICA_NAMESPACE)/nsparse.c \ | ||
648 | - $(ACPICA_NAMESPACE)/nssearch.c \ | ||
649 | - $(ACPICA_NAMESPACE)/nsutils.c \ | ||
650 | - $(ACPICA_NAMESPACE)/nswalk.c \ | ||
651 | - $(ACPICA_NAMESPACE)/nsxfobj.c \ | ||
652 | - $(ACPICA_PARSER)/psargs.c \ | ||
653 | - $(ACPICA_PARSER)/psloop.c \ | ||
654 | - $(ACPICA_PARSER)/psopcode.c \ | ||
655 | - $(ACPICA_PARSER)/psparse.c \ | ||
656 | - $(ACPICA_PARSER)/psscope.c \ | ||
657 | - $(ACPICA_PARSER)/pstree.c \ | ||
658 | - $(ACPICA_PARSER)/psutils.c \ | ||
659 | - $(ACPICA_PARSER)/pswalk.c \ | ||
660 | - $(ACPICA_PARSER)/psobject.c \ | ||
661 | - $(ACPICA_PARSER)/psopinfo.c \ | ||
662 | - $(ACPICA_DISPATCHER)/dswscope.c \ | ||
663 | - $(ACPICA_DISPATCHER)/dswstate.c \ | ||
664 | - $(ACPICA_DISPATCHER)/dsfield.c \ | ||
665 | - $(ACPICA_DISPATCHER)/dsobject.c \ | ||
666 | - $(ACPICA_DISPATCHER)/dsopcode.c \ | ||
667 | - $(ACPICA_DISPATCHER)/dsutils.c \ | ||
668 | - $(ACPICA_DISPATCHER)/dswexec.c \ | ||
669 | - $(ACPICA_DISPATCHER)/dswload.c \ | ||
670 | - $(ACPICA_DISPATCHER)/dswload2.c \ | ||
671 | - $(ACPICA_DISPATCHER)/dsargs.c \ | ||
672 | - $(ACPICA_DISPATCHER)/dscontrol.c \ | ||
673 | - $(ACPICA_EXECUTER)/exconvrt.c \ | ||
674 | - $(ACPICA_EXECUTER)/excreate.c \ | ||
675 | - $(ACPICA_EXECUTER)/exdump.c \ | ||
676 | - $(ACPICA_EXECUTER)/exmisc.c \ | ||
677 | - $(ACPICA_EXECUTER)/exmutex.c \ | ||
678 | - $(ACPICA_EXECUTER)/exnames.c \ | ||
679 | - $(ACPICA_EXECUTER)/exoparg1.c \ | ||
680 | - $(ACPICA_EXECUTER)/exoparg2.c \ | ||
681 | - $(ACPICA_EXECUTER)/exoparg3.c \ | ||
682 | - $(ACPICA_EXECUTER)/exoparg6.c \ | ||
683 | - $(ACPICA_EXECUTER)/exprep.c \ | ||
684 | - $(ACPICA_EXECUTER)/exregion.c \ | ||
685 | - $(ACPICA_EXECUTER)/exresnte.c \ | ||
686 | - $(ACPICA_EXECUTER)/exresolv.c \ | ||
687 | - $(ACPICA_EXECUTER)/exresop.c \ | ||
688 | - $(ACPICA_EXECUTER)/exstore.c \ | ||
689 | - $(ACPICA_EXECUTER)/exstoren.c \ | ||
690 | - $(ACPICA_EXECUTER)/exstorob.c \ | ||
691 | - $(ACPICA_EXECUTER)/exsystem.c \ | ||
692 | - $(ACPICA_EXECUTER)/exutils.c \ | ||
693 | - $(ACPICA_COMMON)/adfile.c \ | ||
694 | - $(ACPICA_COMMON)/adisasm.c \ | ||
695 | - $(ACPICA_COMMON)/adwalk.c \ | ||
696 | - $(ACPICA_COMMON)/ahpredef.c \ | ||
697 | - $(ACPICA_COMMON)/dmextern.c \ | ||
698 | - $(ACPICA_COMMON)/dmrestag.c \ | ||
699 | - $(ACPICA_COMMON)/dmtable.c \ | ||
700 | - $(ACPICA_COMMON)/dmtbinfo.c \ | ||
701 | - $(ACPICA_COMMON)/dmtbdump.c \ | ||
702 | - $(ACPICA_DEBUGGER)/dbfileio.c \ | ||
703 | - $(ACPICA_DISASSEMBLER)/dmbuffer.c \ | ||
704 | - $(ACPICA_DISASSEMBLER)/dmnames.c \ | ||
705 | - $(ACPICA_DISASSEMBLER)/dmopcode.c \ | ||
706 | - $(ACPICA_DISASSEMBLER)/dmobject.c \ | ||
707 | - $(ACPICA_DISASSEMBLER)/dmresrc.c \ | ||
708 | - $(ACPICA_DISASSEMBLER)/dmresrcl.c \ | ||
709 | - $(ACPICA_DISASSEMBLER)/dmresrcs.c \ | ||
710 | - $(ACPICA_DISASSEMBLER)/dmutils.c \ | ||
711 | - $(ACPICA_DISASSEMBLER)/dmwalk.c \ | ||
712 | - $(ACPICA_DISASSEMBLER)/dmdeferred.c \ | ||
713 | - $(ACPICA_DISASSEMBLER)/dmresrcl2.c \ | ||
714 | - $(ACPICA_TABLES)/tbfadt.c \ | ||
715 | - $(ACPICA_TABLES)/tbinstal.c \ | ||
716 | - $(ACPICA_TABLES)/tbutils.c \ | ||
717 | - $(ACPICA_TABLES)/tbxface.c \ | ||
718 | - $(ACPICA_SERVICE)/osunixxf.c \ | ||
719 | - $(ACPICA_COMPILER)/fwts_iasl_interface.c | ||
720 | +libfwtsiasl_la_CPPFLAGS = $(AM_CPPFLAGS) | ||
721 | +libfwtsiasl_la_SOURCES = \ | ||
722 | + fwts_iasl_interface.c \ | ||
723 | + aslcompile.c \ | ||
724 | + aslcompilerlex.c \ | ||
725 | + aslcompilerparse.c \ | ||
726 | + aslanalyze.c \ | ||
727 | + aslcodegen.c \ | ||
728 | + aslerror.c \ | ||
729 | + aslfiles.c \ | ||
730 | + aslfold.c \ | ||
731 | + asllength.c \ | ||
732 | + asllisting.c \ | ||
733 | + aslload.c \ | ||
734 | + asllookup.c \ | ||
735 | + aslmap.c \ | ||
736 | + aslopcodes.c \ | ||
737 | + asloperands.c \ | ||
738 | + aslopt.c \ | ||
739 | + aslpredef.c \ | ||
740 | + aslresource.c \ | ||
741 | + aslrestype1.c \ | ||
742 | + aslrestype1i.c \ | ||
743 | + aslrestype2.c \ | ||
744 | + aslrestype2d.c \ | ||
745 | + aslrestype2e.c \ | ||
746 | + aslrestype2q.c \ | ||
747 | + aslrestype2w.c \ | ||
748 | + aslstartup.c \ | ||
749 | + aslstubs.c \ | ||
750 | + asltransform.c \ | ||
751 | + asltree.c \ | ||
752 | + aslutils.c \ | ||
753 | + aslbtypes.c \ | ||
754 | + aslwalks.c \ | ||
755 | + asluuid.c \ | ||
756 | + aslmethod.c \ | ||
757 | + aslhex.c \ | ||
758 | + aslnamesp.c \ | ||
759 | + aslfileio.c \ | ||
760 | + asllistsup.c \ | ||
761 | + asloffset.c \ | ||
762 | + aslxref.c \ | ||
763 | + aslprepkg.c \ | ||
764 | + dtfield.c \ | ||
765 | + dtio.c \ | ||
766 | + dtsubtable.c \ | ||
767 | + dttemplate.c \ | ||
768 | + dttable.c \ | ||
769 | + dtutils.c \ | ||
770 | + dtexpress.c \ | ||
771 | + dtcompile.c \ | ||
772 | + dtparserparse.c \ | ||
773 | + dtparserlex.c \ | ||
774 | + prparserparse.c \ | ||
775 | + prparserlex.c \ | ||
776 | + prscan.c \ | ||
777 | + aslrestype2s.c \ | ||
778 | + prmacros.c \ | ||
779 | + prutils.c \ | ||
780 | + prexpress.c \ | ||
781 | + ../components/utilities/utalloc.c \ | ||
782 | + ../components/utilities/utcache.c \ | ||
783 | + ../components/utilities/utcopy.c \ | ||
784 | + ../components/utilities/utdebug.c \ | ||
785 | + ../components/utilities/utdelete.c \ | ||
786 | + ../components/utilities/utglobal.c \ | ||
787 | + ../components/utilities/utinit.c \ | ||
788 | + ../components/utilities/utlock.c \ | ||
789 | + ../components/utilities/utobject.c \ | ||
790 | + ../components/utilities/utmisc.c \ | ||
791 | + ../components/utilities/utmath.c \ | ||
792 | + ../components/utilities/utmutex.c \ | ||
793 | + ../components/utilities/utresrc.c \ | ||
794 | + ../components/utilities/utstate.c \ | ||
795 | + ../components/utilities/utxface.c \ | ||
796 | + ../components/utilities/utxferror.c \ | ||
797 | + ../components/utilities/utdecode.c \ | ||
798 | + ../components/utilities/utpredef.c \ | ||
799 | + ../components/utilities/utstring.c \ | ||
800 | + ../components/utilities/utaddress.c \ | ||
801 | + ../components/utilities/utownerid.c \ | ||
802 | + ../components/utilities/utexcep.c \ | ||
803 | + ../components/namespace/nsaccess.c \ | ||
804 | + ../components/namespace/nsalloc.c \ | ||
805 | + ../components/namespace/nsdump.c \ | ||
806 | + ../components/namespace/nsnames.c \ | ||
807 | + ../components/namespace/nsobject.c \ | ||
808 | + ../components/namespace/nsparse.c \ | ||
809 | + ../components/namespace/nssearch.c \ | ||
810 | + ../components/namespace/nsutils.c \ | ||
811 | + ../components/namespace/nswalk.c \ | ||
812 | + ../components/namespace/nsxfobj.c \ | ||
813 | + ../components/parser/psargs.c \ | ||
814 | + ../components/parser/psloop.c \ | ||
815 | + ../components/parser/psopcode.c \ | ||
816 | + ../components/parser/psparse.c \ | ||
817 | + ../components/parser/psscope.c \ | ||
818 | + ../components/parser/pstree.c \ | ||
819 | + ../components/parser/psutils.c \ | ||
820 | + ../components/parser/pswalk.c \ | ||
821 | + ../components/parser/psobject.c \ | ||
822 | + ../components/parser/psopinfo.c \ | ||
823 | + ../components/dispatcher/dswscope.c \ | ||
824 | + ../components/dispatcher/dswstate.c \ | ||
825 | + ../components/dispatcher/dsfield.c \ | ||
826 | + ../components/dispatcher/dsobject.c \ | ||
827 | + ../components/dispatcher/dsopcode.c \ | ||
828 | + ../components/dispatcher/dsutils.c \ | ||
829 | + ../components/dispatcher/dswexec.c \ | ||
830 | + ../components/dispatcher/dswload.c \ | ||
831 | + ../components/dispatcher/dswload2.c \ | ||
832 | + ../components/dispatcher/dsargs.c \ | ||
833 | + ../components/dispatcher/dscontrol.c \ | ||
834 | + ../components/executer/exconvrt.c \ | ||
835 | + ../components/executer/excreate.c \ | ||
836 | + ../components/executer/exdump.c \ | ||
837 | + ../components/executer/exmisc.c \ | ||
838 | + ../components/executer/exmutex.c \ | ||
839 | + ../components/executer/exnames.c \ | ||
840 | + ../components/executer/exoparg1.c \ | ||
841 | + ../components/executer/exoparg2.c \ | ||
842 | + ../components/executer/exoparg3.c \ | ||
843 | + ../components/executer/exoparg6.c \ | ||
844 | + ../components/executer/exprep.c \ | ||
845 | + ../components/executer/exregion.c \ | ||
846 | + ../components/executer/exresnte.c \ | ||
847 | + ../components/executer/exresolv.c \ | ||
848 | + ../components/executer/exresop.c \ | ||
849 | + ../components/executer/exstore.c \ | ||
850 | + ../components/executer/exstoren.c \ | ||
851 | + ../components/executer/exstorob.c \ | ||
852 | + ../components/executer/exsystem.c \ | ||
853 | + ../components/executer/exutils.c \ | ||
854 | + ../common/adfile.c \ | ||
855 | + ../common/adisasm.c \ | ||
856 | + ../common/adwalk.c \ | ||
857 | + ../common/ahpredef.c \ | ||
858 | + ../common/dmextern.c \ | ||
859 | + ../common/dmrestag.c \ | ||
860 | + ../common/dmtable.c \ | ||
861 | + ../common/dmtbinfo.c \ | ||
862 | + ../common/dmtbdump.c \ | ||
863 | + ../components/debugger/dbfileio.c \ | ||
864 | + ../components/disassembler/dmbuffer.c \ | ||
865 | + ../components/disassembler/dmnames.c \ | ||
866 | + ../components/disassembler/dmopcode.c \ | ||
867 | + ../components/disassembler/dmobject.c \ | ||
868 | + ../components/disassembler/dmresrc.c \ | ||
869 | + ../components/disassembler/dmresrcl.c \ | ||
870 | + ../components/disassembler/dmresrcs.c \ | ||
871 | + ../components/disassembler/dmutils.c \ | ||
872 | + ../components/disassembler/dmwalk.c \ | ||
873 | + ../components/disassembler/dmdeferred.c \ | ||
874 | + ../components/disassembler/dmresrcl2.c \ | ||
875 | + ../components/tables/tbfadt.c \ | ||
876 | + ../components/tables/tbinstal.c \ | ||
877 | + ../components/tables/tbutils.c \ | ||
878 | + ../components/tables/tbxface.c \ | ||
879 | + ../os_specific/service_layers/osunixxf.c | ||
880 | + | ||
881 | diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am | ||
882 | index d708f34..7668b8c 100644 | ||
883 | --- a/src/lib/src/Makefile.am | ||
884 | +++ b/src/lib/src/Makefile.am | ||
885 | @@ -12,6 +12,8 @@ libfwts_la_LDFLAGS = \ | ||
886 | -L$(top_srcdir)/src/acpica/source/compiler \ | ||
887 | -lfwtsiasl | ||
888 | |||
889 | +libfwts_la_CPPFLAGS = $(AM_CPPFLAGS) | ||
890 | + | ||
891 | # | ||
892 | # Components of the fwts core helper library libfwts | ||
893 | # | ||
diff --git a/meta-oe/recipes-extended/fwts/fwts_git.bb b/meta-oe/recipes-extended/fwts/fwts_git.bb index 4f88f2368..086e6d928 100644 --- a/meta-oe/recipes-extended/fwts/fwts_git.bb +++ b/meta-oe/recipes-extended/fwts/fwts_git.bb | |||
@@ -5,13 +5,10 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" | |||
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f" | 6 | LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f" |
7 | 7 | ||
8 | PV = "14.01.00" | 8 | PV = "14.02.00" |
9 | 9 | ||
10 | SRCREV = "fef72314787d7b029d932ef56b4a117538cf69e3" | 10 | SRCREV = "628534d216f135939f2f7b6b0a6c076c8d73bff9" |
11 | SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ | 11 | SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git" |
12 | file://subdir.patch \ | ||
13 | file://jsonc.patch \ | ||
14 | " | ||
15 | 12 | ||
16 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
17 | 14 | ||