diff options
Diffstat (limited to 'meta/recipes-core/base-files')
| -rw-r--r-- | meta/recipes-core/base-files/base-files/fstab.systemd | 9 | ||||
| -rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 7 |
2 files changed, 1 insertions, 15 deletions
diff --git a/meta/recipes-core/base-files/base-files/fstab.systemd b/meta/recipes-core/base-files/base-files/fstab.systemd deleted file mode 100644 index cb48a0de4a..0000000000 --- a/meta/recipes-core/base-files/base-files/fstab.systemd +++ /dev/null @@ -1,9 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -rootfs / auto defaults 1 1 -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 e7a9d82133..a56450dc3f 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 @@ -18,7 +18,6 @@ SRC_URI = "file://rotation \ file://profile \ file://shells \ file://fstab \ - file://fstab.systemd \ file://filesystems \ file://issue.net \ file://issue \ @@ -92,11 +91,7 @@ do_install () { install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation fi - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -m 0644 ${WORKDIR}/fstab.systemd ${D}${sysconfdir}/fstab - else - install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab - fi + install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile |