| Message ID | 20230125181100.297826-1-jose.quaresma@foundries.io |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/kirkstone] ti-img-rogue-umlibs: handling the firmware installation with usrmerge | expand |
This conflicts with some other graphics changes that we are making for kirkstone/master. Mainly changing the version of the img-rogue-umlibs recipe. Given that I'm not certain if the patch will still be applicable to the new version I'm not going to apply this patch at this time. Once we have the new graphics changes rolled out, we can take a look if the issue still exists (likely it will) and we can look at a new patch at that time. On 1/25/2023 12:11, Jose Quaresma wrote: > The ti-img-rogue-umlibs package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > --- > ...kefile-handle-firmware-with-usrmerge.patch | 33 +++++++++++++++++++ > .../ti-img-rogue-umlibs_1.15.6133109.bb | 11 +++++-- > 2 files changed, 41 insertions(+), 3 deletions(-) > create mode 100644 meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch > > diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch > new file mode 100644 > index 00000000..ca06f88a > --- /dev/null > +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch > @@ -0,0 +1,33 @@ > +From 3a696a3eb2c23da1d4abcda3d3e3b6aca65a9f9b Mon Sep 17 00:00:00 2001 > +From: Jose Quaresma <jose.quaresma@foundries.io> > +Date: Tue, 24 Jan 2023 12:39:30 +0000 > +Subject: [PATCH] Makefile: handle firmware with usrmerge > + > +Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > +--- > + Makefile | 5 +++-- > + 1 file changed, 3 insertions(+), 2 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index 48f9b9c..04b4154 100755 > +--- a/Makefile > ++++ b/Makefile > +@@ -1,4 +1,5 @@ > + DESTDIR ?= ${DISCIMAGE} > ++FWDIR ?= lib > + TARGET_PRODUCT ?= j721e_linux > + BUILD ?= release > + WINDOW_SYSTEM ?= nulldrmws > +@@ -13,7 +14,7 @@ all: > + install: > + mkdir -p ${DESTDIR}/${etcdir} > + mkdir -p ${DESTDIR}/${usrdir} > +- mkdir -p ${DESTDIR}/${fwdir} > ++ mkdir -p ${DESTDIR}/${FWDIR} > + cp -ar ${SRCDIR}/${etcdir}/* ${DESTDIR}/${etcdir} > + cp -ar ${SRCDIR}/${usrdir}/* ${DESTDIR}/${usrdir} > +- cp -ar ${SRCDIR}/${fwdir}/* ${DESTDIR}/${fwdir} > ++ cp -ar ${SRCDIR}/${fwdir}/* ${DESTDIR}/${FWDIR} > +-- > +2.34.1 > + > diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb > index a665c614..cb3f0056 100644 > --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb > +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb > @@ -10,11 +10,15 @@ REQUIRED_MACHINE_FEATURES = "gpu" > PACKAGE_ARCH = "${MACHINE_ARCH}" > COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx" > > -PR = "r2" > +PR = "r3" > > BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" > > -SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" > +SRC_URI = " \ > + git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH} \ > + file://0001-Makefile-handle-firmware-with-usrmerge.patch \ > +" > + > SRCREV = "5977e82b96028f783d39c7219f016c1faf8dc5f5" > > TARGET_PRODUCT:j721e = "j721e_linux" > @@ -52,7 +56,8 @@ RRECOMMENDS:${PN} += "ti-img-rogue-driver" > S = "${WORKDIR}/git" > > do_install () { > - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} > + oe_runmake install DESTDIR=${D} FWDIR=${nonarch_base_libdir} \ > + TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} > chown -R root:root ${D} > } > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#15654): https://lists.yoctoproject.org/g/meta-ti/message/15654 > Mute This Topic: https://lists.yoctoproject.org/mt/96526423/6551054 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Ryan Eatmon <reatmon@ti.com> escreveu no dia segunda, 30/01/2023 à(s) 20:34: > > This conflicts with some other graphics changes that we are making for > kirkstone/master. Mainly changing the version of the img-rogue-umlibs > recipe. Given that I'm not certain if the patch will still be > applicable to the new version I'm not going to apply this patch at this > time. Once we have the new graphics changes rolled out, we can take a > look if the issue still exists (likely it will) and we can look at a new > patch at that time. > Sure, this can be carried on a bbappend. I can rebase and submit it again if needed after the upgrade. Thanks, Jose > > > On 1/25/2023 12:11, Jose Quaresma wrote: > > The ti-img-rogue-umlibs package is not obeying usrmerge distro feature. > /lib should be relocated to /usr. [usrmerge] > > > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > --- > > ...kefile-handle-firmware-with-usrmerge.patch | 33 +++++++++++++++++++ > > .../ti-img-rogue-umlibs_1.15.6133109.bb | 11 +++++-- > > 2 files changed, 41 insertions(+), 3 deletions(-) > > create mode 100644 > meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch > > > > diff --git > a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch > b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch > > new file mode 100644 > > index 00000000..ca06f88a > > --- /dev/null > > +++ > b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch > > @@ -0,0 +1,33 @@ > > +From 3a696a3eb2c23da1d4abcda3d3e3b6aca65a9f9b Mon Sep 17 00:00:00 2001 > > +From: Jose Quaresma <jose.quaresma@foundries.io> > > +Date: Tue, 24 Jan 2023 12:39:30 +0000 > > +Subject: [PATCH] Makefile: handle firmware with usrmerge > > + > > +Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > +--- > > + Makefile | 5 +++-- > > + 1 file changed, 3 insertions(+), 2 deletions(-) > > + > > +diff --git a/Makefile b/Makefile > > +index 48f9b9c..04b4154 100755 > > +--- a/Makefile > > ++++ b/Makefile > > +@@ -1,4 +1,5 @@ > > + DESTDIR ?= ${DISCIMAGE} > > ++FWDIR ?= lib > > + TARGET_PRODUCT ?= j721e_linux > > + BUILD ?= release > > + WINDOW_SYSTEM ?= nulldrmws > > +@@ -13,7 +14,7 @@ all: > > + install: > > + mkdir -p ${DESTDIR}/${etcdir} > > + mkdir -p ${DESTDIR}/${usrdir} > > +- mkdir -p ${DESTDIR}/${fwdir} > > ++ mkdir -p ${DESTDIR}/${FWDIR} > > + cp -ar ${SRCDIR}/${etcdir}/* ${DESTDIR}/${etcdir} > > + cp -ar ${SRCDIR}/${usrdir}/* ${DESTDIR}/${usrdir} > > +- cp -ar ${SRCDIR}/${fwdir}/* ${DESTDIR}/${fwdir} > > ++ cp -ar ${SRCDIR}/${fwdir}/* ${DESTDIR}/${FWDIR} > > +-- > > +2.34.1 > > + > > diff --git a/meta-ti-bsp/recipes-graphics/libgles/ > ti-img-rogue-umlibs_1.15.6133109.bb > b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb > > index a665c614..cb3f0056 100644 > > --- a/meta-ti-bsp/recipes-graphics/libgles/ > ti-img-rogue-umlibs_1.15.6133109.bb > > +++ b/meta-ti-bsp/recipes-graphics/libgles/ > ti-img-rogue-umlibs_1.15.6133109.bb > > @@ -10,11 +10,15 @@ REQUIRED_MACHINE_FEATURES = "gpu" > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx" > > > > -PR = "r2" > > +PR = "r3" > > > > BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" > > > > -SRC_URI = "git:// > git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH} > <http://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=$%7BBRANCH%7D> > " > > +SRC_URI = " \ > > + git:// > git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH} > <http://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=$%7BBRANCH%7D> > \ > > + file://0001-Makefile-handle-firmware-with-usrmerge.patch \ > > +" > > + > > SRCREV = "5977e82b96028f783d39c7219f016c1faf8dc5f5" > > > > TARGET_PRODUCT:j721e = "j721e_linux" > > @@ -52,7 +56,8 @@ RRECOMMENDS:${PN} += "ti-img-rogue-driver" > > S = "${WORKDIR}/git" > > > > do_install () { > > - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} > BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} > > + oe_runmake install DESTDIR=${D} FWDIR=${nonarch_base_libdir} \ > > + TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} > WINDOW_SYSTEM=${PVR_WS} > > chown -R root:root ${D} > > } > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#15654): > https://lists.yoctoproject.org/g/meta-ti/message/15654 > > Mute This Topic: https://lists.yoctoproject.org/mt/96526423/6551054 > > Group Owner: meta-ti+owner@lists.yoctoproject.org > > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [ > reatmon@ti.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > > > -- > Ryan Eatmon reatmon@ti.com > ----------------------------------------- > Texas Instruments, Inc. - LCPD - MGTS >
diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch new file mode 100644 index 00000000..ca06f88a --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch @@ -0,0 +1,33 @@ +From 3a696a3eb2c23da1d4abcda3d3e3b6aca65a9f9b Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <jose.quaresma@foundries.io> +Date: Tue, 24 Jan 2023 12:39:30 +0000 +Subject: [PATCH] Makefile: handle firmware with usrmerge + +Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 48f9b9c..04b4154 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,5 @@ + DESTDIR ?= ${DISCIMAGE} ++FWDIR ?= lib + TARGET_PRODUCT ?= j721e_linux + BUILD ?= release + WINDOW_SYSTEM ?= nulldrmws +@@ -13,7 +14,7 @@ all: + install: + mkdir -p ${DESTDIR}/${etcdir} + mkdir -p ${DESTDIR}/${usrdir} +- mkdir -p ${DESTDIR}/${fwdir} ++ mkdir -p ${DESTDIR}/${FWDIR} + cp -ar ${SRCDIR}/${etcdir}/* ${DESTDIR}/${etcdir} + cp -ar ${SRCDIR}/${usrdir}/* ${DESTDIR}/${usrdir} +- cp -ar ${SRCDIR}/${fwdir}/* ${DESTDIR}/${fwdir} ++ cp -ar ${SRCDIR}/${fwdir}/* ${DESTDIR}/${FWDIR} +-- +2.34.1 + diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index a665c614..cb3f0056 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -10,11 +10,15 @@ REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx" -PR = "r2" +PR = "r3" BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize" -SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" +SRC_URI = " \ + git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH} \ + file://0001-Makefile-handle-firmware-with-usrmerge.patch \ +" + SRCREV = "5977e82b96028f783d39c7219f016c1faf8dc5f5" TARGET_PRODUCT:j721e = "j721e_linux" @@ -52,7 +56,8 @@ RRECOMMENDS:${PN} += "ti-img-rogue-driver" S = "${WORKDIR}/git" do_install () { - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} + oe_runmake install DESTDIR=${D} FWDIR=${nonarch_base_libdir} \ + TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} chown -R root:root ${D} }
The ti-img-rogue-umlibs package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> --- ...kefile-handle-firmware-with-usrmerge.patch | 33 +++++++++++++++++++ .../ti-img-rogue-umlibs_1.15.6133109.bb | 11 +++++-- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs/0001-Makefile-handle-firmware-with-usrmerge.patch