On Wed, Oct 11, 2017 at 08:10:45PM +0200, Jean-Jacques Hiblot wrote: > > > On 11/10/2017 20:07, Denys Dmytriyenko wrote: > >No need, I'll merge them as is. > Thanks. > BTW when doing a backport from another branch, should the original > commit ID and branch be described?
Usually you keep original commit log including all SoBs, after which you provide info where it's forward/back-ported from, including original commit IDs and then new set of SoBs. For example: =================================== recipe: change something This change is due to this and that Signed-off-by: Author Signed-off-by: Maintainer (from layer/branch commit-id) Signed-off-by: Submitter =================================== The part above (from layer/branch commit-id) is from the original commit. This is the practice we use in the Yocto Project and besides helping with traceability, speeds up reviewing of backported patches, since they've been previously reviewed and accepted. -- Denys > >On Wed, Oct 11, 2017 at 08:05:06PM +0200, Jean-Jacques Hiblot wrote: > >>On 11/10/2017 20:02, Denys Dmytriyenko wrote: > >>>Are these 2 backports from morty? Please keep original commit logs then. > >>Yes they are backports from morty? > >> > >>Do you want me to resend? > >> > >>JJ > >> > >>> > >>>On Wed, Oct 11, 2017 at 07:58:44PM +0200, Jean-Jacques Hiblot wrote: > >>>>Signed-off-by: Jean-Jacques Hiblot <[email protected]> > >>>>--- > >>>> meta-arago-distro/recipes-extended/socketcan/can-utils_git.bbappend | 3 > >>>> +++ > >>>> 1 file changed, 3 insertions(+) > >>>> create mode 100644 > >>>> meta-arago-distro/recipes-extended/socketcan/can-utils_git.bbappend > >>>> > >>>>diff --git > >>>>a/meta-arago-distro/recipes-extended/socketcan/can-utils_git.bbappend > >>>>b/meta-arago-distro/recipes-extended/socketcan/can-utils_git.bbappend > >>>>new file mode 100644 > >>>>index 0000000..c0e6666 > >>>>--- /dev/null > >>>>+++ b/meta-arago-distro/recipes-extended/socketcan/can-utils_git.bbappend > >>>>@@ -0,0 +1,3 @@ > >>>>+SRCREV = "5b518a0a5fa56856f804372a6b99b518dedb5386" > >>>>+ > >>>>+PR_append = ".arago0" > >>>>-- > >>>>1.9.1 > >>>> > _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
