search

OE4T / tegra-demo-distro

Reference/demonstration distro for meta-tegra
MIT License
73 stars 74 forks source link

scripts: Fix create-distro-layer mender option #233

Closed dwalkes closed 1 year ago

dwalkes commented 1 year ago

The previous implementation assumed REQUIRED_TD_BBLAYERS_CONF_VERSION was the same between the base distro and the mender distro script.

Instead of attempting to patch the distro.conf file with tegrademo-mender content, use the tegrademo-mender content as-is.

Then tweak the copy scripts in the mender case to avoid replacing the tegrademo.conf reference in the distro configuration copied from the mender config. Use the name ${DISTRO_NAME}-base.conf for the file created from tegrademo.conf to avoid name collisions with the later rename scripts.

Tested with

./scripts-setup/create-distro-layer -d my-mender -m
. ./setup-env -m jetson-nano-devkit-emmc -d my-mender build-my-mender

and

./scripts-setup/create-distro-layer -d my-distro
. ./setup-env -m jetson-nano-devkit-emmc -d my-distro build-my-distro

Closes https://github.com/OE4T/tegra-demo-distro/issues/232

Signed-off-by: Dan Walkes danwalkes@trellis-logic.com

dwalkes commented 1 year ago

The associated mender logic is already gone from the master and kirkstone branches, so I think targeting kirkstone-l4t-r32.7.x is the right place.

madisongh commented 1 year ago

@dwalkes This probably needs cherry-picking to the dunfell branches also, right?

dwalkes commented 1 year ago

@madisongh it worked when I tested on dunfell earlier but this is probably a fix we need there too I suppose.