From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH] dpkg-raw: Make conffiles identification more robust
Date: Wed, 14 Feb 2018 20:02:16 +0100 [thread overview]
Message-ID: <c2e5176e-4389-27f9-59fc-f30cb3fac9bb@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
We should only filter our files that are under ${D}/etc/, not every
file that may have "/etc/" in its path.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/classes/dpkg-raw.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index e3ae9e8..e0ea811 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -47,7 +47,7 @@ addtask deb_package_prepare after do_install before do_deb_package_conffiles
do_deb_package_conffiles() {
CONFFILES=${D}/DEBIAN/conffiles
- find ${D} -type f -path '*/etc/*' | sed -e 's|^${D}|/|' >> $CONFFILES
+ find ${D} -type f -path '${D}/etc/*' | sed -e 's|^${D}|/|' >> $CONFFILES
test -s $CONFFILES || rm $CONFFILES
}
--
2.13.6
next reply other threads:[~2018-02-14 19:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 19:02 Jan Kiszka [this message]
2018-02-15 15:41 ` Alexander Smirnov
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=c2e5176e-4389-27f9-59fc-f30cb3fac9bb@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.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