diff options
| author | John Klug <john.klug@multitech.com> | 2020-11-11 18:48:27 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2020-11-11 18:48:27 -0600 |
| commit | b00be59bbc49535097c450b6b8c5fc10c1efd6dd (patch) | |
| tree | 25cf0e14f66c5fca1cfe41b31bf862d60a36cf12 /recipes-core/base-files | |
| parent | db088915be6dca3f09dedbcdaa7264d9271b1c74 (diff) | |
| download | meta-mlinux-b00be59bbc49535097c450b6b8c5fc10c1efd6dd.tar.gz meta-mlinux-b00be59bbc49535097c450b6b8c5fc10c1efd6dd.tar.bz2 meta-mlinux-b00be59bbc49535097c450b6b8c5fc10c1efd6dd.zip | |
Merge multiarch project to: added missing index file 2020 June 11GitosisMultiarch
Diffstat (limited to 'recipes-core/base-files')
| -rw-r--r-- | recipes-core/base-files/base-files_3.0.14.bbappend | 10 | ||||
| -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.bb | 17 |
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} +} |