From 50fad98b749604543914b7e5a54d443dbf6b0541 Mon Sep 17 00:00:00 2001 From: Ratan Gupta Date: Fri, 28 Sep 2018 19:43:44 +0530 Subject: Moving fstab file into subdirectory FILESEXTRAPATHS_prepend was conditional for only ubi-based-file system now we have the requirement where we want to prepend path for all other cases,so moving the fstab file in the specific directory and add that subdirectory-path conditionaly. (From meta-phosphor rev: cb9552f017c3803dc0ec0ab628dce14863bf8389) Change-Id: I9d3baf42ef1d712ec6c52f53a5ae56a2ceef1ddf Signed-off-by: Ratan Gupta Signed-off-by: Brad Bishop --- meta-phosphor/recipes-core/base-files/base-files/df-ubi/fstab | 9 +++++++++ meta-phosphor/recipes-core/base-files/base-files/fstab | 9 --------- meta-phosphor/recipes-core/base-files/base-files_%.bbappend | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 meta-phosphor/recipes-core/base-files/base-files/df-ubi/fstab delete mode 100644 meta-phosphor/recipes-core/base-files/base-files/fstab (limited to 'meta-phosphor/recipes-core/base-files') diff --git a/meta-phosphor/recipes-core/base-files/base-files/df-ubi/fstab b/meta-phosphor/recipes-core/base-files/base-files/df-ubi/fstab new file mode 100644 index 000000000..4a0766876 --- /dev/null +++ b/meta-phosphor/recipes-core/base-files/base-files/df-ubi/fstab @@ -0,0 +1,9 @@ +# openbmc fstab + +/dev/root / auto defaults 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /media tmpfs defaults 0 0 +/var/persist/home /home none bind 0 0 diff --git a/meta-phosphor/recipes-core/base-files/base-files/fstab b/meta-phosphor/recipes-core/base-files/base-files/fstab deleted file mode 100644 index 4a0766876..000000000 --- a/meta-phosphor/recipes-core/base-files/base-files/fstab +++ /dev/null @@ -1,9 +0,0 @@ -# openbmc fstab - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media tmpfs defaults 0 0 -/var/persist/home /home none bind 0 0 diff --git a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend index 4b48dc78b..5da4025f8 100644 --- a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend +++ b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_df-obmc-ubi-fs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_df-obmc-ubi-fs := "${THISDIR}/${PN}/df-ubi:" RDEPENDS_${PN}_append_df-obmc-ubi-fs = " preinit-mounts" -- cgit v1.2.3