On Thu, 2011-05-05 at 00:57 -0700, Saul Wold wrote:
> From: Paul Eggleton <paul.eggle...@linux.intel.com>
>
> Signed-off-by: Paul Eggleton <paul.eggle...@linux.intel.com>
> ---
> meta/recipes-core/base-files/base-files_3.0.14.bb | 19 +++++++++++++++++++
> 1 files changed, 19 insertions(+), 0 deletions(-)
>
> 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 4445081..c80faaa 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
> @@ -131,6 +131,25 @@ do_install_basefilesissue () {
> fi
> }
>
> +<<<<<<< HEAD
> +=======
> +do_install_append_nylon() {
> + printf "" "" >${D}${sysconfdir}/resolv.conf
> + rm -r ${D}/mnt/*
> + rm -r ${D}/media
> + rm -rf ${D}/tmp
> + ln -sf /var/tmp ${D}/tmp
> +}
> +
> +do_install_append_slugos() {
> + printf "" "" >${D}${sysconfdir}/resolv.conf
> + rm -r ${D}/mnt/*
> + rmdir ${D}/home/root
> + install -m 0755 -d ${D}/root
> + ln -s ../root ${D}/home/root
> +}
> +
> +>>>>>>> d67f12d... Remove machine-specific metadata for machines no longer
> in oe-core
> do_install_append_linuxstdbase() {
> for d in ${dirs3755}; do
> install -m 0755 -d ${D}$d
Er, I didn't take this ;-)
Cheers,
Richard
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
