From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6738649791561990144 X-Received: by 2002:a05:600c:2153:: with SMTP id v19mr2219730wml.146.1568964169237; Fri, 20 Sep 2019 00:22:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a318:: with SMTP id c24ls1333145wrb.2.gmail; Fri, 20 Sep 2019 00:22:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqweTwH0sxvYmlL6NF8v+MTcp4qjZPwoBzj0W6Z2sVeRDziKKxO4PNHuLU+gwEnen3anEeNe X-Received: by 2002:adf:8444:: with SMTP id 62mr11445475wrf.202.1568964168783; Fri, 20 Sep 2019 00:22:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568964168; cv=none; d=google.com; s=arc-20160816; b=zNGRTTTivDuN4BtJ4gllp68qPKAyZKPzb9MUukCX7MAVNzdPloKtvQnvFJnZlGNVyi RqJ5hfvyO15sf1OsFsCfC2Sv3sYPkOobpvLPiqMInHewxD/zWr+PrIIL2EN3/TNng9MH 2iGKvgreIdcKR7pxX11PlA34BWVo5ixqIqL4s7trLw6I+QMruLBqy5nMUXg2jRDurZHs a3yOJvIPwm9cyTs7iWCvN8dCJpP7psr1flaj4oWtwfLR/CSa33gMuvRLO2BNE8tEheJS gdKp5DkIFYz4v1K1o8XU9ePVvrFi1fvQASM+e/bx7uZBxFd6YpHjyRaIem1x6BeJXQLc z0xg== 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:date:subject:cc:to:from; bh=WDUKJcdKtTmXkFxWhbdZW7XuY/5n07vT4kKBwiWimQY=; b=PzU0459yG/ENcW8w+OE2PdC1YWpaJWE+y2JDox4aNBUzsxTaemBshqC8kbYNGNnP/P YoQ128YBSfwamVqakFT2yphmBtLwal9Trkv4LA7SKO1qkE6DUYPZ/GDjfrCbtENO5esX 7xZhnlNHNaG334+7pzLFWlF6/4yxbc7qqs4DxCXDkdcEDzlk8kP0T0HFLz04as1J2kHs ijgFdGpC5rT4jLROAAXJLOTMXs1YLtd1CSz+nkrqi8d+9ecbYSAp4q1pegwtqZKbPt9/ yA9RFwWGyEqJDL1u+3S9XezDSXwmbi84sPmkXW2baqCu5DOWS/aW94NV4sxBfzRs8drD tHQg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m1si80617wrs.0.2019.09.20.00.22.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Sep 2019 00:22:48 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x8K7Mm4p022765 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 20 Sep 2019 09:22:48 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.69.220]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8K7MFZD011864; Fri, 20 Sep 2019 09:22:47 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Henning Schild Subject: [PATCH v2 2/3] dpkg-base: ignore binary packages for "apt-get source" Date: Fri, 20 Sep 2019 09:22:11 +0200 Message-Id: <20190920072212.7764-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190920072212.7764-1-henning.schild@siemens.com> References: <20190920072212.7764-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: QXp7RspYU5ch From: Henning Schild A buildchroot might already know the new/rebuild version of an upstream package as a binary coming from isar-apt. Now apt-get source will try to fetch that one instead of the upstream version that we rebuild to produce the new one. Not that ignoring binaries also means we loose the vague version matching, inform users about that. This problem can be seen in partial rebuild scenarios and the switch solves it, at least until we do have sources in isar-apt. Having sources there, the best idea would probably be to choose the exact upstream version to rebuild, to not find our own in an incremental build. Signed-off-by: Henning Schild --- RECIPE-API-CHANGELOG.md | 7 +++++++ meta/classes/dpkg-base.bbclass | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index bbef1a3..1f29eb2 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -149,6 +149,13 @@ default). Changes in v0.8 --------------- +### `apt://` SRC_URIs where added and briefly changed their version picking way + +Recipes that use SRC_URIs with `apt://` and choose a version with `=` had a +partial matching feature for a short time between 0.7 and 0.8. In 0.8 the +version has to be the exact upsteam match. +It is probably best to not specify a version if you can. + ### `isar-image.bbclass` class will be deprecated in future version of isar The content of `isar-image.bbclass` was moved to the `image.bbclass` file. diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 1deccd4..f77eb7b 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -34,8 +34,9 @@ do_apt_fetch() { -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ -o Dir::Etc::SourceParts="-" \ -o APT::Get::List-Cleanup="0" + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - sh -c 'cd ${PP} && apt-get -y source ${SRC_APT}' + sh -c 'cd ${PP} && apt-get -y --only-source source ${SRC_APT}' dpkg_undo_mounts } -- 2.21.0