summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-06-28 15:48:36 +0800
committerSaul Wold <sgw@linux.intel.com>2013-07-02 07:58:08 -0700
commit458e76e470966d759067b2f6e6f00fa75a2963f3 (patch)
treeaccb5a32892179dd155d9039461b62c5d092d6d9 /meta/recipes-core
parent4ec1266e7e1aacdb9d3d0fc5cd6307b60df1731e (diff)
downloadopenembedded-core-458e76e470966d759067b2f6e6f00fa75a2963f3.tar.gz
openembedded-core-458e76e470966d759067b2f6e6f00fa75a2963f3.tar.bz2
openembedded-core-458e76e470966d759067b2f6e6f00fa75a2963f3.zip
base-files: remove the unnecessary /media/xxx directories
A few directories under /media were created by default, /media/card, /media/ram, /media/realroot, etc. These directories actually have no real usage now, thus removing them. The /media/ram entry in the fstab is also removed, as mounting a tmpfs over /media/ram in our system brings no benefit. Note that a duplicate '/mnt' entry in dirs755 are also removed. [Yocto #4774] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/base-files/base-files/fstab1
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb7
2 files changed, 1 insertions, 7 deletions
diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab
index dd613a1953..e625ebc8ff 100644
--- a/meta/recipes-core/base-files/base-files/fstab
+++ b/meta/recipes-core/base-files/base-files/fstab
@@ -6,7 +6,6 @@ devpts /dev/pts devpts mode=0620,gid=5 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
tmpfs /var/volatile tmpfs defaults 0 0
-tmpfs /media/ram tmpfs defaults 0 0
# uncomment this if your device has a SD/MMC/Transflash slot
#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 88d1ac9eaa..054fefa050 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -43,9 +43,7 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
/sys ${localstatedir}/lib/misc ${localstatedir}/spool \
${localstatedir}/volatile \
${localstatedir}/volatile/log \
- /mnt /media /media/card /media/cf /media/net /media/ram \
- /media/union /media/realroot /media/hdd \
- /media/mmc1"
+ /media"
dirs3755 = "/srv \
${prefix}/local ${prefix}/local/bin ${prefix}/local/games \
${prefix}/local/include ${prefix}/local/lib ${prefix}/local/sbin \
@@ -79,9 +77,6 @@ do_install () {
for d in ${volatiles}; do
ln -sf volatile/$d ${D}${localstatedir}/$d
done
- for d in card cf net ram; do
- ln -sf /media/$d ${D}/mnt/$d
- done
ln -snf ../run ${D}${localstatedir}/run
ln -snf ../run/lock ${D}${localstatedir}/lock