switched to use appstream-native instead of expecting to have
appstreamcli installed on the host machine
Am Sa, 24. Dez 2022 um 07:30:27 +0100 schrieb Markus Volk
<[email protected]>:
Signed-off-by: Markus Volk <[email protected]
<mailto:[email protected]>>
---
.../appstream/0001-fix-crosscompile.patch | 43 ++++++++++++++++++
.../appstream/appstream_0.15.5.bb | 45
+++++++++++++++++++
2 files changed, 88 insertions(+)
create mode 100644
meta-oe/recipes-support/appstream/appstream/0001-fix-crosscompile.patch
create mode 100644
meta-oe/recipes-support/appstream/appstream_0.15.5.bb
diff --git
a/meta-oe/recipes-support/appstream/appstream/0001-fix-crosscompile.patch
b/meta-oe/recipes-support/appstream/appstream/0001-fix-crosscompile.patch
new file mode 100644
index 000000000..fe8dcff91
--- /dev/null
+++
b/meta-oe/recipes-support/appstream/appstream/0001-fix-crosscompile.patch
@@ -0,0 +1,43 @@
+From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00
2001
+From: Markus Volk <[email protected] <mailto:[email protected]>>
+Date: Mon, 12 Dec 2022 15:42:42 +0100
+Subject: [PATCH] fix crosscompile
+
+Signed-off-by: Markus Volk <[email protected]
<mailto:[email protected]>>
+
+Upstream-Status: Inappropriate [oe-specific]
+---
+ data/meson.build | 2 +-
+ meson.build | 2 +-
+ tools/meson.build | 9 +++++++++
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index aea0cb25..1a085fc9 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,7 @@ install_data('its/metainfo.loc',
+ metainfo_with_relinfo = custom_target('gen-output',
+ input : ['../NEWS',
'org.freedesktop.appstream.cli.metainfo.xml'],
+ output :
['nol10n_withrelinfo_org.freedesktop.appstream.cli.metainfo.xml'],
+- command : [ascli_exe, 'news-to-metainfo', '--limit=6',
'@INPUT0@', '@INPUT1@', '@OUTPUT@']
++ command : ['appstreamcli', 'news-to-metainfo', '--limit=6',
'@INPUT0@', '@INPUT1@', '@OUTPUT@']
+ )
+
+ metainfo_i18n = i18n.itstool_join(
+diff --git a/meson.build b/meson.build
+index fd0e3373..2f273ada 100644
+--- a/meson.build
++++ b/meson.build
+@@ -124,7 +124,7 @@ if get_option ('gir')
+ dependency('gobject-introspection-1.0', version: '>=1.56')
+ endif
+
+-stemmer_inc_dirs = include_directories(['/usr/include'])
++stemmer_inc_dirs = include_directories([''])
+ if get_option('stemming')
+ stemmer_lib = cc.find_library('stemmer', required: true)
+ if not cc.has_header('libstemmer.h')
+--
+2.34.1
+
diff --git a/meta-oe/recipes-support/appstream/appstream_0.15.5.bb
b/meta-oe/recipes-support/appstream/appstream_0.15.5.bb
new file mode 100644
index 000000000..80f487852
--- /dev/null
+++ b/meta-oe/recipes-support/appstream/appstream_0.15.5.bb
@@ -0,0 +1,45 @@
+SUMMARY = "AppStream is a collaborative effort for making
machine-readable software metadata easily available."
+HOMEPAGE = "<https://github.com/ximion/appstream>"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM =
"file://COPYING;md5=435ed639f84d4585d93824e7da3d85da"
<file://copying;md5=435ed639f84d4585d93824e7da3d85da/>
+
+DEPENDS = " \
+ appstream-native \
+ curl-native \
+ curl \
+ docbook-xml-dtd4-native \
+ gperf-native \
+ glib-2.0 \
+ glib-2.0-native \
+ libyaml \
+ libstemmer \
+ libxml2 \
+ libxmlb \
+ libxslt-native \
+ itstool-native \
+ docbook-xsl-stylesheets-native \
+ python3-pygments-native \
+"
+
+inherit meson gobject-introspection gettext gtk-doc pkgconfig vala
+
+GIR_MESON_OPTION = ""
+
+SRC_URI =
"https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz
<https://www.freedesktop.org/software/appstream/releases/AppStream-$%7BPV%7D.tar.xz>"
+SRC_URI:append:class-target = " file://0001-fix-crosscompile.patch"
<file://0001-fix-crosscompile.patch/>
+SRC_URI[sha256sum] =
"cb15ed62cc2729683879a2dbf98c0a3267ea2b4d57bba6bc55e70a25500e04c2"
+
+S = "${WORKDIR}/AppStream-${PV}"
+
+FILES:${PN} += "${datadir}"
+
+EXTRA_OEMESON:class-target +=
"--cross-file=${WORKDIR}/meson-${PN}.cross"
+
+do_write_config:append:class-target() {
+ cat >${WORKDIR}/meson-${PN}.cross <<EOF
+[binaries]
+appstreamcli = '${STAGING_BINDIR_NATIVE}/appstreamcli'
+EOF
+}
+
+BBCLASSEXTEND = "native"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#100205):
https://lists.openembedded.org/g/openembedded-devel/message/100205
Mute This Topic: https://lists.openembedded.org/mt/95858381/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
