| Message ID | 20240208233722.2565237-2-rs@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | Fix rogue driver compilation with lts prep | expand |
On 2/8/2024 5:37 PM, rs@ti.com wrote: > From: Randolph Sapp <rs@ti.com> > > Switch the branches to the new LTS names. These are still experimental, > hence the isolation from kirkstone. The upstream branch is now carrying > the equivalent to the kbuild patch so we're dropping it here. > > Signed-off-by: Randolph Sapp <rs@ti.com> > --- > .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb | 6 ++---- > .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | 2 +- > 2 files changed, 3 insertions(+), 5 deletions(-) > > 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 0e894534..02ec9fe9 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 > @@ -16,15 +16,13 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" > > DEPENDS = "virtual/kernel" > > -BRANCH = "linuxws/kirkstone/k6.1/${PV}" > +BRANCH = "linuxws/scarthgap/k6.6/${PV}" > > SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" > > -SRC_URI:append = " file://0001-build-kbuild-Makefile.template-use-SECONDARY.patch" > - NAK. Your previous patch for bumping the version to 23.3.6512818 did not build on master because of this patch. So I went ahead and removed it and "fixed up" your patch with the removal. I like to have as atomic commits as possible. I should have said something at that time, but I know you are busy. Please rebase on master-wip and resubmit this patch. > S = "${WORKDIR}/git" > > -SRCREV = "41a494accb30aa2f247e6a4e123a4954982f2a88" > +SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81" > > TARGET_PRODUCT:j721e = "j721e_linux" > TARGET_PRODUCT:j721s2 = "j721s2_linux" > diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb > index 288eb52b..a0a9a295 100644 > --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb > +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb > @@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" > > PR = "r3" > > -BRANCH = "linuxws/kirkstone/k6.1/${PV}" > +BRANCH = "linuxws/scarthgap/k6.6/${PV}" > SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" > SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" > S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
On 2/8/2024 9:13 PM, Ryan Eatmon via lists.yoctoproject.org wrote: > > > On 2/8/2024 5:37 PM, rs@ti.com wrote: >> From: Randolph Sapp <rs@ti.com> >> >> Switch the branches to the new LTS names. These are still experimental, >> hence the isolation from kirkstone. The upstream branch is now carrying >> the equivalent to the kbuild patch so we're dropping it here. >> >> Signed-off-by: Randolph Sapp <rs@ti.com> >> --- >> .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb | 6 ++---- >> .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | 2 +- >> 2 files changed, 3 insertions(+), 5 deletions(-) >> >> 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 0e894534..02ec9fe9 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 >> @@ -16,15 +16,13 @@ COMPATIBLE_MACHINE = >> "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" >> DEPENDS = "virtual/kernel" >> -BRANCH = "linuxws/kirkstone/k6.1/${PV}" >> +BRANCH = "linuxws/scarthgap/k6.6/${PV}" >> SRC_URI = >> "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" >> -SRC_URI:append = " >> file://0001-build-kbuild-Makefile.template-use-SECONDARY.patch" >> - > > NAK. Your previous patch for bumping the version to 23.3.6512818 did > not build on master because of this patch. So I went ahead and removed > it and "fixed up" your patch with the removal. I like to have as atomic > commits as possible. Sent that without rereading it... I was referring to the 0001-build-kbuild-Makefile.template-use-SECONDARY.patch patch file... I already removed that and deleted it as part of your previous patch when I applied it to master. > I should have said something at that time, but I know you are busy. > > Please rebase on master-wip and resubmit this patch. > > >> S = "${WORKDIR}/git" >> -SRCREV = "41a494accb30aa2f247e6a4e123a4954982f2a88" >> +SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81" >> TARGET_PRODUCT:j721e = "j721e_linux" >> TARGET_PRODUCT:j721s2 = "j721s2_linux" >> diff --git >> a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb >> index 288eb52b..a0a9a295 100644 >> --- >> a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb >> +++ >> b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb >> @@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = >> "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" >> PR = "r3" >> -BRANCH = "linuxws/kirkstone/k6.1/${PV}" >> +BRANCH = "linuxws/scarthgap/k6.6/${PV}" >> SRC_URI = >> "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" >> SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" >> S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#17462): https://lists.yoctoproject.org/g/meta-ti/message/17462 > Mute This Topic: https://lists.yoctoproject.org/mt/104250019/6551054 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 2/8/24 21:16, Ryan Eatmon via lists.yoctoproject.org wrote: > On 2/8/2024 9:13 PM, Ryan Eatmon via lists.yoctoproject.org wrote: >> On 2/8/2024 5:37 PM, rs@ti.com wrote: >>> From: Randolph Sapp <rs@ti.com> >>> >>> Switch the branches to the new LTS names. These are still experimental, >>> hence the isolation from kirkstone. The upstream branch is now carrying >>> the equivalent to the kbuild patch so we're dropping it here. >>> >>> Signed-off-by: Randolph Sapp <rs@ti.com> >>> --- >>> .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb | 6 ++---- >>> .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | 2 +- >>> 2 files changed, 3 insertions(+), 5 deletions(-) >>> >>> 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 0e894534..02ec9fe9 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 >>> @@ -16,15 +16,13 @@ COMPATIBLE_MACHINE = >>> "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" >>> DEPENDS = "virtual/kernel" >>> -BRANCH = "linuxws/kirkstone/k6.1/${PV}" >>> +BRANCH = "linuxws/scarthgap/k6.6/${PV}" >>> SRC_URI = >>> "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" >>> -SRC_URI:append = " >>> file://0001-build-kbuild-Makefile.template-use-SECONDARY.patch" >>> - >> >> NAK. Your previous patch for bumping the version to 23.3.6512818 did >> not build on master because of this patch. So I went ahead and >> removed it and "fixed up" your patch with the removal. I like to have >> as atomic commits as possible. > > Sent that without rereading it... I was referring to the > 0001-build-kbuild-Makefile.template-use-SECONDARY.patch patch file... I > already removed that and deleted it as part of your previous patch when > I applied it to master. > Oh, you do know that .SECONDARY thing is based on both the version of make and the version of the kernel you are building against right? Building against 6.1 it isn't necessary but anything after 6.2 with make > 4.4 or something breaks it. Full logic for the fix here: https://git.ti.com/cgit/graphics/ti-img-rogue-driver/commit/?h=linuxws/kirkstone/k6.1/23.3.6512818&id=303425c1202a3fee194fda67b8953ca9938c6732 Inspired/required by: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=875ef1a57f32fcb91010dc9bc8bd1166956a579e > >> I should have said something at that time, but I know you are busy. >> >> Please rebase on master-wip and resubmit this patch. >> >> >>> S = "${WORKDIR}/git" >>> -SRCREV = "41a494accb30aa2f247e6a4e123a4954982f2a88" >>> +SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81" >>> TARGET_PRODUCT:j721e = "j721e_linux" >>> TARGET_PRODUCT:j721s2 = "j721s2_linux" >>> diff --git >>> a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb >>> index 288eb52b..a0a9a295 100644 >>> --- >>> a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb >>> +++ >>> b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb >>> @@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = >>> "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" >>> PR = "r3" >>> -BRANCH = "linuxws/kirkstone/k6.1/${PV}" >>> +BRANCH = "linuxws/scarthgap/k6.6/${PV}" >>> SRC_URI = >>> "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" >>> SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" >>> S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" >> >> >> >> >> > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#17463): https://lists.yoctoproject.org/g/meta-ti/message/17463 > Mute This Topic: https://lists.yoctoproject.org/mt/104250019/7693777 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [res.sapp@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 0e894534..02ec9fe9 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 @@ -16,15 +16,13 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" DEPENDS = "virtual/kernel" -BRANCH = "linuxws/kirkstone/k6.1/${PV}" +BRANCH = "linuxws/scarthgap/k6.6/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" -SRC_URI:append = " file://0001-build-kbuild-Makefile.template-use-SECONDARY.patch" - S = "${WORKDIR}/git" -SRCREV = "41a494accb30aa2f247e6a4e123a4954982f2a88" +SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb index 288eb52b..a0a9a295 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb @@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" PR = "r3" -BRANCH = "linuxws/kirkstone/k6.1/${PV}" +BRANCH = "linuxws/scarthgap/k6.6/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"