From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a05:6a20:3d96:b0:191:b1ab:1f70 with SMTP id s22-20020a056a203d9600b00191b1ab1f70mr18713996pzi.8.1704182161178; Mon, 01 Jan 2024 23:56:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:3924:b0:6da:838f:2df9 with SMTP id fh36-20020a056a00392400b006da838f2df9ls427262pfb.2.-pod-prod-00-us; Mon, 01 Jan 2024 23:56:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7b5GuSdbyhYeJhJFXGJrcnUVGFzheMKfXv4GKhxla21Czne/68ihKAO0OqBJxMul91B0l X-Received: by 2002:a05:6a20:f39b:b0:196:39c2:d491 with SMTP id qr27-20020a056a20f39b00b0019639c2d491mr8673701pzb.48.1704182159878; Mon, 01 Jan 2024 23:55:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704182159; cv=pass; d=google.com; s=arc-20160816; b=FMKC98y5MjGIUFqqkiTQPdCBazNDBFQF7GP+f/7EQcpamrWPIhozlMeIYYIxH5DQg2 oCvDMGKZ+oAnNJuwQt4weYiIyTID0FTNHiFpcSBczowDXFnpL+ioV7f5mMTEO5YJ+ppT 1fxSsQ4WDxH+XfHOCYwLxPiImtXfhQ6euMaKDmJQxEmwLYzemATbszrnWzpFsNYf1FHW 6wPb1A4nagpz5oHoLV94uof13moPzv/mZe3IxBzAlvJfnsV60EBpYU/W+XdDGJdEfTxC ni0e3v8jxYnZie2Ey4PaZlDSWT5YXrCyXyXDBj3Qv5UrQpwnkLN62gw6CRYuEfj050B8 dbhg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:to:content-language:subject :from:user-agent:date:message-id:dkim-signature; bh=W5xjiijGOpaBAooXQ6dLjTCi44xa2TnZ8y+hx1pbjJM=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=OwdOe1VXiWrIvKPksUCy6hxNutT9GtxYtus8y4t2YjEMFvHqgvFDv4oqxpoPfD4tWI J9gSBvYJNEaSlqRYEyX4RnA04hhmlJ8ktRlGRkAkkyrQ2JtQfKQXy/zWorWKRygAQoSa 2HMqqtaOZu8tdsIk6CLa+SRg2VFU0wpxBP3eIyqevHrhbfXtC44wiIXwNlYioOniezMc kxLT7IeipwCOMYcNusraCrPtKKsxLB9PH+YDiho4bXAGZyLSknljAar5sCuoXfV4S46O AXQrVWQhhK1mUyo2TRN7563ZGumLvSY3dLE5HWzuY5xTTdc3FB8clLWrg528AsC4fR78 QH0g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=nlxilpQG; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::618 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0618.outbound.protection.outlook.com. [2a01:111:f400:fe0e::618]) by gmr-mx.google.com with ESMTPS id s66-20020a632c45000000b005ce1bfe8d6bsi1327644pgs.3.2024.01.01.23.55.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jan 2024 23:55:59 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::618 as permitted sender) client-ip=2a01:111:f400:fe0e::618; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=nlxilpQG; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::618 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lf53QDLtzca7wKRrduAstazIExJQItNacxeVDe/7LKld2Ag+eg4khQmfoZYzUPzKkW1pZVeW/yRjQpheOJkD7GxQhGmTrtVCNyue5STLQIvE4vX9HRUfsYsSXWee+3aTUJBXbP3Yd7l7hJzUDj7Ir8NBh/hG25F5seNGIBa0Ya9iJOobb8jHMzg6JB+cQ/cbay6DuE9GeC+2HzgZR2x/zL1w4uzfcW2ppwxy1pQ+roE6tgrqnVVzAilyBuvz0PHSOXeAMKuMZAjd9WCsO5MNu/xqIHIgEchl2lTaFWLo0meTMPRVtf0S8o5oSzvDqVvrccdvpk6QF4lOz3UAiYbheQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W5xjiijGOpaBAooXQ6dLjTCi44xa2TnZ8y+hx1pbjJM=; b=CE1OBzk5EDBEP72qi0nNNaPbVPsbmKkrIU9H7xBrEyAnSji+V/63QmudmZDz1DAJhWxtXxZ7tjQzVbGINoJNX0vH4hSkBKTmMi5y4QjiYFktKupgk44ixeogWuuWWAxcbKu4DbcfuI3A9pYVCFMnMJoVW7HKwR1oB+bmXwz6rm93Zp+jNNcHGaMc2ajkp4f21PGimGE9sJB7oHp8cQ+ax9yoCR68b+9tg3UBrpM1osuCxonNHpUFHm0+ndwKTbKEeASOyhDijqjBqzb9eGtYaBiF2kib8cIPMZr+P5yVHE4YXcTvxzNOz0Pmy9oU5qgDvBOKgpz0H6VVUEcckv/YoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W5xjiijGOpaBAooXQ6dLjTCi44xa2TnZ8y+hx1pbjJM=; b=nlxilpQGWyW23VHNnGZ6V/9GJVINs87by8B5BHrJbZNEVthUeAEtkx+7D0RijRQ1AtwRikLHGW76wBEq48B6ER0dsPgup16zVUXnS2KhwlG+5GjFjMPbwwSZAn+DvETCM5LkiBcJJiisCI2aCSkyFCTuasXZ0yBunecjIPOMcw+v3rkXq4po4fVQ3a0fihxs5PDKkgDRtxLqkeJLD/7AtWjKPkmYBW3LDbWvra1yPdSFuIZDLaN+AY06m7lev/acjAgy9xcouQbe7+/Z7JPlEABYnC52BXnpbyfBy4z01Jd/1JuMRdnx95Vfwe36fKRWidE1ehywppyr7EBZagFnlA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by DB9PR10MB5332.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:336::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Tue, 2 Jan 2024 07:55:56 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::96c7:d239:1723:8761]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::96c7:d239:1723:8761%5]) with mapi id 15.20.7135.023; Tue, 2 Jan 2024 07:55:56 +0000 Message-ID: <9b36ffce-0214-4734-b04a-06475bb0c97c@siemens.com> Date: Tue, 2 Jan 2024 08:55:54 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH v2] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US To: isar-users Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0216.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e4::20) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|DB9PR10MB5332:EE_ X-MS-Office365-Filtering-Correlation-Id: 38a1d855-b8f2-48ee-6987-08dc0b68407a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6ZuFRm0J1JrmCi2POQRjAnpwgZts9VDTa92CdPpcBk9gQH6/NZ7NYDoB+DErieLkpunBYlo0nHBrcrqrAGZ6FzhkKN3nU7Lef64F2nPiPWkSz160v6YC8OHzSUaVZlZGgHajPYym1Jpx8d1hxCqdneEfE8xvbefoZv8+HfACgcoB6rQwjfYKAnHncOlWCmplnJzCTCotux+5DFMWck7uEKI6WOcSNHi1nKAeVS9+cbcHchwaqzkFZz+4CIPFg0ewaxI10DjAJqgTdnZI4VvCgI/w3gF2LDO+FY6XZYrNBUL3sM5ZrqjK66BSnksVrmRnBtKGOTjDr6BVxBIpsfYpvt7YSFvd5D8g4GNjBfExTggoCBpEJ+5HXxFZyntpSKJcEsh5ahx9N34FsXQEU1s+UAdp8rlBWfXN66Rh9NsUIWTUwnQgtLk4TsBpzCJhXKk8Mlem+MSS9MHehym4VbRyFVFwwaZp20aQ5fPReyCEO1cupbR/4nh14C0ffRWaEGgWDTtL/UOdxhgWE/7FSgDy5dFIHUSta6eeQJRg19wy2ljzwIobWo4sd6hwVf8KyYsAYIRELp7k3jS98khSDLQ78FuTITZ+eXdHbK1Je35sKDhazfpfxp4qk5aUxfFzOVNXalnA8DyhnPrpnvncQ4oR7TU4RPQoaAZJouJtCMS43aI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(366004)(376002)(346002)(136003)(396003)(39860400002)(230922051799003)(1800799012)(451199024)(186009)(64100799003)(41300700001)(26005)(83380400001)(2616005)(38100700002)(2906002)(82960400001)(8676002)(316002)(8936002)(5660300002)(44832011)(478600001)(6916009)(6506007)(66476007)(66556008)(66946007)(6486002)(6512007)(31696002)(86362001)(36756003)(31686004)(43740500002)(45980500001)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eG9hZS9SWHdiaWJsWmlGWjRJTEVEY2xlYXBnVWFWMjREOUNNQkF0ZDdkNTZq?= =?utf-8?B?Y2VJelFSNUlnTjZmcE9jS0RGUEM0ZVliU2RNVndSNmpib0FSSTFsSVJCZ204?= =?utf-8?B?aW80ZFlYYWZjdWxock8yVTFyaER2TU1WM0tSbWtocUhEWjdIZFhhR3ZFa0J2?= =?utf-8?B?alg0OWxQWGdqM0lzUkN0czBERTZpZWY1RUJqREwyd1dXOFNJRDZENmhlbWl1?= =?utf-8?B?Vi91aEsrcVYzR2x1VWd3S3JwazJGWVZxakFKWlhBbVFlNUhpeHBkQUgydC8x?= =?utf-8?B?Zlh5djRlYnJuMG1ROUxHWGNBb0JodHlKd1JObkdUUzNxbHlXU2RoeUdVRWJQ?= =?utf-8?B?ZDFlR0xBdnNGbXBBdVR5Vk9NQU5GL1RZdkRXbTNwRmllUm9wZGlmSmN4eVZm?= =?utf-8?B?L2lLTEhtL0xtQzArUGZCZk13cHo3d0NYMXlBbnp1T0hHYXdLck1ZdUgxdDky?= =?utf-8?B?QWJBTU1hNUFlOVZwNnk3cWJzTVl1ZC9FTXJXNVk5bUI2MmxzMDcwczFEbDJx?= =?utf-8?B?aWN1TmxrbmVscFdyK1VBSjRacTZXcE5BR2orMDBFQjFJbExyTEZRV0hxR1ph?= =?utf-8?B?dFlHS2pRUS9WRENWNCtyMFhkc3hqSi8zeERIUTJsbnhSRlVnMDdSTjhTU08z?= =?utf-8?B?Y1NUbGRveUxoTUlyU1AxN1I0T3MvM2dGRThnQVhJSTFjZnNIRmUzaU9kQlB6?= =?utf-8?B?cXFDak56WW5nQjViWHBNL0MvZEtkajVQT0ZjN1hNS2VqMERFVTFCeWhwNzVu?= =?utf-8?B?WVNvYkFOYU5NRTY2eGpvVndBdG9HOTlBMFdFQXBwMzI5eTNDZ2ZtMGFkT3Vx?= =?utf-8?B?NTdMaUFXOXVGZVUvNXJRNWJWazhiSzFlK2hRZ2xrc0l1ZEl1bU9DUHhaN3Zn?= =?utf-8?B?REk5R2ZtVmh0eDh4OU1WcEJvdnNERTFLSWFLR0tUT1J0MjBiaXk2VXRDM2xF?= =?utf-8?B?TVNsZVRablZKSkZ6Y0piZ3VIVjNOT013RmhVVXlKUGxPZFRrd1dvZHN6Q29q?= =?utf-8?B?MHdWKyszVFJiSElESlRCRWdBQVBWcmJqeEo0UVpoS3YveWtab0hCc2t0cGlh?= =?utf-8?B?MnU3YzFsQm1PZWI2VkNOL0g5ZVBMS1N1NC9lZUJwdGw1K3dISDhUU0VzNEdY?= =?utf-8?B?SlRTaWdFSWhmK1lUMmNOUURrbnp1WUU0UFk3NW1HTUZvNytuVW92M0dLOWxD?= =?utf-8?B?ZzRUZlUyZkFlMW4wV0dqSjNzWDlSR2cybmF6SWkrdkVxa1Nrb1Y0TDAxMjho?= =?utf-8?B?eG5HRFNCelU5aFZLcy9sVTlTemRJc1RmYXhXamlONlNBRjFwSGZiU2p0ZkJE?= =?utf-8?B?ZEtFK1NXdWpzMGZjT2dhNGZQRE9CTnRkSG1lNUdxZXlCTytjYmQ0aWpiNDBi?= =?utf-8?B?aHp6VGIrNEtmQWFJRnhJYm1hYW1TaUV1MEtmbGxuSjhhSEZIdVZVbzJSTWVm?= =?utf-8?B?MDdSUzFVZXllVVFZL2hhSGNuODA2c2tCbFJVUzMrd2xPaWQwbU5NOWdabGph?= =?utf-8?B?QmJEdlZTR2tHSE9sVnBPVi8vcElBOGhlaTRIazJUejZYUS9HV1FGZkhBODVY?= =?utf-8?B?TzRzTzlDV1NiVVpTZm00RmJzclEraklaMW5paGxONHRkanI2Y2VJSWtjMEhY?= =?utf-8?B?SHAxTitpZ0lNdmJJdi9EcithaG9MNXZBU0paeW9waWowbHoyRXZtdnd1d0o4?= =?utf-8?B?STV4b3dUdk4wS3B5VnIvZEdqdDZrS01iMUxPSUtWU3pCR0dHT0tWTXo3bVhD?= =?utf-8?B?MGMyVVFXSU5kUlJrNGxBUkZVS2wvbk8vZllFM092OEVINTErK2x6OElOeFFr?= =?utf-8?B?bWVSS3dESzFLL3hIM3B4b1FZbVhSUkdyaFFaZS9vcThsSlhsSGxDd2lkWWln?= =?utf-8?B?NWk5UlpsQWdoa1BjQUJqZTgrNDN0bjRiM3ppVVFxcGp1bkp5RkNnZnlvTFIy?= =?utf-8?B?cnRrVi9RK3k4V3ZUQmlIUFF1WVgrS2NZc1h0NzlCNGNRYnUydUtyRkdDRXY2?= =?utf-8?B?WEpOTDB1eWpXUkdMZXltcktVN2ZqZzdIS0R3WVdxTG1SMVRHdzY0OUk3QnBu?= =?utf-8?B?UjFTdEdYeENkOW42ZjQ5QzlhNGxKZkZsZlNFZjVpUW9LQXM1MzQyZ1F0MWJO?= =?utf-8?B?RVNvVWFOWWtLY0JNMUh2enJDNE8vZDliZEhGazB6b25MSDY1REFDdnVtS3lD?= =?utf-8?B?Rmc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38a1d855-b8f2-48ee-6987-08dc0b68407a X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2024 07:55:56.7127 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bBIDhV+sF52nUWnyIdpG0Q7wTQb0fGFrWSWly6uYLggqK1DC1bL7AVpP3hLb2XYqxIqme5J9bepgnqk5wA1n5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB5332 X-TUID: b+uVznJ4dwZB From: Jan Kiszka During the migration to sbuild, support for using self-built packages in the build environment was lost if those were already part of the sbuild-chroot. This restores it by adding --apt-distupgrade to the sbuild call. But that is not enough because sbuild will only upgrade packages from already configured sources, not those specified via --extra-repository. We therefore have to switch back to configuring isar-apt during sbuild-chroot creation. As rootfs_configure_isar_apt configures the isar repo under /isar-apt, we bind-mount the one in /home/builder/${PN} to that folder. Another difference is that we now need to run apt-get update explicitly, but only for isar-apt. Signed-off-by: Jan Kiszka --- Changes in v2: - fix regressions caused by adding isar-apt to more schroots than needed meta/classes/dpkg-base.bbclass | 22 ++++++++++--------- meta/classes/dpkg.bbclass | 5 +++-- .../sbuild-chroot/sbuild-chroot.inc | 2 -- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7b054d3f..6a6964b2 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -19,8 +19,6 @@ DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_C DEB_BUILD_PROFILES ?= "" DEB_BUILD_OPTIONS ?= "" -ISAR_APT_REPO ?= "deb [trusted=yes] file:///home/builder/${PN}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO} ${DEBDISTRONAME} main" - python do_adjust_git() { import subprocess @@ -221,8 +219,17 @@ def isar_export_build_settings(d): os.environ['DEB_BUILD_OPTIONS'] = isar_deb_build_options(d) os.environ['DEB_BUILD_PROFILES'] = isar_deb_build_profiles(d) +dpkg_schroot_create_configs() { + schroot_create_configs + sudo -s <<'EOSUDO' + sbuild_fstab="${SBUILD_CONF_DIR}/fstab" + fstab_isarapt="${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO} /isar-apt none rw,bind 0 0" + grep -qxF "${fstab_isarapt}" ${sbuild_fstab} || echo "${fstab_isarapt}" >> ${sbuild_fstab} +EOSUDO +} + python do_dpkg_build() { - bb.build.exec_func('schroot_create_configs', d) + bb.build.exec_func('dpkg_schroot_create_configs', d) try: bb.build.exec_func("dpkg_runbuild", d) finally: @@ -297,11 +304,9 @@ python do_devshell() { bb.build.exec_func('schroot_configure_ccache', d) schroot = d.getVar('SBUILD_CHROOT') - isar_apt = d.getVar('ISAR_APT_REPO') pkg_arch = d.getVar('PACKAGE_ARCH') build_arch = d.getVar('BUILD_ARCH') pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) - debdistroname = d.getVar('DEBDISTRONAME') install_deps = ":" if d.getVar('BB_CURRENTTASK') == "devshell_nodeps" else f"mk-build-deps -i \ --host-arch {pkg_arch} --build-arch {build_arch} \ @@ -310,15 +315,12 @@ python do_devshell() { termcmd = "schroot -d / -c {0} -u root -- sh -c ' \ cd {1}; \ - echo {2} > /etc/apt/sources.list.d/isar_apt.list; \ - echo \"Package: *\nPin: release n={3}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt; \ - echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt; \ apt-get -y -q update; \ - {4}; \ + {2}; \ export PATH=$PATH_PREPEND:$PATH; \ $SHELL -i \ '" - oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, debdistroname, install_deps), "Isar devshell", d) + oe_terminal(termcmd.format(schroot, pp_pps, install_deps), "Isar devshell", d) bb.build.exec_func('schroot_delete_configs', d) } diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 1d684e98..0cdb5792 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -110,16 +110,17 @@ dpkg_runbuild() { DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -print) - sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ + sbuild -A -n -c ${SBUILD_CHROOT} \ --host=${PACKAGE_ARCH} --build=${BUILD_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-alternatives \ --bd-uninstallable-explainer=apt \ - --no-apt-update \ + --no-apt-update --apt-distupgrade \ --chroot-setup-commands="echo \"Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt" \ --chroot-setup-commands="echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt" \ --chroot-setup-commands="rm -f /var/log/dpkg.log" \ --chroot-setup-commands="mkdir -p ${deb_dir}" \ --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/" \ + --chroot-setup-commands="apt-get update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"" \ --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ --finished-build-commands="[ -z "$(find ${deb_dir} -maxdepth 1 -name '*.deb' -print -quit)" ] || cp ${CP_FLAGS} ${deb_dir}/*.deb -t ${ext_deb_dir}/" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 39ced80b..2f07de82 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -56,8 +56,6 @@ SBUILD_CHROOT_DIR = "${WORKDIR}/rootfs" ROOTFSDIR = "${SBUILD_CHROOT_DIR}" ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" -# We don't need /etc/apt/sources.list.d/isar-apt.list' while it's handled by sbuild -ROOTFS_CONFIGURE_COMMAND:remove = "rootfs_configure_isar_apt" ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" # Do not cleanup base-apt -- 2.35.3