From patchwork Fri Jun 14 19:36:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 45116 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08D24C27C6E for ; Fri, 14 Jun 2024 19:36:42 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.2680.1718393790982280263 for ; Fri, 14 Jun 2024 12:36:31 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 3881240CC7; Fri, 14 Jun 2024 19:36:30 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gTZkWNKG22cn; Fri, 14 Jun 2024 19:36:30 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 156FB40C8C; Fri, 14 Jun 2024 19:36:28 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 47590163FA0; Fri, 14 Jun 2024 15:36:28 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master/scarthgap][PATCH] meta-ti: remove MACHINE_KERNEL_PR globally Date: Fri, 14 Jun 2024 15:36:27 -0400 Message-Id: <20240614193627.795075-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Jun 2024 19:36:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/17743 From: Denys Dmytriyenko MACHINE_KERNEL_PR is a remnant of the early OE days and hasn't been needed for quite some time. Let's finally remove it completely. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/include/k3.inc | 3 --- meta-ti-bsp/conf/machine/include/omap-a15.inc | 3 --- meta-ti-bsp/conf/machine/include/ti33x.inc | 3 --- meta-ti-bsp/conf/machine/include/ti43x.inc | 3 --- .../recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb | 3 --- .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb | 3 --- .../powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb | 3 --- .../recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 3 --- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 4 ---- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb | 4 ---- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb | 4 ---- meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb | 3 --- .../recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb | 3 --- 13 files changed, 42 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 2b82cb82..34991ec9 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -7,9 +7,6 @@ require conf/machine/include/arm/arch-arm64.inc BBMULTICONFIG += "k3r5" -# Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r0" - require conf/machine/include/ti-bsp.inc KERNEL_IMAGETYPE = "Image" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 3637ad0a..be086936 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -4,9 +4,6 @@ SOC_FAMILY:append = ":omap-a15" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/arm/armv7a/tune-cortexa15.inc -# Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r7" - require conf/machine/include/ti-bsp.inc # Graphics providers and variables diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 45934aa0..a8dc2174 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -4,9 +4,6 @@ SOC_FAMILY:append = ":ti33x" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/arm/armv7a/tune-cortexa8.inc -# Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r22" - require conf/machine/include/ti-bsp.inc # Graphics providers and variables diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index c6a3c510..6fb87f16 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -4,9 +4,6 @@ SOC_FAMILY:append = ":ti43x" DEFAULTTUNE ?= "armv7athf-neon" require conf/machine/include/arm/armv7a/tune-cortexa9.inc -# Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r3" - require conf/machine/include/ti-bsp.inc # Graphics providers and variables diff --git a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb index a56810d4..818ed683 100644 --- a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb +++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb @@ -7,9 +7,6 @@ inherit module features_check REQUIRED_MACHINE_FEATURES = "gc320" -MACHINE_KERNEL_PR:append = "i" -PR = "${MACHINE_KERNEL_PR}" - # Need to branch out with ${PV} var BRANCH = "ti-${PV}-k5.10" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb index 02ec9fe9..34c22cb2 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb @@ -7,9 +7,6 @@ inherit module PROVIDES = "virtual/gpudriver" -MACHINE_KERNEL_PR:append = "b" -PR = "${MACHINE_KERNEL_PR}" - PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb index fdb8b51d..6f374f69 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb @@ -7,9 +7,6 @@ inherit module PROVIDES = "virtual/gpudriver" -MACHINE_KERNEL_PR:append = "b" -PR = "${MACHINE_KERNEL_PR}" - PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index ca28ae76..f112c662 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -9,9 +9,6 @@ PROVIDES = "virtual/gpudriver" COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" -MACHINE_KERNEL_PR:append = "x" -PR = "${MACHINE_KERNEL_PR}" - PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/kernel" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index 5c495d46..47b573e1 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -18,10 +18,6 @@ S = "${WORKDIR}/git" SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa" PV = "6.6+git" -# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR:append = "b" -PR = "${MACHINE_KERNEL_PR}" - KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" KERNEL_GIT_PROTOCOL = "https" KERNEL_GIT_BRANCH = "master" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index 51d0a6a5..2cdfb1b9 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -26,10 +26,6 @@ BRANCH ?= "ti-linux-6.1.y" SRCREV ?= "c1c2f1971fbf6ddad93a8c94314fe8221e7aa6be" PV = "6.1.83+git" -# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR:append = "b" -PR = "${MACHINE_KERNEL_PR}" - KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" KERNEL_GIT_PROTOCOL = "https" SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb index cd26a9cd..ab7a497e 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb @@ -26,10 +26,6 @@ BRANCH ?= "ti-linux-6.6.y" SRCREV ?= "76313798e7121bf56820e7aa7aed82a0f3ffc566" PV = "6.6.25+git" -# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR:append = "b" -PR = "${MACHINE_KERNEL_PR}" - KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" KERNEL_GIT_PROTOCOL = "https" SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ diff --git a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb index 9d85829b..62b4645c 100644 --- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb +++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb @@ -2,9 +2,6 @@ DESCRIPTION = "Debug Sub-System (DebugSS) driver for Keystone and DRA7xx devices LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3" -# This package builds a kernel module, use kernel PR as base and append a local -MACHINE_KERNEL_PR:append = "d" -PR = "${MACHINE_KERNEL_PR}" PV:append = "+git" S = "${WORKDIR}/git/debugss_module/debugss-mod" diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb index 8bea12f7..d2b5f004 100644 --- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb +++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb @@ -2,9 +2,6 @@ DESCRIPTION = "Interface for GDB to commincate witha TI C66X DSP" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=75859989545e37968a99b631ef42722e" -# This package builds a kernel module, use kernel PR as base and append a local -MACHINE_KERNEL_PR:append = "b" -PR = "${MACHINE_KERNEL_PR}" PV:append = "+git" SRC_URI:append = "\