sysprof: add a recipe from oe-core
PATCH 1/3 sysprof: add a recipe from oe-core
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch create mode 100644 meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch create mode 100644 meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb
meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +27 -0
@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data') +-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +
meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +22 -0
@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +
meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +32 -0
@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ + file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" + +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "
Signature · 1 line
2.17.1
PATCH 2/3 sysprof: update to 3.34.1
0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch is replaced by a meson option.
Enable all options, as polkit is now available.
---
...thing-in-help-as-it-requires-itstool.patch | 27 --------------
...-Define-NT_GNU_BUILD_ID-if-undefined.patch | 35 +++++++++++++++++++
.../files/define-NT_GNU_BUILD_ID.patch | 22 ------------
.../{sysprof_3.32.0.bb => sysprof_3.34.1.bb} | 18 ++++++----
4 files changed, 46 insertions(+), 56 deletions(-)
delete mode 100644 meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
create mode 100644 meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
delete mode 100644 meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
rename meta-oe/recipes-kernel/sysprof/{sysprof_3.32.0.bb => sysprof_3.34.1.bb} (54%)meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 23 Aug 2017 18:38:26 +0300 -Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3986273..ae2f65e 100644 ---- a/meson.build -+++ b/meson.build -@@ -164,7 +164,6 @@ subdir('tools') - subdir('tests') - - subdir('data') --subdir('help') - subdir('po') - - meson.add_install_script('build-aux/meson/post_install.sh') --- -2.7.4 -
meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 18 Jul 2011 16:00:17 -0700 +Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined + +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +%% original patch: define-NT_GNU_BUILD_ID.patch +--- + src/libsysprof/elfparser.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h +index 160e4c9..94fa5c0 100644 +--- a/src/libsysprof/elfparser.h ++++ b/src/libsysprof/elfparser.h +@@ -18,6 +18,10 @@ + + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; + +-- +2.17.1 +
meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch deleted +0 -22
@@ -1,22 +0,0 @@ -On uclibc elf.h does not have GNU extentions but we need this define -so we define it locally if its not getting it from elf.h - -Signed-off-by: Khem Raj <[email protected]> - -Upstream-Status: Pending - -Index: git/elfparser.h -=================================================================== ---- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 -+++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 -@@ -17,6 +17,10 @@ - */ - #include <glib.h> - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif -+ - typedef struct ElfSym ElfSym; - typedef struct ElfParser ElfParser; -
meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb +11 -7
@@ -2,23 +2,26 @@ SUMMARY = "System-wide Performance Profiler for Linux" HOMEPAGE = "http://www.sysprof.com" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext systemd upstream-version-is-even gsettings DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" -SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" -SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629" +SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0" SRC_URI += " \ - file://define-NT_GNU_BUILD_ID.patch \ - file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ " -PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" -PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" +PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" + +# Enablig this requries yelp +EXTRA_OEMESON += "-Dhelp=false -Dsystemdunitdir=${systemd_unitdir}" SOLIBS = ".so" FILES_SOLIBSDEV = ""
@@ -28,5 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysp FILES_${PN} += " \ ${datadir}/dbus-1/system-services \ ${datadir}/dbus-1/system.d \ + ${datadir}/dbus-1/interfaces \ ${datadir}/metainfo \ "
Signature · 1 line
2.17.1
PATCH 3/3 sysprof: move from meta-oe to meta-gnome
In reply to Alexander Kanavin---
.../files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 0
{meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch (100%)
rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb (100%)meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch renamed from meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch +0 -0
meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb +0 -0
Signature · 1 line
2.17.1
Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome
Why don't you add it to the right layer in the 1/3 change?
Quoted 33 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 0 {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch (100%) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb(100%)
diff --git
a/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchsimilarity index 100%
rename frommeta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchrename tometa-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchmeta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb +0
-1--2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome
Because I already had the patches ready, and simply added the move between layers on top of them. Placing it to the right layer requires either a patchset do-over from scratch, or resolving a merge conflict with possibility for mistakes.
Alex
Quoted 39 lines · Martin Jansa
Why don't you add it to the right layer in the 1/3 change?
Quoted 33 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 0 {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch (100%) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb(100%)
diff --git
a/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchsimilarity index 100%
rename frommeta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchrename tometa-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchmeta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb +0
-1--2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome
Doing "git mv" in interactive rebase of the first commit should be really easy to do and if git doesn't figure out the 2/3 automatically, than you can still check that the rebased 2/3 looks like the current 3/3 did (and if doesn't then just squash git diff into it), I don't see how this is error prone.
Quoted 48 lines · Alexander Kanavin
Because I already had the patches ready, and simply added the move between layers on top of them. Placing it to the right layer requires either a patchset do-over from scratch, or resolving a merge conflict with possibility for mistakes.
Alex
Quoted 39 lines · Martin Jansa
Why don't you add it to the right layer in the 1/3 change?
Quoted 33 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 0 {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch (100%) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb(100%)
diff --git
a/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchsimilarity index 100%
rename frommeta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchrename tometa-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchmeta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb +0
-1--2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH v2 1/2 sysprof: add a recipe from oe-core
From: Alexander Kanavin <[email protected]>
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch create mode 100644 meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch create mode 100644 meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +27 -0
@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data') +-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +22 -0
@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +32 -0
@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ + file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" + +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "
Signature · 1 line
2.20.1
PATCH v2 2/2 sysprof: update to 3.34.1
From: Alexander Kanavin <[email protected]>
0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch is replaced by a meson option.
Enable all options, as polkit is now available.
---
...thing-in-help-as-it-requires-itstool.patch | 27 --------------
...-Define-NT_GNU_BUILD_ID-if-undefined.patch | 35 +++++++++++++++++++
.../files/define-NT_GNU_BUILD_ID.patch | 22 ------------
.../{sysprof_3.32.0.bb => sysprof_3.34.1.bb} | 18 ++++++----
4 files changed, 46 insertions(+), 56 deletions(-)
delete mode 100644 meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
create mode 100644 meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch
delete mode 100644 meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
rename meta-gnome/recipes-kernel/sysprof/{sysprof_3.32.0.bb => sysprof_3.34.1.bb} (54%)meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Wed, 23 Aug 2017 18:38:26 +0300 -Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3986273..ae2f65e 100644 ---- a/meson.build -+++ b/meson.build -@@ -164,7 +164,6 @@ subdir('tools') - subdir('tests') - - subdir('data') --subdir('help') - subdir('po') - - meson.add_install_script('build-aux/meson/post_install.sh') --- -2.7.4 -
meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 18 Jul 2011 16:00:17 -0700 +Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined + +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +%% original patch: define-NT_GNU_BUILD_ID.patch +--- + src/libsysprof/elfparser.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h +index 160e4c9..94fa5c0 100644 +--- a/src/libsysprof/elfparser.h ++++ b/src/libsysprof/elfparser.h +@@ -18,6 +18,10 @@ + + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; + +-- +2.17.1 +
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch deleted +0 -22
@@ -1,22 +0,0 @@ -On uclibc elf.h does not have GNU extentions but we need this define -so we define it locally if its not getting it from elf.h - -Signed-off-by: Khem Raj <[email protected]> - -Upstream-Status: Pending - -Index: git/elfparser.h -=================================================================== ---- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 -+++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 -@@ -17,6 +17,10 @@ - */ - #include <glib.h> - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif -+ - typedef struct ElfSym ElfSym; - typedef struct ElfParser ElfParser; -
meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb +11 -7
@@ -2,23 +2,26 @@ SUMMARY = "System-wide Performance Profiler for Linux" HOMEPAGE = "http://www.sysprof.com" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext systemd upstream-version-is-even gsettings DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" -SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" -SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629" +SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0" SRC_URI += " \ - file://define-NT_GNU_BUILD_ID.patch \ - file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ " -PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" -PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" +PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" + +# Enablig this requries yelp +EXTRA_OEMESON += "-Dhelp=false -Dsystemdunitdir=${systemd_unitdir}" SOLIBS = ".so" FILES_SOLIBSDEV = ""
@@ -28,5 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysp FILES_${PN} += " \ ${datadir}/dbus-1/system-services \ ${datadir}/dbus-1/system.d \ + ${datadir}/dbus-1/interfaces \ ${datadir}/metainfo \ "
Signature · 1 line
2.20.1
Quoted 7 lines · Martin Jansa
From: Alexander Kanavin <[email protected]>
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
it fails to build for arm
https://errors.yoctoproject.org/Errors/Details/306463/
https://errors.yoctoproject.org/Errors/Details/306361/
Quoted 112 lines
Signed-off-by Alexander Kanavin <[email protected]>Signed-off-by Martin Jansa <[email protected]>--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+)create mode 100644
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchcreate mode 100644meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
create mode 100644 meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bbmeta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +27
-0@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data') +-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +22
-0@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +32
-0@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ + file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" + +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "
Thanks, I've just sent a patch for this.
Alex
Quoted 150 lines · Khem Raj
Quoted 7 lines · Martin Jansa
From: Alexander Kanavin <[email protected]>
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
it fails to build for arm
https://errors.yoctoproject.org/Errors/Details/306463/
https://errors.yoctoproject.org/Errors/Details/306361/Quoted 9 lines
Signed-off-by Alexander Kanavin <[email protected]>Signed-off-by Martin Jansa <[email protected]>--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+)create mode 100644
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchQuoted 1 line
create mode 100644
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchQuoted 3 lines
create mode 100644 meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
diff --git
a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchQuoted 4 lines
new file mode 100644
index 0000000000..ade51cf864
---/dev/null
+++
b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchmeta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch line 4
Quoted 5 lines
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +4
-0@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requiresitstool.
Quoted 23 lines
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +23
-0+ +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data') +-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +Quoted 1 line
diff --git
a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchb/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchQuoted 4 lines
new file mode 100644
index 0000000000..f75ddad43a
---/dev/null
+++
b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchReview
Quoted 24 lines
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +22
-0@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +(quoted diff) +0
-0b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 4
Quoted 9 lines
new file mode 100644
index 0000000000..b92933806cmeta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +4
-0@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 5
Quoted 1 line
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +1
-0+file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
Quoted 8 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +8
-0+ +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] ="
fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d"meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 18
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +3
-0+SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ +file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +3
-0+ " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES','${GTK3DISTROFEATURES}', 'gtk', '', d)}"
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 21
Quoted 2 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +2
-0+PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] ="-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
Quoted 5 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +5
-0+ +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG','sysprofd', 'sysprof2.service', '', d)}"
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 32
Quoted 7 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +6
-0+ +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
there is another failure seen with clang
http://errors.yoctoproject.org/Errors/Details/306619/
variable environ should perhaps be renamed to avoid clash with system headers definition
Quoted 139 lines · Alexander Kanavin
Thanks, I've just sent a patch for this.
Alex
Quoted 133 lines · Khem Raj
Quoted 7 lines · Martin Jansa
From: Alexander Kanavin <[email protected]>
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
it fails to build for arm
https://errors.yoctoproject.org/Errors/Details/306463/
https://errors.yoctoproject.org/Errors/Details/306361/Quoted 102 lines
Signed-off-by Alexander Kanavin <[email protected]>Signed-off-by Martin Jansa <[email protected]>--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+)create mode 100644
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchcreate mode 100644meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
create mode 100644 meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bbmeta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +27
-0@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data') +-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +22
-0@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +22
-0@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ + file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" +meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 32
Quoted 10 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +10
-0+SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
I have to draw the line here: fixing issues with a non-standard compiler is on you.
Alex
Quoted 170 lines · Khem Raj
there is another failure seen with clang
http://errors.yoctoproject.org/Errors/Details/306619/
variable environ should perhaps be renamed to avoid clash with system headers definition
Quoted 28 lines · Alexander Kanavin
Thanks, I've just sent a patch for this.
Alex
Quoted 22 lines · Khem Raj
Quoted 7 lines · Martin Jansa
From: Alexander Kanavin <[email protected]>
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
it fails to build for arm
https://errors.yoctoproject.org/Errors/Details/306463/
https://errors.yoctoproject.org/Errors/Details/306361/Quoted 7 lines
Signed-off-by Alexander Kanavin <[email protected]>Signed-off-by Martin Jansa <[email protected]>--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32+++++++++++++++++++
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
3 files changed, 81 insertions(+)create mode 100644
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchQuoted 1 line
Quoted 1 line
Quoted 1 line
create mode 100644
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchQuoted 1 line
Quoted 1 line
Quoted 1 line
create mode 100644 meta-gnome/recipes-kernel/sysprof/
sysprof_3.32.0.bb
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
diff --git
a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
new file mode 100644
index 0000000000..ade51cf864
---/dev/null
+++
b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchQuoted 2 lines
Quoted 2 lines
Review line 1
Quoted 2 lines
(quoted diff) +1
-0@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:002001
Quoted 3 lines
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +3
-0+From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requiresitstool.
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +16
-0+ +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data')Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +7
-0+-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +diff --git
a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchb/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
new file mode 100644
index 0000000000..f75ddad43a
---/dev/null
+++
b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patchQuoted 11 lines
Quoted 11 lines
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch line 10
Quoted 11 lines
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +10
-0@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000-0700
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +5
-0++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> +Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +7
-0++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +(quoted diff) +0
-0b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
Quoted 9 lines
Quoted 9 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 4
Quoted 9 lines
new file mode 100644
index 0000000000..b92933806cmeta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +4
-0@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM ="file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
Quoted 1 line
Quoted 1 line
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 5
Quoted 1 line
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +1
-0+file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875"
Quoted 8 lines
Quoted 8 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
Quoted 8 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +8
-0+ +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] ="
fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d"Quoted 3 lines
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 18
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +3
-0+SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ +file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \
Quoted 3 lines
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
Quoted 3 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +3
-0+ " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES','${GTK3DISTROFEATURES}', 'gtk', '', d)}"
Quoted 2 lines
Quoted 2 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 21
Quoted 2 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +2
-0+PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] ="-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
Quoted 5 lines
Quoted 5 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb
Quoted 5 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +5
-0+ +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG','sysprofd', 'sysprof2.service', '', d)}"
Quoted 13 lines
Quoted 13 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 32
Quoted 7 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +6
-0+ +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Quoted 3 lines · Alexander Kanavin
I have to draw the line here: fixing issues with a non-standard compiler is on you.
I wondered why gcc can not find it, perhaps -Wshadow is not enabled, it's fine I do not expect either. It was merely for future reference if someone stumbles on this issue
Quoted 152 lines
Alex
Quoted 149 lines · Khem Raj
there is another failure seen with clang
http://errors.yoctoproject.org/Errors/Details/306619/
variable environ should perhaps be renamed to avoid clash with system headers definition
Quoted 139 lines · Alexander Kanavin
Thanks, I've just sent a patch for this.
Alex
Quoted 133 lines · Khem Raj
Quoted 7 lines · Martin Jansa
From: Alexander Kanavin <[email protected]>
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
it fails to build for arm
https://errors.yoctoproject.org/Errors/Details/306463/
https://errors.yoctoproject.org/Errors/Details/306361/Quoted 102 lines
Signed-off-by Alexander Kanavin <[email protected]>Signed-off-by Martin Jansa <[email protected]>--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+)create mode 100644
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchcreate mode 100644meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
create mode 100644 meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bbmeta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +27
-0@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data') +-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +22
-0@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +22
-0@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ + file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" +meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 32
Quoted 10 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +10
-0+SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
with distros with systemd I am seeing this error
ERROR: sysprof-3.34.1-r0 do_package: SYSTEMD_SERVICE_sysprof value sysprof2.service does not exist
Quoted 163 lines · Khem Raj
Quoted 3 lines · Alexander Kanavin
I have to draw the line here: fixing issues with a non-standard compiler is on you.
I wondered why gcc can not find it, perhaps -Wshadow is not enabled, it's fine I do not expect either. It was merely for future reference if someone stumbles on this issue
Quoted 152 lines
Alex
Quoted 149 lines · Khem Raj
there is another failure seen with clang
http://errors.yoctoproject.org/Errors/Details/306619/
variable environ should perhaps be renamed to avoid clash with system headers definition
Quoted 139 lines · Alexander Kanavin
Thanks, I've just sent a patch for this.
Alex
Quoted 133 lines · Khem Raj
Quoted 7 lines · Martin Jansa
From: Alexander Kanavin <[email protected]>
Latest version (3.34) of sysprof have a hard dependency on polkit, which in turn requires mozjs, which pulls in a number of other meta-oe packages including python2. This makes it difficult to keep sysprof in oe-core, so for the time being it is moved to meta-oe.
it fails to build for arm
https://errors.yoctoproject.org/Errors/Details/306463/
https://errors.yoctoproject.org/Errors/Details/306361/Quoted 102 lines
Signed-off-by Alexander Kanavin <[email protected]>Signed-off-by Martin Jansa <[email protected]>--- ...thing-in-help-as-it-requires-itstool.patch | 27 ++++++++++++++++ .../files/define-NT_GNU_BUILD_ID.patch | 22 +++++++++++++ .../recipes-kernel/sysprof/sysprof_3.32.0.bb | 32 +++++++++++++++++++ 3 files changed, 81 insertions(+)create mode 100644
meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patchcreate mode 100644meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
create mode 100644 meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bbmeta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file +27
-0@@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 23 Aug 2017 18:38:26 +0300 +Subject: [PATCH 2/2] Do not build anything in help/ as it requires itstool. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <[email protected]> + +--- + meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3986273..ae2f65e 100644 +--- a/meson.build ++++ b/meson.build +@@ -164,7 +164,6 @@ subdir('tools') + subdir('tests') + + subdir('data') +-subdir('help') + subdir('po') + + meson.add_install_script('build-aux/meson/post_install.sh') +-- +2.7.4 +meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file +22
-0@@ -0,0 +1,22 @@ +On uclibc elf.h does not have GNU extentions but we need this define +so we define it locally if its not getting it from elf.h + +Signed-off-by: Khem Raj <[email protected]> + +Upstream-Status: Pending + +Index: git/elfparser.h +=================================================================== +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +@@ -17,6 +17,10 @@ + */ + #include <glib.h> + ++#ifndef NT_GNU_BUILD_ID ++#define NT_GNU_BUILD_ID 3 ++#endif ++ + typedef struct ElfSym ElfSym; + typedef struct ElfParser ElfParser; +meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +22
-0@@ -0,0 +1,32 @@ +SUMMARY = "System-wide Performance Profiler for Linux" +HOMEPAGE = "http://www.sysprof.com" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd upstream-version-is-even gsettings + +DEPENDS = "glib-2.0 libxml2-native glib-2.0-native" + +SRC_URI[archive.md5sum] = "d1fa9ad216419d722770ca36713ad3af" +SRC_URI[archive.sha256sum] = "fc22a69e468701c5ec9036e960c6273afa1ed6a89df1f889fed49417add5554d" +SRC_URI += " \ + file://define-NT_GNU_BUILD_ID.patch \ + file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + " + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3" +PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" +meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb line 32
Quoted 10 lines
meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file +10
-0+SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service', '', d)}" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/metainfo \ + "--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome
In reply to Martin JansaIt does not figure out the 2/3, and still forces a conflict resolution. Thanks for doing it (if you correctly resolved the conflicts), but I still think it's entirely unnecessary.
Alex
Quoted 58 lines · Martin Jansa
Doing "git mv" in interactive rebase of the first commit should be really easy to do and if git doesn't figure out the 2/3 automatically, than you can still check that the rebased 2/3 looks like the current 3/3 did (and if doesn't then just squash git diff into it), I don't see how this is error prone.
Quoted 49 lines · Alexander Kanavin
Because I already had the patches ready, and simply added the move between layers on top of them. Placing it to the right layer requires either a patchset do-over from scratch, or resolving a merge conflict with possibility for mistakes.
Alex
Quoted 39 lines · Martin Jansa
Why don't you add it to the right layer in the 1/3 change?
Quoted 33 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 0 {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch (100%) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb (100%)
diff --git
a/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchsimilarity index 100%
rename frommeta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchrename tometa-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchmeta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb +0
-1--2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome
Yo're welcome!
Current 2/2 is the same as 3/3 was, I wasn't resolving any conflicts.
Quoted 66 lines · Alexander Kanavin
It does not figure out the 2/3, and still forces a conflict resolution. Thanks for doing it (if you correctly resolved the conflicts), but I still think it's entirely unnecessary.
Alex
Quoted 58 lines · Martin Jansa
Doing "git mv" in interactive rebase of the first commit should be really easy to do and if git doesn't figure out the 2/3 automatically, than you can still check that the rebased 2/3 looks like the current 3/3 did (and if doesn't then just squash git diff into it), I don't see how this is error prone.
Quoted 49 lines · Alexander Kanavin
Because I already had the patches ready, and simply added the move between layers on top of them. Placing it to the right layer requires either a patchset do-over from scratch, or resolving a merge conflict with possibility for mistakes.
Alex
Quoted 39 lines · Martin Jansa
Why don't you add it to the right layer in the 1/3 change?
Quoted 33 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 0 {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch (100%) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb (100%)
diff --git
a/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchsimilarity index 100%
rename frommeta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchrename tometa-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchmeta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb +0
-1--2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome
I have queued Martin's reworked patches
Quoted 78 lines · Martin Jansa
Yo're welcome!
Current 2/2 is the same as 3/3 was, I wasn't resolving any conflicts.Quoted 4 lines · Alexander Kanavin
It does not figure out the 2/3, and still forces a conflict resolution. Thanks for doing it (if you correctly resolved the conflicts), but I still think it's entirely unnecessary.
Quoted 62 lines
Alex
Quoted 58 lines · Martin Jansa
Doing "git mv" in interactive rebase of the first commit should be really easy to do and if git doesn't figure out the 2/3 automatically, than you can still check that the rebased 2/3 looks like the current 3/3 did (and if doesn't then just squash git diff into it), I don't see how this is error prone.
Quoted 49 lines · Alexander Kanavin
Because I already had the patches ready, and simply added the move between layers on top of them. Placing it to the right layer requires either a patchset do-over from scratch, or resolving a merge conflict with possibility for mistakes.
Alex
Quoted 39 lines · Martin Jansa
Why don't you add it to the right layer in the 1/3 change?
Quoted 33 lines · Alexander Kanavin
Signed-off-by Alexander Kanavin <[email protected]>--- .../files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch | 0 {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch (100%) rename {meta-oe => meta-gnome}/recipes-kernel/sysprof/sysprof_3.34.1.bb (100%)
diff --git
a/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchb/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchsimilarity index 100%
rename frommeta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchrename tometa-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patchmeta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb renamed from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb +0
-1--2.17.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel