diff options
author | Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-03-23 15:40:17 +0100 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-03-24 08:30:12 +0000 |
commit | eb11c68ae9aae60cce255a62d572bdf998a3af27 (patch) | |
tree | a64237ccb33c0f2e314ec1bcd102344265b9341c /meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/default_regular.h | |
parent | c30a7745a5daad19c32dbddeb46fc2ada8783325 (diff) |
Fix optee-os build
* Remove the file generation and directly copy the files.
the files:
default_regular.c
default_regular.h
were generate with command line:
$ scripts/render_font.py \
--font_file lib/libutee/tui/fonts/amble/Amble-Regular.ttf \
--font_size 20 --font_name default_regular \
--out_dir out/arm-plat-rcar/ta_arm64-lib/libutee/tui
the files:
default_bold.c
default_bold.h
were generate with command line:
$ scripts/render_font.py \
--font_file lib/libutee/tui/fonts/amble/Amble-Bold.ttf \
--font_size 20 --font_name default_bold
--out_dir out/arm-plat-rcar/ta_arm64-lib/libutee/tui
python-wand 0.4.3 (and newer) is incompatible with imagemagick >= 7.0,
so we need to backport imagemagick 6.
If you don't have imagemagick 6 install on your host the build of optee-os
will failed.
Change-Id: I83a6c4b963b7d3e18f2730b601934708a2f6c7ef
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/default_regular.h')
-rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/default_regular.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/default_regular.h b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/default_regular.h new file mode 100644 index 000000000..28ae28420 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/default_regular.h @@ -0,0 +1,10 @@ +/* + * This file is auto generated with + * scripts/render_font.py --font_file lib/libutee/tui/fonts/amble/Amble-Regular.ttf --font_size 20 --font_name default_regular --out_dir out/arm-plat-rcar/ta_arm64-lib/libutee/tui + * do not edit. + */ +#ifndef __DEFAULT_REGULAR_H +#define __DEFAULT_REGULAR_H +#include "font.h" +extern const struct font font_default_regular; +#endif /*__DEFAULT_REGULAR_H*/ |