[meta-oe][PATCH 0/4] Extend graphviz and mscgen for nativesdk

[meta-oe][PATCH 0/4] Extend graphviz and mscgen for nativesdk

[Christian Eggers]

doxygen (which is already available for native/nativesdk), is often used
together with the 'dot' tool (graphviz package) and mscgen.


________________________________
 [http://assets.arri.com/media/sign/2020-04-03-E-mail-signature-Stellar2_V1.jpg] <https://microsites.arri.com/stellar/>

Get all the latest information from www.arri.com<https://www.arri.com/>, Facebook<https://www.facebook.com/TeamARRI>, Twitter<https://twitter.com/ARRIChannel>, Instagram<https://instagram.com/arri> and YouTube<https://www.youtube.com/user/ARRIChannel>.

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: München - Registergericht: Amtsgericht München - Handelsregisternummer: HRA 57918
Persönlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: München - Registergericht: Amtsgericht München - Handelsregisternummer: HRB 54477
Geschäftsführer: Dr. Michael Neuhäuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

[meta-oe][PATCH 1/4] graphviz: Extend for nativesdk

[Christian Eggers]

The "dot" tool is often used together with doxygen which is already
available for nativesdk.

Cross compiling graphviz for nativesdk looks quite similar as building
for target. At installation time of the SDK, "dot -c" must be called in
order to create <SDK sysroot>/usr/lib/graphviz/config6.

Signed-off-by: Christian Eggers <ceggers@arri.de>
---
 .../graphviz/graphviz/graphviz-setup.sh       |  6 +++++
 .../graphviz/graphviz_2.40.1.bb               | 24 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh

diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh b/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh
new file mode 100644
index 000000000..df0be9e3e
--- /dev/null
+++ b/meta-oe/recipes-graphics/graphviz/graphviz/graphviz-setup.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "Setting up graphviz..."
+
+# Create /usr/lib/graphviz/config6
+$OECORE_NATIVE_SYSROOT/usr/bin/dot -c
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
index 12ecb9909..aa5c0c820 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb
@@ -16,6 +16,7 @@ DEPENDS = " \
     freetype \
 "
 DEPENDS_append_class-target = " ${BPN}-native"
+DEPENDS_append_class-nativesdk = " ${BPN}-native"
 
 inherit autotools-brokensep pkgconfig gettext
 
@@ -33,6 +34,10 @@ SRC_URI_append_class-target = "\
            file://0001-Use-native-mkdefs.patch \
            file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
 "
+SRC_URI_append_class-nativesdk = "\
+           file://0001-Use-native-mkdefs.patch \
+           file://graphviz-setup.sh \
+"
 SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072"
 SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a"
 
@@ -47,7 +52,17 @@ EXTRA_OECONF_class-target = "\
                 --disable-r \
                 --disable-sharp \
                 "
+EXTRA_OECONF_class-nativesdk = "\
+                --with-expatincludedir=${STAGING_INCDIR} \ 
+                --with-expatlibdir=${STAGING_LIBDIR} \
+                --without-included-ltdl \
+                --disable-java \
+                --disable-tcl \
+                --disable-r \
+                --disable-sharp \
+                "
 CFLAGS_append_class-target = " -D_typ_ssize_t=1 -D_long_double=1"
+CFLAGS_append_class-nativesdk = " -D_typ_ssize_t=1 -D_long_double=1"
 do_configure_prepend() {
     cd ${S}
     # create version.m4 and ignore libtoolize errors
@@ -59,6 +74,13 @@ do_install_append_class-native() {
     install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir}
 }
 
+do_install_append_class-nativesdk() {
+    # graphviz-setup.sh must be executed at SDK installation
+    install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
+    install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d
+}
+FILES_${PN}_class-nativesdk += "${SDKPATHNATIVE}"
+
 PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo"
 
 FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/"
@@ -74,4 +96,4 @@ INSANE_SKIP_${PN}-python = "dev-so"
 
 FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
-- 
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

[meta-oe][PATCH 2/4] ttf-dejavu: Extend for native and nativesdk

[Christian Eggers]

When using doxygen together with the "dot" tool (graphviz package), a
ttf font package is additionally required.

Probably this change could also be moved to ttf.inc.

Signed-off-by: Christian Eggers <ceggers@arri.de>
---
 meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
index f74e5ce6c..03f30bf4a 100644
--- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
+++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
@@ -45,3 +45,9 @@ FILES_${PN}-common          = "${sysconfdir}"
 
 SRC_URI[md5sum] = "d0efec10b9f110a32e9b8f796e21782c"
 SRC_URI[sha256sum] = "fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7"
+
+BBCLASSEXTEND = "native nativesdk"
+
+# Allow installation of fonts into recipe-sysroot-native
+SYSROOT_DIRS_BLACKLIST_remove = "${datadir}/fonts"
+
-- 
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

[meta-oe][PATCH 3/4] gd: Extend for native and nativesdk

[Christian Eggers]

gd is required for msgcgen which is often used together with doxygen.

Signed-off-by: Christian Eggers <ceggers@arri.de>
---
 meta-oe/recipes-support/gd/gd_2.3.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/gd/gd_2.3.0.bb b/meta-oe/recipes-support/gd/gd_2.3.0.bb
index eec8a05ae..554e07fd3 100644
--- a/meta-oe/recipes-support/gd/gd_2.3.0.bb
+++ b/meta-oe/recipes-support/gd/gd_2.3.0.bb
@@ -35,7 +35,7 @@ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"'
 
 DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized"
 
-do_install_append() {
+do_install_append_class-target() {
     # cleanup buildpaths from gdlib.pc
     sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc
 }
@@ -50,3 +50,5 @@ RPROVIDES_${PN}-tools = "${PN}-tools"
 RDEPENDS_${PN}-tools = "perl perl-module-strict"
 
 CVE_PRODUCT = "libgd"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

[meta-oe][PATCH 4/4] mscgen: Extend for native and nativesdk

[Christian Eggers]

msgcgen is often used together with doxygen (which is already available
for native/nativesdk).

Signed-off-by: Christian Eggers <ceggers@arri.de>
---
 meta-oe/recipes-support/mscgen/mscgen_0.20.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
index 276ad201f..49899edd7 100644
--- a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
+++ b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
@@ -16,3 +16,5 @@ inherit autotools gettext
 do_configure_prepend() {
 	sed -i "s#AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)#AC_PATH_PROG([GDLIB_CONFIG],[gdlib-config], ,[${STAGING_BINDIR_CROSS}])#" ${S}/configure.ac
 }
+
+BBCLASSEXTEND = "native nativesdk"
-- 
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

Re: [oe] [meta-oe][PATCH 2/4] ttf-dejavu: Extend for native and nativesdk

[Andreas Müller]

On Tue, Jun 9, 2020 at 3:06 PM Christian Eggers <ceggers@arri.de> wrote:
>
> When using doxygen together with the "dot" tool (graphviz package), a
> ttf font package is additionally required.
>
> Probably this change could also be moved to ttf.inc.
Extend an allarch recipe to native - sounds odd to me...

Andreas

Re: [oe] [meta-oe][PATCH 2/4] ttf-dejavu: Extend for native and nativesdk

[Khem Raj]

On Tuesday, June 9, 2020 6:21:50 AM PDT Andreas Müller wrote:
> On Tue, Jun 9, 2020 at 3:06 PM Christian Eggers <ceggers@arri.de> wrote:
> > When using doxygen together with the "dot" tool (graphviz package), a
> > ttf font package is additionally required.
> > 
> > Probably this change could also be moved to ttf.inc.
> 
> Extend an allarch recipe to native - sounds odd to me...
> 

bbclassextend will convert the dependencies to be PN-<bbclassextend> and thats 
where this will help. But ideally I think I agree, it would be better to sort 
out dependencies such that native/nativesdk can depend on PN for allarch ones.

> Andreas

Re: [oe] [meta-oe][PATCH 2/4] ttf-dejavu: Extend for native and nativesdk

[Christian Eggers]

Am Dienstag, 9. Juni 2020, 15:21:50 CEST schrieb Andreas Müller:
> On Tue, Jun 9, 2020 at 3:06 PM Christian Eggers <ceggers@arri.de> wrote:
> > When using doxygen together with the "dot" tool (graphviz package), a
> > ttf font package is additionally required.
> >
> > Probably this change could also be moved to ttf.inc.
>
> Extend an allarch recipe to native - sounds odd to me...

My main aim is to get the tools for doxygen into the SDK so that
all developers in the team use the same set of tools for our project.

The SDK has two different sysroots:
- cortexa7t2hf-neon-vfpv4-poky-linux-musleabi (target software)
- x86_64-pokysdk-linux (host software)

When I build the package "foo", the files will be installed into the target
sysroot. When I build "nativesdk-foo", the files will be installed into the
host sysroot.

At least the oe-core package
meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb
already extends for native and nativesdk.

Probably the SDK should have a third sysroot for architecture independent
files (allarch packages). Using fonts from the target sysroot for host
applications looks strange for me.

regards
Christian




________________________________
 [http://assets.arri.com/media/sign/2020-04-03-E-mail-signature-Stellar2_V1.jpg] <https://microsites.arri.com/stellar/>

Get all the latest information from www.arri.com<https://www.arri.com/>, Facebook<https://www.facebook.com/TeamARRI>, Twitter<https://twitter.com/ARRIChannel>, Instagram<https://instagram.com/arri> and YouTube<https://www.youtube.com/user/ARRIChannel>.

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: München - Registergericht: Amtsgericht München - Handelsregisternummer: HRA 57918
Persönlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: München - Registergericht: Amtsgericht München - Handelsregisternummer: HRB 54477
Geschäftsführer: Dr. Michael Neuhäuser; Stephan Schenk; Walter Trauninger; Markus Zeiler