From patchwork Tue Jul 13 06:09:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 583 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:d5cd:0:0:0:0:0 with SMTP id a13csp385995oot; Tue, 13 Jul 2021 07:09:39 -0700 (PDT) X-Received: by 2002:a2e:bc0c:: with SMTP id b12mr4430399ljf.244.1626185378777; Tue, 13 Jul 2021 07:09:38 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1626185378; cv=pass; d=google.com; s=arc-20160816; b=Q2uaNeI1qFZf1MBeJLHUMghc+hoHv9vZLPmGVHD+nZmpCD+LDfzKNIg2wmUncD2ytn Dkosqe3Zf08EiyE00hp0aj0gG9Jb6UA+KHSZDsQvyWTK+Le5SNtfIGEfNMwpwSG3yncf cXAfCs2YPPhiBIDaB4lQ6BSeWJzvbmoDTBKvfssAEESd+f3rUtQ/5bZygTjqjIGUR68L Mk5zKUaw2UDAA4ptEZZz++Za6TGqo+m4/bTHFNtNL2zkY4HYLEqkMas5J8pNbkdhrOPM Z6gT2yekg5zGtwYf3BrnqxmMAKLyiaPJFMDDV6M28YD77Wr5Rc4c108hFGewrScua9u9 zDHg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=fDcEYvVOZezdz3DhJ9s+6OVlPhxnkBmogB7CJwZKc0c=; b=hUZyrcDIMM6I8V4oxjnTrLigR3rwSPiHWKrEW2c4dv7dFFt7X579TNAmhG/fER3OGw kafK3WTbjAsxBRC8FG4xh0Jxj0P/qHwHI7kctteZzRqzV+LgMGySXO7pjwkCqgGvT41c RE7EYHMmsFqqvwRKgBAC9wVYDCVRLcCFtFAZVjRtoxQ0WdaWGUpE5Z0yKn39q92yqx/u GKBh59yhvGxbeE37FFc/K39g1LZXkQ1Wm/GfswyrbH/H+psfBTi5v/yg5CzwwjrbjkKm AuG0xaYSrr2PSzji23VhOdwQJ+HdKTPcQXwALdmve4psH6YeBgnurBKGM6i8j2t9nnLj 9Gxw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=oVQX6QZr; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbin5w2dqmgqenmamayq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBIN5W2DQMGQENMAMAYQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id z6sor999037ljz.17.2021.07.13.07.09.37 (Google Transport Security); Tue, 13 Jul 2021 07:09:38 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbin5w2dqmgqenmamayq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=oVQX6QZr; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbin5w2dqmgqenmamayq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBIN5W2DQMGQENMAMAYQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1626185377; cv=pass; d=google.com; s=arc-20160816; b=BQYTnPCc6Il3NiIhICt5gJtCm4cPuXeRpfz1GgdC2mLOu9tcyYMt4L0SYR7fqIxBsd teGvp39jIad7fqTIBsA6Inm8RQrSCHkFRnnZJUl/NKvcZmOH+gXfg4AXzogVKIKvW6B7 QF8uyn8VtWYCimWngUc7NYdCBmyhZ5m3XBUlfDFW8uLHZe46ReiFCWTtX9Ls04QOi4gw eLIqVcBo/AijzFK+0YzdyVhd2RLLGcFNhWOg6zxD6TmNhA86ARKOJ7p8elhiSK7mjmG2 cQu4npuXGFt5D3O3EMxdc46aMZlE2WzZLTrb1E4/7R3BdIiRLv0KHyrvjItI8K/kYSQm BCAg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=fDcEYvVOZezdz3DhJ9s+6OVlPhxnkBmogB7CJwZKc0c=; b=FR6nsOq7NMfeNjfxawlpmWfjaUzdUWSHetqqhzBRCjbHC4cfq71YGgA83agBE+l6Dx KzGlj6TUneLreydG/0lRPZ9q9IL4XO2Ohrr+5D3djgpSbK0QVUZqLru8IESKSB0i2t62 Z9jlpj0LbbUWtz5+SBidMtYmBFRxawkCwTryjKEFmj8reUdQGubOICL6iS8eLPvVe4Pe eND2+Eop8ESZlxt8Bca5QYbcpkJrC1rS+J7nybnKX/vBTmWKt2WtmQlQ8dDbM3rJtqce voFvQN0/d311wl5IsB11i1i9JMsj/1anfgpT9uHYCx1hw7wlkC5PfY3z13yjbvSTNiiU Io5Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=fDcEYvVOZezdz3DhJ9s+6OVlPhxnkBmogB7CJwZKc0c=; b=oVQX6QZrp8vClLnjAejzwkA/P2xk7DsM2Xdpig0iwQooDTIENMRN9naZwaqB2PN4Hj nBC8YL304d2S0FIzQzSZFdWM85/6VrsRdMslvlGJCiveilJXojhj87D46iqxejIvRPx4 DnureirvnT6cugwBiisuIWDTwo+lOUrYua99tifnfCHzQshaakOPthmzKQs5v6J4xWEe e44NfhDIYvkvwVFOotFOx9KY+e8ua0C0f924aavOvItDBUW4tCHdJUc7EtS0w0VarBLw HI8qrE2NIcCI/R0yY94cPpYIikKK+SGJjJzduWnnbHGNoQCjWC00wMdWMtnhj6N851Zg 1qAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=fDcEYvVOZezdz3DhJ9s+6OVlPhxnkBmogB7CJwZKc0c=; b=fNLO3kS+WemdLFGTKE6Ds1ZVbB4bZODZX7Viyc35R+edxhi334KXQvig9xpgT2Kvtk eKFnWOTYo8l68MYkwMOi2pan8NBML89oSI1u2gmr64eDufEzvrr2U4VQ35JtLm3KXgDc 1zGSgpezqdW19/hWkdP0Lo3wvGzhO9qM195w1R0UfZ/xI4mjWaTieGyc3PuIzmUHr5hQ c9+hKmw7qZRwJvTW9NrIeSPDxw2gMFOp5z52NZfbpB6EKnT0U3PLdO3b8WabmZbH829p vhZ3PoLPzUfNHSFiNTPf4936fsO1+wc4MWD7akPRnCxnWnbC3AaWVx1rYnyEDnJBwMFn W9HQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533AQCdCcPzXytKzPsHRf+9UeAeQ0ojTh2hJQklMPTtyHspYi78H 1Vwxsi78CNdmtQSAKF6scW4= X-Google-Smtp-Source: ABdhPJxqBEy9mKxz+t9jkgeMgV6vbnGWBadVhqDCSSdndnrzHMImn1GoDinJMDmAzUjCkqzTC07mnw== X-Received: by 2002:a2e:8e26:: with SMTP id r6mr4358469ljk.159.1626185377672; Tue, 13 Jul 2021 07:09:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7d17:: with SMTP id y23ls504364ljc.10.gmail; Tue, 13 Jul 2021 07:09:36 -0700 (PDT) X-Received: by 2002:a2e:85d7:: with SMTP id h23mr4370231ljj.329.1626185376716; Tue, 13 Jul 2021 07:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626185376; cv=none; d=google.com; s=arc-20160816; b=P4FsE+PKuAjuY7CYbQnreluGTEvlDN+EJeRaqawWUZQexG/tooXJNaNZL9cXes5Am/ zonxGcM6/JUXt79no4uDwNHFrHHPgrceQNtgwAHG7w8qa7hLJte5H8L1xNuLL/G5mySR w80l4DAV21UIPTcuUlQ8vwDGPTnNAtU0bioTj1d8ruTtcPyLQ1wea44teATgXNUSQW4E RVjM01LdvVuXmgMbxOl6f6oSxTCqZ6imwp6girspdjjqnOKp/MSWA3T5U+/2/DAGm4n4 NCnaYV0NLDMK0JBb9Wt8wBJKauWA+7u9SJgvyW4IIx4rxd3J2QhU/HCTGpiHAxNj+DOf aJVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=6LNOAri/8ska/VaqwHZKsncZCiqAG5yDVkN07XWxzd4=; b=CxDUVY1WhpkcrbX/oFveRVzNjWJOLNGm0BIBtfN1k1jVNOH1Wy319KGMcSwlNN6/ad NiTnVP8Q1be5iQW0SfdOZWp3NZM1wHAWMEMtPyCrvG1zbT56mLsbs1Gn8skA0+3Rgk6f yRZqPO1YG90nCzO8RJnIL8Ft3n2nT4Ca3jYjNc6X7vNqfqpq2P1d9Us11TGQhwXLX8b7 t0K5UDOFn/EsWRs+p0ns994l4FE5TYSstlHXAjeTg8wD2ACLYJ0n9fBac9DNK6M0wekZ Dc4WTsF6lq8Fj0g9nWLO4z2cnot3M1bzrxWFGYPyHFKDf5ErLUgwG2eqBQMpujLMtHHP 0Sdw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id b12si627222lfb.9.2021.07.13.07.09.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jul 2021 07:09:36 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 16DE9Z5R030459 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 Jul 2021 16:09:36 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.120]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16DE9ZFd031468; Tue, 13 Jul 2021 16:09:35 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild , Adriaan Schmidt Subject: [PATCH] meta/debianize: do not create compat file when new style is in control Date: Tue, 13 Jul 2021 16:09:33 +0200 Message-Id: <20210713140933.16216-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1705178959351601019?= X-GMAIL-MSGID: =?utf-8?q?1705178959351601019?= 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 Signed-off-by: Henning Schild --- 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