From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6499458059831607296 X-Received: by 10.28.218.138 with SMTP id r132mr370252wmg.20.1513273003730; Thu, 14 Dec 2017 09:36:43 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.198.3 with SMTP id n3ls1334384wrg.0.gmail; Thu, 14 Dec 2017 09:36:43 -0800 (PST) X-Google-Smtp-Source: ACJfBovpj5lVkxK1GUGj0Ppn3Vuk5jsCx9Qe0mXo/xteqIypSqZO0CLxUtE/3k8Ay6apkqT6//tH X-Received: by 10.28.0.74 with SMTP id 71mr365557wma.32.1513273003233; Thu, 14 Dec 2017 09:36:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513273003; cv=none; d=google.com; s=arc-20160816; b=EbTPowguyBxXRGfUvk2+etOMLePSIAB0BqsxbxSGWXM/5/CnGeOUnxsxAW12o6Qer6 x4F2JlHUWyIVT4b8fRl98462LgC+olLTka71CWqMXnuI85OMtS4QwDiGPJPp+CaAnV9Y LcmMNRcyIjmCfX6l/2Gkd7Xju3HGWhOGMhKtUq3tEpwxFp2L+bxneNZX45PtJo7rfvCb lReFEinvdpfyKfWs77xqXZCYzwbvevprjMe+kke0dpmrEuW5lSpmC8cudeSY8XayP6KC 2AFRxWbVja5Gd79gMZyV5zxXX8iB/bFYl0ZCBMfvCpr8X1O1Mv5PwksSQ480xo7Qb4t4 70cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=MjB1hplEteWHmvow8njvWhS7nDmjJMJbtL8dKCrinQM=; b=LpFUoBOTlkergMhbFWIzP4YyGWwLaGLlBcVBPKxDn6oZJ7huVUvqytLlMEUzJzlmFT Lds1aYGdlb51MUbvKSCF9rX1TKVLAsHzwB/FQgTEA5GZAHNShwTzsA0qW8HszNPzC13V oPpqOOg8nFqq+pc3Pkc8bI54s8Wb7yaKJeo6mzGHpl4f2ygxlh6xHHYX6+aw2yyY2hI4 3+jj24ILL7bOlWUOv1SDy7+y8KjMR83foJvu4mLePw3Ms6MW0CPK7r/tL1CXCqng6XvE o15yNVfkQtwDEpoO5OnVcmdlqbpcUOSmB6SOPdno4o9cMHXt6YiOXVXL5h11v651zbjB SzcQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id k6si1300822wme.4.2017.12.14.09.36.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 09:36:43 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id vBEHag6p008807 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 14 Dec 2017 18:36:42 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id vBEHagdH016667; Thu, 14 Dec 2017 18:36:42 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Claudius Heine , Christian Storm , Henning Schild Subject: [PATCH] dpkg-raw: take unmodified DEBIAN_DEPENDS for the package Date: Thu, 14 Dec 2017 18:36:34 +0100 Message-Id: <20171214173634.29877-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.13.6 X-TUID: Dz644GrZiQEO To express advanced debian dependencies version numbers in brackets and other constructs are allowed. In such cases you would also have spaces in DEBIAN_DEPENDS which can not just get replaced with commas. Doing that will create invalid "Depends:"-lines. This patch just takes the string as found in the recipe. This way users can express whatever they need and Isar does not need to know anything about the semantics or syntax of that string. This change means that anyone using dpkg-raw will have to comma-separate their DEBIAN_DEPENDS. The change breaks backwards compatibility but simplifies things and hopefully prevents further problems in that space. Reported-by: Christian Storm Signed-off-by: Henning Schild --- meta-isar/recipes-app/example-raw/example-raw_0.2.bb | 2 +- meta/classes/dpkg-raw.bbclass | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meta-isar/recipes-app/example-raw/example-raw_0.2.bb b/meta-isar/recipes-app/example-raw/example-raw_0.2.bb index c431321..657430e 100644 --- a/meta-isar/recipes-app/example-raw/example-raw_0.2.bb +++ b/meta-isar/recipes-app/example-raw/example-raw_0.2.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Sample application for ISAR" MAINTAINER = "Your name here " -DEBIAN_DEPENDS = "apt passwd" +DEBIAN_DEPENDS = "apt (>= 0.4.2), passwd" SRC_URI = "file://README \ file://postinst" diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index ecd5c7f..d132066 100644 --- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -29,12 +29,8 @@ do_deb_package_prepare() { Version: ${PV}+isar Description: ${DESCRIPTION} __EOF__ - if [ "${DEBIAN_DEPENDS}" != "" ] - then - echo -n Depends: >> ${D}/DEBIAN/control - echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ',' >> \ - ${D}/DEBIAN/control - fi + [ "${DEBIAN_DEPENDS}" != "" ] && echo "Depends: ${DEBIAN_DEPENDS}" >> \ + ${D}/DEBIAN/control for t in pre post do for a in inst rm -- 2.13.6