[PATCH] kernel-fitimage: uboot-sign: fix missing signature

[PATCH] kernel-fitimage: uboot-sign: fix missing signature

[Jun Nie]

u-boot.bin with dtb & signature should be placed in ${B} so that
it can be deployed by u-boot as expected. Otherwise, the version
without signature is installed.

Signed-off-by: Jun Nie <jun.nie@linaro.org>
---
 meta/classes/uboot-sign.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8beafff..1fc2a37 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -66,7 +66,7 @@ concat_dtb_helper() {
 		install ${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
 	elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "$deployed_uboot_dtb_binary" ]; then
 		cd ${DEPLOYDIR}
-		cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${UBOOT_BINARY} > ${UBOOT_IMAGE}
+		cat ${UBOOT_NODTB_IMAGE} $deployed_uboot_dtb_binary | tee ${B}/${CONFIG_B_PATH}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
 	else
 		bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."
 	fi
@@ -77,10 +77,12 @@ concat_dtb() {
 		mkdir -p ${DEPLOYDIR}
 		if [ -n "${UBOOT_CONFIG}" ]; then
 			for config in ${UBOOT_MACHINE}; do
+				CONFIG_B_PATH="${config}"
 				cd ${B}/${config}
 				concat_dtb_helper
 			done
 		else
+			CONFIG_B_PATH=""
 			cd ${B}
 			concat_dtb_helper
 		fi
-- 
2.7.4

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[Jun Nie]

Jun Nie <jun.nie@linaro.org> 于2019年7月10日周三 下午3:11写道：
>
> u-boot.bin with dtb & signature should be placed in ${B} so that
> it can be deployed by u-boot as expected. Otherwise, the version
> without signature is installed.
>
> Signed-off-by: Jun Nie <jun.nie@linaro.org>

Does anyone have opinion on this patch? Or suppose it can be merged now?

Thanks!
Jun

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[richard.purdie]

On Wed, 2019-07-10 at 15:10 +0800, Jun Nie wrote:
> u-boot.bin with dtb & signature should be placed in ${B} so that
> it can be deployed by u-boot as expected. Otherwise, the version
> without signature is installed.
> 
> Signed-off-by: Jun Nie <jun.nie@linaro.org>
> ---
>  meta/classes/uboot-sign.bbclass | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

I continue to be very worried we have no test coverage in this area of
the code. Since I don't know it particularly well I'm effectively
merging patches blindly :(.

Cheers,

Richard

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[Jun Nie]

<richard.purdie@linuxfoundation.org> 于2019年7月17日周三 下午7:41写道：
>
> On Wed, 2019-07-10 at 15:10 +0800, Jun Nie wrote:
> > u-boot.bin with dtb & signature should be placed in ${B} so that
> > it can be deployed by u-boot as expected. Otherwise, the version
> > without signature is installed.
> >
> > Signed-off-by: Jun Nie <jun.nie@linaro.org>
> > ---
> >  meta/classes/uboot-sign.bbclass | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
>
> I continue to be very worried we have no test coverage in this area of
> the code. Since I don't know it particularly well I'm effectively
> merging patches blindly :(.
>
> Cheers,
>
> Richard
>
>

Then I think you can merge it as long as it pass current test
coverage. Because I already test the FIT signature feature comes back
with this patch :-)

Best Regards.
Jun

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[richard.purdie]

On Thu, 2019-07-18 at 17:18 +0800, Jun Nie wrote:
> <richard.purdie@linuxfoundation.org> 于2019年7月17日周三 下午7:41写道：
> > On Wed, 2019-07-10 at 15:10 +0800, Jun Nie wrote:
> > > u-boot.bin with dtb & signature should be placed in ${B} so that
> > > it can be deployed by u-boot as expected. Otherwise, the version
> > > without signature is installed.
> > > 
> > > Signed-off-by: Jun Nie <jun.nie@linaro.org>
> > > ---
> > >  meta/classes/uboot-sign.bbclass | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > I continue to be very worried we have no test coverage in this area
> > of
> > the code. Since I don't know it particularly well I'm effectively
> > merging patches blindly :(.
> 
> Then I think you can merge it as long as it pass current test
> coverage. Because I already test the FIT signature feature comes back
> with this patch :-)

It has merged but my point is we really need better test coverage of
these areas of the code.

What I'd really like is for people to help write tests which showed the
broken behaviour the patch is fixing.

Cheers,

Richard

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[Jun Nie]

<richard.purdie@linuxfoundation.org> 于2019年7月18日周四 下午8:33写道：
>
> On Thu, 2019-07-18 at 17:18 +0800, Jun Nie wrote:
> > <richard.purdie@linuxfoundation.org> 于2019年7月17日周三 下午7:41写道：
> > > On Wed, 2019-07-10 at 15:10 +0800, Jun Nie wrote:
> > > > u-boot.bin with dtb & signature should be placed in ${B} so that
> > > > it can be deployed by u-boot as expected. Otherwise, the version
> > > > without signature is installed.
> > > >
> > > > Signed-off-by: Jun Nie <jun.nie@linaro.org>
> > > > ---
> > > >  meta/classes/uboot-sign.bbclass | 4 +++-
> > > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > I continue to be very worried we have no test coverage in this area
> > > of
> > > the code. Since I don't know it particularly well I'm effectively
> > > merging patches blindly :(.
> >
> > Then I think you can merge it as long as it pass current test
> > coverage. Because I already test the FIT signature feature comes back
> > with this patch :-)
>
> It has merged but my point is we really need better test coverage of
> these areas of the code.
>
> What I'd really like is for people to help write tests which showed the
> broken behaviour the patch is fixing.
>
> Cheers,
>
> Richard
>

Just find that there are runqemu script and some qemu test in
openembedded-core/script. But it seems that u-boot is not enabled in
qemu test yet and current test case is only for kernel feature. So
there is huge gap in u-boot test side. I can have a try later, but
cannot make any promise.

Best Regards.
Jun

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[Jun Nie]

Jun Nie <jun.nie@linaro.org> 于2019年7月10日周三 下午3:11写道：
>
> u-boot.bin with dtb & signature should be placed in ${B} so that
> it can be deployed by u-boot as expected. Otherwise, the version
> without signature is installed.
>
> Signed-off-by: Jun Nie <jun.nie@linaro.org>

Hi Richard,

Could you also help to cherry pick this patch to warrior branch?

Thanks!
Jun

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[Jun Nie]

Hi Richard,

Any thoughts on cherry-pick this patch to warrior-dev branch?

Jun

Jun Nie <jun.nie@linaro.org> 于2019年7月25日周四 下午4:26写道：
>
> Jun Nie <jun.nie@linaro.org> 于2019年7月10日周三 下午3:11写道：
> >
> > u-boot.bin with dtb & signature should be placed in ${B} so that
> > it can be deployed by u-boot as expected. Otherwise, the version
> > without signature is installed.
> >
> > Signed-off-by: Jun Nie <jun.nie@linaro.org>
>
> Hi Richard,
>
> Could you also help to cherry pick this patch to warrior branch?
>
> Thanks!
> Jun

Re: [PATCH] kernel-fitimage: uboot-sign: fix missing signature

[Jun Nie]

Hi Richard,

Any concern on cherry-pick this patch to warrior-dev branch?

Regards,
Jun
>
> Jun Nie <jun.nie@linaro.org> 于2019年7月25日周四 下午4:26写道：
> >
> > Jun Nie <jun.nie@linaro.org> 于2019年7月10日周三 下午3:11写道：
> > >
> > > u-boot.bin with dtb & signature should be placed in ${B} so that
> > > it can be deployed by u-boot as expected. Otherwise, the version
> > > without signature is installed.
> > >
> > > Signed-off-by: Jun Nie <jun.nie@linaro.org>
> >
> > Hi Richard,
> >
> > Could you also help to cherry pick this patch to warrior branch?
> >
> > Thanks!
> > Jun