Ping.
On Thu, Jul 15, 2021 at 12:36:35PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <de...@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 <de...@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 <de...@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 <de...@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 <de...@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13944):
https://lists.yoctoproject.org/g/meta-ti/message/13944
Mute This Topic: https://lists.yoctoproject.org/mt/84229759/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
