[gnome-continuous-yocto/gnomeostree-3.28-rocko: 15/218] initramfs-module-install-efi: point to original copy and delete new file



commit 477679ed29df94670207146847dc196043ce428b
Author: California Sullivan <california l sullivan intel com>
Date:   Tue Nov 14 13:20:48 2017 -0800

    initramfs-module-install-efi: point to original copy and delete new file
    
    There is no need to maintain two of the exact same files.
    
    (From OE-Core rev: 59435300d21e9b9801de0e24c9acff5190199bd1)
    
    Signed-off-by: California Sullivan <california l sullivan intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit 49ba882be9e28a51651a543779e6f02d33861393)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../initramfs-framework/install-efi.sh             |  276 --------------------
 .../initramfs-module-install-efi_1.0.bb            |    6 +-
 2 files changed, 3 insertions(+), 279 deletions(-)
---
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb 
b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
index 2270441..3d8c9e7 100644
--- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
@@ -7,14 +7,14 @@ PR = "r4"
 
 inherit allarch
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:"
-SRC_URI = "file://install-efi.sh"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI = "file://init-install-efi.sh"
 
 S = "${WORKDIR}"
 
 do_install() {
     install -d ${D}/init.d
-    install -m 0755 ${WORKDIR}/install-efi.sh ${D}/init.d/install-efi.sh
+    install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh
 }
 
 FILES_${PN} = "/init.d/install-efi.sh"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]