diff mbox series

gator-daemon: bump to 8.4.0

Message ID 20230418163658.13032-1-peron.clem@gmail.com
State New
Headers show
Series gator-daemon: bump to 8.4.0 | expand

Commit Message

Clément Péron April 18, 2023, 4:36 p.m. UTC
Gator Daemon moved to CMake build system so update the recipe

Remove Apache-2.0 license as mxml has been moved out of this package

Drop patches that has been merged

Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 .../0001-Include-missing-cstdint.patch        | 32 -------------------
 .../0001-daemon-mxml-Define-_GNU_SOURCE.patch | 31 ------------------
 ...-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} | 21 ++++--------
 3 files changed, 7 insertions(+), 77 deletions(-)
 delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
 delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
 rename meta-arm/recipes-devtools/gator-daemon/{gator-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} (51%)

Comments

Jon Mason April 20, 2023, 5:30 p.m. UTC | #1
On Tue, Apr 18, 2023 at 06:36:58PM +0200, Cl�ment P�ron wrote:
> Gator Daemon moved to CMake build system so update the recipe
> 
> Remove Apache-2.0 license as mxml has been moved out of this package
> 
> Drop patches that has been merged
> 
> Signed-off-by: Cl�ment P�ron <peron.clem@gmail.com>

This patch fails on all platforms with:

ERROR: Nothing PROVIDES 'libmxml' (but /builds/jonmason00/meta-arm/work/build/../../meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb DEPENDS on or otherwise requires it). Close matches:
  libomxil
  libxml2
  libxpm
ERROR: Required build target 'core-image-sato' has no buildable providers.
Missing or unbuildable dependency chain was: ['core-image-sato', 'gator-daemon', 'libmxml']

Note: We're going to release mickledore in 1 week.  If you want this
in that release, please get the v2 to me as soon as possible.

Thanks,
Jon

> ---
>  .../0001-Include-missing-cstdint.patch        | 32 -------------------
>  .../0001-daemon-mxml-Define-_GNU_SOURCE.patch | 31 ------------------
>  ...-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} | 21 ++++--------
>  3 files changed, 7 insertions(+), 77 deletions(-)
>  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
>  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
>  rename meta-arm/recipes-devtools/gator-daemon/{gator-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} (51%)
> 
> diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> deleted file mode 100644
> index 294f804f..00000000
> --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 87745a6cad0f7819ac8f8d3826f5e228ebd843c5 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Thu, 2 Feb 2023 16:39:26 -0800
> -Subject: [PATCH] Include missing <cstdint>
> -
> -gcc 13 moved some includes around and as a result <cstdint> is no
> -longer transitively included [1]. Explicitly include it
> -for uintXX_t.
> -
> -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
> -
> -Upstream-Status: Submitted [https://github.com/ARM-software/gator/pull/40]
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - daemon/xml/CurrentConfigXML.h | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/daemon/xml/CurrentConfigXML.h b/daemon/xml/CurrentConfigXML.h
> -index 0b239fd..d9047e3 100644
> ---- a/daemon/xml/CurrentConfigXML.h
> -+++ b/daemon/xml/CurrentConfigXML.h
> -@@ -1,6 +1,7 @@
> - /* Copyright (C) 2020-2021 by Arm Limited. All rights reserved. */
> - #pragma once
> - 
> -+#include <cstdint>
> - #include <set>
> - #include <string>
> - 
> --- 
> -2.39.1
> -
> diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> deleted file mode 100644
> index d2460434..00000000
> --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From 04e2e924c3ab8da41343277746804dbcd7bf520d Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sat, 13 Aug 2022 16:49:52 -0700
> -Subject: [PATCH] daemon/mxml: Define _GNU_SOURCE
> -
> -This file uses vasprintf() which is defined only with _GNU_SOURCE
> -feature macro is on.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - daemon/mxml/mxml-string.c | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/daemon/mxml/mxml-string.c b/daemon/mxml/mxml-string.c
> -index 678aeb9..c9cd153 100644
> ---- a/daemon/mxml/mxml-string.c
> -+++ b/daemon/mxml/mxml-string.c
> -@@ -13,6 +13,8 @@
> -  * Include necessary headers...
> -  */
> - 
> -+#define _GNU_SOURCE
> -+
> - #include "config.h"
> - 
> - 
> --- 
> -2.37.2
> -
> diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> similarity index 51%
> rename from meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> rename to meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> index 6188b07e..586b3ce8 100644
> --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> +++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> @@ -8,28 +8,21 @@ HOMEPAGE = "https://github.com/ARM-software/gator"
>  # configuration requirement specified here:
>  # https://github.com/ARM-software/gator#kernel-configuration
>  
> -LICENSE = "GPL-2.0-only & LGPL-2.1-or-later & Apache-2.0"
> +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>                      file://libsensors/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
> -                    file://mxml/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
>                      file://k/perf_event.h;endline=14;md5=e548bf30a60b2ed11ef2dcf7bfdac230 \
>                     "
>  
> -SRCREV = "6a944e7ee1f1c3ab9b2a57efd24c58503122db02"
> -SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https \
> -           file://0001-daemon-mxml-Define-_GNU_SOURCE.patch;striplevel=2 \
> -           file://0001-Include-missing-cstdint.patch;striplevel=2 \
> -          "
> +SRCREV = "75662ba2dc2e1c7a17cff640a35629dca99c5b79"
> +SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https"
>  
>  S = "${WORKDIR}/git/daemon"
>  
> +DEPENDS = "boost libmxml pkgconfig-native protobuf protobuf-native"
> +
>  COMPATIBLE_HOST = "aarch64.*-linux"
>  
> -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} ${TARGET_CC_ARCH} -D_DEFAULT_SOURCE -DETCDIR=\"${sysconfdir}\"' \
> -                'LDFLAGS=${LDFLAGS} ${TARGET_CC_ARCH}' 'CROSS_COMPILE=${TARGET_PREFIX}' \
> -                'CXXFLAGS=${CXXFLAGS} ${TARGET_CC_ARCH} -fno-rtti' CC='${CC}' CXX='${CXX}' V=1"
> +inherit cmake
>  
> -do_install() {
> -        install -d ${D}${sbindir}
> -        install -m 0755 ${S}/gatord ${D}${sbindir}/gatord
> -}
> +EXTRA_OECMAKE += "-DENABLE_VCPKG=OFF -DGATOR_INSTALL_PREFIX=./bin"
> -- 
> 2.39.2 (Apple Git-143)
> 
>
Clément Péron April 20, 2023, 9:30 p.m. UTC | #2
Hi Jon

Le jeu. 20 avr. 2023, 19:30, Jon Mason <jdmason@kudzu.us> a écrit :
>
> On Tue, Apr 18, 2023 at 06:36:58PM +0200, Clément Péron wrote:
> > Gator Daemon moved to CMake build system so update the recipe
> >
> > Remove Apache-2.0 license as mxml has been moved out of this package
> >
> > Drop patches that has been merged
> >
> > Signed-off-by: Clément Péron <peron.clem@gmail.com>
>
> This patch fails on all platforms with:
>
> ERROR: Nothing PROVIDES 'libmxml' (but /builds/jonmason00/meta-arm/work/build/../../meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb DEPENDS on or otherwise requires it). Close matches:
>   libomxil
>   libxml2
>   libxpm
> ERROR: Required build target 'core-image-sato' has no buildable providers.
> Missing or unbuildable dependency chain was: ['core-image-sato', 'gator-daemon', 'libmxml']
>
> Note: We're going to release mickledore in 1 week.  If you want this
> in that release, please get the v2 to me as soon as possible.

Ha yes, this is because libmxml is in meta-oe and not in oe-core.

Should I include a libmxml recipe inside meta-arm or add the meta-oe
layer dependency?

Not sure what's best both are not very satisfying :/

Thanks,
Clement

>
> Thanks,
> Jon
>
> > ---
> >  .../0001-Include-missing-cstdint.patch        | 32 -------------------
> >  .../0001-daemon-mxml-Define-_GNU_SOURCE.patch | 31 ------------------
> >  ...-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} | 21 ++++--------
> >  3 files changed, 7 insertions(+), 77 deletions(-)
> >  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> >  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> >  rename meta-arm/recipes-devtools/gator-daemon/{gator-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} (51%)
> >
> > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > deleted file mode 100644
> > index 294f804f..00000000
> > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > +++ /dev/null
> > @@ -1,32 +0,0 @@
> > -From 87745a6cad0f7819ac8f8d3826f5e228ebd843c5 Mon Sep 17 00:00:00 2001
> > -From: Khem Raj <raj.khem@gmail.com>
> > -Date: Thu, 2 Feb 2023 16:39:26 -0800
> > -Subject: [PATCH] Include missing <cstdint>
> > -
> > -gcc 13 moved some includes around and as a result <cstdint> is no
> > -longer transitively included [1]. Explicitly include it
> > -for uintXX_t.
> > -
> > -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
> > -
> > -Upstream-Status: Submitted [https://github.com/ARM-software/gator/pull/40]
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - daemon/xml/CurrentConfigXML.h | 1 +
> > - 1 file changed, 1 insertion(+)
> > -
> > -diff --git a/daemon/xml/CurrentConfigXML.h b/daemon/xml/CurrentConfigXML.h
> > -index 0b239fd..d9047e3 100644
> > ---- a/daemon/xml/CurrentConfigXML.h
> > -+++ b/daemon/xml/CurrentConfigXML.h
> > -@@ -1,6 +1,7 @@
> > - /* Copyright (C) 2020-2021 by Arm Limited. All rights reserved. */
> > - #pragma once
> > -
> > -+#include <cstdint>
> > - #include <set>
> > - #include <string>
> > -
> > ---
> > -2.39.1
> > -
> > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > deleted file mode 100644
> > index d2460434..00000000
> > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > +++ /dev/null
> > @@ -1,31 +0,0 @@
> > -From 04e2e924c3ab8da41343277746804dbcd7bf520d Mon Sep 17 00:00:00 2001
> > -From: Khem Raj <raj.khem@gmail.com>
> > -Date: Sat, 13 Aug 2022 16:49:52 -0700
> > -Subject: [PATCH] daemon/mxml: Define _GNU_SOURCE
> > -
> > -This file uses vasprintf() which is defined only with _GNU_SOURCE
> > -feature macro is on.
> > -
> > -Upstream-Status: Pending
> > -
> > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ----
> > - daemon/mxml/mxml-string.c | 2 ++
> > - 1 file changed, 2 insertions(+)
> > -
> > -diff --git a/daemon/mxml/mxml-string.c b/daemon/mxml/mxml-string.c
> > -index 678aeb9..c9cd153 100644
> > ---- a/daemon/mxml/mxml-string.c
> > -+++ b/daemon/mxml/mxml-string.c
> > -@@ -13,6 +13,8 @@
> > -  * Include necessary headers...
> > -  */
> > -
> > -+#define _GNU_SOURCE
> > -+
> > - #include "config.h"
> > -
> > -
> > ---
> > -2.37.2
> > -
> > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > similarity index 51%
> > rename from meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> > rename to meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > index 6188b07e..586b3ce8 100644
> > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> > +++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > @@ -8,28 +8,21 @@ HOMEPAGE = "https://github.com/ARM-software/gator"
> >  # configuration requirement specified here:
> >  # https://github.com/ARM-software/gator#kernel-configuration
> >
> > -LICENSE = "GPL-2.0-only & LGPL-2.1-or-later & Apache-2.0"
> > +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> >                      file://libsensors/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
> > -                    file://mxml/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
> >                      file://k/perf_event.h;endline=14;md5=e548bf30a60b2ed11ef2dcf7bfdac230 \
> >                     "
> >
> > -SRCREV = "6a944e7ee1f1c3ab9b2a57efd24c58503122db02"
> > -SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https \
> > -           file://0001-daemon-mxml-Define-_GNU_SOURCE.patch;striplevel=2 \
> > -           file://0001-Include-missing-cstdint.patch;striplevel=2 \
> > -          "
> > +SRCREV = "75662ba2dc2e1c7a17cff640a35629dca99c5b79"
> > +SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https"
> >
> >  S = "${WORKDIR}/git/daemon"
> >
> > +DEPENDS = "boost libmxml pkgconfig-native protobuf protobuf-native"
> > +
> >  COMPATIBLE_HOST = "aarch64.*-linux"
> >
> > -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} ${TARGET_CC_ARCH} -D_DEFAULT_SOURCE -DETCDIR=\"${sysconfdir}\"' \
> > -                'LDFLAGS=${LDFLAGS} ${TARGET_CC_ARCH}' 'CROSS_COMPILE=${TARGET_PREFIX}' \
> > -                'CXXFLAGS=${CXXFLAGS} ${TARGET_CC_ARCH} -fno-rtti' CC='${CC}' CXX='${CXX}' V=1"
> > +inherit cmake
> >
> > -do_install() {
> > -        install -d ${D}${sbindir}
> > -        install -m 0755 ${S}/gatord ${D}${sbindir}/gatord
> > -}
> > +EXTRA_OECMAKE += "-DENABLE_VCPKG=OFF -DGATOR_INSTALL_PREFIX=./bin"
> > --
> > 2.39.2 (Apple Git-143)
> >
> >
Denys Dmytriyenko April 20, 2023, 9:57 p.m. UTC | #3
On Thu, Apr 20, 2023 at 11:30:21PM +0200, Clément Péron wrote:
> Hi Jon
> 
> Le jeu. 20 avr. 2023, 19:30, Jon Mason <jdmason@kudzu.us> a écrit :
> >
> > On Tue, Apr 18, 2023 at 06:36:58PM +0200, Clément Péron wrote:
> > > Gator Daemon moved to CMake build system so update the recipe
> > >
> > > Remove Apache-2.0 license as mxml has been moved out of this package
> > >
> > > Drop patches that has been merged
> > >
> > > Signed-off-by: Clément Péron <peron.clem@gmail.com>
> >
> > This patch fails on all platforms with:
> >
> > ERROR: Nothing PROVIDES 'libmxml' (but /builds/jonmason00/meta-arm/work/build/../../meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb DEPENDS on or otherwise requires it). Close matches:
> >   libomxil
> >   libxml2
> >   libxpm
> > ERROR: Required build target 'core-image-sato' has no buildable providers.
> > Missing or unbuildable dependency chain was: ['core-image-sato', 'gator-daemon', 'libmxml']
> >
> > Note: We're going to release mickledore in 1 week.  If you want this
> > in that release, please get the v2 to me as soon as possible.
> 
> Ha yes, this is because libmxml is in meta-oe and not in oe-core.
> 
> Should I include a libmxml recipe inside meta-arm or add the meta-oe
> layer dependency?

