* [PATCH 1/3] sysprof: add a recipe from oe-core @ 2020-01-13 17:02 Alexander Kanavin 2020-01-13 17:02 ` [PATCH 2/3] sysprof: update to 3.34.1 Alexander Kanavin 2020-01-13 17:02 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin 0 siblings, 2 replies; 17+ messages in thread From: Alexander Kanavin @ 2020-01-13 17:02 UTC (permalink / raw) To: openembedded-devel 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. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- ...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 diff --git a/meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch new file mode 100644 index 000000000..ade51cf86 --- /dev/null +++ b/meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch @@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +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 <alex.kanavin@gmail.com> + +--- + 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 + diff --git a/meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file mode 100644 index 000000000..f75ddad43 --- /dev/null +++ b/meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch @@ -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 <raj.khem@gmail.com> + +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; + diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb new file mode 100644 index 000000000..b92933806 --- /dev/null +++ b/meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb @@ -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 \ + " -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/3] sysprof: update to 3.34.1 2020-01-13 17:02 [PATCH 1/3] sysprof: add a recipe from oe-core Alexander Kanavin @ 2020-01-13 17:02 ` Alexander Kanavin 2020-01-13 17:02 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin 1 sibling, 0 replies; 17+ messages in thread From: Alexander Kanavin @ 2020-01-13 17:02 UTC (permalink / raw) To: openembedded-devel 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. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- ...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%) diff --git a/meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch deleted file mode 100644 index ade51cf86..000000000 --- a/meta-oe/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -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 <alex.kanavin@gmail.com> - ---- - 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 - diff --git a/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch new file mode 100644 index 000000000..75aa86cdb --- /dev/null +++ b/meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch @@ -0,0 +1,35 @@ +From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> + +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 + diff --git a/meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch deleted file mode 100644 index f75ddad43..000000000 --- a/meta-oe/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch +++ /dev/null @@ -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 <raj.khem@gmail.com> - -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; - diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb similarity index 54% rename from meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb rename to meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb index b92933806..b7e7bee6b 100644 --- a/meta-oe/recipes-kernel/sysprof/sysprof_3.32.0.bb +++ b/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb @@ -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 \ " -- 2.17.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/3] sysprof: move from meta-oe to meta-gnome 2020-01-13 17:02 [PATCH 1/3] sysprof: add a recipe from oe-core Alexander Kanavin 2020-01-13 17:02 ` [PATCH 2/3] sysprof: update to 3.34.1 Alexander Kanavin @ 2020-01-13 17:02 ` Alexander Kanavin 2020-01-13 18:14 ` Martin Jansa 1 sibling, 1 reply; 17+ messages in thread From: Alexander Kanavin @ 2020-01-13 17:02 UTC (permalink / raw) To: openembedded-devel Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- .../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.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch similarity index 100% rename from meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch rename to meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb similarity index 100% rename from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb -- 2.17.1 ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome 2020-01-13 17:02 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin @ 2020-01-13 18:14 ` Martin Jansa 2020-01-13 18:52 ` Alexander Kanavin 0 siblings, 1 reply; 17+ messages in thread From: Martin Jansa @ 2020-01-13 18:14 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-devel Why don't you add it to the right layer in the 1/3 change? On Mon, Jan 13, 2020 at 6:03 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > --- > .../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.patch > b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch > similarity index 100% > rename from > meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch > rename to > meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch > diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb > b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb > similarity index 100% > rename from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb > rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome 2020-01-13 18:14 ` Martin Jansa @ 2020-01-13 18:52 ` Alexander Kanavin 2020-01-13 18:57 ` Martin Jansa 0 siblings, 1 reply; 17+ messages in thread From: Alexander Kanavin @ 2020-01-13 18:52 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel 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 On Mon, 13 Jan 2020 at 19:15, Martin Jansa <martin.jansa@gmail.com> wrote: > Why don't you add it to the right layer in the 1/3 change? > > On Mon, Jan 13, 2020 at 6:03 PM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > >> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> --- >> .../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.patch >> b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >> similarity index 100% >> rename from >> meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >> rename to >> meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >> diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >> b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >> similarity index 100% >> rename from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >> rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >> -- >> 2.17.1 >> >> -- >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome 2020-01-13 18:52 ` Alexander Kanavin @ 2020-01-13 18:57 ` Martin Jansa 2020-01-13 19:01 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Martin Jansa 2020-01-13 19:14 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin 0 siblings, 2 replies; 17+ messages in thread From: Martin Jansa @ 2020-01-13 18:57 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-devel 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. On Mon, Jan 13, 2020 at 7:52 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > 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 > > On Mon, 13 Jan 2020 at 19:15, Martin Jansa <martin.jansa@gmail.com> wrote: > >> Why don't you add it to the right layer in the 1/3 change? >> >> On Mon, Jan 13, 2020 at 6:03 PM Alexander Kanavin <alex.kanavin@gmail.com> >> wrote: >> >>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>> --- >>> .../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.patch >>> b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>> similarity index 100% >>> rename from >>> meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>> rename to >>> meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>> diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >>> b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >>> similarity index 100% >>> rename from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >>> rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >>> -- >>> 2.17.1 >>> >>> -- >>> _______________________________________________ >>> Openembedded-devel mailing list >>> Openembedded-devel@lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >>> >> ^ permalink raw reply [flat|nested] 17+ messages in thread
* [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core 2020-01-13 18:57 ` Martin Jansa @ 2020-01-13 19:01 ` Martin Jansa 2020-01-13 19:01 ` [meta-gnome][PATCHv2 2/2] sysprof: update to 3.34.1 Martin Jansa 2020-01-14 0:36 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Khem Raj 2020-01-13 19:14 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin 1 sibling, 2 replies; 17+ messages in thread From: Martin Jansa @ 2020-01-13 19:01 UTC (permalink / raw) To: openembedded-devel From: Alexander Kanavin <alex.kanavin@gmail.com> 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. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- ...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 diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch 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.patch @@ -0,0 +1,27 @@ +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +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 <alex.kanavin@gmail.com> + +--- + 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 + diff --git a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch new file mode 100644 index 0000000000..f75ddad43a --- /dev/null +++ b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch @@ -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 <raj.khem@gmail.com> + +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; + diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb new file mode 100644 index 0000000000..b92933806c --- /dev/null +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb @@ -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 \ + " -- 2.20.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [meta-gnome][PATCHv2 2/2] sysprof: update to 3.34.1 2020-01-13 19:01 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Martin Jansa @ 2020-01-13 19:01 ` Martin Jansa 2020-01-14 0:36 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Khem Raj 1 sibling, 0 replies; 17+ messages in thread From: Martin Jansa @ 2020-01-13 19:01 UTC (permalink / raw) To: openembedded-devel From: Alexander Kanavin <alex.kanavin@gmail.com> 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. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- ...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%) diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch deleted file mode 100644 index ade51cf864..0000000000 --- a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -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 <alex.kanavin@gmail.com> - ---- - 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 - diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch new file mode 100644 index 0000000000..75aa86cdbf --- /dev/null +++ b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch @@ -0,0 +1,35 @@ +From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> + +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 + diff --git a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch deleted file mode 100644 index f75ddad43a..0000000000 --- a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch +++ /dev/null @@ -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 <raj.khem@gmail.com> - -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; - diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb similarity index 54% rename from meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb index b92933806c..b7e7bee6bb 100644 --- a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb @@ -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 \ " -- 2.20.1 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core 2020-01-13 19:01 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Martin Jansa 2020-01-13 19:01 ` [meta-gnome][PATCHv2 2/2] sysprof: update to 3.34.1 Martin Jansa @ 2020-01-14 0:36 ` Khem Raj 2020-01-14 12:01 ` Alexander Kanavin 1 sibling, 1 reply; 17+ messages in thread From: Khem Raj @ 2020-01-14 0:36 UTC (permalink / raw) To: Martin Jansa, openembedded-devel On 1/13/20 11:01 AM, Martin Jansa wrote: > From: Alexander Kanavin <alex.kanavin@gmail.com> > > 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/ > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > ...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 > > diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch > 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.patch > @@ -0,0 +1,27 @@ > +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <alex.kanavin@gmail.com> > +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 <alex.kanavin@gmail.com> > + > +--- > + 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 > + > diff --git a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > new file mode 100644 > index 0000000000..f75ddad43a > --- /dev/null > +++ b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > @@ -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 <raj.khem@gmail.com> > + > +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; > + > diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > new file mode 100644 > index 0000000000..b92933806c > --- /dev/null > +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > @@ -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 \ > + " > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core 2020-01-14 0:36 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Khem Raj @ 2020-01-14 12:01 ` Alexander Kanavin 2020-01-15 14:37 ` Khem Raj 0 siblings, 1 reply; 17+ messages in thread From: Alexander Kanavin @ 2020-01-14 12:01 UTC (permalink / raw) To: Khem Raj; +Cc: OpenEmbedded Devel List Thanks, I've just sent a patch for this. Alex On Tue, 14 Jan 2020 at 01:37, Khem Raj <raj.khem@gmail.com> wrote: > On 1/13/20 11:01 AM, Martin Jansa wrote: > > From: Alexander Kanavin <alex.kanavin@gmail.com> > > > > 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/ > > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > > --- > > ...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 > > > > diff --git > a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch > b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch > > 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.patch > > @@ -0,0 +1,27 @@ > > +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 > > +From: Alexander Kanavin <alex.kanavin@gmail.com> > > +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 <alex.kanavin@gmail.com> > > + > > +--- > > + 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 > > + > > diff --git > a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > > new file mode 100644 > > index 0000000000..f75ddad43a > > --- /dev/null > > +++ > b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > > @@ -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 <raj.khem@gmail.com> > > + > > +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; > > + > > diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > > new file mode 100644 > > index 0000000000..b92933806c > > --- /dev/null > > +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > > @@ -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 \ > > + " > > > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core 2020-01-14 12:01 ` Alexander Kanavin @ 2020-01-15 14:37 ` Khem Raj 2020-01-15 15:02 ` Alexander Kanavin 0 siblings, 1 reply; 17+ messages in thread From: Khem Raj @ 2020-01-15 14:37 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OpenEmbedded Devel List 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 On Tue, Jan 14, 2020 at 4:01 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > Thanks, I've just sent a patch for this. > > Alex > > On Tue, 14 Jan 2020 at 01:37, Khem Raj <raj.khem@gmail.com> wrote: >> >> On 1/13/20 11:01 AM, Martin Jansa wrote: >> > From: Alexander Kanavin <alex.kanavin@gmail.com> >> > >> > 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/ >> >> > >> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >> > --- >> > ...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 >> > >> > diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch >> > 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.patch >> > @@ -0,0 +1,27 @@ >> > +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 >> > +From: Alexander Kanavin <alex.kanavin@gmail.com> >> > +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 <alex.kanavin@gmail.com> >> > + >> > +--- >> > + 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 >> > + >> > diff --git a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch >> > new file mode 100644 >> > index 0000000000..f75ddad43a >> > --- /dev/null >> > +++ b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch >> > @@ -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 <raj.khem@gmail.com> >> > + >> > +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; >> > + >> > diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb >> > new file mode 100644 >> > index 0000000000..b92933806c >> > --- /dev/null >> > +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb >> > @@ -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 \ >> > + " >> > >> >> -- >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core 2020-01-15 14:37 ` Khem Raj @ 2020-01-15 15:02 ` Alexander Kanavin 2020-01-15 15:33 ` Khem Raj 0 siblings, 1 reply; 17+ messages in thread From: Alexander Kanavin @ 2020-01-15 15:02 UTC (permalink / raw) To: Khem Raj; +Cc: OpenEmbedded Devel List I have to draw the line here: fixing issues with a non-standard compiler is on you. Alex On Wed, 15 Jan 2020 at 15:37, Khem Raj <raj.khem@gmail.com> wrote: > 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 > > On Tue, Jan 14, 2020 at 4:01 AM Alexander Kanavin > <alex.kanavin@gmail.com> wrote: > > > > Thanks, I've just sent a patch for this. > > > > Alex > > > > On Tue, 14 Jan 2020 at 01:37, Khem Raj <raj.khem@gmail.com> wrote: > >> > >> On 1/13/20 11:01 AM, Martin Jansa wrote: > >> > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > > >> > 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/ > >> > >> > > >> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > >> > --- > >> > ...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 > >> > > >> > diff --git > a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch > b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch > >> > 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.patch > >> > @@ -0,0 +1,27 @@ > >> > +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 > 2001 > >> > +From: Alexander Kanavin <alex.kanavin@gmail.com> > >> > +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 <alex.kanavin@gmail.com> > >> > + > >> > +--- > >> > + 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 > >> > + > >> > diff --git > a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > >> > new file mode 100644 > >> > index 0000000000..f75ddad43a > >> > --- /dev/null > >> > +++ > b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > >> > @@ -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 <raj.khem@gmail.com> > >> > + > >> > +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; > >> > + > >> > diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > >> > new file mode 100644 > >> > index 0000000000..b92933806c > >> > --- /dev/null > >> > +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > >> > @@ -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 \ > >> > + " > >> > > >> > >> -- > >> _______________________________________________ > >> Openembedded-devel mailing list > >> Openembedded-devel@lists.openembedded.org > >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core 2020-01-15 15:02 ` Alexander Kanavin @ 2020-01-15 15:33 ` Khem Raj 2020-01-15 21:33 ` Khem Raj 0 siblings, 1 reply; 17+ messages in thread From: Khem Raj @ 2020-01-15 15:33 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OpenEmbedded Devel List On Wed, Jan 15, 2020 at 7:02 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > 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 > Alex > > On Wed, 15 Jan 2020 at 15:37, Khem Raj <raj.khem@gmail.com> wrote: >> >> 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 >> >> On Tue, Jan 14, 2020 at 4:01 AM Alexander Kanavin >> <alex.kanavin@gmail.com> wrote: >> > >> > Thanks, I've just sent a patch for this. >> > >> > Alex >> > >> > On Tue, 14 Jan 2020 at 01:37, Khem Raj <raj.khem@gmail.com> wrote: >> >> >> >> On 1/13/20 11:01 AM, Martin Jansa wrote: >> >> > From: Alexander Kanavin <alex.kanavin@gmail.com> >> >> > >> >> > 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/ >> >> >> >> > >> >> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >> >> > --- >> >> > ...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 >> >> > >> >> > diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch >> >> > 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.patch >> >> > @@ -0,0 +1,27 @@ >> >> > +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 >> >> > +From: Alexander Kanavin <alex.kanavin@gmail.com> >> >> > +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 <alex.kanavin@gmail.com> >> >> > + >> >> > +--- >> >> > + 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 >> >> > + >> >> > diff --git a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch >> >> > new file mode 100644 >> >> > index 0000000000..f75ddad43a >> >> > --- /dev/null >> >> > +++ b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch >> >> > @@ -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 <raj.khem@gmail.com> >> >> > + >> >> > +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; >> >> > + >> >> > diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb >> >> > new file mode 100644 >> >> > index 0000000000..b92933806c >> >> > --- /dev/null >> >> > +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb >> >> > @@ -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 \ >> >> > + " >> >> > >> >> >> >> -- >> >> _______________________________________________ >> >> Openembedded-devel mailing list >> >> Openembedded-devel@lists.openembedded.org >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core 2020-01-15 15:33 ` Khem Raj @ 2020-01-15 21:33 ` Khem Raj 0 siblings, 0 replies; 17+ messages in thread From: Khem Raj @ 2020-01-15 21:33 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OpenEmbedded Devel List 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 On Wed, Jan 15, 2020 at 7:33 AM Khem Raj <raj.khem@gmail.com> wrote: > > On Wed, Jan 15, 2020 at 7:02 AM Alexander Kanavin > <alex.kanavin@gmail.com> wrote: > > > > 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 > > > Alex > > > > On Wed, 15 Jan 2020 at 15:37, Khem Raj <raj.khem@gmail.com> wrote: > >> > >> 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 > >> > >> On Tue, Jan 14, 2020 at 4:01 AM Alexander Kanavin > >> <alex.kanavin@gmail.com> wrote: > >> > > >> > Thanks, I've just sent a patch for this. > >> > > >> > Alex > >> > > >> > On Tue, 14 Jan 2020 at 01:37, Khem Raj <raj.khem@gmail.com> wrote: > >> >> > >> >> On 1/13/20 11:01 AM, Martin Jansa wrote: > >> >> > From: Alexander Kanavin <alex.kanavin@gmail.com> > >> >> > > >> >> > 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/ > >> >> > >> >> > > >> >> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >> >> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > >> >> > --- > >> >> > ...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 > >> >> > > >> >> > diff --git a/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/meta-gnome/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch > >> >> > 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.patch > >> >> > @@ -0,0 +1,27 @@ > >> >> > +From d332b480257aa98b63d39c3c94896a111536f937 Mon Sep 17 00:00:00 2001 > >> >> > +From: Alexander Kanavin <alex.kanavin@gmail.com> > >> >> > +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 <alex.kanavin@gmail.com> > >> >> > + > >> >> > +--- > >> >> > + 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 > >> >> > + > >> >> > diff --git a/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > >> >> > new file mode 100644 > >> >> > index 0000000000..f75ddad43a > >> >> > --- /dev/null > >> >> > +++ b/meta-gnome/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch > >> >> > @@ -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 <raj.khem@gmail.com> > >> >> > + > >> >> > +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; > >> >> > + > >> >> > diff --git a/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > >> >> > new file mode 100644 > >> >> > index 0000000000..b92933806c > >> >> > --- /dev/null > >> >> > +++ b/meta-gnome/recipes-kernel/sysprof/sysprof_3.32.0.bb > >> >> > @@ -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 \ > >> >> > + " > >> >> > > >> >> > >> >> -- > >> >> _______________________________________________ > >> >> Openembedded-devel mailing list > >> >> Openembedded-devel@lists.openembedded.org > >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome 2020-01-13 18:57 ` Martin Jansa 2020-01-13 19:01 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Martin Jansa @ 2020-01-13 19:14 ` Alexander Kanavin 2020-01-13 19:17 ` Martin Jansa 1 sibling, 1 reply; 17+ messages in thread From: Alexander Kanavin @ 2020-01-13 19:14 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel 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 On Mon, 13 Jan 2020 at 19:58, Martin Jansa <martin.jansa@gmail.com> wrote: > 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. > > On Mon, Jan 13, 2020 at 7:52 PM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > >> 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 >> >> On Mon, 13 Jan 2020 at 19:15, Martin Jansa <martin.jansa@gmail.com> >> wrote: >> >>> Why don't you add it to the right layer in the 1/3 change? >>> >>> On Mon, Jan 13, 2020 at 6:03 PM Alexander Kanavin < >>> alex.kanavin@gmail.com> wrote: >>> >>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>> --- >>>> .../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.patch >>>> b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>>> similarity index 100% >>>> rename from >>>> meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>>> rename to >>>> meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>>> diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>> b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>> similarity index 100% >>>> rename from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>> rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>> -- >>>> 2.17.1 >>>> >>>> -- >>>> _______________________________________________ >>>> Openembedded-devel mailing list >>>> Openembedded-devel@lists.openembedded.org >>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >>>> >>> ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome 2020-01-13 19:14 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin @ 2020-01-13 19:17 ` Martin Jansa 2020-01-13 20:38 ` Khem Raj 0 siblings, 1 reply; 17+ messages in thread From: Martin Jansa @ 2020-01-13 19:17 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-devel Yo're welcome! Current 2/2 is the same as 3/3 was, I wasn't resolving any conflicts. On Mon, Jan 13, 2020 at 8:14 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > 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 > > On Mon, 13 Jan 2020 at 19:58, Martin Jansa <martin.jansa@gmail.com> wrote: > >> 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. >> >> On Mon, Jan 13, 2020 at 7:52 PM Alexander Kanavin <alex.kanavin@gmail.com> >> wrote: >> >>> 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 >>> >>> On Mon, 13 Jan 2020 at 19:15, Martin Jansa <martin.jansa@gmail.com> >>> wrote: >>> >>>> Why don't you add it to the right layer in the 1/3 change? >>>> >>>> On Mon, Jan 13, 2020 at 6:03 PM Alexander Kanavin < >>>> alex.kanavin@gmail.com> wrote: >>>> >>>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> >>>>> --- >>>>> .../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.patch >>>>> b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>>>> similarity index 100% >>>>> rename from >>>>> meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>>>> rename to >>>>> meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch >>>>> diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>>> b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>>> similarity index 100% >>>>> rename from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>>> rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb >>>>> -- >>>>> 2.17.1 >>>>> >>>>> -- >>>>> _______________________________________________ >>>>> Openembedded-devel mailing list >>>>> Openembedded-devel@lists.openembedded.org >>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >>>>> >>>> ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 3/3] sysprof: move from meta-oe to meta-gnome 2020-01-13 19:17 ` Martin Jansa @ 2020-01-13 20:38 ` Khem Raj 0 siblings, 0 replies; 17+ messages in thread From: Khem Raj @ 2020-01-13 20:38 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel I have queued Martin's reworked patches On Mon, Jan 13, 2020 at 11:18 AM Martin Jansa <martin.jansa@gmail.com> wrote: > > Yo're welcome! > Current 2/2 is the same as 3/3 was, I wasn't resolving any conflicts. > > On Mon, Jan 13, 2020 at 8:14 PM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > > > 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 > > > > On Mon, 13 Jan 2020 at 19:58, Martin Jansa <martin.jansa@gmail.com> wrote: > > > >> 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. > >> > >> On Mon, Jan 13, 2020 at 7:52 PM Alexander Kanavin <alex.kanavin@gmail.com> > >> wrote: > >> > >>> 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 > >>> > >>> On Mon, 13 Jan 2020 at 19:15, Martin Jansa <martin.jansa@gmail.com> > >>> wrote: > >>> > >>>> Why don't you add it to the right layer in the 1/3 change? > >>>> > >>>> On Mon, Jan 13, 2020 at 6:03 PM Alexander Kanavin < > >>>> alex.kanavin@gmail.com> wrote: > >>>> > >>>>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > >>>>> --- > >>>>> .../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.patch > >>>>> b/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch > >>>>> similarity index 100% > >>>>> rename from > >>>>> meta-oe/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch > >>>>> rename to > >>>>> meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch > >>>>> diff --git a/meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb > >>>>> b/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb > >>>>> similarity index 100% > >>>>> rename from meta-oe/recipes-kernel/sysprof/sysprof_3.34.1.bb > >>>>> rename to meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb > >>>>> -- > >>>>> 2.17.1 > >>>>> > >>>>> -- > >>>>> _______________________________________________ > >>>>> Openembedded-devel mailing list > >>>>> Openembedded-devel@lists.openembedded.org > >>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > >>>>> > >>>> > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-01-15 21:33 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-01-13 17:02 [PATCH 1/3] sysprof: add a recipe from oe-core Alexander Kanavin 2020-01-13 17:02 ` [PATCH 2/3] sysprof: update to 3.34.1 Alexander Kanavin 2020-01-13 17:02 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin 2020-01-13 18:14 ` Martin Jansa 2020-01-13 18:52 ` Alexander Kanavin 2020-01-13 18:57 ` Martin Jansa 2020-01-13 19:01 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Martin Jansa 2020-01-13 19:01 ` [meta-gnome][PATCHv2 2/2] sysprof: update to 3.34.1 Martin Jansa 2020-01-14 0:36 ` [meta-gnome][PATCHv2 1/2] sysprof: add a recipe from oe-core Khem Raj 2020-01-14 12:01 ` Alexander Kanavin 2020-01-15 14:37 ` Khem Raj 2020-01-15 15:02 ` Alexander Kanavin 2020-01-15 15:33 ` Khem Raj 2020-01-15 21:33 ` Khem Raj 2020-01-13 19:14 ` [PATCH 3/3] sysprof: move from meta-oe to meta-gnome Alexander Kanavin 2020-01-13 19:17 ` Martin Jansa 2020-01-13 20:38 ` Khem Raj
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.