From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a92:cb83:0:b0:360:78af:d9f8 with SMTP id z3-20020a92cb83000000b0036078afd9f8mr925884ilo.59.1705585833897; Thu, 18 Jan 2024 05:50:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:ad0b:0:b0:35f:cc83:de21 with SMTP id w11-20020a92ad0b000000b0035fcc83de21ls218634ilh.2.-pod-prod-01-us; Thu, 18 Jan 2024 05:50:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEYTHcg9NP3ueLaQo3f/Tt4DQVY8J0MOCnS0rpZLZOp7gnjeP5tyw21ZxsO/5GLBTP0Bcv X-Received: by 2002:a6b:f318:0:b0:7be:e321:764 with SMTP id m24-20020a6bf318000000b007bee3210764mr1092296ioh.24.1705585832884; Thu, 18 Jan 2024 05:50:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705585832; cv=pass; d=google.com; s=arc-20160816; b=zxSD8PNQXytamgaWF+/Ts/j4C5Wqw5XcUPnDHeCV6JJRIjLpQKjgkas4m1D717lQDT c4x2YyqDJJCZU/iyHwr2j71mPN9FvvPLsUViEqIgj9e7lKBqy9GTIaKpFGM6jl/zOHVW ByG2C3dyhqwUUs6Dz2E4cY34QuRN+LC8juypwMQsNdp6AucpssLgiL/dvJ2ioHkTKYjB LMwFtiuLvu3b5uVLZiYuCIYg+R6BpeXcyRXJ4x4f5BXXMbxL5a4uHWfL+xfpRbfEx65F N1Jc/wtjUv6qDlaIGvBU54jZYuO+6ANRnXzMn3lc9B/cerOpjmktmBvjab6cckUlbeIi qQLg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:content-language:subject :to:from:user-agent:date:message-id:dkim-signature; bh=hRTm7lXBONkPWBXD3tlX4ndegMyVdYggw6Stvc1bO5E=; fh=ZarmHTTFmyhIxiexnxKnhCKvSDwk3HqhxhHvjEwQ0ZQ=; b=Rxm3fjXjIP13e06zy2M9FmKLvwLU9FxKjboNRLKVs2j3Uxk5xFaPNKmmR96mJz5zgJ z2uCBpD9LbqZtZjHHTH3o5KpPoM4uzVh6Aeo/SQlFPXTwRl/mek5yax2ysaM4JFdX0Xj l0Y3YqkiTNKmdcxxVGpN0gOAvBtVXhmFUDmc7QIzRNEUuU6TPuGbnt2nxgABdLtWTu2f VMNxuXLRyq4HY/DPLsP7SMKrGiIl4zt60+TFP1+N7QwREhxxxIsNilwkx6uFYZpyjVmB S5VZninoua3m+Mzxwuh3JI2wcfXE5Hn4TCd/kzqqI41DrFEV+S9NE1TFGyEF4qVIDkYx 973Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=rQKzaxea; 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:fe02::60b 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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on060b.outbound.protection.outlook.com. [2a01:111:f400:fe02::60b]) by gmr-mx.google.com with ESMTPS id u15-20020a6be90f000000b007bf78d10c87si26998iof.2.2024.01.18.05.50.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2024 05:50:32 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::60b as permitted sender) client-ip=2a01:111:f400:fe02::60b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=rQKzaxea; 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:fe02::60b 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=M1XNXj159nSQzsxMsznEGJH0H61evYghnNSNiHtZTnATXzFI8zBEA7yur95CQL+6z6NY/ATYZRXKZwnb18nkQQx2FKUY/zDPBXONguK33LGtfpdRuzKD/LWcv9NAuK877/dWeohZhEFcvdd0cL1ZeAt4e6Q00USsWrjLic01Pkr22Jgb7YLFiBAPJ4TfbjneWwHt+AiXVmZmuFu2aEC7W800+tFHSURldLdvbnXQfovwMo+MWwxxYR2R1uWemAimFpaInIVIS+wv3xqohm7tfwINAPeKU4yV2hdjxClLqjCJpQui8uWfpcb8BVYsPnX3pdPsyTHfp6MjSoFXZp/2xw== 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=hRTm7lXBONkPWBXD3tlX4ndegMyVdYggw6Stvc1bO5E=; b=d68pMytfnRU9Gzq0UaBsYUTGmHmVz/uIYC6VqGscBf+gVuoriDqRKxliN9fCgeKPCKgRirzIv9MFd7JTdJ402IEOgk3pcsscYwnW0IQWeCiqg2TEeN7fXMRpbfMDf89r3saNkSMXEc0SkC3EZ7PX4hgtt3WgVQhikKgt7fihShOWV6CoR0c3bM684CuhDY96uT4mMXeitDAy7mLy7zt0PpzIDpzLo89WOul+cb2YuEjF3+QlEfSIoVYi1Atfw5AkdMEzQhRZlHr/8dHTPh7XwEOVm2KhBmdlSKMwqKLS3BaBTKRNdtPwRurSeC7mFoygY9tZrS3dO1t7C/jg9++0AQ== 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=hRTm7lXBONkPWBXD3tlX4ndegMyVdYggw6Stvc1bO5E=; b=rQKzaxeakx54EBHu5E5HX1UlW5dX7QgX6rTLQx392O9NkrmS8gF8JZheeIkuqtR6r32USQFe7Ssj/CRSOHt3TzTn6h/Jn3LXisppbw1yzRsTNCX43HT9KCcFzgRt56hxuTdDvxLkHQM9IzMzzhQ8OJn6g7iIXrmucil6lqUu3QkbMlqwTw0ex+eYvUvoHitdufQpa5CpTekcg48l+2kN1OU3U67W2Ogzxn3xHHelo8uEI9nOnDpmnqRi1eCwAh8MBfSBHku9PTEQv1daTqEuK6WH5CSLsR46uYgCA9ib89hyhN3Jw9K4/wwdUxqf72PRhwmrhZkFL2LJcwZ8WOImMQ== 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 GV1PR10MB6011.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:5e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Thu, 18 Jan 2024 13:50:29 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe%3]) with mapi id 15.20.7202.024; Thu, 18 Jan 2024 13:50:29 +0000 Message-ID: Date: Thu, 18 Jan 2024 14:50:26 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: isar-users Subject: [PATCH v6] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US Cc: "A, Srinuvasan" , Uladzimir Bely Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0117.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::8) 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_|GV1PR10MB6011:EE_ X-MS-Office365-Filtering-Correlation-Id: 2c8b4d2b-248e-4bc6-47f4-08dc182c6ea9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SQc7Dap3woAn2/0Kfjxp+yUlBxkXy1LG3o1PjrPUqVNCATk1vPNbxx9xWWHoL69rv/jE/T1eoT4WcsJIlcC81micewT7r+C0GnMqNwimtBq/E/vwX5VTyaO8RDFDqZSw4ABMf8v4QyskQE8umxI3h6TKODuiHh8aJUxx0I3BPFIcrKElhNdTOlQ/ODI8M2TShOWdrDIYiMMOtcekNkMcgl7L1wkSphxmqbYKf5rx9+vUmeAEfIoc6gcJXqbq3utd8jSyrTFqUStAq9sL+AjpFacXDsoiEUDrHaQjC+6yU8hfVy5pELBgvw/D4JjaGauaTSAQeCS/OIvfaWZ5woRjV/zkYnuQNmuASFHDNWIV6eJ1h/eznX32Y/p/SV1MN0g7sBppOn6GT3iSdk+SLfcUC5kYnp+vL+qKgCOy8WzVLe/nFPpXABZckn0/ztnTFnXkfyoSJ7XrHLlSiSIb7N1k1ZqKOrD3p2bkTVTI5VeVe4q5KBcr6dQqjwnAfm51G8c+i27wYgcrUWMZQNTpzhg85m+M8c3JPnuKER2AU93/czLgh3K+HrufyyO+5sUAnUDUTuPgrOZ1I44TusxbtxbDvvzllxm/uNxaNQnVbR49FQyy+PHBYaYOi5W+9141nfohKwVQhvoyagNZ6uN5HM2Skn85qUOqhdTUVDfhWAlF+NmLzpyVZIXU1RpY7J1nzWyd3pmLoKOV8sme0G4t2ZC+hvUcawYaytkmZPDsEIwpNso= 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)(346002)(136003)(376002)(39860400002)(396003)(230173577357003)(230273577357003)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(31686004)(66899024)(26005)(6666004)(83380400001)(6506007)(86362001)(36756003)(31696002)(82960400001)(44832011)(66556008)(8676002)(4326008)(2616005)(6512007)(66946007)(38100700002)(66476007)(6916009)(54906003)(316002)(5660300002)(8936002)(478600001)(41300700001)(2906002)(6486002)(45980500001)(43740500002)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NG5FZHhXQkd5eEFwMno1K2RCU1Q0dDJuSG9DUytzU2lnTXd5Z0dpRy9JOXVu?= =?utf-8?B?RHdMaWQ1a1B5bFhZN2JBdXdRQlpkeVBBUWJ3enVsTW1rbVdOL1lGRFpNZHRr?= =?utf-8?B?VUZNN0tMSGFkYUpJQy9sS3FNc0lRaFg3S29uMElNRXlZd2VKcWNCRkJLR2k1?= =?utf-8?B?RFNLNVlWc1VSaytJOVFBU0Yxb2g2RW8xUjdqNlZNdE9ZNEIxeCtVcGJCcTB2?= =?utf-8?B?YVBQRkN0RGtUV3NLdHNvTkxKTzI5REQrd2NtTitBOXJqQm9FSXNwbnBsYllM?= =?utf-8?B?QnRWdURkbi9uVzM4VWkvMDVhTmJYcUZiNGoveFVxWEp4TkwzVGc5R1lJcGVO?= =?utf-8?B?VE1sOUhsZjYxcStsU3R2c0ZrUURncjBLM2ZMalF0NVgxN1Zxd1lMNDdmc3Vz?= =?utf-8?B?QklNODFoVFFXdDcyMDNYeHJxQXBUMHM0YnlnMmUwV25pRGl1SFNLbHhxZHhu?= =?utf-8?B?bFMzWkRwbndXYjlyUTYzQjVUcW05ZVRubzF6aUJmOTIyNWpRQUxTKzc1Mlll?= =?utf-8?B?YnYwTTVMYWQ4cUdubnJ1Y09TTm5GK29DS3RXU2s5SFZ5dzB5VUliLzg1Nlcy?= =?utf-8?B?UmRQTGxKaFE0U1VzMFlCSGExcnliMTR1TUdZYzNIUUp6Q1lnQ0U5RDRDVWpM?= =?utf-8?B?eS9nRmQvQ0R0cEYrK3VzYW4vQzRRS0pXMmE2YkxrZERQYkJSb0JycTZRVDhw?= =?utf-8?B?SE5MZDZJR1JZblIzU2RiQ2tnSHdrd2JsQkxUK3pqcFF1UzFNMTBnRzc2cnFh?= =?utf-8?B?R0NQZmxETlJJOWp6VHN2UEpCNXIwYWt5eHE0UmE3UVJ3WVN5NlZjS1dtY29s?= =?utf-8?B?OUF6aVRoVnV5MGhvSWw0cWhLSE5GT25kRGEzSzJZZkR5c043WTdDWGJYdUlh?= =?utf-8?B?alZqRmJ5c2txVWRTTlFyRFBCS05ZZ016T1psQWI1OHBOMk9SemJzQXUzZnpI?= =?utf-8?B?Q3RhMzNyQm1wK1pOOFFBVmJ0MVVLSlBQczB1YmdEMnlVOXF0U2NMQ29lQ2JU?= =?utf-8?B?bmY3Z3JKdTF6MWtXS0tLbnVyd3pOR1BRb1BYcUtCamhEREtRZmxxZ0YwSFdj?= =?utf-8?B?RGswbUEvOVd4Ti9jb2ZRNFBFUnJ5VTlYUUMvWkJpb0FSY2szSTZNck9oRkNB?= =?utf-8?B?aG5hYTdiY0pUTnpJMU96dytDUnhXN3VmdVV0cVA5ZEtzZ2NNUkh6NE5YZHlV?= =?utf-8?B?Y1BvUjY1NXMrVitPQXNwVjlNeEJHKzVDZlJ2R013RzZxQ2V2S2hNUlBtS3ow?= =?utf-8?B?L0dHTU1Wc1R0dHg5bjhDd1RGa3VPbm5Balg0UDZISWRFUXdTSzJNY3dhS1NF?= =?utf-8?B?b003cUpzVVg4cjRUM0ZGOWh6WEMxeEtKTTRocVBiTHc2dUpsUDV2NzNyR0Qz?= =?utf-8?B?K0ZPdU9heEVUbjlRaVpXTUtUVkdJWkVVTHlValBXcStRWkQ2V2lnSFIwQ3Y4?= =?utf-8?B?ZUM0YjhtUEMrOGp4K3NRblcyOE16LzRJRFlmYmoyNkk0UG5DenBvZldWc1dC?= =?utf-8?B?bU5tRVZraUV0U1hTNWxWQXdCOFFkakl5S0FLN2pnRFlud1VSR3pQR2lSellv?= =?utf-8?B?bDVjTjVZME1rU2NPd1EvS2lpOXMzWm9PUEFMWWZHa050a2tpYVdYZUEwYVhm?= =?utf-8?B?RGxDandURjREQ3VnQ3Mxd1lKUXlISVJQbjZaV2FMUXpDVTQvRXB1eGVHb0Q0?= =?utf-8?B?TzNJT3Z6aDAzN2JpNThQb0pBQkpjUVFMQlg4dG5MYzFta0tRQjBnZWo1QjAx?= =?utf-8?B?OUZWOVk4NU1zb0xZWVppUkxiK1BnczdEbjFOKzZ5Q21UVVBRZ3Znamo0SXZt?= =?utf-8?B?NUZ4WTd2cGx3bmQvaml2dHZ3TDRUTXpIaWFoQkdwRkM0NzFITXQxTmNNeEZP?= =?utf-8?B?MG54dlk4TXBrRkdLRzd6N0ZpaHlaNWorK1EvTUFoYVI0b1F2S0g4U2t5SVlD?= =?utf-8?B?VWlBUlgvUTdQSXJEb3NUcFpZOVMrRjg3NUZUZ1R3VGZSeUJMa25uTzkzeEg0?= =?utf-8?B?YVFROGxHUFV2UDRtVENabDBOMVFjU21zRWxwOFovbXdkQkVZOVdEcTZNUWtS?= =?utf-8?B?eUdDMWFPK2crT2p4Wm9rTXhHQTdCRmNKZ0RGcEdoV0ZuK0MyejBrVmEwSTBo?= =?utf-8?B?YjhGUFV5d25GdXQ5V3pzaEFYdURpajF4STQ0QVZFUi9sWjlMYmF5TGp6UWpY?= =?utf-8?B?SXc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c8b4d2b-248e-4bc6-47f4-08dc182c6ea9 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2024 13:50:29.5089 (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: PQ4mRUCEC9x9RLZ7cZLfg1KlTMpW3M00rVPh6ugE1pf09emVKrMyRmp4KOf0TiGvsCPWLeqd3hO2YRUW1YQiyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR10MB6011 X-TUID: 5O3VARI/J+YI 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. For apt fetching, we neither need nor want isar-apt to be available. Rebuilding self-generated apt packages is generally pointless as the needs are better addressed in the generating recipe itself. Exposing isar-apt to the fetch may furthermore lead to fetching a previously built source package of the same recipe, rather than pulling the external version. And because the sbuild-chroots are now left behind with isar-apt configured, the configuration in imager_run can be removed (credits to Srinuvasan Arjunan). Signed-off-by: Jan Kiszka --- Changes in v6: - basically, going back to v4 but disabling isar-apt in do_apt_fetch I was able to resolve the scenario that Uladzimir was sharing this way. And I also realized that apt fetching as well as unpacking should have no deal with isar-apt. So, v5 was taking a wrong turn. meta/classes/dpkg-base.bbclass | 29 +++++++++++-------- meta/classes/dpkg.bbclass | 5 ++-- meta/classes/image-tools-extension.bbclass | 13 --------- .../sbuild-chroot/sbuild-chroot.inc | 2 -- 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7b054d3f..80686677 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 @@ -115,6 +113,8 @@ do_apt_fetch() { trap 'exit 1' INT HUP QUIT TERM ALRM USR1 trap 'schroot_cleanup' EXIT + schroot -d / -u root -c ${SBUILD_CHROOT} -- \ + rm /etc/apt/sources.list.d/isar-apt.list /etc/apt/preferences.d/isar-apt for uri in "${SRC_APT}"; do schroot -d / -c ${SBUILD_CHROOT} -- \ sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source source "$2"' my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${uri}" @@ -221,8 +221,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: @@ -288,7 +297,7 @@ do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb[dirs] = "${S}" python do_devshell() { - bb.build.exec_func('schroot_create_configs', d) + bb.build.exec_func('dpkg_schroot_create_configs', d) isar_export_proxies(d) isar_export_ccache(d) @@ -297,11 +306,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 +317,13 @@ 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}; \ + apt-get -y -q update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"; \ + apt-get -y upgrade; \ + {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 c699a84d..d1666f78 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/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 58799fcf..46bdf78b 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -44,19 +44,6 @@ imager_run() { distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" fi - # prepare isar-apt - schroot -r -c ${session_id} -d / -u root -- sh -c " \ - mkdir -p '/etc/apt/sources.list.d' - echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ - '/etc/apt/sources.list.d/isar-apt.list' - - mkdir -p '/etc/apt/preferences.d' - cat << EOF > '/etc/apt/preferences.d/isar-apt' -Package: * -Pin: release n=${DEBDISTRONAME} -Pin-Priority: 1000 -EOF" - E="${@ isar_export_proxies(d)}" deb_dl_dir_import ${schroot_dir} ${distro} schroot -r -c ${session_id} -d / -u root -- sh -c " \ 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