Please do NOT add meta-oe as a dependency for meta-arm/meta-arm! That would be 
a blow for several dependent BSP layers re-using meta-arm...


> Not sure what's best both are not very satisfying :/
> 
> Thanks,
> Clement
> 
> >
> > Thanks,
> > Jon
> >
> > > ---
> > >  .../0001-Include-missing-cstdint.patch        | 32 -------------------
> > >  .../0001-daemon-mxml-Define-_GNU_SOURCE.patch | 31 ------------------
> > >  ...-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} | 21 ++++--------
> > >  3 files changed, 7 insertions(+), 77 deletions(-)
> > >  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > >  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > >  rename meta-arm/recipes-devtools/gator-daemon/{gator-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} (51%)
> > >
> > > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > > deleted file mode 100644
> > > index 294f804f..00000000
> > > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > > +++ /dev/null
> > > @@ -1,32 +0,0 @@
> > > -From 87745a6cad0f7819ac8f8d3826f5e228ebd843c5 Mon Sep 17 00:00:00 2001
> > > -From: Khem Raj <raj.khem@gmail.com>
> > > -Date: Thu, 2 Feb 2023 16:39:26 -0800
> > > -Subject: [PATCH] Include missing <cstdint>
> > > -
> > > -gcc 13 moved some includes around and as a result <cstdint> is no
> > > -longer transitively included [1]. Explicitly include it
> > > -for uintXX_t.
> > > -
> > > -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
> > > -
> > > -Upstream-Status: Submitted [https://github.com/ARM-software/gator/pull/40]
> > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > ----
> > > - daemon/xml/CurrentConfigXML.h | 1 +
> > > - 1 file changed, 1 insertion(+)
> > > -
> > > -diff --git a/daemon/xml/CurrentConfigXML.h b/daemon/xml/CurrentConfigXML.h
> > > -index 0b239fd..d9047e3 100644
> > > ---- a/daemon/xml/CurrentConfigXML.h
> > > -+++ b/daemon/xml/CurrentConfigXML.h
> > > -@@ -1,6 +1,7 @@
> > > - /* Copyright (C) 2020-2021 by Arm Limited. All rights reserved. */
> > > - #pragma once
> > > -
> > > -+#include <cstdint>
> > > - #include <set>
> > > - #include <string>
> > > -
> > > ---
> > > -2.39.1
> > > -
> > > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > > deleted file mode 100644
> > > index d2460434..00000000
> > > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > > +++ /dev/null
> > > @@ -1,31 +0,0 @@
> > > -From 04e2e924c3ab8da41343277746804dbcd7bf520d Mon Sep 17 00:00:00 2001
> > > -From: Khem Raj <raj.khem@gmail.com>
> > > -Date: Sat, 13 Aug 2022 16:49:52 -0700
> > > -Subject: [PATCH] daemon/mxml: Define _GNU_SOURCE
> > > -
> > > -This file uses vasprintf() which is defined only with _GNU_SOURCE
> > > -feature macro is on.
> > > -
> > > -Upstream-Status: Pending
> > > -
> > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > ----
> > > - daemon/mxml/mxml-string.c | 2 ++
> > > - 1 file changed, 2 insertions(+)
> > > -
> > > -diff --git a/daemon/mxml/mxml-string.c b/daemon/mxml/mxml-string.c
> > > -index 678aeb9..c9cd153 100644
> > > ---- a/daemon/mxml/mxml-string.c
> > > -+++ b/daemon/mxml/mxml-string.c
> > > -@@ -13,6 +13,8 @@
> > > -  * Include necessary headers...
> > > -  */
> > > -
> > > -+#define _GNU_SOURCE
> > > -+
> > > - #include "config.h"
> > > -
> > > -
> > > ---
> > > -2.37.2
> > > -
> > > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > > similarity index 51%
> > > rename from meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> > > rename to meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > > index 6188b07e..586b3ce8 100644
> > > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> > > +++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > > @@ -8,28 +8,21 @@ HOMEPAGE = "https://github.com/ARM-software/gator"
> > >  # configuration requirement specified here:
> > >  # https://github.com/ARM-software/gator#kernel-configuration
> > >
> > > -LICENSE = "GPL-2.0-only & LGPL-2.1-or-later & Apache-2.0"
> > > +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later"
> > >  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > >                      file://libsensors/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
> > > -                    file://mxml/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
> > >                      file://k/perf_event.h;endline=14;md5=e548bf30a60b2ed11ef2dcf7bfdac230 \
> > >                     "
> > >
> > > -SRCREV = "6a944e7ee1f1c3ab9b2a57efd24c58503122db02"
> > > -SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https \
> > > -           file://0001-daemon-mxml-Define-_GNU_SOURCE.patch;striplevel=2 \
> > > -           file://0001-Include-missing-cstdint.patch;striplevel=2 \
> > > -          "
> > > +SRCREV = "75662ba2dc2e1c7a17cff640a35629dca99c5b79"
> > > +SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https"
> > >
> > >  S = "${WORKDIR}/git/daemon"
> > >
> > > +DEPENDS = "boost libmxml pkgconfig-native protobuf protobuf-native"
> > > +
> > >  COMPATIBLE_HOST = "aarch64.*-linux"
> > >
> > > -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} ${TARGET_CC_ARCH} -D_DEFAULT_SOURCE -DETCDIR=\"${sysconfdir}\"' \
> > > -                'LDFLAGS=${LDFLAGS} ${TARGET_CC_ARCH}' 'CROSS_COMPILE=${TARGET_PREFIX}' \
> > > -                'CXXFLAGS=${CXXFLAGS} ${TARGET_CC_ARCH} -fno-rtti' CC='${CC}' CXX='${CXX}' V=1"
> > > +inherit cmake
> > >
> > > -do_install() {
> > > -        install -d ${D}${sbindir}
> > > -        install -m 0755 ${S}/gatord ${D}${sbindir}/gatord
> > > -}
> > > +EXTRA_OECMAKE += "-DENABLE_VCPKG=OFF -DGATOR_INSTALL_PREFIX=./bin"
> > > --
> > > 2.39.2 (Apple Git-143)
Clément Péron April 21, 2023, 9:02 a.m. UTC | #4
Hi Denys,

