From 9c992309b027d83ed3be3b746b581cc628a6701b Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 5 Aug 2015 11:56:16 +0200 Subject: [PATCH] alsa-state: remove PREFERRED_VERSION_linux-dey override Now each platform is only supported in one kernel version, so there is no need to have multiple alsa config files per linux kernel version. https://jira.digi.com/browse/DEL-1747 Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend | 2 +- .../alsa-state/{3.10 => }/ccardimx28/asound.inline.state | 0 .../alsa-state/{3.10 => }/ccardimx28/asound.inline_play.state | 0 .../alsa-state/{3.10 => }/ccardimx28/asound.micro.state | 0 .../alsa-state/{3.10 => }/ccardimx28/asound.micro_play.state | 0 .../alsa-state/{3.10 => }/ccardimx28/asound.play.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx51/asound.inline.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx51/asound.inline_play.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx51/asound.micro.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx51/asound.micro_play.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx51/asound.play.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx53/asound.inline.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx53/asound.inline_play.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx53/asound.micro.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx53/asound.micro_play.state | 0 .../alsa-state/{2.6.35.14 => }/ccimx53/asound.play.state | 0 .../alsa-state/alsa-state/{3.10 => }/ccimx6/asound.conf | 0 .../alsa-state/alsa-state/{3.10 => }/ccimx6/asound.inline.state | 0 .../alsa-state/{3.10 => }/ccimx6/asound.inline_play.state | 0 .../alsa-state/alsa-state/{3.10 => }/ccimx6/asound.micro.state | 0 .../alsa-state/{3.10 => }/ccimx6/asound.micro_play.state | 0 .../alsa-state/alsa-state/{3.10 => }/ccimx6/asound.play.state | 0 22 files changed, 1 insertion(+), 1 deletion(-) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccardimx28/asound.inline.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccardimx28/asound.inline_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccardimx28/asound.micro.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccardimx28/asound.micro_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccardimx28/asound.play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx51/asound.inline.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx51/asound.inline_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx51/asound.micro.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx51/asound.micro_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx51/asound.play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx53/asound.inline.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx53/asound.inline_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx53/asound.micro.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx53/asound.micro_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{2.6.35.14 => }/ccimx53/asound.play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccimx6/asound.conf (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccimx6/asound.inline.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccimx6/asound.inline_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccimx6/asound.micro.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccimx6/asound.micro_play.state (100%) rename meta-digi-arm/recipes-bsp/alsa-state/alsa-state/{3.10 => }/ccimx6/asound.play.state (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 93f83d861..f58443d54 100644 --- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,6 +1,6 @@ # Copyright (C) 2013 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}/${PREFERRED_VERSION_linux-dey}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI += " \ file://asound.inline_play.state \ diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.inline_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.inline_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.micro_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.micro_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccardimx28/asound.play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccardimx28/asound.play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.inline_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.inline_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.micro_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.micro_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx51/asound.play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx51/asound.play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.inline_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.inline_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.micro_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.micro_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/2.6.35.14/ccimx53/asound.play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx53/asound.play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.conf b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.conf similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.conf rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.conf diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.inline_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.inline_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro_play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro_play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.micro_play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.micro_play.state diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.play.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.play.state similarity index 100% rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/3.10/ccimx6/asound.play.state rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx6/asound.play.state