From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6506885723410399232 X-Received: by 10.80.137.157 with SMTP id g29mr884831edg.2.1515002391912; Wed, 03 Jan 2018 09:59:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.212.217 with SMTP id e25ls13120987edj.2.gmail; Wed, 03 Jan 2018 09:59:51 -0800 (PST) X-Google-Smtp-Source: ACJfBoujWyx7fosi32vogDmlPLuLuogOo2u28KmDCNN8x4rkgpZHxNSjkrtRUCvGBmB8OE4FodxL X-Received: by 10.80.201.7 with SMTP id o7mr878382edh.3.1515002391548; Wed, 03 Jan 2018 09:59:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515002391; cv=none; d=google.com; s=arc-20160816; b=0aDx7ZDi1GpYutGoFe8sdQXZhhIswn1BwzyFrg/BZkLIMm/ztwxvdtqbH5JPtVj6jN rJHNWkRgvDj4W0IUgtppzwrdMSGez9fttn9MhdJfWul3LEAHn2NaM4qNNwEXredkgasP hjWndFaBaSC4rijvxYQYXcvpQB+vkc716qLv155pP0B5ygflWBaxVKrzWJKwD+ga2prh 1uy9iUDrZnW7cg/ErDXVuq9x9t08tGXiR87PNPd3OHGg22ZzgCKAt8mXOW/SdfVdnolq gCQrMkhZV6kn5voEUJo/qeX1rSdF58Y9dFWj7t3gkTjHxgeD3xqrIkYEgvFt7XOtZOGb xfWg== 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=FHlhy5FDEeVc2nweSZbZDA9AcSjxPbbGlPeb9FrU6wA=; b=OH+0WEK+0j1N9S6tBTAIVPnf+RK3oPL6BK+cPRnFKoF2m8cVDztQQv/V1kLTTHv4YZ zPx329542SFAiVU5u8guIYR2voEud2fo+ZaEnd3oeRjqWoU7EtqgcqPFPS8Y/VioFErf lyW2EqrEUpGK0OwIVLbIIsNRO4Jsgbw8A2XqXQ+VufJ/A/78ncyomdmfp7GmAVDP0D1L MnoPcZyZOJ88W0oh54B2rgSM4glmMosXDQmTa+kGkbBjA00yWYBALawnQLdnw2NzqP+N vUGbklOhSpZfhkLG1jJFsoc7U+s5adcBMfBcbyzW6omqGfZEuMLi6EoO7Z6Jwvw+9tKA Ixrg== 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 s29si238919eds.0.2018.01.03.09.59.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 09:59:51 -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 mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w03HxoRU006630 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 3 Jan 2018 18:59:50 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w03Hxomg004385; Wed, 3 Jan 2018 18:59:50 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Frank Lenormand , Henning Schild Subject: [PATCH] build.sh: Yet another fix for the installation of build deps Date: Wed, 3 Jan 2018 18:59:48 +0100 Message-Id: <20180103175948.26103-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.13.6 X-TUID: WCuEKcHfpuBT 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 | 3 ++- meta/recipes-devtools/buildchroot/files/build.sh | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 59ad0e0..581cb9a 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -25,7 +25,8 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ locales \ docbook-to-man \ apt \ - automake" + automake \ + devscripts" 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