On Thu, 20 Apr 2023 at 23:58, Denys Dmytriyenko <denis@denix.org> wrote:
>
> On Thu, Apr 20, 2023 at 11:30:21PM +0200, Clément Péron wrote:
> > Hi Jon
> >
> > Le jeu. 20 avr. 2023, 19:30, Jon Mason <jdmason@kudzu.us> a écrit :
> > >
> > > On Tue, Apr 18, 2023 at 06:36:58PM +0200, Clément Péron wrote:
> > > > Gator Daemon moved to CMake build system so update the recipe
> > > >
> > > > Remove Apache-2.0 license as mxml has been moved out of this package
> > > >
> > > > Drop patches that has been merged
> > > >
> > > > Signed-off-by: Clément Péron <peron.clem@gmail.com>
> > >
> > > This patch fails on all platforms with:
> > >
> > > ERROR: Nothing PROVIDES 'libmxml' (but /builds/jonmason00/meta-arm/work/build/../../meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb DEPENDS on or otherwise requires it). Close matches:
> > >   libomxil
> > >   libxml2
> > >   libxpm
> > > ERROR: Required build target 'core-image-sato' has no buildable providers.
> > > Missing or unbuildable dependency chain was: ['core-image-sato', 'gator-daemon', 'libmxml']
> > >
> > > Note: We're going to release mickledore in 1 week.  If you want this
> > > in that release, please get the v2 to me as soon as possible.
> >
> > Ha yes, this is because libmxml is in meta-oe and not in oe-core.
> >
> > Should I include a libmxml recipe inside meta-arm or add the meta-oe
> > layer dependency?
>
> Please do NOT add meta-oe as a dependency for meta-arm/meta-arm! That would be
> a blow for several dependent BSP layers re-using meta-arm...

Ok, I will send a v2 with the libmxml recipe.

That's not perfect to reuse the same recipe but it's better than
depending on meta-oe.

Regards,
Clement

>
>
> > Not sure what's best both are not very satisfying :/
> >
> > Thanks,
> > Clement
> >
> > >
> > > Thanks,
> > > Jon
> > >
> > > > ---
> > > >  .../0001-Include-missing-cstdint.patch        | 32 -------------------
> > > >  .../0001-daemon-mxml-Define-_GNU_SOURCE.patch | 31 ------------------
> > > >  ...-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} | 21 ++++--------
> > > >  3 files changed, 7 insertions(+), 77 deletions(-)
> > > >  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > > >  delete mode 100644 meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > > >  rename meta-arm/recipes-devtools/gator-daemon/{gator-daemon_7.8.0.bb => gator-daemon_8.4.0.bb} (51%)
> > > >
> > > > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > > > deleted file mode 100644
> > > > index 294f804f..00000000
> > > > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
> > > > +++ /dev/null
> > > > @@ -1,32 +0,0 @@
> > > > -From 87745a6cad0f7819ac8f8d3826f5e228ebd843c5 Mon Sep 17 00:00:00 2001
> > > > -From: Khem Raj <raj.khem@gmail.com>
> > > > -Date: Thu, 2 Feb 2023 16:39:26 -0800
> > > > -Subject: [PATCH] Include missing <cstdint>
> > > > -
> > > > -gcc 13 moved some includes around and as a result <cstdint> is no
> > > > -longer transitively included [1]. Explicitly include it
> > > > -for uintXX_t.
> > > > -
> > > > -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
> > > > -
> > > > -Upstream-Status: Submitted [https://github.com/ARM-software/gator/pull/40]
> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > > ----
> > > > - daemon/xml/CurrentConfigXML.h | 1 +
> > > > - 1 file changed, 1 insertion(+)
> > > > -
> > > > -diff --git a/daemon/xml/CurrentConfigXML.h b/daemon/xml/CurrentConfigXML.h
> > > > -index 0b239fd..d9047e3 100644
> > > > ---- a/daemon/xml/CurrentConfigXML.h
> > > > -+++ b/daemon/xml/CurrentConfigXML.h
> > > > -@@ -1,6 +1,7 @@
> > > > - /* Copyright (C) 2020-2021 by Arm Limited. All rights reserved. */
> > > > - #pragma once
> > > > -
> > > > -+#include <cstdint>
> > > > - #include <set>
> > > > - #include <string>
> > > > -
> > > > ---
> > > > -2.39.1
> > > > -
> > > > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > > > deleted file mode 100644
> > > > index d2460434..00000000
> > > > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
> > > > +++ /dev/null
> > > > @@ -1,31 +0,0 @@
> > > > -From 04e2e924c3ab8da41343277746804dbcd7bf520d Mon Sep 17 00:00:00 2001
> > > > -From: Khem Raj <raj.khem@gmail.com>
> > > > -Date: Sat, 13 Aug 2022 16:49:52 -0700
> > > > -Subject: [PATCH] daemon/mxml: Define _GNU_SOURCE
> > > > -
> > > > -This file uses vasprintf() which is defined only with _GNU_SOURCE
> > > > -feature macro is on.
> > > > -
> > > > -Upstream-Status: Pending
> > > > -
> > > > -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > > > ----
> > > > - daemon/mxml/mxml-string.c | 2 ++
> > > > - 1 file changed, 2 insertions(+)
> > > > -
> > > > -diff --git a/daemon/mxml/mxml-string.c b/daemon/mxml/mxml-string.c
> > > > -index 678aeb9..c9cd153 100644
> > > > ---- a/daemon/mxml/mxml-string.c
> > > > -+++ b/daemon/mxml/mxml-string.c
> > > > -@@ -13,6 +13,8 @@
> > > > -  * Include necessary headers...
> > > > -  */
> > > > -
> > > > -+#define _GNU_SOURCE
> > > > -+
> > > > - #include "config.h"
> > > > -
> > > > -
> > > > ---
> > > > -2.37.2
> > > > -
> > > > diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > > > similarity index 51%
> > > > rename from meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> > > > rename to meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > > > index 6188b07e..586b3ce8 100644
> > > > --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
> > > > +++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
> > > > @@ -8,28 +8,21 @@ HOMEPAGE = "https://github.com/ARM-software/gator"
> > > >  # configuration requirement specified here:
> > > >  # https://github.com/ARM-software/gator#kernel-configuration
> > > >
> > > > -LICENSE = "GPL-2.0-only & LGPL-2.1-or-later & Apache-2.0"
> > > > +LICENSE = "GPL-2.0-only & LGPL-2.1-or-later"
> > > >  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> > > >                      file://libsensors/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
> > > > -                    file://mxml/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
> > > >                      file://k/perf_event.h;endline=14;md5=e548bf30a60b2ed11ef2dcf7bfdac230 \
> > > >                     "
> > > >
> > > > -SRCREV = "6a944e7ee1f1c3ab9b2a57efd24c58503122db02"
> > > > -SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https \
> > > > -           file://0001-daemon-mxml-Define-_GNU_SOURCE.patch;striplevel=2 \
> > > > -           file://0001-Include-missing-cstdint.patch;striplevel=2 \
> > > > -          "
> > > > +SRCREV = "75662ba2dc2e1c7a17cff640a35629dca99c5b79"
> > > > +SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https"
> > > >
> > > >  S = "${WORKDIR}/git/daemon"
> > > >
> > > > +DEPENDS = "boost libmxml pkgconfig-native protobuf protobuf-native"
> > > > +
> > > >  COMPATIBLE_HOST = "aarch64.*-linux"
> > > >
> > > > -EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} ${TARGET_CC_ARCH} -D_DEFAULT_SOURCE -DETCDIR=\"${sysconfdir}\"' \
> > > > -                'LDFLAGS=${LDFLAGS} ${TARGET_CC_ARCH}' 'CROSS_COMPILE=${TARGET_PREFIX}' \
> > > > -                'CXXFLAGS=${CXXFLAGS} ${TARGET_CC_ARCH} -fno-rtti' CC='${CC}' CXX='${CXX}' V=1"
> > > > +inherit cmake
> > > >
> > > > -do_install() {
> > > > -        install -d ${D}${sbindir}
> > > > -        install -m 0755 ${S}/gatord ${D}${sbindir}/gatord
> > > > -}
> > > > +EXTRA_OECMAKE += "-DENABLE_VCPKG=OFF -DGATOR_INSTALL_PREFIX=./bin"
> > > > --
> > > > 2.39.2 (Apple Git-143)
diff mbox series

