From bccb5890b8d7cdc83d34b2dc34c98a726aa10864 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 26 Feb 2019 16:47:06 +0100 Subject: [PATCH] busybox: generalize bbappend to support different revisions Latest update to version 1.29.3 in upstream breaks the compatibility of our bbappend, to avoid it in future updates, this commit generalizes the bbappend to apply all the 1.29 series. Signed-off-by: Arturo Buzarra --- .../busybox/{busybox-1.29.2 => busybox}/acpid.map | 0 .../{busybox-1.29.2 => busybox}/bridgeifupdown | 0 .../{busybox-1.29.2 => busybox}/busybox-acpid | 0 .../{busybox-1.29.2 => busybox}/busybox-ntpd | 0 .../{busybox-1.29.2 => busybox}/ccimx6qpsbc/standby | 0 .../{busybox-1.29.2 => busybox}/ccimx6sbc/standby | 0 .../{busybox-1.29.2 => busybox}/ccimx6ul/acpid.map | 0 .../{busybox-1.29.2 => busybox}/ccimx6ul/standby | 0 .../ccimx6ul/standby-actions | 0 .../{busybox-1.29.2 => busybox}/ccimx8x/acpid.map | 0 .../{busybox-1.29.2 => busybox}/ccimx8x/standby | 0 .../ccimx8x/standby-actions | 0 .../busybox/{busybox-1.29.2 => busybox}/defconfig | 0 .../{busybox-1.29.2 => busybox}/digi-logo.png | Bin .../busybox/{busybox-1.29.2 => busybox}/index.html | 0 .../{busybox-1.29.2 => busybox}/pswitch-poweroff | 0 .../{busybox-1.29.2 => busybox}/pswitch-standby | 0 .../{busybox-1.29.2 => busybox}/standby-systemd | 0 ...ybox_1.29.2.bbappend => busybox_1.29.%.bbappend} | 4 ++-- 19 files changed, 2 insertions(+), 2 deletions(-) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/acpid.map (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/bridgeifupdown (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/busybox-acpid (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/busybox-ntpd (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx6qpsbc/standby (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx6sbc/standby (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx6ul/acpid.map (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx6ul/standby (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx6ul/standby-actions (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx8x/acpid.map (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx8x/standby (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/ccimx8x/standby-actions (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/defconfig (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/digi-logo.png (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/index.html (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/pswitch-poweroff (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/pswitch-standby (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.29.2 => busybox}/standby-systemd (100%) rename meta-digi-dey/recipes-core/busybox/{busybox_1.29.2.bbappend => busybox_1.29.%.bbappend} (96%) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox/acpid.map similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/acpid.map rename to meta-digi-dey/recipes-core/busybox/busybox/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/bridgeifupdown b/meta-digi-dey/recipes-core/busybox/busybox/bridgeifupdown similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/bridgeifupdown rename to meta-digi-dey/recipes-core/busybox/busybox/bridgeifupdown diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/busybox-acpid b/meta-digi-dey/recipes-core/busybox/busybox/busybox-acpid similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/busybox-acpid rename to meta-digi-dey/recipes-core/busybox/busybox/busybox-acpid diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/busybox-ntpd b/meta-digi-dey/recipes-core/busybox/busybox/busybox-ntpd similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/busybox-ntpd rename to meta-digi-dey/recipes-core/busybox/busybox/busybox-ntpd diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6qpsbc/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6qpsbc/standby rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6sbc/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6sbc/standby rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6ul/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/acpid.map similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6ul/acpid.map rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6ul/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6ul/standby rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6ul/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby-actions similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx6ul/standby-actions rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby-actions diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx8x/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/acpid.map similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx8x/acpid.map rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx8x/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx8x/standby rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx8x/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby-actions similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/ccimx8x/standby-actions rename to meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby-actions diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/defconfig b/meta-digi-dey/recipes-core/busybox/busybox/defconfig similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/defconfig rename to meta-digi-dey/recipes-core/busybox/busybox/defconfig diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/digi-logo.png b/meta-digi-dey/recipes-core/busybox/busybox/digi-logo.png similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/digi-logo.png rename to meta-digi-dey/recipes-core/busybox/busybox/digi-logo.png diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/index.html b/meta-digi-dey/recipes-core/busybox/busybox/index.html similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/index.html rename to meta-digi-dey/recipes-core/busybox/busybox/index.html diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/pswitch-poweroff b/meta-digi-dey/recipes-core/busybox/busybox/pswitch-poweroff similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/pswitch-poweroff rename to meta-digi-dey/recipes-core/busybox/busybox/pswitch-poweroff diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/pswitch-standby b/meta-digi-dey/recipes-core/busybox/busybox/pswitch-standby similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/pswitch-standby rename to meta-digi-dey/recipes-core/busybox/busybox/pswitch-standby diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.29.2/standby-systemd b/meta-digi-dey/recipes-core/busybox/busybox/standby-systemd similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.29.2/standby-systemd rename to meta-digi-dey/recipes-core/busybox/busybox/standby-systemd diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.29.2.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.29.%.bbappend similarity index 96% rename from meta-digi-dey/recipes-core/busybox/busybox_1.29.2.bbappend rename to meta-digi-dey/recipes-core/busybox/busybox_1.29.%.bbappend index b5d03c162..680b46a97 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.29.2.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.29.%.bbappend @@ -1,6 +1,6 @@ -# Copyright (C) 2013-2018 Digi International. +# Copyright (C) 2013-2019 Digi International. -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://standby \ file://standby-actions \