Message ID | 20231221075730.201111-3-mikko.rapeli@linaro.org |
---|---|
State | New |
Headers | show |
Series | [meta-security,1/4] tpm2-tss: support native builds | expand |
On Thu Dec 21, 2023 at 8:57 AM CET, Mikko Rapeli wrote: > From: Erik Schilling <erik.schilling@linaro.org> > > It is embedded into IMAGE_NAME since poky master branch commit > 6f6c79029bc2020907295858449c725952d560a1 > > Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Erik Schilling <erik.schilling@linaro.org> > --- > classes/dm-verity-img.bbclass | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass > index 3dd2b94..7f35df5 100644 > --- a/classes/dm-verity-img.bbclass > +++ b/classes/dm-verity-img.bbclass > @@ -115,7 +115,7 @@ process_verity() { > > verity_setup() { > local TYPE=$1 > - local INPUT=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$TYPE > + local INPUT=${IMAGE_NAME}.$TYPE > local SIZE=$(stat --printf="%s" $INPUT) > local OUTPUT=$INPUT.verity > local OUTPUT_HASH=$INPUT.verity > @@ -157,7 +157,7 @@ verity_setup() { > # make "dateless" symlink for the hash so the wks can find it. > verity_hash() { > cd ${IMGDEPLOYDIR} > - ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${DM_VERITY_IMAGE_TYPE}.vhash \ > + ln -sf ${IMAGE_NAME}.${DM_VERITY_IMAGE_TYPE}.vhash \ > ${IMAGE_BASENAME}-${MACHINE}.${DM_VERITY_IMAGE_TYPE}.vhash > } >
diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass index 3dd2b94..7f35df5 100644 --- a/classes/dm-verity-img.bbclass +++ b/classes/dm-verity-img.bbclass @@ -115,7 +115,7 @@ process_verity() { verity_setup() { local TYPE=$1 - local INPUT=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$TYPE + local INPUT=${IMAGE_NAME}.$TYPE local SIZE=$(stat --printf="%s" $INPUT) local OUTPUT=$INPUT.verity local OUTPUT_HASH=$INPUT.verity @@ -157,7 +157,7 @@ verity_setup() { # make "dateless" symlink for the hash so the wks can find it. verity_hash() { cd ${IMGDEPLOYDIR} - ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${DM_VERITY_IMAGE_TYPE}.vhash \ + ln -sf ${IMAGE_NAME}.${DM_VERITY_IMAGE_TYPE}.vhash \ ${IMAGE_BASENAME}-${MACHINE}.${DM_VERITY_IMAGE_TYPE}.vhash }