| Message ID | 20230111152841.2307746-1-saul.wold@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | at: Change where files are modified | expand |
I feel like assuming do_patch is python, even if it is, is less clean than just using postfuncs. On Wed, Jan 11, 2023 at 8:29 AM Saul Wold <Saul.Wold@windriver.com> wrote: > The create_spdx code relies on patched code, if files are changed > or added during the do_configure phase they will be missed by the > create_spdx process. So we need to ensure files modifications/additions > happen in the do_patch phase. > > Signed-off-by: Saul Wold <saul.wold@windriver.com> > --- > meta/recipes-extended/at/at_3.2.5.bb | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-extended/at/at_3.2.5.bb > b/meta/recipes-extended/at/at_3.2.5.bb > index 87a436173f1..45700366e0f 100644 > --- a/meta/recipes-extended/at/at_3.2.5.bb > +++ b/meta/recipes-extended/at/at_3.2.5.bb > @@ -52,8 +52,12 @@ INITSCRIPT_PARAMS = "defaults" > > SYSTEMD_SERVICE:${PN} = "atd.service" > > -do_configure:prepend() { > - cp -f ${WORKDIR}/posixtm.[ch] ${S} > +do_patch:append() { > + bb.build.exec_func('copy_posix_files', d) > +} > + > +copy_posix_files() { > + cp -f ${WORKDIR}/posixtm.[ch] ${S} > } > > do_install () { > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#175753): > https://lists.openembedded.org/g/openembedded-core/message/175753 > Mute This Topic: https://lists.openembedded.org/mt/96201863/3617123 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > kergoth@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index 87a436173f1..45700366e0f 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb @@ -52,8 +52,12 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE:${PN} = "atd.service" -do_configure:prepend() { - cp -f ${WORKDIR}/posixtm.[ch] ${S} +do_patch:append() { + bb.build.exec_func('copy_posix_files', d) +} + +copy_posix_files() { + cp -f ${WORKDIR}/posixtm.[ch] ${S} } do_install () {
The create_spdx code relies on patched code, if files are changed or added during the do_configure phase they will be missed by the create_spdx process. So we need to ensure files modifications/additions happen in the do_patch phase. Signed-off-by: Saul Wold <saul.wold@windriver.com> --- meta/recipes-extended/at/at_3.2.5.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)