Skip to content

Commit

Permalink
fix initrd copy in 0003-wic-bootimg-efi-implement-include-path.patch
Browse files Browse the repository at this point in the history
Signed-off-by: Maxim Uvarov <[email protected]>
Change-Id: I28f3f2ee8058d9d02e15ee7bb9278d010e4caf5c
  • Loading branch information
muvarov committed Jun 8, 2021
1 parent 8db5f75 commit 8c60b46
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
1 change: 1 addition & 0 deletions conf/bblayers.conf
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ EXTRALAYERS ?= " \
${OEROOT}/layers/meta-cloud-services/ \
${OEROOT}/layers/meta-cloud-services/meta-openstack \
${OEROOT}/layers/meta-security/meta-tpm \
${OEROOT}/layers/meta-security/meta-parsec \
${OEROOT}/layers/meta-openembedded/meta-perl \
${OEROOT}/layers/meta-96boards \
${OEROOT}/layers/meta-arm/meta-arm \
Expand Down
17 changes: 9 additions & 8 deletions patches/0003-wic-bootimg-efi-implement-include-path.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c7d6acb8aa346b026e846b066e47d73429f3d7f7 Mon Sep 17 00:00:00 2001
From 9a490cad141e2a341674b847126916f4ada6fa3a Mon Sep 17 00:00:00 2001
From: Maxim Uvarov <[email protected]>
Date: Mon, 20 Jan 2020 19:22:52 +0000
Subject: [PATCH] wic: bootimg-efi: implement --include-path
Expand All @@ -8,20 +8,21 @@ like dtbs.

Signed-off-by: Maxim Uvarov <[email protected]>
---
scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++++
1 file changed, 4 insertions(+)
scripts/lib/wic/plugins/source/bootimg-efi.py | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index a39d852f6a..8caa1385ba 100644
index 937e06c6e6..b3454e1bc8 100644
--- a/openembedded-core/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/openembedded-core/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -290,6 +290,10 @@ class BootimgEFIPlugin(SourcePlugin):
@@ -348,6 +348,11 @@ class BootimgEFIPlugin(SourcePlugin):
cp_cmd = "cp %s %s/" % (startup, hdddir)
exec_cmd(cp_cmd, True)

+ for path in part.include_path or []:
+ cp_cmd = "cp -r %s %s/" % (path, hdddir)
+ exec_cmd(cp_cmd, True)
+ for paths in part.include_path or []:
+ for path in paths:
+ cp_cmd = "cp -r %s %s/" % (path, hdddir)
+ exec_cmd(cp_cmd, True)
+
du_cmd = "du -bks %s" % hdddir
out = exec_cmd(du_cmd)
Expand Down

0 comments on commit 8c60b46

Please sign in to comment.