summaryrefslogtreecommitdiff
path: root/recipes-core
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2019-09-05 11:19:08 -0500
committerSerhii Kostiuk <serhii.o.kostiuk@globallogic.com>2020-05-20 19:50:20 +0300
commita699d36a15e2aa575db5f0d0fdfa2f0995a7c93a (patch)
treebe53ac471c624402c0027331159056d7a8537479 /recipes-core
parent4da364c0fe31d5d531f04bda5f44a101a7c4fb09 (diff)
downloadmeta-mlinux-a699d36a15e2aa575db5f0d0fdfa2f0995a7c93a.tar.gz
meta-mlinux-a699d36a15e2aa575db5f0d0fdfa2f0995a7c93a.tar.bz2
meta-mlinux-a699d36a15e2aa575db5f0d0fdfa2f0995a7c93a.zip
Create new fstab-at91 /etc/fstab recipe, and remove /etc/fstab from base-files
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/base-files/base-files_3.0.14.bbappend10
-rw-r--r--recipes-core/base-files/fstab-at91/fstab (renamed from recipes-core/base-files/base-files/mlinux/fstab)0
-rw-r--r--recipes-core/base-files/fstab-at91_1.0.bb17
3 files changed, 26 insertions, 1 deletions
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
index d7431ad..3ff14ba 100644
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,9 +1,17 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR = "m1"
+PR = "m2"
+
+CONFFILES_${PN}_remove = "${sysconfdir}/fstab"
+FILES_${PN}_remove = "${sysconfdir}/fstab"
do_install_append() {
if [ -d ${D}/media ] ; then
rmdir ${D}/media # So the next line does not nest the media link inside of media
fi
ln -snf /run/media ${D}/media
+ set -x
+ if [ -f ${D}/${sysconfdir}/fstab ] ; then
+ rm ${D}/${sysconfdir}/fstab
+ fi
+ set +x
}
diff --git a/recipes-core/base-files/base-files/mlinux/fstab b/recipes-core/base-files/fstab-at91/fstab
index 8922faf..8922faf 100644
--- a/recipes-core/base-files/base-files/mlinux/fstab
+++ b/recipes-core/base-files/fstab-at91/fstab
diff --git a/recipes-core/base-files/fstab-at91_1.0.bb b/recipes-core/base-files/fstab-at91_1.0.bb
new file mode 100644
index 0000000..cd2102a
--- /dev/null
+++ b/recipes-core/base-files/fstab-at91_1.0.bb
@@ -0,0 +1,17 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+inherit allarch
+PR = "r1"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PROVIDES = "fstab"
+DEPENDS = "base-files"
+RDEPENDS_${PN} = "base-files"
+
+SRC_URI = "file://fstab"
+
+FILES_${PN} = "${sysconfdir}/fstab"
+
+do_install() {
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}
+}