python/python3-binwalk_2.3.3.bb: changed src to updated fork

[tym2k1]

See related issues:
ReFirmLabs/binwalk#671
ReFirmLabs/binwalk#675

[tym2k1]

Currently old version of binwalk fails at develop due to using python 3.11 and it's deprecated module imp.

ModuleNotFoundError: No module named 'imp'

Related Stack Overflow thread

[tym2k1]

When the recipe gets verified it should be upstreamed

[PLangowski]

Looks good and also works :)

[tym2k1]

@PLangowski I've checked the differences in manifests related to bumping the layer priority. Here are the diffs as output by generate-changelog.sh from PR #152

python3 generate-changed-recipes.py dts-base-image-genericx86-64-20240910132915.manifest dts-base-image-genericx86-64-20240909115958.manifest
Changed recipes:
python3-binwalk: 2.3.4 -> 2.4.2+git0+3dd13d7fd8
python3-uefi-firmware: 1.11 -> 1.9
New recipes:
Deleted recipes:
kernel-module-tpm-atmel-6.6.21-yocto-standard: 6.6.21+git0+f7f00b22ef_06644f0d71
kernel-module-tpm-infineon-6.6.21-yocto-standard: 6.6.21+git0+f7f00b22ef_06644f0d71
kernel-module-tpm-nsc-6.6.21-yocto-standard: 6.6.21+git0+f7f00b22ef_06644f0d71

It's sensible that python3-uefi-firmware gets backported as we have an outdated version in our repository and a more up-to-date is present in meta-python. I'll delete it but we must verify if the deleted kernel modules affect the functionality in any way.

[tym2k1]

The mentioned kernel modules seem to be declared in meta-dts-distro/recipes-kernel/kernel/linux-yocto/tpm.cfg

[tym2k1]

Ran built image on QEMU via Dasharo/open-source-firmware-validation/blob/develop/scripts/ci/qemu-run.sh from develop branch. The tpm emulation works correctly:

bash-5.2# tpm2_pcrread
  sha1:
    0 : 0x9D1EA6A08961EAD5488881E46A11BFB1C34DFF67
    1 : 0x3C478FB482D5F324104902C24AD71A72DC08E988
    2 : 0x74CBEAD085C1A91D8FA73A2C4489DB2617A5B04A
    3 : 0xB2A83B0EBF2F8374299A5B2BDFC31EA955AD7236
    4 : 0xFB40F309E9579C9095B68DC6F03B4B19CF8E8BF1
    5 : 0xD16D7E629FD8D08CA256F9AD3A3A1587C9E6CC1B
    6 : 0xB2A83B0EBF2F8374299A5B2BDFC31EA955AD7236
    7 : 0xE3CA6F88302A4A33FDA58154FA65B16B5E26E84F
    8 : 0x0000000000000000000000000000000000000000
    9 : 0x047BE74F8175800332AED0FD319706E47F4FB337
    10: 0x0000000000000000000000000000000000000000
    11: 0x0000000000000000000000000000000000000000
    12: 0x0000000000000000000000000000000000000000
    13: 0x0000000000000000000000000000000000000000
    14: 0x0000000000000000000000000000000000000000
    15: 0x0000000000000000000000000000000000000000
    16: 0x0000000000000000000000000000000000000000
    17: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
    18: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
    19: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
    20: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
    21: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
    22: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
    23: 0x0000000000000000000000000000000000000000

[tym2k1]

bash-5.2# zcat /proc/config.gz | grep -i infineon
CONFIG_TCG_TIS_I2C_INFINEON=y
CONFIG_TCG_INFINEON=y

bash-5.2# zcat /proc/config.gz | grep -i atmel
CONFIG_WLAN_VENDOR_ATMEL=y
# CONFIG_ATMEL is not set
# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
CONFIG_TCG_TIS_I2C_ATMEL=y
CONFIG_TCG_ATMEL=y
# CONFIG_SND_ATMEL_SOC is not set
# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set

bash-5.2# zcat /proc/config.gz | grep -i nsc
CONFIG_TCG_NSC=y
# CONFIG_PHY_CAN_TRANSCEIVER is not set

These values were until now overwritten by meta-security.

Here are logs from previous dts release:

bash-5.2# zcat /proc/config.gz | grep -iE "atmel|infineon|nsc"
CONFIG_WLAN_VENDOR_ATMEL=y
# CONFIG_ATMEL is not set
# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
# CONFIG_TCG_TIS_I2C_ATMEL is not set
# CONFIG_TCG_TIS_I2C_INFINEON is not set
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
# CONFIG_SND_ATMEL_SOC is not set
# CONFIG_PHY_CAN_TRANSCEIVER is not set
# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
# CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set

[tym2k1]

Ok so everything seems fine. Merging