From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6506885723410399232 X-Received: by 10.223.195.93 with SMTP id e29mr269645wrg.3.1515002663160; Wed, 03 Jan 2018 10:04:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.151.196 with SMTP id t4ls6033048wrb.0.gmail; Wed, 03 Jan 2018 10:04:22 -0800 (PST) X-Google-Smtp-Source: ACJfBotZg4uuzEWCrJrQAxgu5YzQKwxwLSFBNro/bBxhThKKV1GtEALjDnphr7LtE86IJnAltWWv X-Received: by 10.223.195.143 with SMTP id p15mr272272wrf.20.1515002662843; Wed, 03 Jan 2018 10:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515002662; cv=none; d=google.com; s=arc-20160816; b=f5OROuVQw0hQ1Ly06VLgClaGAycCnJND+AiOMTH9QPT1z/KKa9rq2+f+AweGIhSo0s B+s3FiDM6w/33vbZvUSBAxvwFUNvOrRhWoRs0fJVv9YhSBZtrYV2BASzu7YjH9h22xWI rXSzSGd7zrmHTMQoNyidNvVGqKkCVim28oZFBo6bYClyEjFZCdTLJXU4UWwoLbA/NkXM yMne7GV+QAM7pNt8Z84heH+VCJlW06s94qb4PWZipcn8kB+45ApOuwj3yhN29DBQ8qTJ L97MnbVr+BG1wK289pg+n96htHVyh7rx1QrdaYpUX8+cZ2EBjGG6+R9ECkv6K1JjNj7P 0QRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:arc-authentication-results; bh=h/ZyQqZPSvZSlQ0D4Hp7KN2RGMGuRFuGQt8yNnu8TJQ=; b=DA6+pRR1GmgJ0pBuEw6FhGGhyj+9Os3ceGPLDvfx/U0hgdJnDYY2PjXTw4gG/7v01G nr18kzgke6rf4wN6OVsS2tLKKwnM8tXZyx/7RmSwLGWN7ASxOxFxcOWthKyhuwNEbuNP +xuCqFUAFtRRs136IXI6vlEimwNXXbMr0N9TOSEChjlmJsKG/+fAHkDn0GDaK7I3WbSt JiW+7sMcE0HT5W5cBVNxAqrlmjqdj2MjxhISMZF70Snf67yVku+SnvxxbAhxIxZrmaGY pfnTAb9Wo+08Tu5+lDfvSk0/MezabnR8c9eDuKJ9bwwFsBL3ZAEmoKw4WQXtSgztZBjr fI9Q== 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 r70si1474271wmg.2.2018.01.03.10.04.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:04:22 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w03I4L7u012193 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 3 Jan 2018 19:04:21 +0100 Received: from mmd1pvb1c.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 w03I4L5S001399; Wed, 3 Jan 2018 19:04:21 +0100 Date: Wed, 3 Jan 2018 19:04:20 +0100 From: Henning Schild To: , Alexander Smirnov Cc: Frank Lenormand Subject: Re: [PATCH] build.sh: Yet another fix for the installation of build deps Message-ID: <20180103190420.3e14e7cd@mmd1pvb1c.ad001.siemens.net> In-Reply-To: <20180103175948.26103-1-henning.schild@siemens.com> References: <20180103175948.26103-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: Iv/oUR2z9LDe Am Wed, 3 Jan 2018 18:59:48 +0100 schrieb Henning Schild : > 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 The -r means that we do not want to keep the generated .deb-file. And the -i says we want to install it right away. For moving this code around for APT_BASE you would skip both and generate the dep-package long before calling build.sh of the actual package. And you would install the dep-package in the APT_BASE multistrap. I think these .debs are ok to go into the Isar repo, we could invent yet another one ... Henning > # If autotools files have been created, update their timestamp to > # prevent them from being regenerated