From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7313604901749129216 X-Received: by 2002:a05:6358:7e46:b0:170:e172:b8e5 with SMTP id p6-20020a0563587e4600b00170e172b8e5mr9907710rwm.57.1702831336789; Sun, 17 Dec 2023 08:42:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:c2c:b0:67a:b4d6:5fa0 with SMTP id a12-20020a0562140c2c00b0067ab4d65fa0ls3115771qvd.2.-pod-prod-04-us; Sun, 17 Dec 2023 08:42:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHkepmVxVeBWXVNnXp25xqibzw9whHJPZVxY18B4U5CNgv5NuS4z6JF0Rq7dmZ+MabMMrc X-Received: by 2002:ad4:5c62:0:b0:67f:53a:a728 with SMTP id i2-20020ad45c62000000b0067f053aa728mr10246532qvh.50.1702831335753; Sun, 17 Dec 2023 08:42:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702831335; cv=pass; d=google.com; s=arc-20160816; b=fBN/Rb8Jp7O5Qi8h7ShcRrn7XkHcmu4P5VLcJNsvtpBqF2EXRZFJYnbrKPy5wJGDyi tDI6Ps6YSMKvKy+JFfyYobwqRNInvH18AlfVBERIqcHrtc3R/GvMakx9O4KxVGpcAWpE f24oEd3xxck2XqG1o7MPXR4Xq+MJYxlZicGVOQ25RxhgndPWrnZeEJPUEdBn0RRCeioy Xa6aLyBa4q4ibPbciRGvehHfiEUXy8CtWWXLXOpD5cwkbKH7FJnAsDY0AsiXhxHfRt5y jSHjydSXtQrcv7lkKod3rYX/3KBOZetP7eJ0KRoHKFz2UnCsCPQyM6nOVBpSfVibAxNd V7mg== 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=qZ89NjaEL6sgkA5bryBBl8lvo1OqvcjOHe4WsCc4KrI=; fh=UcPvsCCqbIcNV4PK5uonY7jMbyOAsYpqxx5G97WoOZY=; b=cNP4C8ccBuL3gMaimqaEJi539QD0KpYw7qXH8KzOVte8dfIK3AUJmekUp1zWJkjzKp Blg/QST4Tyx8+DckOhIeC/23Th51+qcpkA/J4jG5T5qjnsORz1mmN3jGXMtd9KPf5ngr 641UYM8ASHiBRssjsSgzCc0t969z6/xYwshsjRy7VlxipZCbB6eg8d7cmINCU4VhGy0S i2yN7uFMrGbIj+6I0QC89LaW8cFImfViHA7ENctLtdbU8vwoXZQ51+qRD7SuJTdlaSxy 6MslLLHjqyjmqfYYvwk4TzH+uWDtippghFiivtE+9LZ61NCAc7gpVR3P+xAGuqgCn7OY r9zw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="pCaXukZ/"; 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::627 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-db5eur01on0627.outbound.protection.outlook.com. [2a01:111:f400:fe02::627]) by gmr-mx.google.com with ESMTPS id ot5-20020a05620a818500b0076989bfc79fsi1474131qkn.1.2023.12.17.08.42.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2023 08:42:15 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::627 as permitted sender) client-ip=2a01:111:f400:fe02::627; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="pCaXukZ/"; 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::627 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=mE0UBR7I3yCBerj/ymyINpkIh7F2LazaOCpqGwdy/p7kdlyY1AYr5amPBegWHClQfMUBh7DmiPbfFTasgTGYY8CtwmHSJQGT2p/3n4tzENZ8FnHFs0P4zZN95oT8IPn8GHQVqnERqSAWKkk+SYZNa867YdFyxyBK/864Km1pDM5N92rBxOMhynsCVPqzoLUqE5WwZCZ439Jqhwfjt5Cy3g790LI5Pp6dgcK9/yzjZ/MG6no24VWvYycowo+SPurEjjv5lodLPT0J4hVba24doFmmuG12nxxYrBPTO/ULvNpqFbtMqJ9TFIqwAqR3ciWMtrd3oHcxEd9tgGiYN6AJqw== 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=qZ89NjaEL6sgkA5bryBBl8lvo1OqvcjOHe4WsCc4KrI=; b=aK4AbkUHAXUk5Zp/kpAImYQbPGR/Hr+D0AS3mBIpluwZWebVwhdiz6YGugG1G0fqPRWvmdNS+AjC7thlWzdRvp1Isl+9cwUbhTd2k7Z5OoiuURH5t9MvzMeHH854nN/IXEBPCRxvQs8FpaJ4yVdYQGGpG8omXwNzzAiMljU5q3aqmP4Cbl6fr/8VrGir2pjbMICfLv/GTRqU3uDP59O0jvK+p3AI7sJ86pLKfpObXB7Qj7mO/nZ7C/+p9mrTbdYlE2O/7wx86SrBkGmDQRqMfQr3nvEb0maljenDnvTJYfS+ERjnxd1N7QxvIKzndLSX7q9A/iBLNgxEP6NXxz/ABg== 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=qZ89NjaEL6sgkA5bryBBl8lvo1OqvcjOHe4WsCc4KrI=; b=pCaXukZ/lydUCdnQExtWla9AazoGx4x6dEOXL3XO8bIh8ncFtUlkjr3LRd9bJnteTqYV+rvW6vnEgrkJr07tysuqHc8hUz+VTwrhaMbFn5Br7qKy1s8TodxF/gKquznuQaGLijYgMGmd99RiuS7/0B5/WsLEN6R199k4h3UlThM0B/t3XFwOPDQl3goMp8bi3C4/3+Tu7oq2UdEfPDpp08GB8VcBnBeKP/U3e6M3p9D3cXwnODyKx0bRhn6wJPn5wrZkRRNC+YL5uvd+rlL3VkTmgTnJx6V1+9XDwk5oNU5/s9Eo0mnJMpQqI93U6gn/apfQvdDF14U+HrInhvtbWw== 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 AM7PR10MB3686.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:13f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.37; Sun, 17 Dec 2023 16:42:13 +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.7091.034; Sun, 17 Dec 2023 16:42:13 +0000 Message-ID: Date: Sun, 17 Dec 2023 17:42:11 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH] dpgk: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US To: isar-users Cc: Srinuvasan Arjunan , "Kowalsky, Clara (T CED SES-DE)" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0165.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::10) 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_|AM7PR10MB3686:EE_ X-MS-Office365-Filtering-Correlation-Id: da778e4e-8935-4bf8-81cf-08dbff1f1ee9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7CUavMLuPR8yyTcv7u6da5ykYozakhaOAcQRcTLrk7Re5S7uL/MwlqgYSudU1N9SEWjp5AtuANZ1124A1KaRz8gSWFGzRfRegEaQxEK54ep1PrZW5w7uhq3W63PBUBi7axX4PcKUXmEvOV/AfccK2WAbaDdDLliYPP8fOaVeMW1Wikab35sofQBo3LDxgZk5nRmwWF6T84dPAX1f/lbjZ4uty85hm+GGtJRtXfAYK1392aHp1yiVvKX3tqqcU4zmM/HJENj4L8kx1GsvNc+7m+hOQotp/TWyLHXC2cIiqg8RrMBSS0r+JoPLM+5ROPVp7KKROT5rmvy8TNHR3yOqMQZu1tsJUJCr3AMAqlXJDqM3UWluJ7wTFg//qEnVf2jYVQQ6xdt7v2xMcEn19Stqj1+Jn1seRwtsqIbYUY2p4z4+o0abyk9d1OVPXzcvPR883iZQB4Ko+J/YNvlhqQpK0MywgnGOFPGwu6nrzHrzXdDkAGBiSjm46U9/6KSQT72Hp0UeKEutE90zdgAv/3lAON6rqSnQTOKPkN8NlRgeXr27pPGzvs9qzPcuSaefi5QP0Mr1L9i3I+UyGxWUzmKhsoQgCzL4K85+YUJTVX0XGEsQJTcRXJ+mN5gFZIZ61BJC+3WiSxQqVTfKae+cCEsZW1ucpGqE/QCkRavDEeGzDyDncheqGpu1tOXbZH6fAe/n 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)(39860400002)(366004)(346002)(376002)(136003)(396003)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(83380400001)(26005)(6506007)(2616005)(107886003)(6512007)(44832011)(5660300002)(4326008)(41300700001)(2906002)(6486002)(478600001)(316002)(54906003)(8936002)(8676002)(66556008)(66476007)(6916009)(66946007)(36756003)(86362001)(31696002)(82960400001)(38100700002)(31686004)(43740500002)(45980500001)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U0hEU1ZneEh6aDJ4Z1pJendzSm1jdXAxbnMxNjJkV2xZOERhaGR3NW45aDdE?= =?utf-8?B?SUV0Y2dvTXZJS3JYSWNBY1YyWnV0MllzbWZLYVBsekZ4L1d4UFhnQk9oN2FY?= =?utf-8?B?aGRMZkkvTGZVcWFaTGxxYzkxeTFMeGFEdUFFRFFsa3FhdG1aRy84ZXFqUGxr?= =?utf-8?B?WFU1M1Foc3BjZ1FuU0d0TXRpYmQxdjlXcEtVQk1pQTVqU1NOZWgrRm8vMitG?= =?utf-8?B?b2x2QncweStsQksxbWR5T005RnhwRElROGppYU8wVU5DTC95aFJ2WTkvNWRw?= =?utf-8?B?YWRqL2xxcXNNb0lGdnFIblVOMG03M1JaQ3pQMGZCTGQyeGsxVzNGUkpHQ1ow?= =?utf-8?B?NTRVNm5kNXdZNUZsVkhNTGVpanlEOE9rbWVvNk5hNDMvdnI0UFhvL3lYbzNB?= =?utf-8?B?YVBUeUpKUlcvSnh3d0lGdkwvZUttbE9lYkttN3lWTGNFeElSZXY0K29MY293?= =?utf-8?B?TmVqcU0vaU5TSm1hK0lVQWZEREkvOWVmMWFEcTI3RDFWd0x6NmsvekZTNE9L?= =?utf-8?B?bUEzSkdhSzQvMm5FczlwamI1K0tkR055V2M3VGExaXN6eHB2Mjh0V0ZHQnBS?= =?utf-8?B?MXF0SDBiNzJWRWloaXplWU1UMys1WUNTdXZyaEsyd2ZDanozRENBOEVaaHFz?= =?utf-8?B?NXdpY1VtdDUwVGQ0K1Z6RnNWVkN0K3owOCtrYU1obVNEcS9HUVFuSHVWck1q?= =?utf-8?B?OWExL2tDeGdIUnljbEZiN0Nnclp0aTI1U2RWbklhQW5ISGtWWjdQam5nbDdE?= =?utf-8?B?WkxONHdGVnJlNFJEaFhJMndZZUJWcWc4dCswS3hkOWF5ZVc0NW15WHpaVkww?= =?utf-8?B?NWM0dkdBUWR0SGd1MUVqNE5zczRMeXBTcGtkZ1RnQVhUMkFZVTIrWjl3Q1g2?= =?utf-8?B?U2luQ2RmM2ZZcy9WRE0wQVlUZ24vR1RPZERTQnJVQy9IOERubGNhbnNsTUlp?= =?utf-8?B?aGVEeXk4Z09QdllWdUp6S2VPR3JXb01aZGdVY01YTEJ6Z0VPVVRTRnViUlZQ?= =?utf-8?B?TVlPaC9rRnBvNWpNdlYxOW10SXgxRDBjVGFRM0dMaEJHWFZjZUtvbFp2R085?= =?utf-8?B?WldkT2Nod2hJWEdzbmlhbVI1YTF1YXZ6b0p6UTN4ZnV1dis5dFpkVEJibDBa?= =?utf-8?B?VDJoSGZnTDNyUm9OS2NWSmJjRE43TDB4YWtZcGpCb3VWSDJ4Rk84R3BIdUdS?= =?utf-8?B?V2p3VVRkZUNvOElFaDczY0JlRDdWam14WDdvRFVIemlRaEJ6TFdQT1hES2dr?= =?utf-8?B?djdERWhseE1uZ3VYWmtVZ29IaWVEcDhFL1o5dXMwNFdXZ2JDVE5MVHE1alR2?= =?utf-8?B?ODFYMmJ6ODV2V2t0d1d1M2RCaTU4WUNlUXdVbkdqWkNLTUxDUmVLa1k2Y3hn?= =?utf-8?B?Qkhxckh0Mlp0anQ4NlU3YVp6VlFITXNXVU9rbysyVG95VHUrN3ZiS2NEODAw?= =?utf-8?B?bDIvaUZkdUl5eG5pMlJSdUdYQXhBZTlqZFllL0hSa3IvK3oxbGdoc1Mxb1NP?= =?utf-8?B?MjY4Y0tWTndkc1orN0pvblV4WmhUNzBybWNVRWxXWXNkdzk5aERDZi96UWlV?= =?utf-8?B?RFJpeGtsWDlORmg4L2M1ZnNzdzA4dnZXWWQwalpORmp5RVk5R1lZbkJLUTVU?= =?utf-8?B?akttWUhVRlhOZFJDbDlPZEJkRzl2cEJaMFYvWlJQaytWVk0vaGUwczRmYnha?= =?utf-8?B?VjI1aVhCZUxTZ01Ga0Fqa3lQQ1NURW1VZzZxMTVCdG9ZbWdOUE1xVzVQZnRP?= =?utf-8?B?ekZBeHBlanRYTUxIL3hHS0RLeXB4NWZieVpUR2RJNWtQWVVlcHdrYStzVUlC?= =?utf-8?B?VlFqRFZPWDBoVjRBVktzUUZFN3ZGdnh1OFZOc0ZzOWNZT29meFp4dHFFSWF1?= =?utf-8?B?MHIwNWpGV21TTWl4M3ExZ3ppTjgwdUxpN0IzcndpaHZQZTZIUTlmYktrTVJ5?= =?utf-8?B?U0pFQUF0eXBydVViV1BiWWhYd1lpMithaTN6Nkt0K2xzZUVmemZ5Tjdwb2VL?= =?utf-8?B?RkFFREhocEJGaE83cm1jNXB3cFF1MjZodHc4Y3dvZURTWWtSTnhmMXJISUMz?= =?utf-8?B?R3pqaDlaVmQ5TWMrL2Zad0VMQjVOc0RQdEN3SEdSTzM0VW5wZHdiVStkN1RB?= =?utf-8?B?R1F4bjhjWFVOemtydnROYzd6OWZJRElDMWx3L01neHRqb1lRMVRCTjNtUVNT?= =?utf-8?B?bnc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: da778e4e-8935-4bf8-81cf-08dbff1f1ee9 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2023 16:42:13.4085 (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: +SgTLbZWwshzKt9p4zmmXBE44F0k/G/qmlGx80yWXAj1ta0jU5BFk1y8Le38pNl1n1NI1PXZI0YYnxUG/R+GXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3686 X-TUID: bxXO6a6x9Yfx 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 the already configured sources, not those specified via --extra-repository. We therefore switch back to configuring isar-apt during sbuild-chroot creation which is actually slightly simpler than using --extra-repository. 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 --- My original plan was to use linux-libc-dev as test case for this, but we have some todos to make that work in cross-build scenarios (IOW, KERNEL_LIBC_DEV_DEPLOY is broken for cross). Clara, this avoids your workaround for xenomai-images that hard-codes the linux-libc-dev version in order to enforce an upgrade. Srinu, this does not fill an SBUILD_FLAVOR with self-built packages yet, but it should simplify it, obsoleting the need for any extra class. meta/classes/dpkg-base.bbclass | 11 ++--------- meta/classes/dpkg.bbclass | 5 +++-- meta/classes/sbuild.bbclass | 3 +++ meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 2 -- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7b054d3f..5c1f55c4 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 @@ -297,11 +295,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 +306,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/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass index 995f7a54..3e9bf38b 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -49,6 +49,9 @@ EOF fstab_downloads="${DL_DIR} /downloads none rw,bind 0 0" grep -qxF "${fstab_downloads}" ${sbuild_fstab} || echo "${fstab_downloads}" >> ${sbuild_fstab} fi + + 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 } diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index 938b8334..3634ad05 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" DEPLOY_SCHROOT = "${@d.getVar('SCHROOT_' + d.getVar('SBUILD_VARIANT').upper() + '_DIR')}${SBUILD_SCHROOT_SUFFIX}" -- 2.35.3