From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6786557818880131072 X-Received: by 2002:a19:c192:: with SMTP id r140mr7783872lff.113.1580118768193; Mon, 27 Jan 2020 01:52:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7309:: with SMTP id o9ls1637582ljc.11.gmail; Mon, 27 Jan 2020 01:52:47 -0800 (PST) X-Google-Smtp-Source: APXvYqwK0n68k5N6fDRGjhtT3i8/gufG7ipPZJJuvBdgGXk7Bua5NSbiOVR39S1ncwk0NArDAG9E X-Received: by 2002:a2e:884c:: with SMTP id z12mr9846504ljj.55.1580118767589; Mon, 27 Jan 2020 01:52:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580118767; cv=none; d=google.com; s=arc-20160816; b=F5LHPlv8nyO0yoS3PKPQv2WyozIojarLk8e9cFIxp1qp8VD9rWHMtQm7+QLzYubzTW MkewwcgKoPdqKBcu8gid5K6VXgerNEX7qDfvhCgVYNdEx5n8d3VyRzv7roBZ35WzRCMB QMYrxn4lTbc2Rg7DJPtegH2zW02wmv+h/yu+ooTJ3F+ADTZh+vILGy3jxGjK56YiwKRt 3MJ97WlZ4eoIcJKzeikDDoNlYSNGCow/sgS2qctY0rcRV+qH4Shro0buWJJdsnqkk0Yt rNAqpROpeXC8OAZwnHPhwGBYyYUpBGOsxgroZi8suOjqK9LcQkJTWaDDqPdopfck3a8G d4IQ== 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:to:from:date; bh=wEHvr8kCScK8Fo1rhr0y+g3vhHCOFYeE6BZDdcpLsko=; b=sb2amEI8u4IrHCqn/xHwoHseHzjcanR9h9cZnBdWcuLUrXfMb9mk071EhO5A5JwGqb yrZPoFVS0IPfSfUT4EzT4JBergNw7+nvVgxMiXdwZDPlV3X+YukVbz061UNgLhEPLWUn xSAGRSS5L3WVkRbVFqUS8rO2p//OqoUcIeZrLGeyDxHQvdfyQ1ZgZII8QlLA6m5RqtCn x6KM2F3VfJXI0ME6IUGZHwF/okWg09meduUTNajsLtVEoypOYtGSRlpkTWAB41lMhRat GwrhnWab8lui2g0oiaimzMEdP4AtSAGbbskPNNSf4nIGhyezn8uu+IesuwcQr6+g0TNL TGfA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id d8si515412lji.0.2020.01.27.01.52.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jan 2020 01:52:47 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 00R9qkQ8015668 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 27 Jan 2020 10:52:46 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.193]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 00R9qkxb019167 for ; Mon, 27 Jan 2020 10:52:46 +0100 Date: Mon, 27 Jan 2020 10:52:43 +0100 From: Henning Schild To: Subject: Re: [PATCH] wic-img: allow wic to find bitbake binary Message-ID: <20200127105243.008f3c56@md1za8fc.ad001.siemens.net> In-Reply-To: <20200127095019.16567-1-henning.schild@siemens.com> References: <20200127095019.16567-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: L4xP28HpxXYq On Mon, 27 Jan 2020 10:50:19 +0100 Henning Schild wrote: > From: Henning Schild > > Some code paths/plugins use bitbake libraries. Those are found > relative to the bitbake binary. > Mount bitbake into the buildchroot and rewrite the sudo statement so > that bitbake will be found in PATH. > > One example to trigger the original problem would be to use the > "--exclude-path" argument for the "part" command of wic. Unfortunately that fix on the Isar side is just part of the story for this example. Still let us run wic in an environment where it can find bitbake and its libs. After all that is what wic is used to. Henning > Signed-off-by: Henning Schild > --- > meta/classes/wic-img.bbclass | 24 +++++++++++++++++++----- > 1 file changed, 19 insertions(+), 5 deletions(-) > > diff --git a/meta/classes/wic-img.bbclass > b/meta/classes/wic-img.bbclass index 7d30e45e..afab3941 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -132,7 +132,7 @@ do_wic_image() { > buildchroot_do_mounts > sudo -s <<'EOSUDO' > ( flock 9 > - for dir in ${BBLAYERS} ${STAGING_DIR} ${ISARROOT}/scripts; do > + for dir in ${BBLAYERS} ${STAGING_DIR} ${ISARROOT}/scripts > ${ISARROOT}/bitbake; do mkdir -p ${BUILDCHROOT_DIR}/$dir > if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; > then mount --bind --make-private $dir ${BUILDCHROOT_DIR}/$dir > @@ -148,11 +148,25 @@ EOSUDO > WICTMP=$(cd ${BUILDCHROOT_DIR}; mktemp -d -p tmp) > > sudo -E chroot ${BUILDCHROOT_DIR} \ > - ${ISARROOT}/scripts/wic create ${WKS_FULL_PATH} \ > - --vars "${STAGING_DIR}/${MACHINE}/imgdata/" \ > - -o /$WICTMP/${IMAGE_FULLNAME}.wic/ \ > + sh -c ' \ > + ISARROOT="$1" > + WKS_FULL_PATH="$2" > + STAGING_DIR="$3" > + MACHINE="$4" > + WICTMP="$5" > + IMAGE_FULLNAME="$6" > + IMAGE_BASENAME="$7" > + shift 7 > + > + export PATH="$ISARROOT/bitbake/bin:$PATH" > + "$ISARROOT"/scripts/wic create "$WKS_FULL_PATH" \ > + --vars "$STAGING_DIR/$MACHINE/imgdata/" \ > + -o "/$WICTMP/${IMAGE_FULLNAME}.wic/" \ > --bmap \ > - -e ${IMAGE_BASENAME} ${WIC_CREATE_EXTRA_ARGS} > + -e "$IMAGE_BASENAME" $@' \ > + my_script "${ISARROOT}" "${WKS_FULL_PATH}" > "${STAGING_DIR}" \ > + "${MACHINE}" "${WICTMP}" "${IMAGE_FULLNAME}" > "${IMAGE_BASENAME}" \ > + ${WIC_CREATE_EXTRA_ARGS} > sudo chown -R $(stat -c "%U" ${ISARROOT}) ${ISARROOT}/meta > ${ISARROOT}/meta-isar ${ISARROOT}/scripts || true WIC_DIRECT=$(ls -t > -1 ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head > -1) sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP}