From ce25aae1334c79a6ea0c37bd7f67b951042ffd55 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Tue, 16 Apr 2019 14:16:29 +0200 Subject: [PATCH] nm-distro: Move ostree related config to distro config These config were present in HW specific configuration files --- conf/distro/netmodule-linux-ostree.conf | 5 +++++ conf/distro/netmodule-linux.conf | 2 ++ 2 files changed, 7 insertions(+) diff --git a/conf/distro/netmodule-linux-ostree.conf b/conf/distro/netmodule-linux-ostree.conf index 7f7b963..44129b2 100644 --- a/conf/distro/netmodule-linux-ostree.conf +++ b/conf/distro/netmodule-linux-ostree.conf @@ -8,3 +8,8 @@ DISTRO_FEATURES_append = " sota" OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot" OSTREE_COMMIT_SUBJECT = "${IMAGE_BASENAME};${EXTERNALSRC_GIT_SRCREV}" +KERNEL_CLASSES_append = "kernel-fitimage" +KERNEL_IMAGETYPES_sota = "fitImage" +KERNEL_IMAGETYPE_sota = "fitImage" +OSTREE_KERNEL = "${KERNEL_IMAGETYPE}-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}" +INITRAMFS_IMAGE_BUNDLE_sota = "1" diff --git a/conf/distro/netmodule-linux.conf b/conf/distro/netmodule-linux.conf index cf9ce9d..981f4c4 100644 --- a/conf/distro/netmodule-linux.conf +++ b/conf/distro/netmodule-linux.conf @@ -98,4 +98,6 @@ OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot" INHERIT += "externalgitsrc" INHERIT += "image-buildinfo" +PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" KERNEL_MODULE_AUTOLOAD += "cryptodev" +