From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7289087461490163712 X-Received: by 2002:a19:641c:0:b0:503:7f6:ac20 with SMTP id y28-20020a19641c000000b0050307f6ac20mr16682248lfb.5.1697122925182; Thu, 12 Oct 2023 08:02:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1301:b0:503:3447:33bf with SMTP id x1-20020a056512130100b00503344733bfls52489lfu.1.-pod-prod-07-eu; Thu, 12 Oct 2023 08:02:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+YbwazEmXLPQ3v0FTzfQgoFCNxbViq8j1uIVjpq0cDwMIDDoPTnbNm8vtST47jiqFQLVZ X-Received: by 2002:a19:ad4b:0:b0:503:182e:1def with SMTP id s11-20020a19ad4b000000b00503182e1defmr19515547lfd.69.1697122923255; Thu, 12 Oct 2023 08:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697122923; cv=none; d=google.com; s=arc-20160816; b=EaBnNuNnLdr7nHqIFWoj7Su9NRkgUHvqzEk1DKy43O2vFxuSdX9r+RV+/tu6dZWERi WZw+t/cfq00oOzTOksqoDPVuicADtm2vm0qxUaWE243QZ2yZiwK4xHbAjw5NT/rgFJg7 RNQosxikZ3ZAX+n6fBlYUKukInAAgkXxwFv2+eKfrqA9N03evJKRIouOHKLcMhWc8Axk OQBBCOKS33XYCHrbwU0WZ/WCdG2Sjkg9bYa/f7ovlOeCEm2nTsLfhmFMwxrnJB7kmpS8 q2bAJeON3JhuEhuNVsEMj7fwb/3faXArXeO4H11l/4+RhVhjm3orTZgAWkUKxruMYQO7 wulQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=UE1ayRP7NMbNr9zOf7osGA+aGJq4gQbovmivas7D3MY=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=wtaswz0ZPWJRKs08bZhFvK5/4r0yo4BTWJoDTvJkSFMMGRImPBldUqhicZWl9wWXlI O6ntJMrxWlwtVYlsxGGZJSR3BFYn9bHIm7/Vf/hI14x98BYIpwU7v9Eald56FUGD/9+T KikldOff5GGryNyEArQ9Xhk6YBY8eIMGsM/twm7nh4MNkIXWA5t07RzcvV9SQtgN0b4S afqKO8rDoxyAbi2b7kMfKgAe7puwGVthBj1t4o7mbhGjTe06xbf+cLttD9Yso9NWcpcM kLJzLZLPYQ3YRb90XAJkhuNhvc2So7SKHH3Lvq8w6W6GOWwl/TM3+5jbKLnLDvbLwGbu 5JIw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o6-20020ac25e26000000b005056618eed7si724448lfg.4.2023.10.12.08.02.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Oct 2023 08:02:03 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 39CF21WL032368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Oct 2023 17:02:01 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] Allow disabling source packages cleanup Date: Thu, 12 Oct 2023 18:01:51 +0300 Message-Id: <20231012150151.286688-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: ghkNFoUWxoYX 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} 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 -- 2.34.1