From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6506885723410399232 X-Received: by 10.46.42.6 with SMTP id q6mr298976ljq.21.1515059093670; Thu, 04 Jan 2018 01:44:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.159.65 with SMTP id i62ls354715lfe.2.gmail; Thu, 04 Jan 2018 01:44:53 -0800 (PST) X-Google-Smtp-Source: ACJfBosRt1BiIDwpn8s3Pensd1rzrE7Z+aHilsYkY8LQjPf0PyhcUPnvHJ0B5+SN+ck4D+mOyd6Q X-Received: by 10.25.56.27 with SMTP id f27mr211180lfa.13.1515059093178; Thu, 04 Jan 2018 01:44:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515059093; cv=none; d=google.com; s=arc-20160816; b=AHNNCDRpNeMmCMa8sjrlk2Rpcc+nmfp2EngCpSQ35DnDrBh+ob6RWIM85DVJB4oJ9G 9zcJL9MFAV79379UzsP5+I5ytnhmEm/scc1MyAyS26KeHsGeebhS14ect0vOlk5Lc1E9 oJJf2s7CzqjLdz9GDyNyMKpZD8TkHxwrgRLiYA/nYZzwxPpoCP3tzL5lh4VXbr06/LEl TJAtsHZKx03CokqtVJfZ7krUdyvWTY5eQdRBajctE2TyYZPhw0fpYtQYdOmjGBKUarHn 9VRJZUoMsX8zbYamF8O1LlZlhl4dqmmftugk6dxtIDsSpBS95G9usaiL7m7iP5UAdjtx M26g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=bHZ0fAuT+T0nZEIXaOxhmzRP2LllN37UvotU61+IPTQ=; b=SJiGzs1+9V1bC3KGZkhNM2vD9OltJAoz3adkzlQUk6aQk7f8OyZn6cc28mErORYHrX HIV4zbU57YaDLnt15b+EsuVJe6PzuTIL1h6cLKe5y4Hi1fDElKUb+zQL/wBYrlqkhIvm LfWvLrrWqxh5usJ93CM9fI/hwy5i0qClm5BY+xw8OJ5YSbZ1X4Ry7eLlbEmhsrwa006u NblGxqzC3mucmgFr7js0rOCEHkyo/9GTrM2WB8X3ivnt7IDvtoUDLwflXlItHdUdc9bZ i4E9LGr9XKtqoA7xQkZXzcyM/AILgZ1pEl64hWJChdNYNNRhKSD6xQCBoKMy70l4aCi8 xX4A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id u62si335481lfi.4.2018.01.04.01.44.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 01:44:53 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w049ipPf009117 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 4 Jan 2018 10:44:51 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w049ipEe008279; Thu, 4 Jan 2018 10:44:51 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Frank Lenormand , Henning Schild Subject: [PATCHv2] build.sh: yet another fix for the installation of build deps Date: Thu, 4 Jan 2018 10:44:50 +0100 Message-Id: <20180104094450.20395-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180103175948.26103-1-henning.schild@siemens.com> References: <20180103175948.26103-1-henning.schild@siemens.com> X-TUID: oJORRZLDnd5/ The perl code guessing the build-deps of packages can not handle all the possible syntax that could be found in Build-Depends. And it ignores Build-Depends-Indep. So there are several issues in it. This patch uses an official debian-tool "mk-build-deb" to install the build deps. The tool generates a package which which will Depends: on the Build-Depends:. Architecture operators, -Indep etc. are handled correctly. Signed-off-by: Henning Schild --- meta/recipes-devtools/buildchroot/buildchroot.bb | 4 +++- meta/recipes-devtools/buildchroot/files/build.sh | 9 ++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 59ad0e0..51f9d5d 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -25,7 +25,9 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ locales \ docbook-to-man \ apt \ - automake" + automake \ + devscripts \ + equivs" WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}" diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh index 5e310ad..975252e 100644 --- a/meta/recipes-devtools/buildchroot/files/build.sh +++ b/meta/recipes-devtools/buildchroot/files/build.sh @@ -6,13 +6,8 @@ # Go to build directory cd $1 -# Get list of dependencies manually. The package is not in apt, so no apt-get -# build-dep. dpkg-checkbuilddeps output contains version information and isn't -# directly suitable for apt-get install. -DEPS=`perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)|\[[^]]+\]//mg; print if $p' < debian/control` - -# Install deps -apt-get install -y $DEPS +# Install all build deps +mk-build-deps -i -r debian/control # If autotools files have been created, update their timestamp to # prevent them from being regenerated -- 2.13.6