From dda8f1bab2b6dca9ba5f82479194176f7b8e066d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 20 Jul 2019 02:12:37 +0200 Subject: psplash: create psplash tmpfs mount directory in psplash-init The psplash binary uses TMPDIR as directory to store the FIFO to communicate with the psplash tools. This directory can be in any location an init system determines to be suitable, psplash-init uses /mnt/ for it. Rather than creating the mount directory in the recipe, just create it in the init script itself. This allows other init scripts to use a different location without having an unnecessary .psplash directory in /mnt. (From OE-Core rev: dd8c7f2466d94fd8326b962e9bcfc4f42a35da38) Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 1 + meta/recipes-core/psplash/psplash_git.bb | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 0bce1de536..fee23e681c 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -24,6 +24,7 @@ for x in $CMDLINE; do done export TMPDIR=/mnt/.psplash +[ -d $TMPDIR ] || mkdir -p $TMPDIR mount tmpfs -t tmpfs $TMPDIR -o,size=40k rotation=0 diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 3161a5e3f1..56734c1582 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb @@ -97,7 +97,6 @@ python do_compile () { } do_install_append() { - install -d ${D}/mnt/.psplash/ install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh install -d ${D}${bindir} @@ -107,8 +106,6 @@ do_install_append() { rm -f ${D}${bindir}/psplash } -FILES_${PN} += "/mnt/.psplash" - INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." -- cgit v1.2.3-54-g00ecf