From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Henning Schild <henning.schild@siemens.com>,
Adriaan Schmidt <adriaan.schmidt@siemens.com>
Subject: [PATCH] meta/debianize: do not create compat file when new style is in control
Date: Tue, 13 Jul 2021 16:09:33 +0200 [thread overview]
Message-ID: <20210713140933.16216-1-henning.schild@siemens.com> (raw)
The modern way to set the compat level is a Build-Depends on
debhelper-compat, in which case a compat file must not exist.
So if there is a control file using that new way, skip the creation of a
compat file.
Reported-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/classes/debianize.bbclass | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass
index dad1cb48fa40..878aaca89543 100644
--- a/meta/classes/debianize.bbclass
+++ b/meta/classes/debianize.bbclass
@@ -89,7 +89,11 @@ deb_debianize() {
if [ -f ${WORKDIR}/compat ]; then
install -v -m 644 ${WORKDIR}/compat ${S}/debian/compat
else
- deb_create_compat
+ # new style compat level could be in control
+ # do not create a compat file in that case
+ if ! grep "debhelper-compat" ${WORKDIR}/control; then
+ deb_create_compat
+ fi
fi
# create the control-file if there is no control-file in WORKDIR
if [ -f ${WORKDIR}/control ]; then
--
2.31.1
next reply other threads:[~2021-07-13 14:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 14:09 Henning Schild [this message]
2021-07-13 21:22 ` Henning Schild
2021-07-14 6:43 ` Jan Kiszka
2021-07-14 11:22 ` Henning Schild
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=20210713140933.16216-1-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=adriaan.schmidt@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