From 0380161f02d4ae48fa1f3f14864bee29a79bcf01 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 14 Sep 2022 14:16:22 +0200 Subject: [PATCH] meta-digi: generalize recipes to support ConnectCore MP13 DVK platform https://onedigi.atlassian.net/browse/DEL-8078 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend | 2 +- .../alsa-state/alsa-state/{ccmp15 => ccmp1}/asound.conf | 0 .../alsa-state/alsa-state/{ccmp15 => ccmp1}/asound.state | 0 meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 2 +- .../recipes-core/busybox/busybox/{ccmp15 => ccmp1}/standby | 2 +- .../busybox/busybox/{ccmp15 => ccmp1}/standby-actions | 0 .../recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | 2 +- 8 files changed, 5 insertions(+), 5 deletions(-) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{ccmp15 => ccmp1}/asound.conf (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{ccmp15 => ccmp1}/asound.state (100%) rename meta-digi-dey/recipes-core/busybox/busybox/{ccmp15 => ccmp1}/standby (98%) rename meta-digi-dey/recipes-core/busybox/busybox/{ccmp15 => ccmp1}/standby-actions (100%) diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend index 843f5359b..25ca3a823 100644 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend @@ -13,7 +13,7 @@ SRC_URI:append:ccimx6 = " \ SRC_URI:append:ccimx6ul = " file://asound.state" SRC_URI:append:ccimx8x = " file://asound.state" SRC_URI:append:ccimx8m = " file://asound.state" -SRC_URI:append:ccmp15 = " file://asound.state" +SRC_URI:append:ccmp1 = " file://asound.state" do_install:append:ccimx6() { ln -sf asound.micro_play.state ${D}${localstatedir}/lib/alsa/asound.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp15/asound.conf b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp1/asound.conf similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp15/asound.conf rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp1/asound.conf diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp15/asound.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp1/asound.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp15/asound.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp1/asound.state diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb index 8297c9bb2..cd326f853 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.25.bb @@ -22,4 +22,4 @@ inherit bin_package INSANE_SKIP:${PN} = "already-stripped" -COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m|ccmp15)" +COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m|ccmp1)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index 136e64f07..d4708ccfb 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -47,4 +47,4 @@ do_configure:append() { KERNEL_EXTRA_ARGS:stm32mpcommon += "LOADADDR=${ST_KERNEL_LOADADDR}" -COMPATIBLE_MACHINE = "(ccimx6ul|ccmp15-dvk)" +COMPATIBLE_MACHINE = "(ccimx6ul|ccmp1)" diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccmp15/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccmp1/standby similarity index 98% rename from meta-digi-dey/recipes-core/busybox/busybox/ccmp15/standby rename to meta-digi-dey/recipes-core/busybox/busybox/ccmp1/standby index 1f1c9efb1..06845f069 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccmp15/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccmp1/standby @@ -3,7 +3,7 @@ # # standby # -# Copyright (C) 2016-2018 by Digi International Inc. +# Copyright (C) 2022 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccmp15/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccmp1/standby-actions similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox/ccmp15/standby-actions rename to meta-digi-dey/recipes-core/busybox/busybox/ccmp1/standby-actions diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index 4d6449023..dbbbdbfec 100644 --- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -39,7 +39,7 @@ SRC_URI:append:ccimx6ulsbc = " \ file://0001-pulseaudio-keep-headphones-volume-in-platforms-witho.patch \ " -SRC_URI:append:ccmp15 = " \ +SRC_URI:append:ccmp1 = " \ file://0001-pulseaudio-keep-headphones-volume-in-platforms-witho.patch \ "