* [PATCH] mercury: Fix include path for cobalt/wrapper.h
@ 2021-02-15 21:59 Jan Kiszka
2021-02-16 9:20 ` Philippe Gerum
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kiszka @ 2021-02-15 21:59 UTC (permalink / raw)
To: Xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
Long broken, likely not practically relevant. But now that we known it,
let's fix it: There is no mercury/wrapper.h, but we have that file under
mercury/copperplate.
Reported-by: Florian Bezdeka <florian.bezdeka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
include/copperplate/wrappers.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/copperplate/wrappers.h b/include/copperplate/wrappers.h
index a7c68f5cb8..06b94b5e4c 100644
--- a/include/copperplate/wrappers.h
+++ b/include/copperplate/wrappers.h
@@ -24,7 +24,7 @@
#ifdef CONFIG_XENO_COBALT
#include <cobalt/wrappers.h>
#else /* CONFIG_XENO_MERCURY */
-#include <mercury/wrappers.h>
+#include <mercury/boilerplate/wrappers.h>
#endif /* CONFIG_XENO_MERCURY */
#endif /* _COPPERPLATE_WRAPPERS_H */
--
2.26.2
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mercury: Fix include path for cobalt/wrapper.h
2021-02-15 21:59 [PATCH] mercury: Fix include path for cobalt/wrapper.h Jan Kiszka
@ 2021-02-16 9:20 ` Philippe Gerum
2021-02-16 9:44 ` Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Philippe Gerum @ 2021-02-16 9:20 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Xenomai, Bezdeka, Florian (T RDA IOT SES-DE)
Jan Kiszka <jan.kiszka@siemens.com> writes:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Long broken, likely not practically relevant. But now that we known it,
> let's fix it: There is no mercury/wrapper.h, but we have that file under
> mercury/copperplate.
>
A better fix would be to drop copperplate/wrappers.h. This is an
internal header, which has no in-tree user. This explains why Mercury
builds flawlessly even if that file would attempt to pull in a
non-existent header.
--
Philippe.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mercury: Fix include path for cobalt/wrapper.h
2021-02-16 9:20 ` Philippe Gerum
@ 2021-02-16 9:44 ` Jan Kiszka
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kiszka @ 2021-02-16 9:44 UTC (permalink / raw)
To: Philippe Gerum; +Cc: Xenomai, Bezdeka, Florian (T RDA IOT SES-DE)
On 16.02.21 10:20, Philippe Gerum wrote:
>
> Jan Kiszka <jan.kiszka@siemens.com> writes:
>
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Long broken, likely not practically relevant. But now that we known it,
>> let's fix it: There is no mercury/wrapper.h, but we have that file under
>> mercury/copperplate.
>>
>
> A better fix would be to drop copperplate/wrappers.h. This is an
> internal header, which has no in-tree user. This explains why Mercury
> builds flawlessly even if that file would attempt to pull in a
> non-existent header.
Fine with me - I just wasn't sure about the role of this header.
Patch will follow.
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-16 9:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-15 21:59 [PATCH] mercury: Fix include path for cobalt/wrapper.h Jan Kiszka
2021-02-16 9:20 ` Philippe Gerum
2021-02-16 9:44 ` Jan Kiszka
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.