From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7289087461490163712 X-Received: by 2002:a2e:9882:0:b0:2bd:a5:3560 with SMTP id b2-20020a2e9882000000b002bd00a53560mr20876354ljj.38.1697126255876; Thu, 12 Oct 2023 08:57:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc08:0:b0:2b9:631f:ac29 with SMTP id b8-20020a2ebc08000000b002b9631fac29ls211613ljf.1.-pod-prod-08-eu; Thu, 12 Oct 2023 08:57:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3LjEfAJ9Td58joYwR/fiaqnV6R+H65Cz4pTX5zMp0ddb1mWGuBjvwDh9hafDlfWLT3X2s X-Received: by 2002:a2e:7010:0:b0:2c1:2211:97d1 with SMTP id l16-20020a2e7010000000b002c1221197d1mr18845750ljc.50.1697126253649; Thu, 12 Oct 2023 08:57:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697126253; cv=none; d=google.com; s=arc-20160816; b=bAei8vYdqykymh5DmXQ9u0MZrMeBYIHpbB8XIAv78ppX/5eXBSfKBnUEdUXKlD5n84 C9ILBwM2j8R8ePMJEgJzk3v1d9NQfFHF6g/eM3p4cZhcTK/JxT1TmWQh5XvUFdvQ3Psc naJJPOU0hjxcJVoz0z5AB/Nj7M74q17wpA7zVjt24q3iaBGhFKEfoQ7ZUHfvMqY1+C7b xnbwyuNkqjtXYj7/d1FR2ajdQOjpUOBrzjTpgSXTUTHM8QFBSh5QO1VxG7R34HIcZ3iu Ui+iEasAgpqCwq67Oagwl9dyZ0jVF2IWorI/f+o1upm7NyWC5MvIEB0X6ri4iO37T8hp tUcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=bZYeW7UWLYSHJ8DDW6kjuFlVQ5HH/g1ptypuN3sMIvk=; fh=4Jz2KZ3xkoeji9voafVGP8uhQ/uPWa4vCmhAC041tsc=; b=0ApFVAfQZRUMIj+apX7Ceuuroy+B9tQFjPzawQw3z1gxxaSwjIMQGZe1pLRLRH6x7m RxS2rEoNIFKaJ43zePuUIxf1Iz1AH8WICjFklGpnPnVx3aKDj/jTBhkYwV8p/QgqpiME Yh8V7yEMipT+2XYqivpzt92Gpz+K4SfM25Ei4Cu4nlDR2e0iddS6aCCpNtMpGtb1N7r+ antuAX5qploffLTrP3y4c11XFzwmjGexnIGIZ6sZCW6yIVX+SZA17+ZhLjtOV9iLRsqk i5Ww8VrJsuSqHwAeNsGt40ztxtC1XmipU8hqlSTNeJgVOrQQYreaJwjQPY8UqF5IuHEW /Yag== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e16-20020a05651c151000b002bced4ef910si961729ljf.3.2023.10.12.08.57.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Oct 2023 08:57:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 39CFvURw000506 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Oct 2023 17:57:31 +0200 Message-ID: Subject: Re: [PATCH] Allow disabling source packages cleanup From: Uladzimir Bely To: Jan Kiszka , Anton Mikanovich , isar-users@googlegroups.com Date: Thu, 12 Oct 2023 18:57:32 +0300 In-Reply-To: References: <20231012150151.286688-1-amikan@ilbers.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: kwaAGxoVOpuC On Thu, 2023-10-12 at 17:21 +0200, 'Jan Kiszka' via isar-users wrote: > 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. > >=20 > > Signed-off-by: Anton Mikanovich > > --- > > =C2=A0RECIPE-API-CHANGELOG.md=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 | 15 +++++++++++++++ > > =C2=A0meta/classes/dpkg-source.bbclass |=C2=A0 4 +++- > > =C2=A02 files changed, 18 insertions(+), 1 deletion(-) > >=20 > > 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. > > =C2=A0We need local copy of isar-apt to have build dependencies > > reachable. Now is > > =C2=A0prepared in separate task: do_local_isarapt. > > =C2=A0This 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} >=20 > Where is dpkg-source documenting this list? Or does it come from > somewhere else? >=20 This is from "dpkg-source --help". > 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). >=20 > > 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 @@ > > =C2=A0 > > =C2=A0inherit dpkg-base > > =C2=A0 > > +DPKG_SOURCE_EXTRA_ARGS ?=3D "-I" > > + > > =C2=A0do_dpkg_source() { > > =C2=A0=C2=A0=C2=A0=C2=A0 # Create a .dsc file from source directory to = use it with > > sbuild > > =C2=A0=C2=A0=C2=A0=C2=A0 DEB_SOURCE_NAME=3D$(dpkg-parsechangelog --show= -field Source -- > > file ${WORKDIR}/${PPS}/debian/changelog) > > @@ -12,7 +14,7 @@ do_dpkg_source() { > > =C2=A0=C2=A0=C2=A0=C2=A0 if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 export SOURCE_DATE_EPO= CH=3D"${SOURCE_DATE_EPOCH}" > > =C2=A0=C2=A0=C2=A0=C2=A0 fi > > -=C2=A0=C2=A0=C2=A0 sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}" > > +=C2=A0=C2=A0=C2=A0 sh -c "cd ${WORKDIR}; dpkg-source ${DPKG_SOURCE_EXT= RA_ARGS} -b > > ${PPS}" > > =C2=A0} > > =C2=A0addtask dpkg_source after do_prepare_build before do_dpkg_build > > =C2=A0 >=20 > 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. >=20 > Jan >=20 > --=20 > Siemens AG, Technology > Linux Expert Center >=20