From: Mike Looijmans <mike.looijmans@topic.nl>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-networking][PATCH] recipes-connectivity/samba: Only rmdir directories that exist
Date: Mon, 11 Jan 2016 19:06:20 +0100 [thread overview]
Message-ID: <5693EF1C.5090500@topic.nl> (raw)
In-Reply-To: <1D770D53-86F4-45AA-9515-0A2F9538575F@gmail.com>
On 11-01-16 19:00, Khem Raj wrote:
>
>> On Jan 11, 2016, at 9:53 AM, Mike Looijmans <mike.looijmans@topic.nl> wrote:
>>
>> Depending on PACKAGECONFIG selection, the /run/samba directory may not
>> have been created. Make the do_install_append handle both situations
>> by checking whether these directories exist before attempting to remove
>> them.
>>
>> This fixes do_install failing with an error like this:
>> rmdir: failed to remove '/.../samba/4.1.12-r0/image/run/samba': No such file or directory
>>
>> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
>> ---
>> meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
>> index a51d31f..8e89e49 100644
>> --- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
>> +++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
>> @@ -104,8 +104,12 @@ EXTRA_OECONF += "--enable-fhs \
>> LDFLAGS += "-Wl,-z,relro,-z,now"
>>
>> do_install_append() {
>> - rmdir --ignore-fail-on-non-empty "${D}/run/samba"
>> - rmdir --ignore-fail-on-non-empty "${D}/run"
>> + if [ -d "${D}/run" ]; then
>> + if [ -d "${D}/run/samba" ]; then
>> + rmdir --ignore-fail-on-non-empty "${D}/run/samba"
>> + fi
>> + rmdir --ignore-fail-on-non-empty "${D}/run"
>> + fi
>
> why don’t we delete /run completely ? it won’t work if package contents are in there anyway
>
That's what I do in a bbappend, just "rm -rf ${D}/run" (and also replace
the non-functional startup script, but that's distro specific), but I
thought that it might serve some purpose for the one who wrote the recipe.
/run is usually volatile, so putting files in there is pointless, right?
next prev parent reply other threads:[~2016-01-11 18:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 17:53 [meta-networking][PATCH] recipes-connectivity/samba: Only rmdir directories that exist Mike Looijmans
2016-01-11 18:00 ` Khem Raj
2016-01-11 18:06 ` Mike Looijmans [this message]
2016-01-11 18:11 ` Khem Raj
2016-01-12 15:17 ` Mike Looijmans
2016-01-13 17:17 ` [meta-networking][PATCH v2] recipes-connectivity/samba: Remove /run directory tree Mike Looijmans
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5693EF1C.5090500@topic.nl \
--to=mike.looijmans@topic.nl \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox