| Message ID | 20231221075730.201111-2-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> > > Build host may not have bc. > > Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Erik Schilling <erik.schilling@linaro.org> > --- > classes/dm-verity-img.bbclass | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass > index 045c860..3dd2b94 100644 > --- a/classes/dm-verity-img.bbclass > +++ b/classes/dm-verity-img.bbclass > @@ -49,6 +49,8 @@ DM_VERITY_SEPARATE_HASH ?= "0" > DM_VERITY_ROOT_GUID ?= "4f68bce3-e8cd-4db1-96e7-fbcaf984b709" > DM_VERITY_RHASH_GUID ?= "2c7357ed-ebd2-46d9-aec1-23d437ec2bf5" > > +DEPENDS += "bc-native" > + > # Process the output from veritysetup and generate the corresponding .env > # file. The output from veritysetup is not very machine-friendly so we need to > # convert it to some better format. Let's drop the first line (doesn't contain > @@ -87,8 +89,8 @@ process_verity() { > # https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ > > ROOT_HASH=$(cat $ENV | grep ^ROOT_HASH | sed 's/ROOT_HASH=//' | tr a-f A-F) > - ROOT_HI=$(echo "obase=16;ibase=16;$ROOT_HASH/2^80" | /usr/bin/bc) > - ROOT_LO=$(echo "obase=16;ibase=16;$ROOT_HASH%2^80" | /usr/bin/bc) > + ROOT_HI=$(echo "obase=16;ibase=16;$ROOT_HASH/2^80" | bc) > + ROOT_LO=$(echo "obase=16;ibase=16;$ROOT_HASH%2^80" | bc) > > # Hyphenate as per UUID spec and as expected by wic+sgdisk parameters. > # Prefix with leading zeros, in case hash chunks weren't using highest bits
diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass index 045c860..3dd2b94 100644 --- a/classes/dm-verity-img.bbclass +++ b/classes/dm-verity-img.bbclass @@ -49,6 +49,8 @@ DM_VERITY_SEPARATE_HASH ?= "0" DM_VERITY_ROOT_GUID ?= "4f68bce3-e8cd-4db1-96e7-fbcaf984b709" DM_VERITY_RHASH_GUID ?= "2c7357ed-ebd2-46d9-aec1-23d437ec2bf5" +DEPENDS += "bc-native" + # Process the output from veritysetup and generate the corresponding .env # file. The output from veritysetup is not very machine-friendly so we need to # convert it to some better format. Let's drop the first line (doesn't contain @@ -87,8 +89,8 @@ process_verity() { # https://uapi-group.org/specifications/specs/discoverable_partitions_specification/ ROOT_HASH=$(cat $ENV | grep ^ROOT_HASH | sed 's/ROOT_HASH=//' | tr a-f A-F) - ROOT_HI=$(echo "obase=16;ibase=16;$ROOT_HASH/2^80" | /usr/bin/bc) - ROOT_LO=$(echo "obase=16;ibase=16;$ROOT_HASH%2^80" | /usr/bin/bc) + ROOT_HI=$(echo "obase=16;ibase=16;$ROOT_HASH/2^80" | bc) + ROOT_LO=$(echo "obase=16;ibase=16;$ROOT_HASH%2^80" | bc) # Hyphenate as per UUID spec and as expected by wic+sgdisk parameters. # Prefix with leading zeros, in case hash chunks weren't using highest bits