[krogoth] [PATCH 1/2] can-utils: update to the latest

[krogoth] [PATCH 1/2] can-utils: update to the latest

[Jean-Jacques Hiblot]

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
 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

[krogoth] [PATCH 2/2] packagegroup-*-addons*: replace canutils with can-utils

[Jean-Jacques Hiblot]

The latter supports CAN-FD and is required for MCAN IP on dra76

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
---
 .../packagegroup-arago-tisdk-addons-sdk-target.bb              | 10 +++++-----
 .../packagegroups/packagegroup-arago-tisdk-addons.bb           | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
index b31d729..d1c664f 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-target.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install headers and libraries related to addons into the SDK"
 LICENSE = "MIT"
-PR = "r33"
+PR = "r34"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -116,13 +116,13 @@ EXTRA_LIBS_append_k2e = "\
 	nwal-lld-staticdev \
 "
 
-UTILS_append_ti33x = " canutils-dev"
-UTILS_append_ti43x = " canutils-dev"
-UTILS_append_dra7xx = " canutils-dev \
+UTILS_append_ti33x = " can-utils-dev"
+UTILS_append_ti43x = " can-utils-dev"
+UTILS_append_dra7xx = " can-utils-dev \
                         elfutils-dev \
                         elfutils-staticdev \
 "
-UTILS_append_k2g = " canutils-dev"
+UTILS_append_k2g = " can-utils-dev"
 
 EXTRA_LIBS = ""
 EXTRA_LIBS_append_omap-a15 = " cmem-dev"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 8bfcb82..57f5021 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install additional utilities/demos for SDKs"
 LICENSE = "MIT"
-PR = "r54"
+PR = "r55"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -31,13 +31,13 @@ UTILS_UBOOT_FW = "u-boot-fw-utils"
 UTILS_UBOOT_FW_keystone = ""
 
 UTILS_append_ti33x = " mmc-utils \
-                       canutils \
+                       can-utils \
                        switch-config \
                        pru-icss \
 "
 
 UTILS_append_ti43x = " mmc-utils \
-                       canutils \
+                       can-utils \
                        switch-config \
                        libdrm-omap \
                        pru-icss \
@@ -54,7 +54,7 @@ UTILS_append_omap-a15 = " mmc-utils \
                           uio-module-drv-test \
 "
 
-UTILS_append_dra7xx = " canutils \
+UTILS_append_dra7xx = " can-utils \
                         dsptop \
                         gdbc6x \
                         glsdk-example-apps \
@@ -81,7 +81,7 @@ UTILS_append_k2e = " \
 "
 
 UTILS_append_k2g = " \
-    canutils \
+    can-utils \
     pru-icss \
 "
 
-- 
1.9.1

Re: [krogoth] [PATCH 1/2] can-utils: update to the latest

[Denys Dmytriyenko]

Are these 2 backports from morty? Please keep original commit logs then.


On Wed, Oct 11, 2017 at 07:58:44PM +0200, Jean-Jacques Hiblot wrote:
> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
> ---
>  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
> 

Re: [krogoth] [PATCH 1/2] can-utils: update to the latest

[Jean-Jacques Hiblot]

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 <jjhiblot@ti.com>
>> ---
>>   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
>>

Re: [krogoth] [PATCH 1/2] can-utils: update to the latest

[Denys Dmytriyenko]

No need, I'll merge them as is.

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 <jjhiblot@ti.com>
> >>---
> >>  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
> >>
> 

Re: [krogoth] [PATCH 1/2] can-utils: update to the latest

[Jean-Jacques Hiblot]

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?
JJ
>
> 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 <jjhiblot@ti.com>
>>>> ---
>>>>   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
>>>>

Re: [krogoth] [PATCH 1/2] can-utils: update to the latest

[Denys Dmytriyenko]

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 <jjhiblot@ti.com>
> >>>>---
> >>>>  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
> >>>>
>