From a23491b95d7decb8f9070b21e2daed48f70ddbb9 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Tue, 27 Mar 2018 21:48:00 -0400 Subject: [PATCH] replace base-files skel files with our version --- meta-citadel/recipes-citadel/citadel-config/citadel-config.bb | 4 ++++ meta-citadel/recipes-core/base-files/base-files_%.bbappend | 3 +++ 2 files changed, 7 insertions(+) diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb index 731d4da..31b16a8 100644 --- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb +++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb @@ -24,6 +24,8 @@ SRC_URI = "\ file://citadel-ifconfig.sh \ file://00-storage-tmpfiles.conf \ file://NetworkManager.conf \ + file://share/dot.bashrc \ + file://share/dot.profile \ file://share/dot.vimrc \ file://polkit/citadel.rules \ file://systemd/zram-swap.service \ @@ -78,6 +80,8 @@ do_install() { install -m 0644 ${WORKDIR}/citadel-network.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0755 ${WORKDIR}/citadel-ifconfig.sh ${D}${libexecdir} + install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc + install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile install -m 0755 ${WORKDIR}/share/dot.vimrc ${D}${sysconfdir}/skel/.vimrc install -m 0755 ${WORKDIR}/polkit/citadel.rules ${D}${sysconfdir}/polkit-1/rules.d/ diff --git a/meta-citadel/recipes-core/base-files/base-files_%.bbappend b/meta-citadel/recipes-core/base-files/base-files_%.bbappend index f9da04c..0291f57 100644 --- a/meta-citadel/recipes-core/base-files/base-files_%.bbappend +++ b/meta-citadel/recipes-core/base-files/base-files_%.bbappend @@ -8,4 +8,7 @@ volatiles = "" do_install_append () { rm ${D}${sysconfdir}/fstab + rm ${D}${sysconfdir}/skel/.bashrc + rm ${D}${sysconfdir}/skel/.profile + }