From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6572049490740510720 X-Received: by 2002:a1c:f60b:: with SMTP id w11-v6mr926876wmc.7.1530174518169; Thu, 28 Jun 2018 01:28:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f704:: with SMTP id v4-v6ls1930437wmh.11.canary-gmail; Thu, 28 Jun 2018 01:28:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpemO5afQJTXvyM348Z1/kpIXQm/6ZdPKo9A3QpB1QI3Q8Q58jlNmA/9eEixI5khlA84uFWK X-Received: by 2002:a1c:f219:: with SMTP id s25-v6mr873851wmc.23.1530174517747; Thu, 28 Jun 2018 01:28:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530174517; cv=none; d=google.com; s=arc-20160816; b=vt7lxyl5H4LjUqiT/Ou/SURFZ2kQs4G2Vm25/I+aoNu6OoKp0gVs77tkcAtkm1P5AF g/JpQG5/QNLCO2xkqfmHXgaIREQVgpy9kPLensiRdnwPX5SjKCQBL7d+EFRjW+JxEUzp Of7ECpSSPiDEOjBIcTqPMxgvfZgVJwgNk7e9D88sp3o9V8/kjlb9AwyRL73IUaQr6bgD caxCBHMh1AWQGtQYNcolSLUw9euXds+fadt6dskCZ5mHPqI05rq4RO1eqA+1feiJvlx5 R+sfvVtegCF/OTKXLPSbZ6fwPlVWefSXgNRng3Myt7UBSDoUV392tWBIL2FV7Xy+/dkg O3/g== 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=2HsVfnjloU4DBCrdTr+dlc2Jo9K7qLpudnENhWbl+Zo=; b=S63ws4HfPmcM4YzWYZeLOHfDYa92pqbUcDEwRsV0xJnjTp+mFDI+gDUoz0CyInw/xi sXxbTnOIgbPYcUm8VNcK/ugawxTlBrfgAZcku3BJRtyi8ozv9G01yu2jEptEw7LqscxR GKjYM/RjxXKBtIGlZlRYxxAynRPeILzYJ4COie8qFuNDC7iXu0q9shWkmIai6df9+/WP T0Lfiz9YZ/VoDLs35ND0i4ewfjjkxjEqSY54rIHnvtyX18kE9mulc/IaAeSEviqpeic4 HgaYMVIshGD/xm1nbYWSHBCC816HlhgMSP/aYdcTMK2gsiMIbfo4LDiRzNOhBP/qO0i3 arOw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id a14-v6si212968wrq.0.2018.06.28.01.28.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 01:28:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from azat.i.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w5S8SEqE024070 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT); Thu, 28 Jun 2018 10:28:27 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v2 08/12] build.sh: Add target parameter Date: Thu, 28 Jun 2018 10:28:06 +0200 Message-Id: <20180628082810.3571-9-asmirnov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180628082810.3571-1-asmirnov@ilbers.de> References: <20180628082810.3571-1-asmirnov@ilbers.de> X-TUID: jBFoJRUXqHD6 Pass target architecture to build as a parameter for the script. Signed-off-by: Alexander Smirnov --- meta/classes/dpkg.bbclass | 2 +- meta/recipes-devtools/buildchroot/files/build.sh | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 195174a..87ffbce 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -11,5 +11,5 @@ ROOTFS_DIR = "${BUILDCHROOT_DIR}" # Build package from sources using build script dpkg_runbuild() { E="${@ bb.utils.export_proxies(d)}" - sudo -E chroot ${ROOTFS_DIR} /build.sh ${PP}/${PPS} + sudo -E chroot ${ROOTFS_DIR} /build.sh ${PP}/${PPS} ${DISTRO_ARCH} } diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh index 73c0889..d127dae 100644 --- a/meta/recipes-devtools/buildchroot/files/build.sh +++ b/meta/recipes-devtools/buildchroot/files/build.sh @@ -6,6 +6,19 @@ set -e +# Create human-readable names +target_arch=$2 + +# Notes: +# mk-build-deps for jessie and jtretch has different parameter name to specify +# host architecture. +debian_version=$(cat /etc/debian_version | cut -c 1) +if [ $(($debian_version)) -ge 9 ]; then + set_arch="--host-arch $target_arch" +else + set_arch="-a target_arch" +fi + # Go to build directory cd $1 @@ -36,7 +49,7 @@ install_cmd="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y -o APT::Get::List-Cleanup="0" # Install all build deps - mk-build-deps -t "${install_cmd}" -i -r debian/control + mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control ) 42>/dpkg.lock # If autotools files have been created, update their timestamp to @@ -48,4 +61,4 @@ for i in configure aclocal.m4 Makefile.am Makefile.in; do done # Build the package -dpkg-buildpackage +dpkg-buildpackage -a$target_arch -- 2.1.4