| Message ID | BN0P110MB16423592266085271C069BA7CF959@BN0P110MB1642.NAMP110.PROD.OUTLOOK.COM (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [IMAGEBUILDER] uboot-script-gen: allow fit generation with no dom0 kernel | expand |
On Mon, 25 Jul 2022, Smith, Jackson wrote: > Hi Stefano, > > My colleague Jason Lei and I would like to submit a patch to imagebuilder. > > It seems that generating a .fit with a true dom0less configuration fails because an extraneous comma is included in the its file. > > We believe this change resolves the issue. Hi Jackson, thanks for your contribution! Yes, I see the problem: the code assumes there is a dom0 kernel. If there is no dom0 kernel then load_files will be wrongly starting with a "," I would be happy to commit your patch. I assume I can add your Signed-off-by to it, right? Signed-off-by: Jackson Smith <rsmith@RiversideResearch.org> Signed-off-by is the "Developer Certificate of Origin" which means: https://developercertificate.org/ > > Remove extraneous comma in generated its file when no DOM0_KERNEL is specified. > > diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen > index 8f08cd6..6f94fce 100755 > --- a/scripts/uboot-script-gen > +++ b/scripts/uboot-script-gen > @@ -676,7 +676,12 @@ create_its_file_xen() > i=$(( $i + 1 )) > continue > fi > - load_files+=", \"domU${i}_kernel\"" > + if test -z "$load_files" > + then > + load_files+="\"domU${i}_kernel\"" > + else > + load_files+=", \"domU${i}_kernel\"" > + fi > cat >> "$its_file" <<- EOF > domU${i}_kernel { > description = "domU${i} kernel binary"; > >
> -----Original Message----- > From: Stefano Stabellini <sstabellini@kernel.org> > > On Mon, 25 Jul 2022, Smith, Jackson wrote: > > Hi Stefano, > > > > My colleague Jason Lei and I would like to submit a patch to imagebuilder. > > > > It seems that generating a .fit with a true dom0less configuration fails > because an extraneous comma is included in the its file. > > > > We believe this change resolves the issue. > > Hi Jackson, thanks for your contribution! > > Yes, I see the problem: the code assumes there is a dom0 kernel. If there is no > dom0 kernel then load_files will be wrongly starting with a "," > > I would be happy to commit your patch. I assume I can add your Signed-off-by > to it, right? Yes, that is fine. Could you also add Jason, as he worked this out initially? I've added him to the message so he can give his ok. > > Signed-off-by: Jackson Smith <rsmith@RiversideResearch.org> > > Signed-off-by is the "Developer Certificate of Origin" which means: > https://developercertificate.org/ > > > > > > > Remove extraneous comma in generated its file when no DOM0_KERNEL is > specified. > > > > diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index > > 8f08cd6..6f94fce 100755 > > --- a/scripts/uboot-script-gen > > +++ b/scripts/uboot-script-gen > > @@ -676,7 +676,12 @@ create_its_file_xen() > > i=$(( $i + 1 )) > > continue > > fi > > - load_files+=", \"domU${i}_kernel\"" > > + if test -z "$load_files" > > + then > > + load_files+="\"domU${i}_kernel\"" > > + else > > + load_files+=", \"domU${i}_kernel\"" > > + fi > > cat >> "$its_file" <<- EOF > > domU${i}_kernel { > > description = "domU${i} kernel binary"; > > > >
Hello, > -----Original Message----- > From: Smith, Jackson <rsmith@RiversideResearch.org> > > > -----Original Message----- > > From: Stefano Stabellini <sstabellini@kernel.org> > > > > On Mon, 25 Jul 2022, Smith, Jackson wrote: > > > Hi Stefano, > > > > > > My colleague Jason Lei and I would like to submit a patch to imagebuilder. > > > > > > It seems that generating a .fit with a true dom0less configuration > > > fails > > because an extraneous comma is included in the its file. > > > > > > We believe this change resolves the issue. > > > > Hi Jackson, thanks for your contribution! > > > > Yes, I see the problem: the code assumes there is a dom0 kernel. If > > there is no > > dom0 kernel then load_files will be wrongly starting with a "," > > > > I would be happy to commit your patch. I assume I can add your > > Signed-off-by to it, right? > > Yes, that is fine. Could you also add Jason, as he worked this out initially? > I've added him to the message so he can give his ok. > Yes, I would like to be signed off on the patch as well using this email. Thanks, Jason Lei > > > > Signed-off-by: Jackson Smith <rsmith@RiversideResearch.org> > > > > Signed-off-by is the "Developer Certificate of Origin" which means: > > https://developercertificate.org/ > > > > > > > > > > > > Remove extraneous comma in generated its file when no DOM0_KERNEL > is > > specified. > > > > > > diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen > > > index 8f08cd6..6f94fce 100755 > > > --- a/scripts/uboot-script-gen > > > +++ b/scripts/uboot-script-gen > > > @@ -676,7 +676,12 @@ create_its_file_xen() > > > i=$(( $i + 1 )) > > > continue > > > fi > > > - load_files+=", \"domU${i}_kernel\"" > > > + if test -z "$load_files" > > > + then > > > + load_files+="\"domU${i}_kernel\"" > > > + else > > > + load_files+=", \"domU${i}_kernel\"" > > > + fi > > > cat >> "$its_file" <<- EOF > > > domU${i}_kernel { > > > description = "domU${i} kernel binary"; > > > > > >
On Wed, 27 Jul 2022, Jason Shuhua Lei wrote: > Hello, > > -----Original Message----- > > From: Smith, Jackson <rsmith@RiversideResearch.org> > > > > > -----Original Message----- > > > From: Stefano Stabellini <sstabellini@kernel.org> > > > > > > On Mon, 25 Jul 2022, Smith, Jackson wrote: > > > > Hi Stefano, > > > > > > > > My colleague Jason Lei and I would like to submit a patch to imagebuilder. > > > > > > > > It seems that generating a .fit with a true dom0less configuration > > > > fails > > > because an extraneous comma is included in the its file. > > > > > > > > We believe this change resolves the issue. > > > > > > Hi Jackson, thanks for your contribution! > > > > > > Yes, I see the problem: the code assumes there is a dom0 kernel. If > > > there is no > > > dom0 kernel then load_files will be wrongly starting with a "," > > > > > > I would be happy to commit your patch. I assume I can add your > > > Signed-off-by to it, right? > > > > Yes, that is fine. Could you also add Jason, as he worked this out initially? > > I've added him to the message so he can give his ok. > > > Yes, I would like to be signed off on the patch as well using this email. Done, thanks!
diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index 8f08cd6..6f94fce 100755 --- a/scripts/uboot-script-gen +++ b/scripts/uboot-script-gen @@ -676,7 +676,12 @@ create_its_file_xen() i=$(( $i + 1 )) continue fi - load_files+=", \"domU${i}_kernel\"" + if test -z "$load_files" + then + load_files+="\"domU${i}_kernel\"" + else + load_files+=", \"domU${i}_kernel\"" + fi cat >> "$its_file" <<- EOF domU${i}_kernel { description = "domU${i} kernel binary";