From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7289087461490163712 X-Received: by 2002:a05:6512:400c:b0:503:655:12e7 with SMTP id br12-20020a056512400c00b00503065512e7mr25730706lfb.62.1697124105146; Thu, 12 Oct 2023 08:21:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:32ac:b0:502:acf9:8c35 with SMTP id q12-20020a05651232ac00b00502acf98c35ls500728lfe.2.-pod-prod-09-eu; Thu, 12 Oct 2023 08:21:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0+BOVk2QgJGQgR1I6+XMqMR1IHcJf187EBQYxkTqLKS/8CkL7mqwNXBrTzjoiZmoXdsJW X-Received: by 2002:ac2:443a:0:b0:502:f740:220 with SMTP id w26-20020ac2443a000000b00502f7400220mr14732285lfl.58.1697124102786; Thu, 12 Oct 2023 08:21:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1697124102; cv=pass; d=google.com; s=arc-20160816; b=qMOxp3w9l/Fu+181WJaAEwW/UmYe1aTREL2GaYAaN+DidEcXHP54m71Jt21u6YFQnk NFdPYYODApmMoSsmHVvlWJ3J9969zY+Rycg+DC38FK8QZlFza3VqIcRXw/zgUKKp3bAS mLSxHhWIxI99BVoRS7NkuAfe0e0vYnZMmBW6v44xdfTzNFSt3rwG0xQSusXiwXLIuPIp rYcwfkCp1LzOTDxkH+XE9Wc/TiPX+mPB/wpMh9adLPPKmN4oNlf33xVaW/ziBcI25AfK YW8cTpTGsg9M9dkSwiPFNDhcezru4D5+WnAvXi1BNIii+Ff5zzDxF26vSGwknB1lTR/t ia+Q== 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:from:references :to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=9LMAJ2Rjfux2TxjgzdmtYuKvJx6ULjCYxaFBCIakvZ4=; fh=JZvUnqoG0jWph92hWpw0EINycbLveqkIcdkusZDYok4=; b=b/TWO+mRV9dw4eUdxwqfuTy2qxThlJO/yJpsEcKm93+CU3QKRK0xryNBGzcqPC7nUZ Brc77+I5pgpb8doYRmEhhrRQQMvdACGlrTMMN1ykYpw0OnIr9f4mOQJ0uUren3U1ZUOB 8uHH1fAdfikGR+tZrb/NSWBhRaL8GX7gl3czuZLR+2gxsN5S2EW3wyErxEqpi9RV5XIN TJpZCAlpWkb5Sf9YATCpDL1WhJLgQmiXhx7dFuX77UqUF1hCPQJALFxx3SV2nYxVWa2C ngJb+WKyPUenopZNT+UDNUwWYAOf2gjo/aLdKXDFw+pHCIY4V741QMyGAAtsCdfOTMhH VVvA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=q56vIYSh; 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:fe12::61a 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 EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2061a.outbound.protection.outlook.com. [2a01:111:f400:fe12::61a]) by gmr-mx.google.com with ESMTPS id c19-20020a056512325300b00503ce43f46asi803132lfr.11.2023.10.12.08.21.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Oct 2023 08:21:42 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe12::61a as permitted sender) client-ip=2a01:111:f400:fe12::61a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=q56vIYSh; 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:fe12::61a 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=Otqsu86+kLDhNqsdzjILsd7fC6GLAij8Occclkye5+CosKABgpmUr7h0GGvayVRld4lkbxNeLqxNStiqTbG+FPEToWUcpZ7h7EwcUl2YuU0/reOu9Ev2cXb2X2f7N5x++VxHUSibCtKozmUUro0QKpF8njSHliQ1OmmM1pXM1tgMuT/4esZrjSIeh4N8V6Q9pmhzx5+2yzscfKkJJmEQuPWG1+qKnoJDa5PKE0qX9DsWuGujOiH0kNTdtaGWdoDG0pmmzZjBqlQsKtcBiCeNsJGLXmmdsKYZNLY3IN/UjC7PFimaHcnhPp3ZHgiEypf+T3X2pCECh/8CwQr68h7+eQ== 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=9LMAJ2Rjfux2TxjgzdmtYuKvJx6ULjCYxaFBCIakvZ4=; b=fJewT0PtElRwNq0Ypg3NI9cqvmaQRqHYR6FU7Njh1Fd4klrUpvw3YwXlUjiaNiRxe/lAK9pUKlExVUCFAL2J8DhBZQ49+yGDcJYl2jy+fkR1YdANqBXC5071HWXWAntRwmlbsUaBjgZLK20ms+wTNrPE865lr2gtKSkDQKSvLh2IfR9hecl0+8+hWB2ycIjhi8i6L4q3OrclwCX0gcfe5IUckK/+dLiUPLtPqdDeEq0LLxIXH6N6YoS3naZrPdZ54eK04MIQYCqVzMZlekQePusw9P56K/7rrykgKtZ24TJrpxCLQ/7l5HJjcynH28wZa6Xo4AvLDCsefI7tfOnO0g== 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=9LMAJ2Rjfux2TxjgzdmtYuKvJx6ULjCYxaFBCIakvZ4=; b=q56vIYShSt8a6I04YH44zP/fzKLjJ5Z4CdxWrXt1BUhSy9pyhKYO8shSV0Eab+YRLvLUrnHdg1GsaE2NkjDlbgYMiKFmEqQR+voqnj8bGbQNAYZwGxYNJrUs5a9NTVY8E0dZ8esSsNkYTF7IF9gJoYU+v/D1XjrjnrauEGFCGbWpJVYgmKuP0IFx4fqvq/29rZDM1UMfDVnNZiugJ0sf9POh+M/gowbeWjPPXPuHEFvjTNAQqzYZsVODIpzw013Thn4tg7s+9+DCC++3ITZH346+oHqf/qz9qBkq4Ya1iJd6TQ8p/k4jbLL5Jx1WbvihHhoeFzGwpnMTQbAGeUFwwQ== 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 AM8PR10MB4065.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1e3::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 15:21:41 +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 15:21:41 +0000 Message-ID: Date: Thu, 12 Oct 2023 17:21:39 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] Allow disabling source packages cleanup Content-Language: en-US To: Anton Mikanovich , isar-users@googlegroups.com References: <20231012150151.286688-1-amikan@ilbers.de> From: Jan Kiszka In-Reply-To: <20231012150151.286688-1-amikan@ilbers.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0142.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b8::6) 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_|AM8PR10MB4065:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e4db2dd-9450-492a-545c-08dbcb36ef86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X9pQs4ejiTtbfRwkFdqueXf2zqMkZ/uvu9J9k55estfClNCwVo86tFyrE+hwt0IGG45R6O9ykx6c8o1FIBMI9+X/T5pbgPYjfs1YFDh+SIsc8kRN94B8STcF7pg7wAndJjPcAholsIsh7etdegQJUAd19D63WTuXdQnY9o5lvwEgSn0niocTX7TVf5DQqtFQzwRttlud5qJ2VYAr5q06xuL6Mt8CBPHS7SIs0M1NTtllxp2YjpHcuDigWiwFrqAxdA5xpawW5CTQgkLlrt3V4avijP/3JRDdAu6exUmiJ6RGKchdxxlx1foCGa2gTcqaas9aSZplHtrFznqHV+6xLFPUAb5bn5n84xyCd6BlcVXgt+zVpdjqO/ubEIPYZbz2O+dVX5WMdQSTxVXNoPCho5YgUVjEo6Kg6txuE8PsFvqq1ye1PoYCeyBq7HFfp988ZWg4vWvX+Fb2t7lbgGKbwOvbeQcyzdivriHFwLgRlbaotZL4C6BF9z0VZarHIAm3HuBUQgPmx+MKT1QsyyiAA3WO0vVK5H9F+8xjmXwxLsHhn7YHD/0TWSgcKbMTuIs3SnAQ6Mkj6IyvxxJQxr1him5x+0jv5++BmfJeFFrEf5uV+3AuN52+46hgf5XDJ0En7hXgT7qdlvgllIUn1JRzMQ== 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)(136003)(346002)(366004)(39860400002)(376002)(396003)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(36756003)(31686004)(83380400001)(53546011)(2616005)(26005)(8936002)(8676002)(6512007)(6506007)(6486002)(478600001)(41300700001)(82960400001)(316002)(2906002)(31696002)(86362001)(44832011)(5660300002)(66946007)(66476007)(38100700002)(66556008)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aUdPQzIyTjg5bEFrOTg1RHMzZzkxNUdoNExjakZ4NDNia3hyNkNJM1NyV3lF?= =?utf-8?B?N084ZE9DQzdZMzI1VCt5ZVJ3YTdmdkxBbUUveUlBb2YzYk1kVnEvQXV1OEtm?= =?utf-8?B?ejBKSDBYY05nemFnSkNaZ0kxWkRrSkVPcmora202ZitrTXIxRTFJcVpYN0tX?= =?utf-8?B?czJmQmp6N2djd2NNQWZ2NEp0bmVHNVlHK3F4S1RwK3pjM29aQkhoN25IazZv?= =?utf-8?B?bVg5V0FpeE4ycmZWc1o2QVBJYVVZNmh3a0JlRm45b3lzdnlldkE0Ujl2aWoy?= =?utf-8?B?bnFpOS9CaHg0aHZTQXg5TStFeUJMTUh1ME1IUXpNRGhvaVpDQXVIL3BoNHJl?= =?utf-8?B?SS81RTdvWmx1Y3BJVzVVQksrcnRaY25qVmg2ZkRGcllFS2krTkgyTlRUNktC?= =?utf-8?B?NVRONmNFa0lZWTcxZStNZFdmWXZ3ZUdTTnJ5S0V5RlZGUmpMWFBqbVVNTmc0?= =?utf-8?B?Wkd5aHJWcWJBZllvYzg0NHJKQTZCVXkvQlJncUY4aWZtZzFzbDg0d2tFUnN0?= =?utf-8?B?eVNpYzk2OExjK3dJd29ZakhIMEJrT3puVEtqY2IrQ1ZDR2xQMlRRSWRONDJu?= =?utf-8?B?aHdYaU5Eak9TWW5zME5pZ0gwLytIMUQxU1hnaFMzemN2WVFJSUtoMkJNVW05?= =?utf-8?B?eFZwUG9uSVBTdjFzUlphOXZzOU5IVFM0ZGZDaUFSeE1wZmhXU1JEWFlkbWh6?= =?utf-8?B?S1MxcHJIUm53RWJsV3N2ZllSTSs0WHpKdE5FY1ppZUhRcTFpbjhDTEFIb0NN?= =?utf-8?B?QXF6b1JiMDgvVnRDdlE1MEpRT3gyVTI4NlVUdm9YOWh5MlUwc0lERHdHRzh4?= =?utf-8?B?UHJvTjFrWHNyMjcvQmxZdG94VnNnWHBWK2VNNkFVZUJxUExDdjZtVVYzbjVv?= =?utf-8?B?TnBvTTlISG1iQ0pwcFpyb29sMEZXOGlLbDRvN1p1bFNKdmlVTmpqcmpmdWdh?= =?utf-8?B?TVluQzQvQTFJN0RzSDV4U1hEdDdvKzdFdHFodGV4RS9sdzQ0T2NZS05mS3I3?= =?utf-8?B?bkorencvUk5WRTloYVFpUjNPOE9ub0s1RWN1MlNKWHh4ejJWQWovWjZTVUxY?= =?utf-8?B?ZFA0MEN3bTgwQVpEVnJ5WnZlZlVuc09UUml6b094aGNrWGtJaCt3ZzBTNU1F?= =?utf-8?B?Y21EMHdPVmVwaFkwd1M1Vzh5Slh0VXZaYnF2ZUR3azYxcURxNjNwNkR6QWRx?= =?utf-8?B?UlRPUWNFUWhieTlBR3pUT2xHcnR5NytZaER4SVU2a1R5VlNsbmZrRlV5T1p1?= =?utf-8?B?ZmxhMGVlM0VHLzJxOEFwUThmNzVNZDZKcG1ER3QzU2UwTjllbHhqMjNoRnd1?= =?utf-8?B?OFBQNDBRS0hwQ0VwT0JSa2VnZ2RTLzVzZ2VCZTFBbVRHbDZiOW1yakVITlpH?= =?utf-8?B?UGwzUWF2Umw2eUYrYjNtNkkzVjhLdGN6bWQxVzZrVkhrZk14eUo4ZThndlV4?= =?utf-8?B?eVNFMkZOeVdpZnZvZ2tsVDFVeTAzQjBnOG5NSWt4N3BSRDFuNzY4SjFWeXlZ?= =?utf-8?B?dmNEU1ZVTmhmYjN1NWVsVUR4UDVFNk9sVWtPTDZnNkJkTjF2WUtmc2NpN3Q0?= =?utf-8?B?Q0ZGY0FETTlSRDV3ZFJtTzEzWlFjTHI0WHFBUXV6TDdEQm5KR2drZkIvU3hQ?= =?utf-8?B?cy9KcGtNd1pnNHpxci9rZjlIZU1pNjJqcWNKWmlzY0tKdXVSbzIwbEg3VEt2?= =?utf-8?B?djllTjBtQnJPSHdXS0Q1TDFpZmc0ekZzVHBvSWpiUnROekRkWHpUZzdsSGdw?= =?utf-8?B?UkpZZnJHOXdEMS92OFdvc2txSGtnQUQ2dFpnQ3B6RE5ndlRtSmVYSjV4NmRO?= =?utf-8?B?NVdDbkt0NVljbFkveVJuSTNMSUtiUHdUTlNqR21LMDBydUZYaHUwMFRLd2Iv?= =?utf-8?B?L2xEMTY0cGJYd2lkSjRtWTJJT2I1T0lyWFJDMU1rT1VOK1YxN2JwZEViU0cz?= =?utf-8?B?TC81dzhPWnhKYWZHZG9ySjhEeGpFVUtUaUtBd1orczNjS1ViR2s5d3pscG9y?= =?utf-8?B?d2hJaVR2MTB5QnJhdklVUWhJSmdObTg5MUJzbW5RNzVRWlAzNzJ0eTFGL3Iv?= =?utf-8?B?SjdnOXlBeUNjTW9YOG9OWmNZWFpLVE5KcXlhUGljZUlqZ3RWQW1aY2hkZlZo?= =?utf-8?B?YVF0WW1KK0czUmlqTHVNWHJjbmc4SmcyRytQdG1tVEJUbDV1aGRFOGxmamx1?= =?utf-8?B?SEE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e4db2dd-9450-492a-545c-08dbcb36ef86 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 15:21:41.1185 (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: 7HpOJ3ZLayJqu2Z2SKk3bywwvu9qu2OgwdRTSAmE21oe3zn/RzaTyVyums1uBGsevt9MrybU377hUjkEY+mh/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR10MB4065 X-TUID: YGbqtvqD7qQ6 On 12.10.23 17:01, Anton Mikanovich wrote: > To allow building source packages containing binary or CVS files > introduce DPKG_SOURCE_EXTRA_ARGS variable can be set per recipe. > > Signed-off-by: Anton Mikanovich > --- > RECIPE-API-CHANGELOG.md | 15 +++++++++++++++ > meta/classes/dpkg-source.bbclass | 4 +++- > 2 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > index 7d463473..b1699be6 100644 > --- a/RECIPE-API-CHANGELOG.md > +++ b/RECIPE-API-CHANGELOG.md > @@ -539,3 +539,18 @@ some cases dpkg_runbuild:prepend should be replaced by do_dpkg_source:prepend. > We need local copy of isar-apt to have build dependencies reachable. Now is > prepared in separate task: do_local_isarapt. > This task depends of do_deploy_deb of all build dependency recipes. > + > +### Skipping source package cleanup > + > +By default Isar filter out control files and directories of the most common > +revision control systems, backup and swap files and Libtool build output > +directories from the source package. > +Now this can be overriden by setting DPKG_SOURCE_EXTRA_ARGS value in recipe. > + > +Default value is '-I' which sets filter to: > + > +*.a -I*.la -I*.o -I*.so -I.*.sw? -I*/*~ -I,,* -I.[#~]* -I.arch-ids > +-I.arch-inventory -I.be -I.bzr -I.bzr.backup -I.bzr.tags -I.bzrignore > +-I.cvsignore -I.deps -I.git -I.gitattributes -I.gitignore -I.gitmodules > +-I.gitreview -I.hg -I.hgignore -I.hgsigs -I.hgtags -I.mailmap -I.mtn-ignore > +-I.shelf -I.svn -ICVS -IDEADJOE -IRCS -I_MTN -I_darcs -I{arch} Where is dpkg-source documenting this list? Or does it come from somewhere else? I'm also asking because could be useful to reduce it by certain patterns (or maybe even files) so that you can still benefit from filtering, say, version control stuff while keeping other needed files (in our case some *.a files). > diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass > index 1f4f8164..7e3868f6 100644 > --- a/meta/classes/dpkg-source.bbclass > +++ b/meta/classes/dpkg-source.bbclass > @@ -5,6 +5,8 @@ > > inherit dpkg-base > > +DPKG_SOURCE_EXTRA_ARGS ?= "-I" > + > 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) > @@ -12,7 +14,7 @@ do_dpkg_source() { > if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then > export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" > fi > - sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}" > + sh -c "cd ${WORKDIR}; dpkg-source ${DPKG_SOURCE_EXTRA_ARGS} -b ${PPS}" > } > addtask dpkg_source after do_prepare_build before do_dpkg_build > This would mitigate the current issue as well, but I'd be careful to not hurry with introducing a half-baked interface until we have thought through some use cases. Jan -- Siemens AG, Technology Linux Expert Center