summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomita <tomita@cyberdefense.jp>2021-11-07 23:47:02 +0900
committerJia Zhang <zhang.jia@linux.alibaba.com>2021-11-22 17:19:37 +0800
commit22ed4822a808dd6ddcf62b550d2bdc85bad91e95 (patch)
treeecfd5c317c3a2e44fef61b51d0c0a32508eecb0a
parent1b35fd45a58ef015b52a3df4b39048f2ac1ffbe3 (diff)
downloadmeta-secure-core-22ed4822a808dd6ddcf62b550d2bdc85bad91e95.tar.gz
initrdscripts-secure-core: remove /sys and /proc from package
The following failure is shown during secure-core-image-initramfs:do_rootfs(): Error: Transaction check error: file /proc conflicts between attempted installs of initrdscripts-secure-core-1.0-r0.corei7_64 and base-files-3.0.14-r89.intel_x86_64 file /sys conflicts between attempted installs of initrdscripts-secure-core-1.0-r0.corei7_64 and base-files-3.0.14-r89.intel_x86_64 So remove /sys and /proc as base-files has already provided them. Signed-off-by: tomita <tomita@cyberdefense.jp>
-rw-r--r--meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb4
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb b/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb
index 6a14e93..a2e994d 100644
--- a/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb
+++ b/meta/recipes-core/initrdscripts/initrdscripts-secure-core.bb
@@ -14,8 +14,6 @@ do_install() {
14 # Create device nodes expected by kernel in initramfs 14 # Create device nodes expected by kernel in initramfs
15 # before executing /init. 15 # before executing /init.
16 install -d "${D}/dev" 16 install -d "${D}/dev"
17 install -d "${D}/proc"
18 install -d "${D}/sys"
19 install -d "${D}/run" 17 install -d "${D}/run"
20 mknod -m 0600 "${D}/dev/console" c 5 1 18 mknod -m 0600 "${D}/dev/console" c 5 1
21} 19}
@@ -23,8 +21,6 @@ do_install() {
23FILES_${PN} = "\ 21FILES_${PN} = "\
24 /init \ 22 /init \
25 /dev \ 23 /dev \
26 /proc \
27 /sys \
28 /run \ 24 /run \
29" 25"
30 26