-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: lmp.bbclass: app images preload #195
Conversation
meta-lmp-base/classes/lmp.bbclass
Outdated
@@ -15,12 +15,27 @@ ROOTFS_POSTPROCESS_COMMAND_append_sota = " sota_fstab_update; " | |||
|
|||
# Support initial customized target via GARAGE_CUSTOMIZE_TARGET | |||
# This is set by our CI scripts and allows the initial target to populated by | |||
# the build process so it can be incorporated at the first aktualizr-lite run | |||
# the build process so it can b e incorporated at the first aktualizr-lite run |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unintentional change here i'm guessing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, just fixed it.
0d0cc2e
to
766e46d
Compare
meta-lmp-base/classes/lmp.bbclass
Outdated
@@ -23,4 +23,19 @@ IMAGE_CMD_ota_append () { | |||
${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions \ | |||
${GARAGE_TARGET_NAME}-${target_version} | |||
fi | |||
|
|||
if [ "${DOCKER_COMPOSE_APP_PRELOAD}" = "1" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentation is not aligned with the previous code block, using spaces instead of tabs. Mind changing to tab so it can be aligned?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated
Signed-off-by: Mike Sul <[email protected]>
766e46d
to
e708e06
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
Relevant changes: - de0eb14 Merge pull request #210 from YoeDistro/yoe/mut - 1bf66f8 linux-firmware: Use nonarch_base_libdir instead of hardcoding /lib - 478e0c4 Merge pull request #209 from YoeDistro/yoe/mut - 7ca49de ti-18xx-wlconf: Drop spurious dot from PV - aff7e79 ti-18xx-wlconf: Use nonarch_base_libdir instead of hardcoding /lib - f244dd4 Merge pull request #207 from chrisdimich/master - d52f46a linux-boundary: bump revision to bb58f0ee - 1e88fc2 Merge pull request #206 from Ossanes/topic/fix-nitrogen8-boards - 47d2543 nitrogen*: Drop duplicated WKS dependencies - b806279 nitrogen8*: Drop useless overrides for WKS_FILE_DEPENDS - 18912db Merge pull request #203 from boundarydevices/master - 4d1b126 u-boot-boundary: fix fw_env.config management - bd3eb22 u-boot-boundary: switch filesextrapaths to generic-bsp - 7596527 Merge pull request #202 from YoeDistro/yoe/mut - 1efcb1b recipes: Use SPDX naming scheme for LICENSE field - a27ac73 Merge pull request #199 from chrisdimich/master - b30a5bc u-boot-boundary: bump revision to 3d5e7f60 - 4d7c7c5 linux-boundary: bump revision to 04f4286f - f467829 Merge pull request #198 from Ossanes/topic/linux-kontron - 100b41b linux-kontron: defconfig: Rework to enable CONFIG_KPROBES - d236514 linux-kontron: Upgrade 5.4.41>5.10.95 - dc91d5e Merge pull request #197 from Freescale/topic/simplify-overrides - b034e5c Rework machine definitions to reduce duplication - bf7ae43 u-boot-script-toradex: Revert wrong override change - 671aee4 Generalize overrides subsystem for NXP and Mainline support - a161b3a Merge pull request #196 from Ossanes/topic/nitrogen8mp - 52e9a93 nitrogen8mp: Define nxp as default BSP - 10a470a Merge pull request #195 from YoeDistro/yoe/mut - 4560e22 layers: Bump to use kirkstone - 0c68a5a Merge pull request #193 from Ossanes/topic/imx7d-remarkable2-remove-firmwares - 654d5b5 imx7d-remarkable2: Remove bcm43456 firmware as it has no providers - f8d9213 Merge pull request #192 from Ossanes/topic/imx6dl-riotboard-uboot - e78de66 imx6dl-riotboard: Fix u-boot target - 6059586 Merge pull request #191 from sapiippo/apalis-imx6 - 61b70a0 apalis-imx6: add missing space to append - b3670f9 Merge pull request #190 from MaxKrummenacher/master - e064d0e colibri-imx6ull: fix mistyped override - b26df7f Merge pull request #187 from boundarydevices/master - 748b8f0 linux-boundary: bump revision to acef1311 - f007a9f Merge pull request #185 from MaxKrummenacher/update-toradex - 13bd2ac machines: toradex: update - 02bff68 linux-toradex: vf: update to 4.4.291 - 74fc138 linux-toradex: imx: update to 5.4-2.3.x-imx - a2c343e u-boot-script-toradex: improve script - 6e8f05b u-boot-toradex: updated to latest - 839df32 u-boot-toradex: drop inc file - 4661bdc Merge pull request #184 from texierp/topic/git-fetcher - be54937 recipes: use https protocol and add explicit branch parameter - be3442a Merge pull request #183 from Ossanes/topic/remove-dms-ba16 - f6c6d9e Merge pull request #182 from Ossanes/topic/remove-congatec - 5dc9275 imx6q-dms-ba16: Remove files because it is not being maintained - 00acf49 congatec: Remove defconfig - af1c0cb Merge pull request #181 from Ossanes/topic/remove-congatec - 3777793 congatec: Remove files because it is not being maintained - 557e7b6 Merge pull request #180 from Ossanes/topic/u-boot-script-gateworks-imx - d57becc u-boot-script-gateworks-imx.bb: Fix license checksum - ea36713 Merge pull request #178 from Ossanes/topic/linux-remarkable - 322f7f9 linux-remarkable2_5.4.bb: Fix git revision - 5ed5d23 Merge pull request #177 from Ossanes/topic/imx6sl-warp-uboot - 18f54fa imx6sl-warp: Fix u-boot suffix - c57b5f3 Merge pull request #176 from Ossanes/topic/riotboard-suffix - a9fce64 imx6dl-riotboard: Fix u-boot suffix Signed-off-by: Ricardo Salveti <[email protected]>
Preload compose app images into the target rootfs (var/lib/docker) if DOCKER_COMPOSE_APP_PRELOAD is set to "1" provided that the images were dumped before during container build for the corresponding Target.
depends on foundriesio/ci-scripts#71
Signed-off-by: Mike Sul [email protected]