From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7365616083855736832 X-Received: by 2002:a25:b306:0:b0:ddd:72ab:233e with SMTP id 3f1490d57ef6-dee4f50dcefmr9344816276.54.1715583381195; Sun, 12 May 2024 23:56:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:df83:0:b0:de5:b132:90f6 with SMTP id 3f1490d57ef6-debd01256b1ls757993276.0.-pod-prod-05-us; Sun, 12 May 2024 23:56:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnXH+uz0+Tt8BH0VlFhftLE9Lem1IYl0+kLIEzuetfIBasAu9w2y+QLjXU9EGotvTloyOl X-Received: by 2002:a25:f40b:0:b0:de8:bbc4:2b7 with SMTP id 3f1490d57ef6-dee4f324de2mr7346637276.8.1715583380053; Sun, 12 May 2024 23:56:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715583380; cv=pass; d=google.com; s=arc-20160816; b=yZSdCj3P8NJKc8qbyYDCFVqx2vdmyPFv3iTQUfpT9/zODprLxtZQAUXYU5LAn3Mzpu 3o10fUzxeeJZNWetpTBJiOHVFr1t8uDexa8xrL+VYQu/hf/3iIfQb5R6ufPQDtTam0T/ xmSyEN7WZogmdnJzC0xo3ZbQDBDICVhGUSNlYUNzDChyK4UbC7mMkPHtP04W8+BOOgPk SGD5X2CXG/wuqh3oX/dHA9cXHRy0giJ9incvMDnVGxGJD/AzHKp76tQTTTWlA8NySI/S N1AjD0WB61m4uw8WDfGWoLbM7zuvZIq4slkmM0APjwSrqSOTw4OIK7QVQFBvbZ6n83rE rgiw== 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:content-language :references:to:from:subject:user-agent:date:message-id :dkim-signature; bh=GDSYD9Bb+YNv5kF8kqJQdckWAF82LTvOGn2W7dGbR4U=; fh=yA7w3pVfsHy4ZapL517pH3cDpF6cvuQCUXAr2JIZ1/g=; b=sbgKvuz97VnylsffSC7Ty8ISduPHTyKBvp0cxvwGRKYnrtQ5QzvezWYOpnF7Ui1DwS nAbTf0lCknph2PzdpZ7R7nRzdZuLmIGfCbBe9Lm7NcWHv43GeGE6Sdh3G45mk1wjUNK7 eK8ekBpspMPD1hlGN2dB8d86mkHl/qbeugXnnKlaIlxfITy9u8F6et08Ycmk27oLhP42 RhpvP0+7y86Y/X8jQ+NvF5i3b443kka0iz3RiRfCUBaw5YyB0fOLNnOtbqh1oBxU3+h+ cf1ari8WgNN02oYGyPVhUxoLDGRJs97rop9XHZKctJfxQHtT/nblQSlks9k9IHr0Gdy1 0BdQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=V8Pe5oo8; 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:2613::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:f403:2613::601]) by gmr-mx.google.com with ESMTPS id 3f1490d57ef6-debd367f3d4si947833276.0.2024.05.12.23.56.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 May 2024 23:56:19 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::601 as permitted sender) client-ip=2a01:111:f403:2613::601; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=V8Pe5oo8; 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:2613::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=naskFsPM4GHtT8nHouwDytNc/3aK7/7aHhVMpYhplzNDGwgPMzNtriYXkKhyKdpKz4uaoZqPep24Ui3/EEmrjBZ6Q6bFTnq8MGUS7JmrYLthWGj/t4sRBczL3cGQ4b/NiPRxE/ClNc+BenLL06iIAH3EnCB2JOjdG/Ve8aZculfLuLB+HdKWqyjQmu/e0f+75Crujpd/d8CwC5F0GO1kQ22kAVLfmjHvCSlTPr7jfG058Ls1y6Mhn8Wpl+Mo2DKgD2umxH6yg0936GyggphLn58go54w/hRsgtJIatQCRVfMh0Fqdn7BDxgr/Egu/fTydMzkYqm8mQvLL6KD7Telsw== 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=GDSYD9Bb+YNv5kF8kqJQdckWAF82LTvOGn2W7dGbR4U=; b=A8Fa+7mYAD96QXW5YEyF7wZDfDgKUvFwPM0JB2BW1RGqRvZDwws8fNxhs69WNfd1u2jpMBABdgHo5EN/frnNxUO05H80W5vkUZALCk6U5ZDy6X+9ac059elV34yBoMDSp/TQCo/yZxNXoAhxkjdf2Dxttuqn/2ac5FCvJjAroyavqRntFlVlpPs7rMoh6CSOjymYZEydUsGaDumQAQavgvh53eykTJgZKR1aRMQ7ky1p515yw1Pf6fpiyTl+hIHyjk5WC6UCvnYAaENmnS2xJdZSku5A3YbrFlGOkZWvKHFZ1ChRrtFdQE0WkFBPHpvl8lyHwNxWCuWCnccZkJifGQ== 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=GDSYD9Bb+YNv5kF8kqJQdckWAF82LTvOGn2W7dGbR4U=; b=V8Pe5oo86CZDcykCDi7L7ZGtMXUblb22h21L6yaMgcUAR9Kgk0H39jDZvSbwRF1pe3smWvKsAYJvmL4qWa4kJ6e4RtBjXSpWEdmyBOMhW/Ass8DLfC6s31YtTqiMm4oi654AxLYqvZYyQ2xK63b9BVEyrRIZGa9C0BiRz2YSX2aIHRGzUEmdDUsl+y741pc0zjxjxGMfjPhcAQ0vGOlbVF50Hkq/Ddhw1+tI2qWua+xmUSUvJoQ6L0fpTyf6VuLFfbDHDxmbdUz2UvjmvWQs1grFPGM0PWxqVVSjiwBZZa5/szxC5JOdlqM3p3oEXeST5wM8JA3uvybRf0qONWTZ1A== 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 DB9PR10MB6356.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:3c4::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Mon, 13 May 2024 06:56:17 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%7]) with mapi id 15.20.7544.052; Mon, 13 May 2024 06:56:17 +0000 Message-ID: <5e022dca-a8e5-4a0a-b1d5-3f1caa39b2aa@siemens.com> Date: Mon, 13 May 2024 08:56:14 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] dpkg-source: Fix source deployment From: Jan Kiszka To: isar-users , Anton Mikanovich , "Moessbauer, Felix (T CED SES-DE)" , "Schmidt, Adriaan" References: <964d8ba7-3726-4724-904b-100bd537da64@siemens.com> Content-Language: en-US In-Reply-To: <964d8ba7-3726-4724-904b-100bd537da64@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR2P281CA0021.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::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_|DB9PR10MB6356:EE_ X-MS-Office365-Filtering-Correlation-Id: bdd60ef0-a3ef-4001-6438-08dc7319c975 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|1800799015|376005; X-Microsoft-Antispam-Message-Info: =?utf-8?B?dElSWm92Uk5lcythRnhJbkpEaTJta00ra3VwRkltaHhacHJ6QlJ3Z20xOWVJ?= =?utf-8?B?VnZFLys5OFNyZ05aN3NxSmtNbGxvdC9NZTRhYm4xb1lCa3RXdGRTNHV0S3U5?= =?utf-8?B?ZGh4eW1JSW5Cd0dwZ3hPWGNScmN0czhGVVBiV2VpQjk2TVVNYnBGeGdQNHpi?= =?utf-8?B?eVh4YVRuV1ZMc2RIWi9jMWV4MmEwKy9ubGFPOEVVWThKTEJhYkNodnZrTmtz?= =?utf-8?B?NTRqd3BWWnNWTWpvZ3hFNitzRGFjalNGeEF4U1U4UHlEQ044Y0JpcmJUQVRu?= =?utf-8?B?RFhrVWdEYStiMXhvTGJTeWNuZnFZazR5UlFhRFJiOHBDMTJBT29EdEJyYkp2?= =?utf-8?B?azNMNjBpWVdDdENIQiszN3BVekhiWTVLZ2w3cURKQUYwcXR5RGRRWEs4Z29j?= =?utf-8?B?allzVnFwamJLNkFDaXk0a1RxMStqd0dhQlNhU3hrMUl2T2Nqa2U5MXdWL2wv?= =?utf-8?B?cU9wZXNZMGRLMG1VWjRTd1ZPRm1SY3Vib0FHUVh3K01PQWF1eG1pcmlGclRG?= =?utf-8?B?UmJhUzc2cVh4WlJEK2lCZ1gvU1BQRGZLd28ySC9vbmc3MnhPbGduUm43dEJ3?= =?utf-8?B?V1pQQVVtRUJSVHIxL2ZxNjNZV04xNUZWZUpGTTBkaWVBdHM2SXk2VkcxSHRi?= =?utf-8?B?NzllZTBRb01aZXRySmhiakd2OTJFWXRvOFEyTWM1dHVMa1Jkd0NKY2lVREdz?= =?utf-8?B?UU5TUFhaVVpvMWIzaVFXcnB5azdDajBQZjVuRFM1bDNpTnE5SitxWU5PTEI3?= =?utf-8?B?RUE3Rm9RRTFVRGc1VXRiTTVETTN3NjZ2bU43WDQwL3ZQNFFVbGh1b0lXUUlX?= =?utf-8?B?V1hKdU1sK0ViNjFWV2oyK05Sa1JMWGZtNHJrZCtsTEZHRzMzdFR2VEl1anVO?= =?utf-8?B?dW9lcHZiRE9ublZNWUtSalcvQllWUWtJRGg4ZFczVldhaW9uaWtrV2NjWWVK?= =?utf-8?B?VUpKWloyTmVPU2tESGZGdW1kMVVpOWp6NUxIL2dPR1BKS2RBVnh5YjliaDBI?= =?utf-8?B?aktFNlc1blF4VThFMWNyRWV3M3pBT1RCWDhKazQ1UWNUSDRMQnVzazE2U3ly?= =?utf-8?B?S3Z2ckJjdmdjejNlUEhBeDRKNXYzYTFqMXVLZjBXYUY0UTRKdFRLOVl2bFJP?= =?utf-8?B?S0Y0UjNrRnFCaFdodlRXQVplbk1pNjMzdWs1L2ZYakd5Z0ZwbXdLMm5GN3NM?= =?utf-8?B?Z1pNS1hDUW5NQUtKRlh1YWxVbkJ3aFBadVQ1U3pkZVU5MWRrcmJqdWhhK0NK?= =?utf-8?B?dnYvYVpHOFNLVUZkcmJwSEtxbTltU2RUWVRkaGYrNlFXVGdEVENXQ2dEeTFp?= =?utf-8?B?bkFSV2NRMzZSRXpaVFhzL3lPY1NOaXNwcUtVa0lJdnVqNXM0M01QQm9lM3pP?= =?utf-8?B?MS82ekZEUHREUjV5dnYzZjhaWFd3bEZiTGhKUWxNWjYzVHQzVC96QmVtZ2lj?= =?utf-8?B?MEw3Vkt2aHh2M2w3SUVNeDlDOFIrd0FKM1FtOCt0MzI1SDdWRXd4eEN4R3Na?= =?utf-8?B?Q01SU0ZXNG1RNElMbkZGUC8vSnR0S0YxN3Zsd2Y2c2RyWUlJcVNOZE5zelpD?= =?utf-8?B?aEFDU2RmTFllKzliblJtUXJZVFJZd2Z2aExObThQQzQ4alp2c295RVY0emM1?= =?utf-8?B?NDc1Z2xZdndPL0FsUTZaM1E4U0VJS1V3VVQ0Z010TnRocjUyeno4QXhmNm1p?= =?utf-8?B?Wk5aZGYyMHpmNXJLVGN5aGpMaFJDbEhlRWRFZGdRdXdVNHRycUN6czVBPT0=?= 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)(366007)(1800799015)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NHFLZXd6ODNzSmFpQldud0o5b1ZvVzJHejFTalowd3gzMURHVWxMTjBFUE9H?= =?utf-8?B?Z0k3eWNpYjBxZEVxRWJJelQ5SExlT0ErWHNlWXhvT0RqL053M3RTanJsWlNk?= =?utf-8?B?a3FRNE9MeFBWTldhSzBFV2grTXhYeTdrVGJCOFc5WURnVHI5Wi92VmdET0o2?= =?utf-8?B?VC9PVjRGU21EbEFIRFhRT3JnN1NKUXp0anR1elNuKzRZSC96dE1sZDI3dUtz?= =?utf-8?B?WmxaVVR4VFFpelhWVjdVckRzSXRKdGRadHhMbGJmUHpCSTE1SUZRQnd6R2kw?= =?utf-8?B?c3Y2OTJ5eXYwV0VTRHRvNG1TL3Y3WjZISkUwSnhRblZUY3VIdCtLb2lEK2g2?= =?utf-8?B?cUFNSEp5UVZ6NWpGK1M1dkY4YkpuUjZXS0Q0dXdSck04aVVlVnNEQzVCU2E1?= =?utf-8?B?Q0Z4MytjQnBGUUg0NmMyTEpIZElseFMrOGZGOW5HTG5HQ0FYNUdNVzAvLzZK?= =?utf-8?B?dVpVeDNkbFQzRU50MkhUZkttVitRVU85MDJGYzNCbUhNSlI3b0pZdDdnTTZC?= =?utf-8?B?N1dUdml3TU1UOWI4Qm16bkFxSVFOWHFWRng1VEQzNWEzVkxqUG9lZmgwdGVD?= =?utf-8?B?b3pVYTdPV200dm9sRXNGVjRMdHF6dllER1dOTjRNVmlQYkxzSE9ET3AzUnRl?= =?utf-8?B?ekt2cmJFaVBWZDdNakxndEpFRUpSVnpaQjljb0hobFFjQTlSSzlIWWNjelk1?= =?utf-8?B?M1NsZG5Bb2Jnc281aVJ6dGRoRk5jZ1BmVEVvYUxzMkhUVFViWTlhYXYyckds?= =?utf-8?B?ODVpZTVKa0FUUE9Kc2wxOGdlRElaU2swejkrZU84a0dDQ3RLVDNoVHZxMnQ2?= =?utf-8?B?MmxEOHdoM0MzTEF4OWM3NzhkcEQ4aDliWlkvSmd5dmw5OU9saVVJVHVoN1E3?= =?utf-8?B?RDZqY3Q3WDZZdThqS2RvaXVXR2hMaHloeGZ3UTBadkNmZTlZR29zQURUcGdk?= =?utf-8?B?WUlMQis4RGd4aDFwcWJ5c0VaaUxYTzZwekdUQlQwUVdKcS9GMzZDMUY0UHU3?= =?utf-8?B?aUFhR0x5OGlqN3dCamN5bzd1R2VWSDZEZE5DZ1h0c01idlZwbHJmV01qa2Y3?= =?utf-8?B?dlV1MExxS2QvTFQ3UzBxYng1S0J1aFdIQ3E3NmpWblI4MStUSjNRL2Nsa00x?= =?utf-8?B?WnhaaVRIVjlMbkUrbTJzRlQ3aU9hdUJ1dDhnbThFWTQ1cGNJUVhuZVhVNUNQ?= =?utf-8?B?NGVCd0xlVlg0UE1tenJCL1A5V1BXNzBDVTJURGc5OU9qU2lDVS9UbkVueURh?= =?utf-8?B?RVNqaHcwNlRqRVBDajI5c3I1ZzlKVEpLUjUzTmF0Y2E4c1dmWXhXZEk1eDYw?= =?utf-8?B?TXIrek9jblA3MDFNTXVaRWkzOUxxRHdiWGVZdERtSlNnaWx1UXoyaHA3NW1m?= =?utf-8?B?UUZUUTlBbTBIYXlzUDNOT2Y4QXZrL3NTUkdJSFNqNCthMTRzdG5EK05ranh6?= =?utf-8?B?TDZ0ZTc1U3Y3cmllS24vVThxZVE3OGgvYm1aWTBTS2lkMEh3Mmd1TUp2QXY3?= =?utf-8?B?VGpMWWc4QXdBZFUvYmlhWnNCT1pjUC9tOTd5VlRhbndrUVFWVWxZQkdSYW9z?= =?utf-8?B?NisyaFMycDhTN3Y0QkJnd3dKZmdaMDZNYnlmVk90Um9na1VHVnNQTlE2MlNj?= =?utf-8?B?OU5yTXZvSlFUT2xGczdmUUlSOHd6R0tkR1Y0dkdrMnpsNko5em9SUTNTc0h1?= =?utf-8?B?N0R5TTBVcy9IQ0JlMkdrWTVVSlhwbDB1UTJIZHV1bDZQRU9kTE9WY2kvUkpL?= =?utf-8?B?Z3p4OHVqSkdWNDJGcmt1SUxqYjhmSVNFcVRXVEgrQ1FvM293YnoyUFUxcmFG?= =?utf-8?B?NVRna2M3angrTUhPSjArdUsxcHVKRm5tVWduYmEvRVpocDZzYzA3SzFaeEV1?= =?utf-8?B?VDJlL3BYT0Q1bW5JU2pxbktpMlJ4NTRZREhlejNOcXUya0VZYnh1M2tGMEFx?= =?utf-8?B?b3VmVTFnY0lFZ3UxQk1PY1J4UnVlVzBHcTdYZmFQY0tFMHdyajFYYTlFcWlS?= =?utf-8?B?em5ZTUFvc1ZsMTdJMzJMZEo2SDVWdnVxOXl5dHdHbnZtdzVTWUtQU3RYemIy?= =?utf-8?B?ZitVajFDUkNlcVcrTWIvK1FGTGlmL05TaHhxUlkwY0daWmdRRi82SXRJNE83?= =?utf-8?Q?U4m8MPjERDMUcXUv/MPGKa0CU?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdd60ef0-a3ef-4001-6438-08dc7319c975 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2024 06:56:17.2014 (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: 7Tl5XlpGowllaWC6qb6DpQnIR/R1ZQoeRnKiT/EwZFyXPe6712OH4gDtNL0VVK5rq56OcYsOI7Qi6L44ZBR7Jw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB6356 X-TUID: IWROsprL/ywA On 10.05.24 19:32, Jan Kiszka wrote: > On 05.05.24 22:32, 'Jan Kiszka' via isar-users wrote: >> From: Jan Kiszka >> >> This failed if S was not a direct subdir of WORKDIR. Align it with >> do_dpkg_source. >> >> Furthermore, move -maxdepth before -name to prevent warnings about a >> global option specified after a positional one. >> >> Fixes: 38b832ad8248 ("meta: Implement two stage build") >> Signed-off-by: Jan Kiszka >> --- >> meta/classes/dpkg-source.bbclass | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass >> index 7fd5d2ed..005eafbe 100644 >> --- a/meta/classes/dpkg-source.bbclass >> +++ b/meta/classes/dpkg-source.bbclass >> @@ -21,7 +21,7 @@ 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 >> + find "${WORKDIR}" -maxdepth 1 -name '*\.dsc' | while read package; do >> repo_add_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ >> "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \ >> "${DEBDISTRONAME}" \ > > The longer I look at this... Why is this a loop over potentially > multiple dsc files? We are expecting a single source package, and that > is assumed to be called ${BPN} (that assumption for cleaning may be > wrong with external source packages, though). So there should be also > only a single match for *_*.dsc, no? > > I'm actually trying the clean the mess we have in dpkg_runbuild where we > are reading debian/changlog to get the dsc name. When not building the > source packages ourselves, we would have to unpack the sources in order > get the changelog in order to find out the dsc name that is needed to > unpack the source - this is nonsense. > The following changes on top of the this patch is apparently working fine, and you can simply do IMAGE_INSTALL += "linux-headers-${KERNEL_NAME}" again. diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index 1cca9cfb..229e6a5c 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -17,8 +17,7 @@ PN .= "-${KERNEL_NAME}" KERNEL_IMAGE_PKG ??= "linux-image-${KERNEL_NAME}" KERNEL_HEADERS_PKG ??= "linux-headers-${KERNEL_NAME}" -KERNEL_KBUILD_PKG ??= "linux-kbuild-${KERNEL_NAME}" -DEPENDS += "${KERNEL_HEADERS_PKG} ${KERNEL_KBUILD_PKG}-native" +DEPENDS += "${KERNEL_HEADERS_PKG}-native" DEBIAN_BUILD_DEPENDS = "${KERNEL_HEADERS_PKG}" SIGNATURE_KEYFILE ??= "" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index af3504dd..00b169bc 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -113,11 +113,19 @@ BUILD_PROFILES:cross-profile = "kernel" # -native: kbuild package for host BUILD_PROFILES:class-native = "kbuild" -RECIPE_PROVIDES:class-native = "linux-kbuild-${KERNEL_NAME_PROVIDED}-native" +RECIPE_PROVIDES:class-native = " \ + linux-headers-${KERNEL_NAME_PROVIDED}-native \ + linux-kbuild-${KERNEL_NAME_PROVIDED}-native" +# Use pseudo target. We cannot use ${BPN} because it will be auto-extended +# with -native by multiarch.bbclass. +RDEPENDS:class-native = "${BPN}-pseudo-native" # -kbuildtarget: kbuild package for target, enforcing non-cross-build BUILD_PROFILES:class-kbuildtarget = "kbuild" -RECIPE_PROVIDES:class-kbuildtarget = "linux-kbuild-${KERNEL_NAME_PROVIDED}" +RECIPE_PROVIDES:class-kbuildtarget = " \ + linux-headers-${KERNEL_NAME_PROVIDED} \ + linux-kbuild-${KERNEL_NAME_PROVIDED}" +RDEPENDS:class-kbuildtarget = "${BPN}" ISAR_CROSS_COMPILE:class-kbuildtarget = "0" # Make bitbake know we will be producing linux-image and linux-headers packages @@ -125,15 +133,21 @@ ISAR_CROSS_COMPILE:class-kbuildtarget = "0" RECIPE_PROVIDES = " \ linux-image-${KERNEL_NAME_PROVIDED} \ linux-headers-${KERNEL_NAME_PROVIDED} \ + linux-headers-${KERNEL_NAME_PROVIDED}-native \ linux-libc-dev \ linux-libc-dev-${DISTRO_ARCH}-cross \ linux-image-${KERNEL_NAME_PROVIDED}-dbg \ linux-kbuild-${KERNEL_NAME_PROVIDED} \ + ${BPN}-pseudo-native \ " # When cross-profile is active: -# kbuild package is provided by -native or -kbuildtarget variant -# Otherwise it's provided by the default variant -RECIPE_PROVIDES:remove:cross-profile = "linux-kbuild-${KERNEL_NAME_PROVIDED}" +# kbuild package is provided by -native or -kbuildtarget variant. Also headers +# provisioning moves over to ensure those variants are pulled, although the +# package itself is still built by the base recipe. +RECIPE_PROVIDES:remove:cross-profile = " \ + linux-headers-${KERNEL_NAME_PROVIDED} \ + linux-headers-${KERNEL_NAME_PROVIDED}-native \ + linux-kbuild-${KERNEL_NAME_PROVIDED}" # Append headers depends HEADERS_DEPENDS = ", linux-kbuild-${KERNEL_NAME_PROVIDED} | linux-kbuild-${KERNEL_NAME_PROVIDED}-${DISTRO_ARCH}-cross" Jan -- Siemens AG, Technology Linux Expert Center