| Message ID | 20240716194532.26124-1-reatmon@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master] ti-ipc: Fix "buildpaths" QA error | expand |
On Tue, Jul 16, 2024 at 12:45 PM Ryan Eatmon via lists.yoctoproject.org <reatmon=ti.com@lists.yoctoproject.org> wrote: > > Referring to the TI specific kernel header file via -I${UNPACKDIR} > causes a "buildpaths" QA error. Solution is to copy the file from > UNPACKDIR into the S dir at the start of each compile, and then fix the > patch to make sure the #include is correct for this new location. > > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > ...1-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch | 2 +- > meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb | 6 ++++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch > index 522ad5e4..6d84cfb4 100644 > --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch > +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch > @@ -26,7 +26,7 @@ index 2df7420..10f496b 100644 > #endif > > -#include linux_include(KERNEL_INSTALL_DIR,rpmsg_rpc) > -+#include "linux/rpmsg_rpc.h" > ++#include "rpmsg_rpc.h" > > #ifdef _linux_ > #define linux _linux > diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb > index 11be09ea..e12ce273 100644 > --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb > +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb > @@ -18,8 +18,6 @@ SRC_URI += "file://tiipclad-daemon.sh \ > file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \ > " > > -CFLAGS += "-I${UNPACKDIR}=" > - Perhaps adding -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR} in CFLAGS is all you need. > DAEMON = "UNKNOWN" > DAEMON:dra7xx = "lad_dra7xx" > DAEMON:omapl138 = "lad_omapl138" > @@ -40,6 +38,10 @@ do_configure() { > oe_runconf > } > > +do_compile:prepend() { > + cp ${UNPACKDIR}/linux/rpmsg_rpc.h ${S}/packages/ti/ipc/mm/rpmsg_rpc.h > +} > + > do_install:append() { > install -d ${D}${sysconfdir}/init.d/ > > -- > 2.17.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#17868): https://lists.yoctoproject.org/g/meta-ti/message/17868 > Mute This Topic: https://lists.yoctoproject.org/mt/107259201/1997914 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 7/16/2024 4:58 PM, Khem Raj wrote: > On Tue, Jul 16, 2024 at 12:45 PM Ryan Eatmon via > lists.yoctoproject.org <reatmon=ti.com@lists.yoctoproject.org> wrote: >> >> Referring to the TI specific kernel header file via -I${UNPACKDIR} >> causes a "buildpaths" QA error. Solution is to copy the file from >> UNPACKDIR into the S dir at the start of each compile, and then fix the >> patch to make sure the #include is correct for this new location. >> >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> ...1-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch | 2 +- >> meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb | 6 ++++-- >> 2 files changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch >> index 522ad5e4..6d84cfb4 100644 >> --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch >> +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch >> @@ -26,7 +26,7 @@ index 2df7420..10f496b 100644 >> #endif >> >> -#include linux_include(KERNEL_INSTALL_DIR,rpmsg_rpc) >> -+#include "linux/rpmsg_rpc.h" >> ++#include "rpmsg_rpc.h" >> >> #ifdef _linux_ >> #define linux _linux >> diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb >> index 11be09ea..e12ce273 100644 >> --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb >> +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb >> @@ -18,8 +18,6 @@ SRC_URI += "file://tiipclad-daemon.sh \ >> file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \ >> " >> >> -CFLAGS += "-I${UNPACKDIR}=" >> - > > Perhaps adding -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR} > in CFLAGS is all you need. I'll try it. Thanks. >> DAEMON = "UNKNOWN" >> DAEMON:dra7xx = "lad_dra7xx" >> DAEMON:omapl138 = "lad_omapl138" >> @@ -40,6 +38,10 @@ do_configure() { >> oe_runconf >> } >> >> +do_compile:prepend() { >> + cp ${UNPACKDIR}/linux/rpmsg_rpc.h ${S}/packages/ti/ipc/mm/rpmsg_rpc.h >> +} >> + >> do_install:append() { >> install -d ${D}${sysconfdir}/init.d/ >> >> -- >> 2.17.1 >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#17868): https://lists.yoctoproject.org/g/meta-ti/message/17868 >> Mute This Topic: https://lists.yoctoproject.org/mt/107259201/1997914 >> Group Owner: meta-ti+owner@lists.yoctoproject.org >> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [raj.khem@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
On 7/16/2024 4:59 PM, Ryan Eatmon via lists.yoctoproject.org wrote: > > > On 7/16/2024 4:58 PM, Khem Raj wrote: >> On Tue, Jul 16, 2024 at 12:45 PM Ryan Eatmon via >> lists.yoctoproject.org <reatmon=ti.com@lists.yoctoproject.org> wrote: >>> >>> Referring to the TI specific kernel header file via -I${UNPACKDIR} >>> causes a "buildpaths" QA error. Solution is to copy the file from >>> UNPACKDIR into the S dir at the start of each compile, and then fix the >>> patch to make sure the #include is correct for this new location. >>> >>> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >>> --- >>> ...1-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch | 2 +- >>> meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb | 6 ++++-- >>> 2 files changed, 5 insertions(+), 3 deletions(-) >>> >>> diff --git >>> a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch >>> index 522ad5e4..6d84cfb4 100644 >>> --- >>> a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch >>> +++ >>> b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch >>> @@ -26,7 +26,7 @@ index 2df7420..10f496b 100644 >>> #endif >>> >>> -#include linux_include(KERNEL_INSTALL_DIR,rpmsg_rpc) >>> -+#include "linux/rpmsg_rpc.h" >>> ++#include "rpmsg_rpc.h" >>> >>> #ifdef _linux_ >>> #define linux _linux >>> diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb >>> b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb >>> index 11be09ea..e12ce273 100644 >>> --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb >>> +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb >>> @@ -18,8 +18,6 @@ SRC_URI += "file://tiipclad-daemon.sh \ >>> >>> file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \ >>> " >>> >>> -CFLAGS += "-I${UNPACKDIR}=" >>> - >> >> Perhaps adding -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR} >> in CFLAGS is all you need. > > I'll try it. Thanks. > Looks like that works. v2 incoming. > >>> DAEMON = "UNKNOWN" >>> DAEMON:dra7xx = "lad_dra7xx" >>> DAEMON:omapl138 = "lad_omapl138" >>> @@ -40,6 +38,10 @@ do_configure() { >>> oe_runconf >>> } >>> >>> +do_compile:prepend() { >>> + cp ${UNPACKDIR}/linux/rpmsg_rpc.h >>> ${S}/packages/ti/ipc/mm/rpmsg_rpc.h >>> +} >>> + >>> do_install:append() { >>> install -d ${D}${sysconfdir}/init.d/ >>> >>> -- >>> 2.17.1 >>> >>> >>> >>> > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#17870): https://lists.yoctoproject.org/g/meta-ti/message/17870 > Mute This Topic: https://lists.yoctoproject.org/mt/107259201/6551054 > Group Owner: meta-ti+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch index 522ad5e4..6d84cfb4 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc/0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch @@ -26,7 +26,7 @@ index 2df7420..10f496b 100644 #endif -#include linux_include(KERNEL_INSTALL_DIR,rpmsg_rpc) -+#include "linux/rpmsg_rpc.h" ++#include "rpmsg_rpc.h" #ifdef _linux_ #define linux _linux diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb index 11be09ea..e12ce273 100644 --- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb +++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb @@ -18,8 +18,6 @@ SRC_URI += "file://tiipclad-daemon.sh \ file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \ " -CFLAGS += "-I${UNPACKDIR}" - DAEMON = "UNKNOWN" DAEMON:dra7xx = "lad_dra7xx" DAEMON:omapl138 = "lad_omapl138" @@ -40,6 +38,10 @@ do_configure() { oe_runconf } +do_compile:prepend() { + cp ${UNPACKDIR}/linux/rpmsg_rpc.h ${S}/packages/ti/ipc/mm/rpmsg_rpc.h +} + do_install:append() { install -d ${D}${sysconfdir}/init.d/
Referring to the TI specific kernel header file via -I${UNPACKDIR} causes a "buildpaths" QA error. Solution is to copy the file from UNPACKDIR into the S dir at the start of each compile, and then fix the patch to make sure the #include is correct for this new location. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- ...1-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch | 2 +- meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)