meta-digi-dey: swupdate: clean defconfig file
Make the 'defconfig' file a real defconfig by including only differences with respect default
values. While on it, improve the recipe:
- Enable 'BOOTLOADERHANDLER' by default in the 'defconfig'. We were unconditionally setting
this value to 'y' in the recipe, so move it to the default configuration.
- Move 'UBI' configuration values to 'mtd.cfg' file to be added only when device filesystem is
MTD based. Until now, 'UBI' support was always added by default.
- Move the 'SIGNED_IMAGES' configuration entry to a '.cfg' file like we are doing with the rest
of the functionallity. Use 'oe.utils.conditional' checking 'TRUSTFENCE' feature for this.
Signed-off-by: David Escalona <david.escalona@digi.com>
This commit is contained in:
David Escalona
parent
4395fa1f11
commit
429125cce0
|
|
@ -1,126 +1,8 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# SWUpdate Configuration
|
||||
#
|
||||
|
||||
#
|
||||
# SWUpdate Settings
|
||||
#
|
||||
|
||||
#
|
||||
# General Configuration
|
||||
#
|
||||
# CONFIG_CURL is not set
|
||||
# CONFIG_CURL_SSL is not set
|
||||
# CONFIG_DISKFORMAT is not set
|
||||
# CONFIG_SYSTEMD is not set
|
||||
CONFIG_DEFAULT_CONFIG_FILE="/etc/swupdate.cfg"
|
||||
CONFIG_SCRIPTS=y
|
||||
# CONFIG_HW_COMPATIBILITY is not set
|
||||
CONFIG_SW_VERSIONS_FILE="/etc/sw-versions"
|
||||
|
||||
#
|
||||
# Socket Paths
|
||||
#
|
||||
CONFIG_SOCKET_CTRL_PATH=""
|
||||
CONFIG_SOCKET_PROGRESS_PATH=""
|
||||
# CONFIG_MTD is not set
|
||||
# CONFIG_LUA is not set
|
||||
# CONFIG_FEATURE_SYSLOG is not set
|
||||
|
||||
#
|
||||
# Build Options
|
||||
#
|
||||
CONFIG_CROSS_COMPILE=""
|
||||
CONFIG_SYSROOT=""
|
||||
CONFIG_EXTRA_CFLAGS=""
|
||||
CONFIG_EXTRA_LDFLAGS=""
|
||||
CONFIG_EXTRA_LDLIBS=""
|
||||
|
||||
#
|
||||
# Debugging Options
|
||||
#
|
||||
# CONFIG_DEBUG is not set
|
||||
# CONFIG_WERROR is not set
|
||||
# CONFIG_NOCLEANUP is not set
|
||||
|
||||
#
|
||||
# Bootloader support
|
||||
#
|
||||
|
||||
#
|
||||
# Bootloader Interfaces
|
||||
#
|
||||
# CONFIG_BOOTLOADER_NONE is not set
|
||||
# CONFIG_BOOTLOADER_EBG is not set
|
||||
CONFIG_UBOOT=y
|
||||
CONFIG_UBOOT_FWENV="/etc/fw_env.config"
|
||||
CONFIG_UBOOT_DEFAULTENV="/etc/u-boot-initial-env"
|
||||
# CONFIG_BOOTLOADER_GRUB is not set
|
||||
CONFIG_BOOTLOADER_DEFAULT_UBOOT=y
|
||||
CONFIG_UPDATE_STATE_CHOICE_NONE=y
|
||||
# CONFIG_UPDATE_STATE_CHOICE_BOOTLOADER is not set
|
||||
|
||||
#
|
||||
# Interfaces
|
||||
#
|
||||
# CONFIG_DOWNLOAD is not set
|
||||
# CONFIG_SURICATTA is not set
|
||||
# CONFIG_WEBSERVER is not set
|
||||
|
||||
#
|
||||
# Security
|
||||
#
|
||||
# CONFIG_SSL_IMPL_NONE is not set
|
||||
CONFIG_SSL_IMPL_OPENSSL=y
|
||||
# CONFIG_SSL_IMPL_WOLFSSL is not set
|
||||
# CONFIG_SSL_IMPL_MBEDTLS is not set
|
||||
CONFIG_HASH_VERIFY=y
|
||||
# CONFIG_SIGNED_IMAGES is not set
|
||||
# CONFIG_ENCRYPTED_IMAGES is not set
|
||||
|
||||
#
|
||||
# Compressors (zlib always on)
|
||||
#
|
||||
CONFIG_GUNZIP=y
|
||||
# CONFIG_ZSTD is not set
|
||||
|
||||
#
|
||||
# Parsers
|
||||
#
|
||||
|
||||
#
|
||||
# Parser Features
|
||||
#
|
||||
CONFIG_LIBCONFIG=y
|
||||
CONFIG_PARSERROOT=""
|
||||
# CONFIG_JSON is not set
|
||||
# CONFIG_SETSWDESCRIPTION is not set
|
||||
|
||||
#
|
||||
# Handlers
|
||||
#
|
||||
|
||||
#
|
||||
# Image Handlers
|
||||
#
|
||||
# CONFIG_ARCHIVE is not set
|
||||
# CONFIG_BOOTLOADERHANDLER is not set
|
||||
CONFIG_CFI=y
|
||||
# CONFIG_CFIHAMMING1 is not set
|
||||
# CONFIG_DELTA is not set
|
||||
# CONFIG_DISKPART is not set
|
||||
# CONFIG_DISKFORMAT_HANDLER is not set
|
||||
CONFIG_BOOTLOADERHANDLER=y
|
||||
CONFIG_RAW=y
|
||||
# CONFIG_RDIFFHANDLER is not set
|
||||
# CONFIG_READBACKHANDLER is not set
|
||||
# CONFIG_REMOTE_HANDLER is not set
|
||||
CONFIG_SHELLSCRIPTHANDLER=y
|
||||
# CONFIG_SWUFORWARDER_HANDLER is not set
|
||||
# CONFIG_SSBLSWITCH is not set
|
||||
CONFIG_UBIVOL=y
|
||||
CONFIG_UBIATTACH=y
|
||||
CONFIG_UBIBLACKLIST=""
|
||||
CONFIG_UBIWHITELIST=""
|
||||
CONFIG_UBIVIDOFFSET=0
|
||||
# CONFIG_UCFWHANDLER is not set
|
||||
# CONFIG_UNIQUEUUID is not set
|
||||
|
|
|
|||
|
|
@ -1,2 +1,8 @@
|
|||
# Add MTD support
|
||||
CONFIG_MTD=y
|
||||
# Add UBI support
|
||||
CONFIG_UBIVOL=y
|
||||
CONFIG_UBIATTACH=y
|
||||
CONFIG_UBIBLACKLIST=""
|
||||
CONFIG_UBIWHITELIST=""
|
||||
CONFIG_UBIVIDOFFSET=0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
# Add SIGNED_IMAGES support
|
||||
CONFIG_SIGNED_IMAGES=y
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (C) 2016-2022 Digi International Inc.
|
||||
# Copyright (C) 2016-2023 Digi International Inc.
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
|
||||
|
||||
|
|
@ -10,19 +10,9 @@ SRC_URI += " \
|
|||
file://0002-config-add-on-the-fly-build-configuration-variable.patch \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://systemd.cfg', '', d)} \
|
||||
${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'file://mtd.cfg', '', d)} \
|
||||
${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'file://signed_images.cfg', '', d)} \
|
||||
"
|
||||
|
||||
do_configure:append() {
|
||||
# If Trustfence is enabled, enable the signing support in the
|
||||
# '.config' file.
|
||||
if [ "${TRUSTFENCE_SIGN}" = "1" ]; then
|
||||
echo "CONFIG_SIGNED_IMAGES=y" >> ${B}/.config
|
||||
fi
|
||||
# add U-Booot handler to use uboot: type
|
||||
echo "CONFIG_BOOTLOADERHANDLER=y" >> ${B}/.config
|
||||
cml1_do_configure
|
||||
}
|
||||
|
||||
do_install:append() {
|
||||
# Copy the 'progress' binary.
|
||||
install -d ${D}${bindir}/
|
||||
|
|
|
|||
Loading…
Reference in New Issue