From patchwork Tue Jan 3 19:58:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roberto A. Foglietta" X-Patchwork-Id: 2396 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 03 Jan 2023 20:59:00 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f62.google.com (mail-oo1-f62.google.com [209.85.161.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 303JwxEC031835 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 3 Jan 2023 20:59:00 +0100 Received: by mail-oo1-f62.google.com with SMTP id x30-20020a4a2a5e000000b004a3bb354708sf11735678oox.1; Tue, 03 Jan 2023 11:59:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672775933; cv=pass; d=google.com; s=arc-20160816; b=JXgqlwFaozziu31BBgzhH+hNlDoU3xQCupZtUeXhhwaOyTilJXZUnT4JTTQpjH/9QU Pp2R+Su8sNlB6tG04jAJ9qG9D59lsEy8jMdO0PbUJTGNEiHGFcezVNB3CE8l5Ts8YAob bUwOf4iutWcJbR0hPYXXi3yiAsmBgkaxcqGmLP6z9NnHCaJlq8MGI4E6MMaSFueofl4K h+JNeGUU8A2YJs98sy9hg25h5YlX5wIYzY2zjTJLv3jyBrSxli0+rOfjPqyrW3RiL72K mWMF3NJVHuGgXPfe5hblv5tDu9HNazdLy9RkHp3VxjoMEiaDCZG2xcbHgdatRaxVhS4F Sryg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:to:subject:message-id:date:from :mime-version:sender:dkim-signature:dkim-signature; bh=YBjj90xCsUBP8a2pCJKcy89BheY1alQ0/YC6abuiPfQ=; b=znqkkGJhv88mhgGj6qD23uYoVDp1xWQP6gekSqnQdjO2VoME2TCbSakKVad2LXWPhW c2kTeQUfL8dkacaUc8+HoEOcI3qlfEe+0LJ6igVA66HLc9gcZp6WBVxKl5v40D1k8wh/ Ahv8xF26Yi7RTBBdF1ZiYQ0rRqHLQyvBg+0mGI5Bb0jv9FmgAAWpV2pEf+lUpzfi0tas R7WUjR90qfiqi8SdyTuqOSoFCLaNMiT51ucUNbuer4a5UsYOT8n2kwWUlSeBh8WLl421 11mUAK6Nt+3cuECd4ua0pQMzhFA7+NNltFDHLJy4KIwTWO5aX9jd8GPMik4tbgZSA79f J0eQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CCCUnTce; spf=pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::729 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:to:subject:message-id:date:from:mime-version :sender:from:to:cc:subject:date:message-id:reply-to; bh=YBjj90xCsUBP8a2pCJKcy89BheY1alQ0/YC6abuiPfQ=; b=nxSCJpAdhoaXs4Z9lL3Tu+m4Gp5kM0fNIblMzpt3d7uwt1r5aeZEmgoH6X4C6ek5rm 4Sdl178HXRlKkWnAZIUJCtifKXE5/QRd7S3KODusLo3LEMUuXDtF7E2xzowcsXdOFyBZ arSYLA4XTnksQhyq48iGdJufSnIZg57uzNO/oXPGrCok7XtpaN2fkkeQURHR7jqNxOU5 +8uSrKUG90jCJOZk4kBT9w0BkaTyFsJs1aBO4Sv7MKO+Bl7lhrG0NKqawS0eercqGJnl NQwgEKu2xcniVbY9ioXqdecG4GlPJnTUo4iDCEEuexXOhf1Q2jEuRn2nGNpbixYRmM0q IpAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:to:subject:message-id:date:from:mime-version:from :to:cc:subject:date:message-id:reply-to; bh=YBjj90xCsUBP8a2pCJKcy89BheY1alQ0/YC6abuiPfQ=; b=UXesC1SSEZSLkic2Da79jfjecR2QpJ5YRL1HpohZObo3lCBppv7vzLhknKAmIsUplc oWtGbo2FlUdyjPcSxdC8p/vsuCbasO6Lge85wk3XtciuaJTNSbwv49PKRA2Mxbquixwy 71IK/ql4CS/Ffnm/Pwy3YL8RbMR5/YqwSo42kgSYvp0upYwMUdALt2nzbT6YumyEyehx COov0M55UDjnXwd6PNTc1u8IIztWdUehQ7Bk+PorNrvh0WU17y4wFNRXVJfDMVpRSPgq yDO1FUYzpSgW2RHRKDuYD5vWCoI8z5eTZWbyXLiItKp5oL9NuH4kPtbB5Dv0fzU1HlmZ BGNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:to:subject :message-id:date:from:mime-version:x-gm-message-state:sender:from:to :cc:subject:date:message-id:reply-to; bh=YBjj90xCsUBP8a2pCJKcy89BheY1alQ0/YC6abuiPfQ=; b=4WjC3cRt3H7pIOTDB3IqU3iuASXV9w0QqEVDxuFWMmF2AsxG2UPwYbNCeV4OZIe1+m xod47cZeNvnNYom1AtshPTIqBymmURx+sgA4KC0F8mEFvCS/c6sMOn64PdCZGDMvPsTo O84juY+4DU3O/Za3Fadkyv/u0MAuDs+TJ1rzodCSmdPoRhqCemsSU1jhWiZ0+/QF4SeB JExjHa9HEz80rlXmO1zAJiMTrLYfFxxS6uukJSZnS0qiELEg7/Tl0G5db/gITLIM4Zox HCXgxUcNKZpr76eQhg9eCX+vfAjYRMik25iIKVLygLbd+Dcsil2TMv89LJmENUqas6so T1yw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AFqh2koUL9O3KHgewn5pQRaBpDWvTME198Vc7oJ7CePGFN4LMjBDlQUt 8hx7DQ8TKauy1sAprUjLAOk= X-Google-Smtp-Source: AMrXdXvv34AbJv59Jx0I08V7IY7rcFS7Cj0TkbO2XDSw9TIA6cWDWmO2pMFVqrgjXSmeS5NzPDSUjQ== X-Received: by 2002:a9d:7f10:0:b0:673:3f8d:cb3b with SMTP id j16-20020a9d7f10000000b006733f8dcb3bmr2448857otq.184.1672775933609; Tue, 03 Jan 2023 11:58:53 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6808:579:b0:35a:f69:4b04 with SMTP id j25-20020a056808057900b0035a0f694b04ls8283653oig.6.-pod-prod-gmail; Tue, 03 Jan 2023 11:58:53 -0800 (PST) X-Received: by 2002:a05:6808:2085:b0:360:ced9:213f with SMTP id s5-20020a056808208500b00360ced9213fmr28844185oiw.59.1672775933103; Tue, 03 Jan 2023 11:58:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672775933; cv=none; d=google.com; s=arc-20160816; b=hZTnpnRmDm4HbB4KQKIsi5jwpSBj+unqpftji23MEK+fTsAvokI1fLnv18IAnX3koq 6z12bOJbb5mYHTHtkz9dAWbpti6WMJxQ320Yeu+PXllQnUkd6tJ1G5uDGof026MN/eJS SR7JpE8e16bIHBJ5uOA/fQcqHC0MLNqde1MDPBEhsOSR6gXyUhue8IjzGNpe3JPwqYYJ YoVmmdK7+it2zd/QbNIxe6IWpeeR6xY8NzBJRzf31NwNyS5rM+4eY9MUeKkaMxBoKh/n 05aKPqtUp98nW62zv1cs/zvzl7TvvHKW30bIMs58Y1MUNSMwUCvzFFlkcY/oclQYCg98 1Owg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:subject:message-id:date:from:mime-version:dkim-signature; bh=mpvggVTY0ljxb2cMzVqBwxAuBXVlj2Xt7SbG0xrY7WM=; b=aN9etq6eKigfB4/leMqxpQ4KUPhHb60r4l8B6onr68isK4CeCai9do2ikNSJyYMCR3 MO0ohfVRNV04nzWsPk0nHMBsQywCOTrjo6mctTKFGevCQhMUDoWBtbL3pYioPiZUnZDx dEkuyR6+UD+XNNI8DtSOzE9d3eTuQYfabTI2+cXQL9NaWSjQAM0RLHrEA9a77SSf0nTg 1M5vAPTrDBhguMVJJo/EbrcGgniHQla8HRmD+qJjqajO79rTnEd4CXk25XUCYS2vFbHY u5DLgBKb/cTzoZtGRB018KBrdyyoGlI8kwhEaXP6375npYmum3YizTD3+rJnt3Ol9ACv cIhQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CCCUnTce; spf=pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::729 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com. [2607:f8b0:4864:20::729]) by gmr-mx.google.com with ESMTPS id o204-20020acad7d5000000b003610bf55a45si3877163oig.0.2023.01.03.11.58.53 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Jan 2023 11:58:53 -0800 (PST) Received-SPF: pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::729 as permitted sender) client-ip=2607:f8b0:4864:20::729; Received: by mail-qk1-x729.google.com with SMTP id e6so15325320qkl.4 for ; Tue, 03 Jan 2023 11:58:53 -0800 (PST) X-Received: by 2002:ae9:f106:0:b0:705:28bf:f040 with SMTP id k6-20020ae9f106000000b0070528bff040mr948479qkg.203.1672775932318; Tue, 03 Jan 2023 11:58:52 -0800 (PST) MIME-Version: 1.0 From: "Roberto A. Foglietta" Date: Tue, 3 Jan 2023 20:58:15 +0100 Message-ID: Subject: [PATCH] dpkg class sbuild allows extra arguments by vars To: isar-users@googlegroups.com X-Original-Sender: roberto.foglietta@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CCCUnTce; spf=pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::729 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_PASS 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Hi all, Sometimes it is necessary to add some extra commands or arguments to sbuild but create a class into an upper layer just for this breaks the updates. So, this patch allows setting extra parameters through two variables. Signed-off-by: Roberto A. Foglietta --- meta/classes/dpkg.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) https://github.com/ilbers/isar/commit/7e72921747aedf588af492be95fb0b91ad70f455 From 7e72921747aedf588af492be95fb0b91ad70f455 Mon Sep 17 00:00:00 2001 From: "Roberto A. Foglietta" Date: Tue, 3 Jan 2023 20:53:00 +0100 Subject: [PATCH] dpkg class sbuild allows extra arguments by vars Sometimes it is necessary to add some extra commands or arguments to sbuild but create a class into an upper layer just for this breaks the updates. So, this patch allows setting extra parameters through two variables. Signed-off-by: Roberto A. Foglietta --- meta/classes/dpkg.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 7822b14..bf60a5b 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -23,6 +23,9 @@ do_prepare_build_append() { env > ${DPKG_PREBUILD_ENV_FILE} } +DPKG_SBUILD_EXTRA_ARGS_PRE ?= "" +DPKG_SBUILD_EXTRA_ARGS_POST ?= "" + # Build package from sources using build script dpkg_runbuild[vardepsexclude] += "${SBUILD_PASSTHROUGH_ADDITIONS}" dpkg_runbuild() { @@ -104,7 +107,7 @@ dpkg_runbuild() { sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-alternatives \ - --no-apt-update \ + --no-apt-update ${DPKG_SBUILD_EXTRA_ARGS_PRE} \ --chroot-setup-commands="echo \"Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt" \ --chroot-setup-commands="echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt" \ --chroot-setup-commands="rm -f /var/log/dpkg.log" \ @@ -112,7 +115,7 @@ dpkg_runbuild() { --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ --finished-build-commands="cp -n --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ - --debbuildopts="--source-option=-I" \ + --debbuildopts="--source-option=-I" ${DPKG_SBUILD_EXTRA_ARGS_POST} \ --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} sbuild_dpkg_log_export "${WORKDIR}/rootfs/dpkg_partial.log" -- 2.34.1