From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7279128154668531712 X-Received: by 2002:a19:6742:0:b0:500:b7ed:1055 with SMTP id e2-20020a196742000000b00500b7ed1055mr19935914lfj.56.1697102157401; Thu, 12 Oct 2023 02:15:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:5e11:0:b0:502:d736:5e79 with SMTP id s17-20020a195e11000000b00502d7365e79ls109994lfb.1.-pod-prod-03-eu; Thu, 12 Oct 2023 02:15:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELsOjq4kBZ3Q9LaCO7PkxzHDnsI6lToJyx6zx+Q1ZM1R133s9UV20BEwzkm8SjlaVGBcPK X-Received: by 2002:a05:6512:3ca4:b0:500:b9f3:1dc4 with SMTP id h36-20020a0565123ca400b00500b9f31dc4mr25403946lfv.68.1697102155245; Thu, 12 Oct 2023 02:15:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697102155; cv=pass; d=google.com; s=arc-20160816; b=zJM4PgdevwMSVBeeNTwFRu+z4S+y0FQLeh3Qm/0eeI5D9aSqfqBJ12FrkH8a6wxZng gTnq7pfBqMmRXQtFS5u31mPDqlOSS196TEznp4bLnDQ1jL2HI7V3YQZ/fBQqJDBXSJvw gd2k6zl4BKEKueX7Ej/e2oNliOkuvBisqMs4md/WQ4joOu/SEW8mdX7sCNQoyVZZhgym 6w9L6tq7mgZk9lX6aGquIxyRFrxnZJvOtxuf/qDTGrmfndxReLT/2XA8LhE1U+9kuR7U HDqB3gahMmvA4YRdT6p8DCN9pQ8Lfro9xxvW79bO39sgmS2gz6D4PtjTjT2YVix36Pjn WtBg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:references:to :from:content-language:subject:user-agent:date:message-id :dkim-signature; bh=i2JCKPooe0DxXn2MWpRoBHvLbI6sejVIt7UJPSMdGwE=; fh=JZvUnqoG0jWph92hWpw0EINycbLveqkIcdkusZDYok4=; b=nwtWnOOa195AjbXtRJ+5p8eHYCuTlf8h/N9o0r+bg55uy+z9dLz8XVldaSe1fbNmiD BU67hOHTCxTeRq/TfWVj0sU6bQnHz/8d6F7y7lI6/p7+DaoEfIgQ6vOssoLImaMP4Plt EzMP4wzl45taBJ6NWdICVUo1u9zGWxUkQqclhoX0jeh9xiWe2UGpJHIAjFTYZkI4Uwkf DE52rm5Z/5/NKYjFdValK7qftJjOcLwLb1zMs1FnC2lOca4rZXoWzECWrtV4pqUKrHCM N3juL52+z7ROw6xX5xgf9/9GKwA8JQerGVhALV5tr/6/08XIl1uM9uN0VADRkBk+ovzR nFHg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=vK3hoMN2; 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:7d00::601 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 EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20601.outbound.protection.outlook.com. [2a01:111:f400:7d00::601]) by gmr-mx.google.com with ESMTPS id c21-20020a056512239500b0050686eb00d3si629053lfv.12.2023.10.12.02.15.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Oct 2023 02:15:55 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7d00::601 as permitted sender) client-ip=2a01:111:f400:7d00::601; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=vK3hoMN2; 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:7d00::601 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=ferPEFfGbRgALVH8h0WSu+Z62qxdnf9vID8hNmfCnlyPmW43l+rM4YRDNNbSfDO5h+1CqNTtZPzkvuG1QDtTB5837tC+DijnJ+P0B0G2QLlzFBWtRNQcQHYaiTWMQcfR7Of8Cd7/Ip/mGGkN6D8Bo40Tg+Rk9y43/cKVcTWBhWIrdi/LwdhGtp/NYUlkdosT/UXR//Wa+bxuWu6cZt/fQgoIla5lTrjhoXO4okMroBCse92E/iivj1nB1KjWVKuqMbWNHPT827n//dGWfucNnBRhLS39cuRnE/MQ451vlQkwLZwc+36mhMXDJj34eJToJFPG+ITmbgmcU6DQr4/Z+A== 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=i2JCKPooe0DxXn2MWpRoBHvLbI6sejVIt7UJPSMdGwE=; b=NiQ6s4b8ZhfdBNW+a1JF/KY6/dgkwX8QVmbuph300iZe4Pag464vj5BguoLeH0j6HwiQiqhHRSPv/FOlPthEzeM81yLYv+KtTN6781fgcb9iT/ydO1kL8V/W+HZPunuQwHe6reXt0GJwXEIvpVES3N4Z7PRxQeACTyVBbcAE9jUvSFRKU127Y5jSh6PwnIoVfLW9gkhd8SEW7M0t02kYSW7foc3j/Gnd5XzrPk2J83M25+gtBANEg+EoS07/fP1IutVoDUSwFbZS6aRwqIekg9TfMO7qNAol8DEOWd3VDiBW5rx9K3snhadg7/8cH4O0hIli3F4TgoUBiFXEpNAIGw== 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=i2JCKPooe0DxXn2MWpRoBHvLbI6sejVIt7UJPSMdGwE=; b=vK3hoMN24JEa6i9zg8I5xnF8wEUguVoWT01Fyf7W8JLn3tdUrdUwAC1KTEgcT8OCCfMM2rrotRT8I6KFLsrqNPxX4z3DmLOFEplGc8fFMIUMh0VsoIr5IqiwD2KWLAh15CVLv5cnfwFES94iRBX4E6dnIVd9USNoLHmLwjHJ8YKX/aD97qVIk4b5/lWefP55pMS1ma0SMLxSAAHO3Ay4Sg/RJWjaZuvqguXMxZtKD2LOa0s3GFMzPHndNJjaBzx6Gw5AhIEs6nVrt2Oy1FmElHUob697umYe8CJ9VbvtNGEcn9Lej578mlwFcJK9Q+iExFgs4Ko1QyuDJVJO2x5aAw== 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 PAWPR10MB6805.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:335::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Thu, 12 Oct 2023 09:15:53 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2a90:96cb:b3f:6e5]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2a90:96cb:b3f:6e5%2]) with mapi id 15.20.6863.032; Thu, 12 Oct 2023 09:15:53 +0000 Message-ID: <482e686e-a8d0-45a2-a7e6-b16330507281@siemens.com> Date: Thu, 12 Oct 2023 11:15:46 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/5] meta: Implement two stage build Content-Language: en-US From: Jan Kiszka To: Anton Mikanovich , isar-users@googlegroups.com References: <20230915185439.2954192-1-amikan@ilbers.de> <20230915185439.2954192-4-amikan@ilbers.de> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR08CA0020.namprd08.prod.outlook.com (2603:10b6:610:33::25) 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_|PAWPR10MB6805:EE_ X-MS-Office365-Filtering-Correlation-Id: 306f8e66-008c-4e48-de8a-08dbcb03d542 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0En3PaUUVSe/AM5SeceKOHSQbjhAkIFIgGnv0XrjFggJP40aeXkyB5nNv19daABywJora2F9qcwA6nQOjhtjTc5sdsEa/DwZs2Yy3eoSkS8FSwiKhvcDItaE6FqSzqNt6+vVboH9OtrDuuPFWry05SrPAZRSRxXcbc1Q3N7fOX6owudpTICzt2tH9BoHI2C2qvQyVdgY5Sp162Q/QQ2T+14VphOnH2r0oVZwd4EXGXRFJ7s9wg0mDOUxeTlEbc5klGw4iRcqvfTfsEoc007c+wruDE18Pwk3Y5NjHBHtY7fGFo5CxXGn/8rQbmgrTZmxYXHK2fOIy7lsUjMvo+HaV7g062DAYScfsOBDiCmmNVPVSG0pNuxwJKaXMMIXbXap3dFDMdzVreJtj49y/pBgnDi6nyXHEtCoJrGeDYpKyUsLnGSU+OIFJoFzYKNGDLdqXO7f0qsjXyxZ6o9hlCeeMFtxLrJGS8eQtAHltTq/xD60+++sWFWCOkirfiX06N77q29AQQIiYLHuSk6EIXdr5mDEXsbfh7WQrDUInvtgL1rjbCI+1dvWxdpzLsxIqINuoARjE4HUWtmCs6/Vvi7roVZS4LrJEMp3fH6oarWByTjQT7XRL7bucP5RtiI0HZjb/MUNfuzwe6xRS+yfHzJZ5Q== 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)(396003)(376002)(346002)(366004)(136003)(39860400002)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(31686004)(66899024)(6506007)(53546011)(2616005)(6666004)(6512007)(36756003)(31696002)(86362001)(38100700002)(82960400001)(316002)(2906002)(966005)(44832011)(41300700001)(478600001)(66946007)(66556008)(26005)(8936002)(83380400001)(8676002)(5660300002)(6486002)(66476007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NDY2S05DSS9QaldWenc5Z0ZrbW0xMTFkZGxLSmVFUmRhOWVwRm5rMVN1cmpK?= =?utf-8?B?VHNkT1ZmaldSK2FPZnVaTk9zZ1EySTdtWlAwNUxRMDB4WExEK2lmOHJoSXJm?= =?utf-8?B?cEpQd3h0Z0wxRmRieWUyMmpHUU13bGdTaTV4Y3FGdk9kblZBRW16YmFnM2cy?= =?utf-8?B?dTF6Yk50R1kzdXhaNkcxZUUyTnlKVTdocTdWaGtVd1FIWU14NkVvN1FpWlJT?= =?utf-8?B?UG5tRndpNUJsb0J3aUhBL3ZTbkxFSEduSXdNUHg0M1pFZFQ2YUZCeDlEbmtr?= =?utf-8?B?L3NwenF5V05iVmtiSkhiWWF5bzk2Kzl6WWVBejlJMG9TTDNqZ2ZMaDROanpH?= =?utf-8?B?WjhGWitwS082d1VXUkhaYU9HVzViZGl1cTZHWEtaZ0ZSelVoWHE5NThBa0Jr?= =?utf-8?B?Y1JjTTJ6WHhrNkxoZ2tUNHQzQVdnTkNjVzBiMG1WdFFuN3FoNlNzb212eDFR?= =?utf-8?B?cHFQK0VwUVNjcW4wK0dIUEV2YjNGUjNVT0d2eDlwTUR6WHdaMmgyM29JWEpC?= =?utf-8?B?dkZ1aWM2VUhaa0NZL2xTdWdjaWZ4dExuUVFBaWFaaVNuREVma3kycEtQQkZk?= =?utf-8?B?VjlFbjJ3aEFLV3hRZUI2VUZBQWIzQVc5VWlrS0dHUlptbU4rVXhzY29ZbXVI?= =?utf-8?B?Z0YrUXFIK0JPZjJuOU1uQmlBeEtGVjB5M2NEUmhtUWRMNVlxbFpYYTNsVGY0?= =?utf-8?B?NDBrQVQ2SmVUOThoc2toS044SFdnaEU1c0dJQ3Z4dkVNZ3VKOWNta0RPc2dm?= =?utf-8?B?WHYrVERFdUtWZys0RmNiSGNCWnJ4UVE3aFB3bXp4K2Y1TEFmRDc4Y3RKQkNS?= =?utf-8?B?RklPSDZkZEZ3bjZXWlIxVG5odkRYaGJlaDFNMGo5Q0lzQ3h2NzQybW8zYmVJ?= =?utf-8?B?bFhpWU5xeE1UcXF4K2VBYnBJQjBHcGt4RGNXK1Y5M3BESmlSb213eWhPL0sz?= =?utf-8?B?cloya0s2bWtJaGJjekZiVE53bTFpdy82clBYWkhuVHJBMVRrbnVUNjZyWHBQ?= =?utf-8?B?VXpuRjY4VUVsTnlDOUY5eVhCRHN3VkI3NmRyWmdRRTVpREU2Z1FBRk8xZ3NF?= =?utf-8?B?WXlUYWk4OGdrL2ROemFTM2gxbmkyMUhTSEtvVTFwRUNBSDNBakpnOFlmNnpv?= =?utf-8?B?OXpVbjNKbmhUWUMzUW1zY0pIaGJhN2Z4V2J5RVM4V1dXWTI3dWFscjJTSHJq?= =?utf-8?B?WXg2cHpPVGVOdStrZFlqNW5NNTBRUnVGL0c3TTEzcytQVCtkWHQyZndkUzNO?= =?utf-8?B?b3BkaElaN1IxcU9WTE1USGp2MjRRd2JvMUNENjVGQVIzUUUxY29yUGtWNzRI?= =?utf-8?B?blh2Rm5yUnJlSGFic3p0NU9YV1BSSExPWVlVdFVpTTNwMjVRQ3JjUjVrZkJ4?= =?utf-8?B?MGRXak43NHFxQ0hxS0F6ZThmbzNGTnRrcUltQmFEeVMvcmJSelp4eHlUZldE?= =?utf-8?B?Ni81K1RIZUNkZnlwbEhMN21LSzNPVzI4aCt5aENoYUdJeGpGMmhwbFF4NURx?= =?utf-8?B?S3ozSk1RS2poam1ZMGI1SlZWdVZqdFo5TUFCZVYrbHA1Z3J2WnZwWHdjci9j?= =?utf-8?B?UTZQd2V1SDlJN3BCeU9ydW92bGk2SnFOMXo0b0U0R3VNRnNrU3FONVZwMGxO?= =?utf-8?B?bC82Nno0WjVqZFV0YjBVWHdCbmhwakUvSkROM1BzODZIQnVCajZDQXMrOG51?= =?utf-8?B?MXFKTXYvc2FSd1pSaklXMWhQZExoSjZTS1Z5WDh1eldQUVovRFVVaUVaOE5j?= =?utf-8?B?UW1XZjFJZGErNnVVZnN2M1MxM2szMkRHQys0UFVsKzBsRjN2TGtXdXlyOVEy?= =?utf-8?B?TktNWU5rd0xDVUJhdWR3SmtpdlV1L21HeWVmTzVBN0VmbWhHMW1aTnRBSFV0?= =?utf-8?B?R2pEYTZaU25HU0d4S0cwb1dHOE1CcGd5WUhUVWdHUlNNOXMranJDSXk1ajNm?= =?utf-8?B?eW1PcU81d3d6QWQ4Ykoya3lxWTUxWmZqT3JmcmpsVXUvWmhXeVhBd1AxTHRY?= =?utf-8?B?NWZqQlpCcDZ6SmlpR1FPQW42UW94bFBLM0gvYnhXMFdaRG5FYXpPNUNld0s3?= =?utf-8?B?eXhRVC9kTmpjd2hJT3E4SkQyMFJTQWJWYndsQ1l0ZktnWE5sRWJrVVQrQnpP?= =?utf-8?B?dG9FUllXSFZmbHhqWElBQXMyZ1cxemZJRjROd1NzWEJ1RGdUZDFqWm5VanM5?= =?utf-8?B?UlE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 306f8e66-008c-4e48-de8a-08dbcb03d542 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 09:15:52.8616 (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: fuUpcgFUldgpefsvM5k64RMz61Vzghznew4nsrqtFfbUyOv1MU8QgbLV4pQsdK96c793v8JSWLOQRL0jo3P6GA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR10MB6805 X-TUID: 356r/qjzw6nC On 12.10.23 10:48, Jan Kiszka wrote: > On 15.09.23 20:54, Anton Mikanovich wrote: >> Split package build into two stages: building source package and >> building binary package. This allows to obtain Debian package >> dependencies before any build steps will actually start. >> >> Signed-off-by: Anton Mikanovich >> --- >> meta/classes/dpkg-gbp.bbclass | 2 +- >> meta/classes/dpkg-source.bbclass | 33 ++++++++++++++++++++++ >> meta/classes/dpkg.bbclass | 4 +-- >> meta/classes/rootfs.bbclass | 2 ++ >> meta/recipes-kernel/linux/linux-custom.inc | 2 +- >> 5 files changed, 38 insertions(+), 5 deletions(-) >> create mode 100644 meta/classes/dpkg-source.bbclass >> >> diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass >> index 2bd09eaa..a151ade2 100644 >> --- a/meta/classes/dpkg-gbp.bbclass >> +++ b/meta/classes/dpkg-gbp.bbclass >> @@ -11,7 +11,7 @@ PATCHTOOL ?= "git" >> >> GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" >> >> -dpkg_runbuild:prepend() { >> +do_dpkg_source:prepend() { >> sh -c " >> cd ${WORKDIR}/${PPS} >> gbp buildpackage --git-ignore-new --git-builder=/bin/true ${GBP_EXTRA_OPTIONS} >> diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass >> new file mode 100644 >> index 00000000..434f1752 >> --- /dev/null >> +++ b/meta/classes/dpkg-source.bbclass >> @@ -0,0 +1,33 @@ >> +# This software is a part of ISAR. >> +# Copyright (C) 2023 ilbers GmbH >> +# >> +# SPDX-License-Identifier: MIT >> + >> +inherit dpkg-base >> + >> +do_dpkg_source() { >> + # Create a .dsc file from source directory to use it with sbuild >> + DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) >> + find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -delete >> + if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then >> + export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" >> + fi >> + sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}" >> +} >> +addtask dpkg_source after do_prepare_build before do_dpkg_build >> + >> +do_deploy_source[depends] += "isar-apt:do_cache_config" >> +do_deploy_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" >> +do_deploy_source[dirs] = "${S}" >> +do_deploy_source() { >> + repo_del_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ >> + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${BPN}" >> + find "${S}/../" -name '*\.dsc' -maxdepth 1 | while read package; do >> + repo_add_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ >> + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \ >> + "${DEBDISTRONAME}" \ >> + "${package}" >> + done >> +} >> +addtask deploy_source after do_dpkg_source before do_dpkg_build >> + >> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass >> index 90d717ca..2bb167e4 100644 >> --- a/meta/classes/dpkg.bbclass >> +++ b/meta/classes/dpkg.bbclass >> @@ -2,6 +2,7 @@ >> # Copyright (C) 2015-2018 ilbers GmbH >> >> inherit dpkg-base >> +inherit dpkg-source >> >> PACKAGE_ARCH ?= "${DISTRO_ARCH}" >> >> @@ -95,10 +96,7 @@ dpkg_runbuild() { >> >> echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG} >> >> - # Create a .dsc file from source directory to use it with sbuild >> DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) >> - find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -delete >> - sh -c "cd ${WORKDIR}; dpkg-source -q -b ${PPS}" >> DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -print) >> >> sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ >> diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass >> index 7dec7b36..65574a6c 100644 >> --- a/meta/classes/rootfs.bbclass >> +++ b/meta/classes/rootfs.bbclass >> @@ -90,6 +90,8 @@ rootfs_configure_isar_apt() { >> mkdir -p '${ROOTFSDIR}/etc/apt/sources.list.d' >> echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ >> '${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list' >> + echo 'deb-src [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' >> \ >> + '${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list' >> >> mkdir -p '${ROOTFSDIR}/etc/apt/preferences.d' >> cat << EOF > '${ROOTFSDIR}/etc/apt/preferences.d/isar-apt' >> diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc >> index 8b367a2f..fa5d957d 100644 >> --- a/meta/recipes-kernel/linux/linux-custom.inc >> +++ b/meta/recipes-kernel/linux/linux-custom.inc >> @@ -212,6 +212,6 @@ EOF >> fi >> } >> >> -dpkg_runbuild:prepend() { >> +do_dpkg_source:prepend() { >> dpkg_configure_kernel >> } > > This is not transparent to recipe as the very last hunk nicely > demonstrates. Where is the RECIPE-API-CHANGLOG entry? > OK, found it later on. But "in some cases" is not a helpful explanation. I would have expected that all extensions of dpkg_runbuild:prepend touched ${S} need to be moved, or so. Jan > I thought this change was already the reason, but I'm still searching > for a regression of this patch here on our downstream recipe > https://gitlab.com/cip-project/cip-core/isar-cip-core/-/tree/master/recipes-bsp/edk2 > (can be watched under > https://github.com/siemens/meta-iot2050/actions/runs/6492616563/job/17631910317. > Any hints welcome. > > Jan > -- Siemens AG, Technology Linux Expert Center