From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a4a:255a:0:b0:591:dc1e:d8c8 with SMTP id v26-20020a4a255a000000b00591dc1ed8c8mr656845ooe.15.1704383238636; Thu, 04 Jan 2024 07:47:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6820:1011:b0:596:2401:bc81 with SMTP id v17-20020a056820101100b005962401bc81ls140720oor.0.-pod-prod-02-us; Thu, 04 Jan 2024 07:47:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IEF/EYqLPZsu6Qjn5Tw6Z6c3rnDLUujz9NSBoh0WoP9FJI1M7NpaJfNAN5GuHb5rHdnkRcq X-Received: by 2002:a4a:bf1a:0:b0:590:97b9:5565 with SMTP id r26-20020a4abf1a000000b0059097b95565mr471604oop.12.1704383237602; Thu, 04 Jan 2024 07:47:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704383237; cv=pass; d=google.com; s=arc-20160816; b=MFtwVzyzXHZOrrQHrv3bgb9DBT7hzXH8lBMgrFJYycWK9JlpuGKtc8l2x/aI2Q8ald iZOC0aRUFnQ9Tc9uim1i/6+pv0BoWxBpZe5AoXXe4h/dLkTQ7+46zo5qjvwEiOklqe7o kePFdCEAwljdKpNRvi6I0NC0lVG0S99nklSCWHZWUBwf48hHC+9QDwLbpWfpY9XZptwt Ez36wjrSWp0eM9VWcI67mXseKP3v2rvIDN1GB4oNuTqvF0mBfduFa+wJMlIwc2+WYJ7X WMDnh7UAGMwbdZP3bWqmoSrRwWX3JeqNuaS/ehweEP5RSAoAdSnxd2UbiHKTj7AePXuu O6lQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:to:content-language :subject:from:user-agent:date:message-id:dkim-signature; bh=G8v6O7QzW8ji0MB4GZa/4Hvikbng1UYrgA/fGf6Q1EI=; fh=2KHBdC6ETCLM9A35o+V+zMyURRjbQhidaJpej5hggcs=; b=yax1cFvrwgbuRV2rhmr+lFVL/0wUOSemvN0FiMI+4eZTWH66S7EbuHtuh+LrGNCZSE mFjsegao1VJsMvzM1UPlLNqr1LLtCYi0udJ96R0z0s1IMiVaPUK0OXBkonkacBgwNXvL 0nPaA3nHyYSHTvUQUw+AWelr9n4tUSrNrab6VIb4mAjeN+iahj2qG+dojnATZZN15nBS agZA0nQUF+d09iRpapxPcbBkd8+atp7G/Yw9ZlIKqjLZ4s58IxXPN7k+pjO3cRPw3DWP rPhNS/QTdqy3jZcCKPoJlZ7J1I84m7vd6k+ORwRUSSXinzFwiWYzJPJhIZ681l0A5dG4 GTNw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=zW96DY9X; 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:f403:260e::600 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 EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on20600.outbound.protection.outlook.com. [2a01:111:f403:260e::600]) by gmr-mx.google.com with ESMTPS id n5-20020a4abd05000000b0059572e71343si453605oop.1.2024.01.04.07.47.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2024 07:47:17 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:260e::600 as permitted sender) client-ip=2a01:111:f403:260e::600; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=zW96DY9X; 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:f403:260e::600 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=Z4NPVEb8z/jMG2skLnyIUYqPj9dAnpzpYqn+r8+wzL7RWZUELR7H2x1mNLnS8jqfeRGqX7RW02KIXAFjAHvw+UG8gbjskBs33g4eL/8in32FVINmyzYFpVS9B+/+0x2XJoulyrNhVLKPbzP08Qk3BsjkxwbRI+Fcy8ezqsECa/Rz3eM95REMzeus611NUY+qvzf10d/+83gGnbpsK0k0mXwJ3OeB0HBlCU1OMKvkChNmAZvvhH+GZ0lltT5zijjUfteB5c3FYkr0WCyJ9sVyblbEpBNzbkVSJQCGLLZVBRbg/0lL//A9vZTKYFqZzIWc/0ALQzbjOzXsTebV6iTomQ== 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=G8v6O7QzW8ji0MB4GZa/4Hvikbng1UYrgA/fGf6Q1EI=; b=L1shIJpJgAdP3vPpwdBcrKd/v5J25T9eXOeTTyE65ftyY43aRQbGloMedEPgU0k2TPWRuGw5HEAUs6v9SrVTMnqjtYBFdCopnCe4cGtvg8gcHMIBxEirnd5DE6w/Mt4y+pUmH/ie93kp7IeiV7bp4eWOoM/1ds4KTmBYuDvClmotHgNKmJ4W+OKoLhTLdTKCqZikepaMEFT7HihVX+0dH/Q/Qb3/EYzMaRqJ1GiOkhD0OG4q+L1WcUtYImu50EF7bh+MBlUImziyw4na3+sgIxdPZDtjEPVPseqdP+ZjWwawwwjpnEhOmWawxxzZ42efU/kVnoFBSm786lrMdJ2K0Q== 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=G8v6O7QzW8ji0MB4GZa/4Hvikbng1UYrgA/fGf6Q1EI=; b=zW96DY9XGyjHYXnQbtl2HDxY7XK3TTs4K9k4jsLKfr+Qz+pu2Rn0vQ8uXLjsw0sO3oznirdDWdW+7ST0JQgT1ma+8hMwZ88iI1pF3XmJlvEU4AwYGwF/g0qZDoqJEinRMnMxvmgGntg2shpmoPKXapvVgIUcnVHDPoHHd5/W89YAZRx55oYzB7CWkTTvPfPPLIYcyc6A7UXqvaCBrrGgl0yfPS+ywZghmxA6lrBLLcSYMJDyGZWCuzduFraDOskiqrBzOK4cuzWNBARbzo6aDuiUhTcI/FUw0kcJMs8bcTnmUTiGYtQQ7lMzH3dkJl4KN8lwbQqBodIKEA7bRnpgJg== 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 AS2PR10MB7526.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:57b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.14; Thu, 4 Jan 2024 15:47:15 +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.7159.013; Thu, 4 Jan 2024 15:47:15 +0000 Message-ID: <7a7940b9-ea04-4337-ba53-5c71075c5110@siemens.com> Date: Thu, 4 Jan 2024 16:47:12 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH v3] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US To: isar-users Cc: Srinuvasan Arjunan Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0143.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b8::14) 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_|AS2PR10MB7526:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a02c327-a836-412f-0d65-08dc0d3c6cb9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s/ScPFDYrlpBmCKXoswMSreeuszZwxmAvg5DX1YwDEXUtAtUx03P5ZYwpupwqaRtJ4KIdrR/nGBhlyH1ukqRGVOkHAua1+ctkzgbm2oCxB7MP+SRFyBW/bcCqtlDtbG/j/s8x7ZFJKkz/9t4rJ6itqkIIzhLsYYoq1XhD01k9zNw1jwH3lUQxpV3SR8F6+vYgi1VscZCs0ZJ/Mz/4A8yD9kN8iX76P/T9GNwXaVuAX+6LhTreg7uJuGpmC4PhraBKp8WlfDVsR0bbqj8RnsLn1IpT4qzWFwP+ysFRcm7/tCdhbKCJuOiRBl//Nf4TPp1tgHVOlVVjqfZee5ftz32CfAnLXDyHVAk8EsZQOwyUEFSnQtJcjZZR058lx2u9u3xY2SCGqzCCrIg0H8fHC2URTAYRRNz64EGC/79Pyqfzfxzl+U1m+Y7dhg/HCw4fQ3vJWaECtmlCfmOnTlcJE+pNyNQsb65RmisLHn6OhSRPViDl5DVLt4iTUBjE4yGTYogC6ZtJbiyjmtYzpw30VQe0/8hpMTaR+8e6qmPDhQ7Hb+6FAGjxjc73AIwc2+pgkBCppcLaoq0EwALsPpSZYw3Q+ujzNgQMmpeY9ldoGJcDD7OXBg5SbLY5y7R17U6QIazvwzTokEvapD+YKi9CnBBnWbHdfp6pm/DWS6yAxpeacI= 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)(376002)(366004)(136003)(396003)(346002)(39860400002)(230922051799003)(451199024)(186009)(64100799003)(1800799012)(82960400001)(31696002)(36756003)(41300700001)(38100700002)(83380400001)(2616005)(26005)(31686004)(86362001)(6512007)(6666004)(66946007)(478600001)(8936002)(8676002)(6486002)(66556008)(316002)(6916009)(6506007)(66476007)(44832011)(4326008)(2906002)(5660300002)(45980500001)(43740500002)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d1o1YnRIZDlEQ2hUY3ZHdXZRZkRlWE5Dai82MXhzUTEwVmo4ZWdpalc1L0dQ?= =?utf-8?B?cTFpVEw0UHdnU3VVSDdxdlpmRVBMUHI2Q3QzSTRnV1pUeGtJN2FaQjA3M3VM?= =?utf-8?B?SDM3UFg2OEJMck9kV3ZELy8wekl1aWNDT3V5WUo4VFBSVGlGMGN3eExxWkU1?= =?utf-8?B?NEdQL3UwK1Y4WFYvMldmOVJ2SDN0RTBTT0tsOWdjWXI1RzlmWTRmUkRjdUh1?= =?utf-8?B?T1lZbUxGOXlUWVBiQ0s4ZzREdjJwUmxUQXozbDNLSkJSdEh4NlRwUzNuc3lo?= =?utf-8?B?UnB6UmFHbVk0QW94M2QyMjJ6L3k0VzdBMU5LYjVNZWxSWDk5c0xjQTNJUlNq?= =?utf-8?B?TTRVSklIWUppT3pzY3MyZDRrZUxVWHRWckQ1QncrVnZIRW9DZjIyMDdueEdD?= =?utf-8?B?QVRCQmJHVFlza3VoS3dMTnhFVGp0RjRob1NIWElURmVmYmFZQTBHeDV2b3Bh?= =?utf-8?B?UTMzaVhDb291Qk1Dd2xIRmFkTkFhSmdDVGFNakFmR3NCMEg4Y0RvNWNZbWc4?= =?utf-8?B?OWNUaHNxelhBZHdDSE43S1pSNmVaUG9UNngxaVRjMk1TS1VGZ0IxV294NVVW?= =?utf-8?B?elg3ZWJnR29WNnhOQVRELzd0U0lNKzlzL3haYkNTZXI5SG9PbHpsZVkwSmI0?= =?utf-8?B?OUV4TXgzTnZiVDE1K3UzNyttOGtYdVNsaEF5WEowOUU0Ykd1MmpMWkRLcWhY?= =?utf-8?B?ZExTbUhna0ZjM2ltSUlJMU5PV1l5M3I1WHArZUhzM0hjZjdBYWpOaXRCVTZq?= =?utf-8?B?cWZIa1hxdFBNUFhPaHJtZW0xL3Q3cjJBaUtmekQ3K3JBdXQ0TFFic28wbHVK?= =?utf-8?B?NXpZVzNBTW00ZWUrL095Rmp5VTMydmhXdVBnVFVaNUtsZ0dLQ2QxZTNiSFUy?= =?utf-8?B?T0gyZVBJSmJJZllWdmtaMFgxbS9XOFR6SEl1b2tzWmFtd1RWSUVGay9KOE84?= =?utf-8?B?Z2NERVpCUUNYQWExRDk2V3pBZHJtQWN2WXB3Ymt4cXBJSGpwdW5yMUs0RjNs?= =?utf-8?B?c0NIZkN3QnQ2a1g5eTVaOXRkMWpVcUpkSXBPcjA4Y2JSZmt1aElWMVdaWmJJ?= =?utf-8?B?MkYvWEZvM1J6WE1DQVhRRjhKbzBqSHJuQjVEcEYyTGlEVWF2eVBLVHJuVFRH?= =?utf-8?B?Wi9Ib0MvQVNTUThPNzNHUWFkeHNHMDR6YWd0UHl3Sm0wSlN5bG9zM3A2Qkg1?= =?utf-8?B?VWdpdlgyT2dsLzN0SGFzU3JGcTZUVmp4Z0RNaCtrY3IzQzI0WWoxOWJpaDgy?= =?utf-8?B?YmRvM2toMzRHMnI5VlVCOVl0YVBMcjVXVFh3WnFUbnZtckg1elg4dXlnR0kx?= =?utf-8?B?STdEcHpoanVYZlZtSE5TWFVQVUJDUUdJWGtzMU1UbEVmOG1uekI0ZVpWWGNK?= =?utf-8?B?Mk5KYjJUREJqMWFMck9qY29rWlc4Qitic3BXY3JpS083TmpnejFPNmhxVXd4?= =?utf-8?B?a0p3dFJ2Yy9RQk5IemFldVozV3FCdFRBVVdQZEN4aERHa282Vm9vaWY2RU5s?= =?utf-8?B?NFFpVWNUemZJQ2xBam0wdnplWlRiY2tKODd5dWlpZ09xMkc5eVNqdkZZNFVO?= =?utf-8?B?Uld2bTV6bnJpN3BrckxmSWFtbG0vVkt5UjFEVU5HL1RoTWo4OTV5WXpwSzkx?= =?utf-8?B?RUxtZVM1Y0dIYjQ5elk0ZVJVZ3p0QjFqNnJObWJscjNlT1FYVnpuNGFLUXBP?= =?utf-8?B?N2JDOUc5bXA2emxDbU5TcmhmRThtNitPcXc0eGpWaXYzVTZERkZvZXRVRjdp?= =?utf-8?B?d2dJbHlpb3pJVUh6RTdFODFzM3RMQms3VTExOWpqUGRXTHd1OUtoM0ZUZTJw?= =?utf-8?B?NytPb3pwdklqaDZIeFlXbVcyNEZKdmpKeUZaVGlISUNTcTgyVkh0S09tR0V0?= =?utf-8?B?em0vbmdsZ3dqVlczcFJNMU4vSm02OEZOMUd6NFBNZmE3NHVjVDNnRXg4R3Jh?= =?utf-8?B?YmFaZ3M4OGp4SEFrS1dXb3VNYzdWUEROak1CT21WR1RDNzBsMVNPeGtMZEpQ?= =?utf-8?B?UFlweXhHdUp3aW1leUt6R3I0ZyswVlJURFlOYmJDRGNCNk1PK2NDTDVrMXpt?= =?utf-8?B?VkEreW1KNHVwQkhnd2pMdlo2SDM2bUF4NXN5bSt5QzYzMU9jallNVms1am4v?= =?utf-8?B?RFBxWVNoZ1VHWmd4ZTlmQTVLL0t5OGNNOE93Y0EycEp5ZzRHZTVFaDMyM3Bv?= =?utf-8?B?RGc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a02c327-a836-412f-0d65-08dc0d3c6cb9 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2024 15:47:15.3983 (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: ChNHSQvmpU+xbQZlKWUg32EvFU+E0w+E95DXyFiZEBsoj84ICUph3CpDSHIkc9vTsnk4TbPyGweViSwy2L2bsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7526 X-TUID: 61MjasRuDlK1 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 v3: - improve devshell support so that upgrades are done there as well meta/classes/dpkg-base.bbclass | 27 ++++++++++--------- meta/classes/dpkg.bbclass | 5 ++-- .../sbuild-chroot/sbuild-chroot.inc | 2 -- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7b054d3f..52baf169 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: @@ -288,7 +295,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 +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,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 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