From 53cc9f6600e07c496c406d3c4184328eb20385c6 Mon Sep 17 00:00:00 2001 From: Thomas Klaehn Date: Sat, 19 Sep 2020 07:42:32 +0200 Subject: [PATCH] dunfell: Version bump Signed-off-by: Thomas Klaehn --- buildconf/beaglebone-yocto/local.conf.sample | 6 ++++++ buildconf/raspberrypi3-64/local.conf.sample | 5 +++++ conf/layer.conf | 2 +- recipes-core/images/console-image-base.inc | 1 - recipes-core/images/tiny-image-base.inc | 1 - recipes-kernel/linux/linux-raspberrypi_%.bbappend | 4 ++++ .../{linux-yocto_5.2.bbappend => linux-yocto_5.4.bbappend} | 1 + 7 files changed, 17 insertions(+), 3 deletions(-) rename recipes-kernel/linux/{linux-yocto_5.2.bbappend => linux-yocto_5.4.bbappend} (99%) diff --git a/buildconf/beaglebone-yocto/local.conf.sample b/buildconf/beaglebone-yocto/local.conf.sample index fddfee5..70bf2e6 100644 --- a/buildconf/beaglebone-yocto/local.conf.sample +++ b/buildconf/beaglebone-yocto/local.conf.sample @@ -42,3 +42,9 @@ SOURCE_MIRROR_URL = "https://files.blackfinn.de/mirror/sources" BB_GENERATE_MIRROR_TARBALLS = "1" export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR" + +ICECC_PARALLEL_MAKE = "-j 24" +INHERIT += "icecc" + +ICECC_USER_PACKAGE_BL = "pkgconfig-native" + diff --git a/buildconf/raspberrypi3-64/local.conf.sample b/buildconf/raspberrypi3-64/local.conf.sample index 59798ec..f125771 100644 --- a/buildconf/raspberrypi3-64/local.conf.sample +++ b/buildconf/raspberrypi3-64/local.conf.sample @@ -39,3 +39,8 @@ BB_GENERATE_MIRROR_TARBALLS = "1" export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE DL_DIR" +ICECC_PARALLEL_MAKE = "-j 24" +INHERIT += "icecc" + +ICECC_USER_PACKAGE_BL = "pkgconfig-native" + diff --git a/conf/layer.conf b/conf/layer.conf index f39c6df..165b6f4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,5 +11,5 @@ BBFILE_COLLECTIONS += "meta-blackfinn" BBFILE_PATTERN_meta-blackfinn = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-blackfinn = "11" -LAYERSERIES_COMPAT_meta-blackfinn = "zeus warrior thud sumo rocko" +LAYERSERIES_COMPAT_meta-blackfinn = "dunfell zeus warrior thud sumo rocko" diff --git a/recipes-core/images/console-image-base.inc b/recipes-core/images/console-image-base.inc index d2ec6c4..4de1383 100644 --- a/recipes-core/images/console-image-base.inc +++ b/recipes-core/images/console-image-base.inc @@ -74,7 +74,6 @@ IMAGE_INSTALL += " \ " IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu" -IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430" set_local_timezone() { ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime diff --git a/recipes-core/images/tiny-image-base.inc b/recipes-core/images/tiny-image-base.inc index 601dd73..88e05b4 100644 --- a/recipes-core/images/tiny-image-base.inc +++ b/recipes-core/images/tiny-image-base.inc @@ -32,7 +32,6 @@ IMAGE_INSTALL += " \ " IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu" -IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430" set_local_timezone() { ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime diff --git a/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/recipes-kernel/linux/linux-raspberrypi_%.bbappend index 4594474..ed3f998 100644 --- a/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -1,2 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +KERNEL_FEATURES_remove = " cfg/virtio.scc" + KERNEL_MODULE_AUTOLOAD += " brcmfmac i2c-dev spi-bcm2835" diff --git a/recipes-kernel/linux/linux-yocto_5.2.bbappend b/recipes-kernel/linux/linux-yocto_5.4.bbappend similarity index 99% rename from recipes-kernel/linux/linux-yocto_5.2.bbappend rename to recipes-kernel/linux/linux-yocto_5.4.bbappend index 0cb6d49..9e36112 100644 --- a/recipes-kernel/linux/linux-yocto_5.2.bbappend +++ b/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -5,6 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" KERNEL_MODULE_AUTOLOAD += " rtl8192cu" + SRC_URI += " \ file://rtl8192cu.cfg \ file://enable_onboard_leds.cfg \