| Message ID | 20220421210234.26707-1-abongwabonalais@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [yocto-autobuilder-helper] Sourced warning banner scripts to $outputdir | expand |
Hi Amahnui, On April 21, 2022 11:02:35 PM GMT+02:00, Abongwa Amahnui Bonalais <abongwabonalais@gmail.com> wrote: >Signed-off-by: Abongwa Bonalais Amahnui <abongwabonalais@gmail.com> >--- > run-docs-build | 6 ++++++ > 1 file changed, 6 insertions(+) > >diff --git a/run-docs-build b/run-docs-build >index db790dc..b6744ee 100755 >--- a/run-docs-build >+++ b/run-docs-build This will not apply because run-docs-build is in the scripts directory inside yocto-autobuilder-helper git repo. I'm wondering how you got this patch. Do you mind explaining how you created the patch so we can help you fix its creation? >@@ -37,6 +37,12 @@ cd $outputdir > echo Extracing old content from archive > tar -xJf $docbookarchive > >+cp '/home/abongwa/Documents/auto-builder/stylescript.py' $outputdir >+cp '/home/abongwa/Documents/auto-builder/htmlscript.py' $outputdir We do not (fortunately!) have access to your home directory on your PC so this cannot be merged. We need a patch which adds those two scripts in yocto-autobuilder-helper git repo and then use them. You already sent another patch for the scripts, so they just need to be sent together in one patch. git commit --amend and/or git rebase -i will help you merging two commits. Also, once the script is inside yocto-autobuilder-helper git repo, we don't need to copy it anymore :) >+python3 $outputdir/htmlscript.py >+python3 $outputdir/stylescript.py >+ Since those scripts have a Python shebang (#!/usr/bin/env python3) you dont need to call the scripts with python3 in front because the shell will do it automatically for you. Also, you should use $scriptdir/htmlscript.py once it's put in the correct directory since we already are in outputdir at those lines in the script and the files aren't supposed to be in outputdir (outputdir is the directory where all files that needs to be served by docs.yoctoproject.org are, and we don't want this script to be there). Cheers, Quentin >+ > cd $bbdocs > mkdir $outputdir/bitbake >
diff --git a/run-docs-build b/run-docs-build index db790dc..b6744ee 100755 --- a/run-docs-build +++ b/run-docs-build @@ -37,6 +37,12 @@ cd $outputdir echo Extracing old content from archive tar -xJf $docbookarchive +cp '/home/abongwa/Documents/auto-builder/stylescript.py' $outputdir +cp '/home/abongwa/Documents/auto-builder/htmlscript.py' $outputdir +python3 $outputdir/htmlscript.py +python3 $outputdir/stylescript.py + + cd $bbdocs mkdir $outputdir/bitbake
Signed-off-by: Abongwa Bonalais Amahnui <abongwabonalais@gmail.com> --- run-docs-build | 6 ++++++ 1 file changed, 6 insertions(+)