diff options
-rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch | 13 | ||||
-rw-r--r-- | meta/recipes-kernel/sysprof/sysprof_3.30.0.bb (renamed from meta/recipes-kernel/sysprof/sysprof_3.26.1.bb) | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch index e28fdcad94..ade51cf864 100644 --- a/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch +++ b/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch | |||
@@ -1,26 +1,27 @@ | |||
1 | From c2495a4c042e6a675da69bab20cc3669391e8e2a Mon Sep 17 00:00:00 2001 | 1 | From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 23 Aug 2017 18:38:26 +0300 | 3 | Date: Wed, 23 Aug 2017 18:38:26 +0300 |
4 | Subject: [PATCH 1/2] Do not build anything in help/ as it requires itstool. | 4 | Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
8 | --- | 9 | --- |
9 | meson.build | 1 - | 10 | meson.build | 1 - |
10 | 1 file changed, 1 deletion(-) | 11 | 1 file changed, 1 deletion(-) |
11 | 12 | ||
12 | diff --git a/meson.build b/meson.build | 13 | diff --git a/meson.build b/meson.build |
13 | index 4ac3934..8c4369a 100644 | 14 | index 3986273..ae2f65e 100644 |
14 | --- a/meson.build | 15 | --- a/meson.build |
15 | +++ b/meson.build | 16 | +++ b/meson.build |
16 | @@ -116,7 +116,6 @@ subdir('tools') | 17 | @@ -164,7 +164,6 @@ subdir('tools') |
17 | subdir('tests') | 18 | subdir('tests') |
18 | 19 | ||
19 | subdir('data') | 20 | subdir('data') |
20 | -subdir('help') | 21 | -subdir('help') |
21 | subdir('po') | 22 | subdir('po') |
22 | 23 | ||
23 | meson.add_install_script('build-aux/meson_post_install.sh') | 24 | meson.add_install_script('build-aux/meson/post_install.sh') |
24 | -- | 25 | -- |
25 | 2.14.1 | 26 | 2.7.4 |
26 | 27 | ||
diff --git a/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb b/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb index 9fb4e577a6..4f1b75017d 100644 --- a/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb +++ b/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb | |||
@@ -9,8 +9,8 @@ inherit gnomebase gettext systemd upstream-version-is-even | |||
9 | 9 | ||
10 | DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" | 10 | DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" |
11 | 11 | ||
12 | SRC_URI[archive.md5sum] = "6f9f947960ba79bb1269d8ee49b7db78" | 12 | SRC_URI[archive.md5sum] = "ae896a8a2364e18c07fafa9573202f59" |
13 | SRC_URI[archive.sha256sum] = "d8b9d5c2246696e4a3776a312731dc7c014fbd33478bb14d5512c6f1f35a3b11" | 13 | SRC_URI[archive.sha256sum] = "29cd2c4be277f00698dce48259219557c4fddc2c01254b8fac95900a8c663f63" |
14 | SRC_URI += " \ | 14 | SRC_URI += " \ |
15 | file://define-NT_GNU_BUILD_ID.patch \ | 15 | file://define-NT_GNU_BUILD_ID.patch \ |
16 | file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ | 16 | file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ |
@@ -29,4 +29,5 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysp | |||
29 | FILES_${PN} += " \ | 29 | FILES_${PN} += " \ |
30 | ${datadir}/dbus-1/system-services \ | 30 | ${datadir}/dbus-1/system-services \ |
31 | ${datadir}/dbus-1/system.d \ | 31 | ${datadir}/dbus-1/system.d \ |
32 | ${datadir}/metainfo \ | ||
32 | " | 33 | " |