[oe] [PATCH 3/3] sysprof: move from meta-oe to meta-gnome

[Khem Raj]

I have queued Martin's reworked patches

On Mon, Jan 13, 2020 at 11:18 AM Martin Jansa <martin.jansa at 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 at 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 at 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 at 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 at 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 at gmail.com> wrote:
> >>>>
> >>>>> Signed-off-by: Alexander Kanavin <alex.kanavin at 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 at lists.openembedded.org
> >>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >>>>>
> >>>>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel