Patch fuzz in kirkstone

General Discussions
,
1 
WARNING: u-boot-1_2022.01-r0 do_patch: Fuzz detected:

Applying patch 0001-configs-rpi-enable-mender-requirements.patch
patching file configs/rpi_0_w_defconfig
Hunk #1 succeeded at 19 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 44 (offset 3 lines).
patching file configs/rpi_2_defconfig
Hunk #1 succeeded at 20 with fuzz 1 (offset 2 lines).
Hunk #2 succeeded at 44 (offset 4 lines).
patching file configs/rpi_3_32b_defconfig
Hunk #1 succeeded at 21 with fuzz 1 (offset 2 lines).
Hunk #2 succeeded at 47 (offset 4 lines).
patching file configs/rpi_3_b_plus_defconfig
Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 46 (offset 3 lines).
patching file configs/rpi_3_defconfig
Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 46 (offset 3 lines).
patching file configs/rpi_4_32b_defconfig
Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 62 (offset 4 lines).
patching file configs/rpi_4_defconfig
Hunk #1 succeeded at 20 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 60 (offset 4 lines).
patching file configs/rpi_arm64_defconfig
Hunk #1 succeeded at 19 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 52 (offset 2 lines).
patching file configs/rpi_defconfig
Hunk #1 succeeded at 19 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 44 (offset 3 lines).
patching file env/Kconfig
Hunk #1 succeeded at 57 (offset -4 lines).
patching file include/configs/rpi.h
Hunk #1 succeeded at 68 with fuzz 2 (offset -29 lines).


The context lines in the patches can be updated with devtool:

    devtool modify u-boot
    devtool finish --force-patch-refresh u-boot <layer_path>

Don't forget to review changes done by devtool!

WARNING: u-boot-1_2022.01-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]

Is this a concern, did it go through?

Also - how should the resulting cmdline.txt look like for a CM3+?

Distro

INHERIT += "mender-full"
# rpi-update-firmware 

M_IMAGE_VERSION = "51k"
DISTRO_VERSION = "1.3.${M_IMAGE_VERSION}"
MENDER_ARTIFACT_NAME = "M-${M_HW_VERSION}-${M_OS_TYPE}-${M_IMAGE_VERSION}"
MENDER_FEATURES_ENABLE:append = " mender-uboot"

BBMASK += "poky/meta/recipes-devtools/rust"
BBMASK += "poky/meta/recipes-devtools/cargo"
# PREFERRED_VERSION_rust ?= "1.65%"

DISTRO_FEATURES:append = " security tpm systemd virtualization bluetooth bluez5 wifi"
DISTRO_FEATURES:remove = "api-documentation alsa irda zeroconf"

DISTRO_FEATURES_FILTER_NATIVESDK:remove = "api-documentation"

VIRTUAL-RUNTIME_init_manager = "systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native"
VIRTUAL-RUNTIME_init_manager = "sysvinit"

PREFERRED_RPROVIDER_docker-dev = "docker-moby"
PREFERRED_RPROVIDER_docker = "docker-moby"
PREFERRED_PROVIDER_virtual/docker = "docker-moby"
PREFERRED_RPROVIDER_u-boot-default-env = "u-boot"
PREFERRED_VERSION_stm32flash = "0.5"

PREFERRED_VERSION_linux-raspberrypi = "5.10%"

MENDER_CONNECT_USER = "root"
MENDER_CONNECT_SHELL = "/bin/sh"

DISTRO="controller-qa"
DISTRO_CODENAME="blah"
DISTRO_NAME="M OS QA"

require conf/distro/common.conf

# DISRO_FEATURES:remove = "zeroconf"

#MENDER_MTDIDS = "nor0=40000000.flash"
MENDER_SERVER_URL = "<redacted>"
#MENDER_DEMO_HOST_IP_ADDRESS = "40.113.13.217"
#MENDER_TENANT_TOKEN = ""

MENDER_UPDATE_POLL_INTERVAL_SECONDS = "300"
MENDER_INVENTORY_POLL_INTERVAL_SECONDS = "300"
MENDER_RETRY_POLL_INTERVAL_SECONDS = "300"

Machine:

#@TYPE: Machine
#@NAME: Compute Module 3 (CM3)
#@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3)

DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"

require conf/machine/include/arm/armv7a/tune-cortexa7.inc
include conf/machine/include/rpi-base.inc

RPI_KERNEL_DEVICETREE = "dt-blob.dtb bcm2710-rpi-cm3-bt-main-uart.dtb bcm2710-rpi-cm3.dtb"
RPI_KERNEL_DEVICETREE_OVERLAYS += "overlays/sdio34.dtbo overlays/tpm-slb9670.dtbo"

MENDER_DTB_NAME = "bcm2710-rpi-cm3.dtb"
#MACHINE_FEATURES = "apm usbhost keyboard vfat ext2 bluetooth wifi sdio"
MACHINE_FEATURES:remove = "alsa pulseaudio"
RPI_USE_U_BOOT = "1"
IMAGE_BOOT_FILES:append = " dt-blob.bin"

MACHINE_EXTRA_RRECOMMENDS += "\
    linux-firmware-rpidistro-bcm43430 \
    linux-firmware-rpidistro-bcm43455 \
    bluez-firmware-rpidistro-bcm43430a1-hcd \
    bluez-firmware-rpidistro-bcm4345c0-hcd \
    kernel-module-spi-ksz8895 \
"
KERNEL_MODULE_AUTOLOAD += "\
    tpm_tis_spi \
    spi-ksz8895 \
    br_netfilter\
    "

GPU_MEM = "16"
ENABLE_SPI_BUS = "1"
ENABLE_I2C = "1"
ENABLE_UART = "1"
VC4GRAPHICS = "1"
# DISABLE_VC4GRAPHICS = "1"

KBUILD_DEFCONFIG ?= "bcm2709_defconfig"
SDIMG_KERNELIMAGE ?= "kernel7.img"
UBOOT_MACHINE = "rpi_3_32b_config"
CMDLINE = "dwc_otg.lpm_enable=0 console=null  rootfstype=ext4 rootwait"
ARMSTUB ?= "armstub.bin"
2

Hi @emilm,

We are aware of the fuzz, but in itself it is not considered problematic. Concerning the CM3 cmdline.txt, there is no canonical that we are aware of.

Greets,
Josef