* Re: [meta-ti] [master][PATCH] ti-img-rogue-driver: unify with dunfell and fix double-patching [not found] <1692042B86EAB73A.9904@lists.yoctoproject.org> @ 2021-07-26 23:36 ` Denys Dmytriyenko 2021-07-27 16:54 ` Yogesh Siraswar 0 siblings, 1 reply; 4+ messages in thread From: Denys Dmytriyenko @ 2021-07-26 23:36 UTC (permalink / raw) To: meta-ti Ping. On Thu, Jul 15, 2021 at 12:36:35PM -0400, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@konsulko.com> > > There was a discrepancy between master and dunfell where 2 different versions > of the same patch existed, so when syncing branches, it resulted in appying > the same change twice. This cleans it up. > > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > --- > ...k-support-OE-toolchain-alongside-Poky-one.patch | 26 ---------------------- > .../ti-img-rogue-driver_1.13.5776728.bb | 4 ++-- > 2 files changed, 2 insertions(+), 28 deletions(-) > delete mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch > > diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch b/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch > deleted file mode 100644 > index abe48df..0000000 > --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From 0d291f91d86e59d87ce023b4e7b89f6b00aa4aab Mon Sep 17 00:00:00 2001 > -From: Denys Dmytriyenko <denis@denix.org> > -Date: Sat, 27 Mar 2021 00:20:57 -0400 > -Subject: [PATCH] compiler.mk: support OE toolchain alongside Poky one > - > -Signed-off-by: Denys Dmytriyenko <denis@denix.org> > ---- > - build/linux/config/compiler.mk | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk > -index 53a0bef..d45d438 100644 > ---- a/build/linux/config/compiler.mk > -+++ b/build/linux/config/compiler.mk > -@@ -65,7 +65,7 @@ define calculate-compiler-preferred-target > - ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),) > - $(1)_compiler_preferred_target := i386-linux-gnu > - endif > -- ifneq ($$(filter aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) > -+ ifneq ($$(filter aarch64-poky-linux aarch64-oe-linux,$$($(1)_compiler_preferred_target)),) > - $(1)_compiler_preferred_target := aarch64-linux-gnu > - endif > - ifneq ($$(filter armv7a-cros-linux-gnueabi armv7l-tizen-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > --- > -2.7.4 > - > diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb > index 00f1d81..e6edebd 100644 > --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb > +++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb > @@ -19,8 +19,8 @@ PROVIDES = "virtual/gpudriver" > > BRANCH = "1.13-5776728/linux-k5.10" > > -SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ > - file://0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch \ > +SRC_URI = " \ > + git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ > file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ > " > > -- > 2.7.4 > -- Regards, Denys Dmytriyenko <denis@denix.org> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-ti] [master][PATCH] ti-img-rogue-driver: unify with dunfell and fix double-patching 2021-07-26 23:36 ` [meta-ti] [master][PATCH] ti-img-rogue-driver: unify with dunfell and fix double-patching Denys Dmytriyenko @ 2021-07-27 16:54 ` Yogesh Siraswar 2021-07-27 19:06 ` Denys Dmytriyenko 0 siblings, 1 reply; 4+ messages in thread From: Yogesh Siraswar @ 2021-07-27 16:54 UTC (permalink / raw) To: Denys Dmytriyenko, meta-ti On 7/26/2021 6:36 PM, Denys Dmytriyenko wrote: > Ping. > > On Thu, Jul 15, 2021 at 12:36:35PM -0400, Denys Dmytriyenko wrote: >> From: Denys Dmytriyenko <denys@konsulko.com> >> >> There was a discrepancy between master and dunfell where 2 different versions >> of the same patch existed, so when syncing branches, it resulted in appying >> the same change twice. This cleans it up. >> >> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> >> --- >> ...k-support-OE-toolchain-alongside-Poky-one.patch | 26 ---------------------- >> .../ti-img-rogue-driver_1.13.5776728.bb | 4 ++-- >> 2 files changed, 2 insertions(+), 28 deletions(-) >> delete mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch >> >> diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch b/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch >> deleted file mode 100644 >> index abe48df..0000000 >> --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch >> +++ /dev/null >> @@ -1,26 +0,0 @@ >> -From 0d291f91d86e59d87ce023b4e7b89f6b00aa4aab Mon Sep 17 00:00:00 2001 >> -From: Denys Dmytriyenko <denis@denix.org> >> -Date: Sat, 27 Mar 2021 00:20:57 -0400 >> -Subject: [PATCH] compiler.mk: support OE toolchain alongside Poky one >> - >> -Signed-off-by: Denys Dmytriyenko <denis@denix.org> >> ---- >> - build/linux/config/compiler.mk | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk >> -index 53a0bef..d45d438 100644 >> ---- a/build/linux/config/compiler.mk >> -+++ b/build/linux/config/compiler.mk >> -@@ -65,7 +65,7 @@ define calculate-compiler-preferred-target >> - ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),) >> - $(1)_compiler_preferred_target := i386-linux-gnu >> - endif >> -- ifneq ($$(filter aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) >> -+ ifneq ($$(filter aarch64-poky-linux aarch64-oe-linux,$$($(1)_compiler_preferred_target)),) >> - $(1)_compiler_preferred_target := aarch64-linux-gnu >> - endif >> - ifneq ($$(filter armv7a-cros-linux-gnueabi armv7l-tizen-linux-gnueabi,$$($(1)_compiler_preferred_target)),) >> --- >> -2.7.4 >> - >> diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb >> index 00f1d81..e6edebd 100644 >> --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb >> +++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb >> @@ -19,8 +19,8 @@ PROVIDES = "virtual/gpudriver" >> >> BRANCH = "1.13-5776728/linux-k5.10" >> >> -SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ >> - file://0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch \ >> +SRC_URI = " \ >> + git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ >> file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ >> " Shouldn't we revert the patch by removing file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch? And also back-port the patch to dunfell to use patch 0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch instead of /0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch >> >> -- >> 2.7.4 >> > > > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-ti] [master][PATCH] ti-img-rogue-driver: unify with dunfell and fix double-patching 2021-07-27 16:54 ` Yogesh Siraswar @ 2021-07-27 19:06 ` Denys Dmytriyenko 2021-07-27 21:10 ` Yogesh Siraswar 0 siblings, 1 reply; 4+ messages in thread From: Denys Dmytriyenko @ 2021-07-27 19:06 UTC (permalink / raw) To: Siraswar, Yogesh; +Cc: meta-ti On Tue, Jul 27, 2021 at 11:54:05AM -0500, Siraswar, Yogesh wrote: > > > On 7/26/2021 6:36 PM, Denys Dmytriyenko wrote: > >Ping. > > > >On Thu, Jul 15, 2021 at 12:36:35PM -0400, Denys Dmytriyenko wrote: > >>From: Denys Dmytriyenko <denys@konsulko.com> > >> > >>There was a discrepancy between master and dunfell where 2 different versions > >>of the same patch existed, so when syncing branches, it resulted in appying > >>the same change twice. This cleans it up. > >> > >>Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > >>--- > >> ...k-support-OE-toolchain-alongside-Poky-one.patch | 26 ---------------------- > >> .../ti-img-rogue-driver_1.13.5776728.bb | 4 ++-- > >> 2 files changed, 2 insertions(+), 28 deletions(-) > >> delete mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch > >> > >>diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch b/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch > >>deleted file mode 100644 > >>index abe48df..0000000 > >>--- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch > >>+++ /dev/null > >>@@ -1,26 +0,0 @@ > >>-From 0d291f91d86e59d87ce023b4e7b89f6b00aa4aab Mon Sep 17 00:00:00 2001 > >>-From: Denys Dmytriyenko <denis@denix.org> > >>-Date: Sat, 27 Mar 2021 00:20:57 -0400 > >>-Subject: [PATCH] compiler.mk: support OE toolchain alongside Poky one > >>- > >>-Signed-off-by: Denys Dmytriyenko <denis@denix.org> > >>---- > >>- build/linux/config/compiler.mk | 2 +- > >>- 1 file changed, 1 insertion(+), 1 deletion(-) > >>- > >>-diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk > >>-index 53a0bef..d45d438 100644 > >>---- a/build/linux/config/compiler.mk > >>-+++ b/build/linux/config/compiler.mk > >>-@@ -65,7 +65,7 @@ define calculate-compiler-preferred-target > >>- ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),) > >>- $(1)_compiler_preferred_target := i386-linux-gnu > >>- endif > >>-- ifneq ($$(filter aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) > >>-+ ifneq ($$(filter aarch64-poky-linux aarch64-oe-linux,$$($(1)_compiler_preferred_target)),) > >>- $(1)_compiler_preferred_target := aarch64-linux-gnu > >>- endif > >>- ifneq ($$(filter armv7a-cros-linux-gnueabi armv7l-tizen-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > >>--- > >>-2.7.4 > >>- > >>diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb > >>index 00f1d81..e6edebd 100644 > >>--- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb > >>+++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb > >>@@ -19,8 +19,8 @@ PROVIDES = "virtual/gpudriver" > >> BRANCH = "1.13-5776728/linux-k5.10" > >>-SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ > >>- file://0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch \ > >>+SRC_URI = " \ > >>+ git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ > >> file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ > >> " > > Shouldn't we revert the patch by removing file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch? > And also back-port the patch to dunfell to use patch > 0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch > instead of > /0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch It doesn't matter which patch stays and which goes - they are almost identical. Since master was already broken in this aspect, I decided to fix it in master and keep dunfell unchanged. -- Regards, Denys Dmytriyenko <denis@denix.org> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-ti] [master][PATCH] ti-img-rogue-driver: unify with dunfell and fix double-patching 2021-07-27 19:06 ` Denys Dmytriyenko @ 2021-07-27 21:10 ` Yogesh Siraswar 0 siblings, 0 replies; 4+ messages in thread From: Yogesh Siraswar @ 2021-07-27 21:10 UTC (permalink / raw) To: Denys Dmytriyenko; +Cc: meta-ti On 7/27/2021 2:06 PM, Denys Dmytriyenko wrote: > On Tue, Jul 27, 2021 at 11:54:05AM -0500, Siraswar, Yogesh wrote: >> >> >> On 7/26/2021 6:36 PM, Denys Dmytriyenko wrote: >>> Ping. >>> >>> On Thu, Jul 15, 2021 at 12:36:35PM -0400, Denys Dmytriyenko wrote: >>>> From: Denys Dmytriyenko <denys@konsulko.com> >>>> >>>> There was a discrepancy between master and dunfell where 2 different versions >>>> of the same patch existed, so when syncing branches, it resulted in appying >>>> the same change twice. This cleans it up. >>>> >>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> >>>> --- >>>> ...k-support-OE-toolchain-alongside-Poky-one.patch | 26 ---------------------- >>>> .../ti-img-rogue-driver_1.13.5776728.bb | 4 ++-- >>>> 2 files changed, 2 insertions(+), 28 deletions(-) >>>> delete mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch >>>> >>>> diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch b/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch >>>> deleted file mode 100644 >>>> index abe48df..0000000 >>>> --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver/0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch >>>> +++ /dev/null >>>> @@ -1,26 +0,0 @@ >>>> -From 0d291f91d86e59d87ce023b4e7b89f6b00aa4aab Mon Sep 17 00:00:00 2001 >>>> -From: Denys Dmytriyenko <denis@denix.org> >>>> -Date: Sat, 27 Mar 2021 00:20:57 -0400 >>>> -Subject: [PATCH] compiler.mk: support OE toolchain alongside Poky one >>>> - >>>> -Signed-off-by: Denys Dmytriyenko <denis@denix.org> >>>> ---- >>>> - build/linux/config/compiler.mk | 2 +- >>>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>>> - >>>> -diff --git a/build/linux/config/compiler.mk b/build/linux/config/compiler.mk >>>> -index 53a0bef..d45d438 100644 >>>> ---- a/build/linux/config/compiler.mk >>>> -+++ b/build/linux/config/compiler.mk >>>> -@@ -65,7 +65,7 @@ define calculate-compiler-preferred-target >>>> - ifneq ($$(filter i386-% i486-% i586-% i686-%,$$($(1)_compiler_preferred_target)),) >>>> - $(1)_compiler_preferred_target := i386-linux-gnu >>>> - endif >>>> -- ifneq ($$(filter aarch64-poky-linux,$$($(1)_compiler_preferred_target)),) >>>> -+ ifneq ($$(filter aarch64-poky-linux aarch64-oe-linux,$$($(1)_compiler_preferred_target)),) >>>> - $(1)_compiler_preferred_target := aarch64-linux-gnu >>>> - endif >>>> - ifneq ($$(filter armv7a-cros-linux-gnueabi armv7l-tizen-linux-gnueabi,$$($(1)_compiler_preferred_target)),) >>>> --- >>>> -2.7.4 >>>> - >>>> diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb >>>> index 00f1d81..e6edebd 100644 >>>> --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb >>>> +++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb >>>> @@ -19,8 +19,8 @@ PROVIDES = "virtual/gpudriver" >>>> BRANCH = "1.13-5776728/linux-k5.10" >>>> -SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ >>>> - file://0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch \ >>>> +SRC_URI = " \ >>>> + git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ >>>> file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ >>>> " >> >> Shouldn't we revert the patch by removing file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch? >> And also back-port the patch to dunfell to use patch >> 0001-compiler.mk-support-OE-toolchain-alongside-Poky-one.patch >> instead of >> /0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch > > It doesn't matter which patch stays and which goes - they are almost > identical. Since master was already broken in this aspect, I decided > to fix it in master and keep dunfell unchanged. > Applied to master. Thanks ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-27 21:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1692042B86EAB73A.9904@lists.yoctoproject.org>
2021-07-26 23:36 ` [meta-ti] [master][PATCH] ti-img-rogue-driver: unify with dunfell and fix double-patching Denys Dmytriyenko
2021-07-27 16:54 ` Yogesh Siraswar
2021-07-27 19:06 ` Denys Dmytriyenko
2021-07-27 21:10 ` Yogesh Siraswar
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.