public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: Ross Burton <ross.burton@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/3] package_ipk: check CONFFILES exist before adding them to metadata
Date: Thu, 14 Feb 2013 19:31:14 +0100	[thread overview]
Message-ID: <20130214183114.GM3300@jama> (raw)
In-Reply-To: <b1c98f2ddb9165ae580daa42c509caca1fe7cdbc.1360864224.git.ross.burton@intel.com>

[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]

On Thu, Feb 14, 2013 at 05:52:50PM +0000, Ross Burton wrote:
> opkg-build verifies that conffiles exist, so verify that the specified files
> actually exist before writing them to conffiles.

Shouldn't this show at least a warning about missing conffile?

opkg-build error saved me few times before adding CONFFILES with wrong
pattern not matching anything in FILES.

I understand that you cannot use fatal error here for that xorg.conf
use-case, but warning would be nice.

> This mirrors the behaviour of FILES and package_rpm's CONFFILES handling.

 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/classes/package_ipk.bbclass |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
> index d735051..e5e76ef 100644
> --- a/meta/classes/package_ipk.bbclass
> +++ b/meta/classes/package_ipk.bbclass
> @@ -440,7 +440,8 @@ python do_package_ipk () {
>                  bb.utils.unlockfile(lf)
>                  raise bb.build.FuncFailed("unable to open conffiles for writing.")
>              for f in conffiles_str.split():
> -                conffiles.write('%s\n' % f)
> +                if os.path.exists(oe.path.join(root, f)):
> +                    conffiles.write('%s\n' % f)
>              conffiles.close()
>  
>          os.chdir(basedir)
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

  reply	other threads:[~2013-02-14 18:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-14 17:52 [PATCH 0/3] Allow xserver-xf86-config to ship no xorg.conf Ross Burton
2013-02-14 17:52 ` [PATCH 1/3] package_ipk: check CONFFILES exist before adding them to metadata Ross Burton
2013-02-14 18:31   ` Martin Jansa [this message]
2013-02-14 19:14     ` Burton, Ross
2013-02-14 17:52 ` [PATCH 2/3] xserver-xf86-config: don't ship empty xorg.conf Ross Burton
2013-02-14 17:52 ` [PATCH 3/3] xserver-xf86-config: empty generic xorg.conf Ross Burton

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=20130214183114.GM3300@jama \
    --to=martin.jansa@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=ross.burton@intel.com \
    /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