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/0001-Remove-the-file-generation-and-directly-copy-the-fil.patch | |
| 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/0001-Remove-the-file-generation-and-directly-copy-the-fil.patch')
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-Remove-the-file-generation-and-directly-copy-the-fil.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-Remove-the-file-generation-and-directly-copy-the-fil.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-Remove-the-file-generation-and-directly-copy-the-fil.patch new file mode 100644 index 000000000..14b91699a --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-Remove-the-file-generation-and-directly-copy-the-fil.patch @@ -0,0 +1,41 @@ +From f9e26ca66938281a635cdac2fbeda7418488aac8 Mon Sep 17 00:00:00 2001 +From: Ronan Le Martret <ronan.lemartret@iot.bzh> +Date: Thu, 23 Mar 2017 15:20:45 +0100 +Subject: [PATCH] Remove the file generation and directly copy the files. + +Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> +--- + lib/libutee/tui/sub.mk | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/lib/libutee/tui/sub.mk b/lib/libutee/tui/sub.mk +index 517cde4..d55340c 100644 +--- a/lib/libutee/tui/sub.mk ++++ b/lib/libutee/tui/sub.mk +@@ -11,19 +11,15 @@ produce-additional-default_bold = default_bold.h + produce-default_bold = default_bold.c + depends-default_bold := scripts/render_font.py \ + $(sub-dir)/fonts/amble/Amble-Bold.ttf +-recipe-default_bold := scripts/render_font.py \ +- --font_file $(sub-dir)/fonts/amble/Amble-Bold.ttf \ +- --font_size 20 --font_name default_bold \ +- --out_dir $(sub-dir-out) ++recipe-default_bold := cp $(sub-dir)/fonts/amble/default_bold.{c,h} \ ++ $(sub-dir-out) + + gensrcs-y += default_regular + produce-additional-default_regular = default_regular.h + produce-default_regular = default_regular.c + depends-default_regular := scripts/render_font.py \ + $(sub-dir)/fonts/amble/Amble-Regular.ttf +-recipe-default_regular := scripts/render_font.py \ +- --font_file $(sub-dir)/fonts/amble/Amble-Regular.ttf \ +- --font_size 20 --font_name default_regular \ +- --out_dir $(sub-dir-out) ++recipe-default_regular := cp $(sub-dir)/fonts/amble/default_regular.{c,h} \ ++ $(sub-dir-out) + + +-- +2.6.6 + |