From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291294777025232896 X-Received: by 2002:a4a:eb05:0:b0:581:e2fc:fcc with SMTP id f5-20020a4aeb05000000b00581e2fc0fccmr3919866ooj.2.1697636856628; Wed, 18 Oct 2023 06:47:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:41ca:0:b0:581:c9a8:c2f2 with SMTP id x193-20020a4a41ca000000b00581c9a8c2f2ls3315265ooa.0.-pod-prod-01-us; Wed, 18 Oct 2023 06:47:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6nfHN443WafLEevSnQuLbXBqdgJROuROrfBHaJB/xONlsXZnjjaVhKuCQ5ddKztyL8eaq X-Received: by 2002:a05:6830:1053:b0:6bd:67c:ba9c with SMTP id b19-20020a056830105300b006bd067cba9cmr5546451otp.35.1697636855676; Wed, 18 Oct 2023 06:47:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697636855; cv=pass; d=google.com; s=arc-20160816; b=ZA2M498dsaMT5hlQKp4Y/WreUMqwg8mQp3EbOw1B2mQDte6phpp8/OLahz5fqvLHLS BbHrE/49S4dTkAPUtDtqhPNQxp9inmu3PGEQwUpHAS8SV734t6hDu/DDGEpoLNl/HweF jrpzIfARoy3skh/L+9oe1xAHV14AdQsSUl0Isewd7gdVt9PyGMPTun/3kF/e4w4+FxcS vcFzUpr/qITb57okyVBIjnft07eN41dSq0Y+ybyJpZqODyasbEj3Y2AFsgMXbUkUNI+m kIyw++oNn+tTTsJ50LM3jWUOq/SxOtHd3Ru4fZ9eEj+0dBddQOqKDrx8snSD+RrYuWud ZANg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:to:content-language:subject :from:user-agent:date:message-id:dkim-signature; bh=N/h2Yw4z+dWX43e861VNl0v/tWPLnUz8GJ1qsov4FQc=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=BNvZtt7vW77uNjZVu0u9zgw+gF6g6SSMlSRGRCJDo0KIMnvxSRZOcoRgtl9Un5Isfb j4ZW9JYrUL9gBn6a2ynCyqPgyHwfIKNAYc3BniJbAdM3FGxfwmkISbEf84WN/BSUn6kF nBLdugtbJvibPdGdOgUYbyBpCbVj/V+TOwNeIv3NrRR1ZNorUL2F7rw6bzT/D86/Vqqx uPL9LSe+vgvuUN9JsFarCZYzxqBWbSIL0Byca9bZQ3y7cZBdcGN3QjYEMESvFp3XKq8n uNSWxlhaKdgwSjXpODnyq9oZe2TBZZ5R2ce5HFYMfMiqhsUBdwn2BBmex6+u/N/Se8y5 t2zg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=S+pzCzhj; 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:7e1a::626 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-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20626.outbound.protection.outlook.com. [2a01:111:f400:7e1a::626]) by gmr-mx.google.com with ESMTPS id ea14-20020a056a004c0e00b0068fc872aba7si276939pfb.0.2023.10.18.06.47.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Oct 2023 06:47:35 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1a::626 as permitted sender) client-ip=2a01:111:f400:7e1a::626; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=S+pzCzhj; 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:7e1a::626 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=Q0CwyVSoAWlF2OWNEpen8m/k9k2u/FmzAIcqhPVVLipQKO1f8jtyV9Uchj3tVlbs45TZiqdULniw9jCLWVcISTXV0tRvmSOMQgRphF8doThkT2fsjfX7dERiJ9XcnFu4XmeQt0HDiqMFbeJBzBgvxa+elkyxAXio95GHQ6LCi5Zw2sTh+rMmw0lTpfritTge5xKFQGewuUEdwTpsdPaeKOFxN4VjQsgZNxVV7hDxWPvNqZWdcB6CXphhtX7p9i1K7qeK2P3VmQ4kPFg6OTCJoLSSXAft6qhZbVu2rl2N+oo2C7JSFvmqWWvPC4V8OqnoVoHi23UdyZyKLFXmDqJXRg== 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=N/h2Yw4z+dWX43e861VNl0v/tWPLnUz8GJ1qsov4FQc=; b=R8bB185IJPOeZFHaWq0Z95H61UlgYvbDjxbIU4OpzhoAoWzI0IkSvc0HsGshFpbqBdMBwE2rM9Hm72gpcUdAezX+d1g4F6CB+dScfmV2Tv15QccKJQn4eG3KLhQ8yvt8mym7mSvRXH2MuEW+swhxABlwM9FxE2FOx3Ly/SgCJHy5gtcd8elEspg8xrAsQU0e3V5Zb6hJ+L0ditwSYqGneX0Kb5jZP1HbzPalkzt6Gkxcxhmz0nhttzO1IdrtBhjxuKWZKjKfFOtPWFmMxacLfzLQUgjB1N4jBUPn1fzCAWkFNGyHdJvAtxAUndDVeeyqEuFnDF2xWtX4kTkcCkY2iw== 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=N/h2Yw4z+dWX43e861VNl0v/tWPLnUz8GJ1qsov4FQc=; b=S+pzCzhjvibORt4s13+CLgn86+rc51YIKHKTejDsHPBshaR0Ni1L9DQ7V6jitWoZcs5x8lvi/4QYeDVy/4wkLdR1K0Y927MZSpMeXMW0TD8YDS0gG60nKWEkDsYRaGq5iQjQufkkOCRVfc0me0vCo2mwvkKrBrxBKt1N2kGlCdX4bC0ZU0O4KgqBSV3spgepYCb0PI2r00rQlPVc9dgOcEdWPTzZg+cW2XQFAuofbp9y/zuiMs/lflSpX8iuneNSueOtB+iXiWobc2w/aaeD6DaRuvy0UhCH+eADzW+TC2q6bl+VwnZOHipRuQMEH79FUc5QrGkN8bKCah0gWOfKmQ== 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 PAWPR10MB8163.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:381::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.21; Wed, 18 Oct 2023 13:47:30 +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.6907.022; Wed, 18 Oct 2023 13:47:30 +0000 Message-ID: <56795cac-eab1-4bba-93c2-2dd404a59638@siemens.com> Date: Wed, 18 Oct 2023 15:47:29 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH] linux-custom: Allow for config fragments in subdirs Content-Language: en-US To: isar-users Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0364.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f8::12) 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_|PAWPR10MB8163:EE_ X-MS-Office365-Filtering-Correlation-Id: 5474d9cb-6297-4320-6975-08dbcfe0c628 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uK2PKu1mD2bc9ru/lD7MITj7fyxMx/ClbLWqVy95d9XdiYgxQZc1wZNOfMqa+BlX5ve7kXt+H3moSF3iGln1Rp9vRDdmZhc5FGpdZ9XSJOQE9y7DFSNgGtLvHlxMvF4G/mS5odysua14UJnXbu8OmCUTfS7YzZaXPXZy5m2E/6DOTMXFNBVOYocGjC469YFsy47Na7HuzMh9NwG/zD2z2upQF2l01t+htEFEIQyC/ArBSf/2x0ZUCmLr4mNK08KuxN9ndIy8IdIWVwJaeEGMuuXscXgt2aC6Zh+6b4nMlXCfAZ2pr13vDV9y5ClchTKna2bezOPKzJJNgpoTk79Gd9q1ge445Con0FRg0eSTrUwvahLbQt0vKocD4asZbOSuJcJAz2fU8GFhAuttUUJUF8vVlypQ3FUNR/7SQ6bBdC8Ludnx9eGL4Uv2sxGXIohN1ba1/FFnNNVM/RWXzVTHjd/+GshhAIbHFfNjna687B1KcKbkQdXG3X4vtyPTJqXxlC6ZzkS7AwYrwzWOKoV7UdwOvoyWfwH6J4dD5QwQsn0uTW7+Cr8zK3Ne7hkmijqWwQmhG6Ddjllk1bF8/EPGoVJf8quIvQh2E0hTujV7dkrCv7KIEFOyHJkZuOjQLPON 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)(366004)(39860400002)(346002)(136003)(376002)(230922051799003)(1800799009)(186009)(451199024)(64100799003)(8936002)(82960400001)(38100700002)(478600001)(966005)(6916009)(6486002)(66946007)(6506007)(6512007)(316002)(5660300002)(66476007)(66556008)(2906002)(44832011)(41300700001)(83380400001)(2616005)(26005)(8676002)(31696002)(86362001)(36756003)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YThqWHR4MWVGZU1XSzFyeSt5QVlvYWs0Q3h5dUQ4ZjM2NDQ1QTB3WE1GY2dS?= =?utf-8?B?SlFJTVZ3MGNjQmNNOWRhcTJlc0pMeFZNMXBYWVEzTlQ0YTJBYndHejZsUWcx?= =?utf-8?B?cGJnZFloOHQxRXprNzcvLzVXWklnQ3lvRXJhdjJrTGpKemRKS09zbW1NVGpu?= =?utf-8?B?S3VsOVpkTkJDMWd0amZKTCtrZHBSMnpSVUlyTDQ3b2o2Y3FseDJMM0FpNlNm?= =?utf-8?B?Vm1xRSs5RTQvREJVYko0ZVA4RkV2cUpBUHNCM2hZSzM4VGF0UFFXbzlpMnI3?= =?utf-8?B?SVZuaWlHdmxKTmFDM25QWHlKVkJHV2xQbElnVVZabklvVEpZSnNhNTlTZlAw?= =?utf-8?B?eGw1NXRiK3VKU0RDOTc4bXRwRkk0VGxMdFBTUUVPY0xNblIzTFNObVVMN1RR?= =?utf-8?B?U3owMzluNUM1WHA1L0hwR1ZlaWZZQWhsL25MYndyUm45Y2I2bk5yZlVQKzlP?= =?utf-8?B?b3ZydGJLVFRuSUJ1WUYyclo0bVdSM1FiVVdqQ245SFFnMEdRRjhBOTZ3cU5m?= =?utf-8?B?NkREMzVIbWdOMzJiV2I4VnpxTmg2S1BLWU1PV2dGb0xLbC82cytqdFg0TVRx?= =?utf-8?B?N3NGVGpNWTY2TUhRY0QvUmwveXVxRi9PRURwU1lGWE5POWE5V3E1K3lPOXd4?= =?utf-8?B?bDllSnFuWjd2TXZyREJKWFpDTE0yMTh2M1hiM2RjNUZBMGlNOTJ2eUJ6aXI4?= =?utf-8?B?eVo2dll2bmtIL0Y5aVZ5dEZ5aG5EdVdNdDhoN1R5MitxaGhCWlZpNkNGSkVJ?= =?utf-8?B?SEo3UmNXbmRHZ1ZweVVKWUpNdEtVcFRobDNHMldCNk1GRUtSU0R2RW1OY3Y0?= =?utf-8?B?TzZ6bUdMU3hlalA1L08ySTlnd2F4UHhFcnRXR0hvM2t6T2llalhUbWhPeXFv?= =?utf-8?B?NWZpWmZVRCtYLzZ4ZjZ6QXVvTGZubUZPVHF4SzcrVnREV0tqVlluWWlDVFUw?= =?utf-8?B?dUx2QlZ5UWpnRGdCalVUTWM2R21nMkowVjMwZEJRWTJndWgzV0VQbGcvMCtT?= =?utf-8?B?WVVreHJsSStzSWRnODR5RzU3VVFKeGgxOUUwYzZkSXZEazVOWXVvbGNQTEFZ?= =?utf-8?B?SlVhSHd6Uk5ML0hFNzFpZE9qQWZpZnF6R0tIRGlPeFFHemcyODBJNHZva1Fy?= =?utf-8?B?Mjh2OGhUMjBYZFJKWEtvdWJKanNDVDdTa3hpVGhtVCticDluTjZIZ011TnBq?= =?utf-8?B?dXpvYS8wWThOSm1ScURTQnVUNGtzSW1hUURiZDFjcjVRV0YySnFRck5ML0Yv?= =?utf-8?B?NGxTc0ZoTndwQnArSmc5WDNoYk1uSVJqWmFhaTAyVkpNUmNwdHM5dHVvMmxE?= =?utf-8?B?Z0NhaWl1VG1tR1RRUitpd1ZuSWM3WXB6azFpRjMwcFFSS2J5djZhbmJwVmlJ?= =?utf-8?B?M0dZN0QwWXVwTldCbjgxZ2FoQmtLdG91ZDJsYmNlTDlISDJ2MkNNQzhMMWR4?= =?utf-8?B?OFNTT0ZaYzh5bkt4czVYT1A1ZnZJVy8yaHpiUE1tVm1XZUpTUldnMDVsd1l6?= =?utf-8?B?eGprK2pXZFp0MFRzbjZWRjIvaUJhVjRhOXhsNkdkTldFZXFxM25OcnlFbEZo?= =?utf-8?B?MkxlR2ZENVZWUHJ0QUJjZ2dpQ0pRMHJTbWl6MFRnbkQ2UWNscEx3L25YR3RJ?= =?utf-8?B?Z3k1enVPbDVicWo0bmRybDZqK2J6dWl2dCs0TkNHN3lha3hLMUVsN004cTYy?= =?utf-8?B?ZU8rUENXbmh4RVVwaHkvOTZIQUhLb3hleTJadlhuRVdSY2hZRmlxZnhlRTJP?= =?utf-8?B?TmVIckZyOXlXQ1JueUhYbEdlMm1uOFozemRaK1pOWVU3TnlwdGtiTCs4REVF?= =?utf-8?B?Q2M1dVBXUURtY1FZc3IvWjAxMTAxMWlPcnFTNlVlN2RvcWVWV1NuczQ2WVhK?= =?utf-8?B?QkpyODBMWVpWR3lzMktQVU9rWHA2eHVCNE51R3lVTWxEc1VtV3BadVRNbXdz?= =?utf-8?B?SEl6V0phdEM5VThZaGsxY0dRazd0WG0wOHl1eVVBa2tLbmVmYXRadG5MckQv?= =?utf-8?B?WElpTXhONmxyM1JoMW56L0RDcmhmelpJUGw1QXEzMnoyNFdTak1raEFweWVz?= =?utf-8?B?cHRZbXJ4S2E5cHBpeTEyYk0wa2N6bks3bXJoMnhVRm9sa2FhZWd1NVFqenU1?= =?utf-8?B?T0dQeGszOUNWN2JXQlR3WllWSHFDdExsSmtFQnpDb2pQZzk5R0VRY0JFS3FP?= =?utf-8?B?UlE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5474d9cb-6297-4320-6975-08dbcfe0c628 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2023 13:47:30.8189 (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: JI4yke7OFawZ3FRKdMMT69malGlfxIkOWkDKTjHZrNwGYyEbfZXOW0iIH0LYCtZ3YT/G9uIil9nASePNUf2rtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR10MB8163 X-TUID: cEXRIXysOa4Z From: Jan Kiszka Might be useful in same cases, and while fetching and processing already worked, copying didn't take subdirs into account. Adjust the linux-mainline recipe to have a test case for this. Signed-off-by: Jan Kiszka --- .../linux/files/{ => subdir}/no-ubifs-fs.cfg | 0 meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb | 2 +- meta/recipes-kernel/linux/linux-custom.inc | 9 +++++---- 3 files changed, 6 insertions(+), 5 deletions(-) rename meta-isar/recipes-kernel/linux/files/{ => subdir}/no-ubifs-fs.cfg (100%) diff --git a/meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg b/meta-isar/recipes-kernel/linux/files/subdir/no-ubifs-fs.cfg similarity index 100% rename from meta-isar/recipes-kernel/linux/files/no-ubifs-fs.cfg rename to meta-isar/recipes-kernel/linux/files/subdir/no-ubifs-fs.cfg diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb index 7f1bac12..47270cbb 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb @@ -13,7 +13,7 @@ SRC_URI += " \ https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${ARCHIVE_VERSION}.tar.xz \ file://x86_64_defconfig \ file://ftpm-module.cfg \ - file://no-ubifs-fs.cfg \ + file://subdir/no-ubifs-fs.cfg \ file://no-root-nfs.cfg;apply=no" SRC_URI[sha256sum] = "fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c29798a" diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 09fb5c85..876397c3 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -210,10 +210,11 @@ EOF # copy config fragments over to the kernel tree src_frags="${@ " ".join(config_fragments(d)) }" rm -rf ${S}/debian/fragments - if [ -n "${src_frags}" ]; then - mkdir -p ${S}/debian/fragments - (cd ${WORKDIR} && cp ${src_frags} ${S}/debian/fragments/) - fi + for frag in ${src_frags}; do + basedir=$(dirname ${frag}) + mkdir -p ${S}/debian/fragments/${basedir} + cp ${WORKDIR}/${frag} ${S}/debian/fragments/${basedir}/ + done } do_dpkg_source:prepend() { -- 2.35.3