Patch

diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
deleted file mode 100644
index 294f804f..00000000
--- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 87745a6cad0f7819ac8f8d3826f5e228ebd843c5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 2 Feb 2023 16:39:26 -0800
-Subject: [PATCH] Include missing <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint> is no
-longer transitively included [1]. Explicitly include it
-for uintXX_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Upstream-Status: Submitted [https://github.com/ARM-software/gator/pull/40]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- daemon/xml/CurrentConfigXML.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/daemon/xml/CurrentConfigXML.h b/daemon/xml/CurrentConfigXML.h
-index 0b239fd..d9047e3 100644
---- a/daemon/xml/CurrentConfigXML.h
-+++ b/daemon/xml/CurrentConfigXML.h
-@@ -1,6 +1,7 @@
- /* Copyright (C) 2020-2021 by Arm Limited. All rights reserved. */
- #pragma once
- 
-+#include <cstdint>
- #include <set>
- #include <string>
- 
--- 
-2.39.1
-
diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
deleted file mode 100644
index d2460434..00000000
--- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From 04e2e924c3ab8da41343277746804dbcd7bf520d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 13 Aug 2022 16:49:52 -0700
-Subject: [PATCH] daemon/mxml: Define _GNU_SOURCE
-
-This file uses vasprintf() which is defined only with _GNU_SOURCE
-feature macro is on.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- daemon/mxml/mxml-string.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/daemon/mxml/mxml-string.c b/daemon/mxml/mxml-string.c
-index 678aeb9..c9cd153 100644
---- a/daemon/mxml/mxml-string.c
-+++ b/daemon/mxml/mxml-string.c
-@@ -13,6 +13,8 @@
-  * Include necessary headers...
-  */
- 
-+#define _GNU_SOURCE
-+
- #include "config.h"
- 
- 
--- 
-2.37.2
-
diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
similarity index 51%
rename from meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
rename to meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
index 6188b07e..586b3ce8 100644
--- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
+++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_8.4.0.bb
@@ -8,28 +8,21 @@  HOMEPAGE = "https://github.com/ARM-software/gator"
 # configuration requirement specified here:
 # https://github.com/ARM-software/gator#kernel-configuration
 
-LICENSE = "GPL-2.0-only & LGPL-2.1-or-later & Apache-2.0"
+LICENSE = "GPL-2.0-only & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://libsensors/COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
-                    file://mxml/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
                     file://k/perf_event.h;endline=14;md5=e548bf30a60b2ed11ef2dcf7bfdac230 \
                    "
 
-SRCREV = "6a944e7ee1f1c3ab9b2a57efd24c58503122db02"
-SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https \
-           file://0001-daemon-mxml-Define-_GNU_SOURCE.patch;striplevel=2 \
-           file://0001-Include-missing-cstdint.patch;striplevel=2 \
-          "
+SRCREV = "75662ba2dc2e1c7a17cff640a35629dca99c5b79"
+SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;protocol=https"
 
 S = "${WORKDIR}/git/daemon"
 
+DEPENDS = "boost libmxml pkgconfig-native protobuf protobuf-native"
+
 COMPATIBLE_HOST = "aarch64.*-linux"
 
-EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} ${TARGET_CC_ARCH} -D_DEFAULT_SOURCE -DETCDIR=\"${sysconfdir}\"' \
-                'LDFLAGS=${LDFLAGS} ${TARGET_CC_ARCH}' 'CROSS_COMPILE=${TARGET_PREFIX}' \
-                'CXXFLAGS=${CXXFLAGS} ${TARGET_CC_ARCH} -fno-rtti' CC='${CC}' CXX='${CXX}' V=1"
+inherit cmake
 
-do_install() {
-        install -d ${D}${sbindir}
-        install -m 0755 ${S}/gatord ${D}${sbindir}/gatord
-}
+EXTRA_OECMAKE += "-DENABLE_VCPKG=OFF -DGATOR_INSTALL_PREFIX=./bin"