From patchwork Fri May 17 16:35:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3571 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 18:35:54 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HGZr2a017334 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 18:35:54 +0200 Received: by mail-lf1-f61.google.com with SMTP id 2adb3069b0e04-51f22618c20sf8538377e87.0 for ; Fri, 17 May 2024 09:35:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715963746; cv=pass; d=google.com; s=arc-20160816; b=HydPh3BHYdcOjOonLKlwIFK34pMVANEBGV8YK7BwpxDBAXqUkGfldsTRX2LHDUl9aI AsGuaNL1xBiAkD70iz98uMqKQl17t97N8kEjJhBaBDUWHTvWeA/DTdN7pNzKqdYcxCU1 54nq6Xqp7XLdWXh31ZW0ZBP5FPUhXtRGPpDvXFYN9XQD0m2ymrgCmL/IEispBe/9cd9h /AtY7NcDkfVTTnna6ON6tmd0Hp94HONzMSct+i0j+CHzT21uA3OeaQ1mYAgZ28ukMYxX jcFVhSZWxzb8zOh2B+xF6JBVhi82uyFhPZNup9IAbnQ5MMrRURRhRnL+0LohZ/W7kL18 k8LA== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WGmz+rNTshnLc5Asdp3kFaqdGNmh6ld7Wm26CdmgwAk=; fh=yiyiR8snfY/ohie4LjADrICj20AScwjsiqC5/3LC5Vk=; b=wnyHZoB0L2HGJdoU8mbx+ooslR1bKigTiEMFvUmRtTdH0WvZC34GPiBn5nfwbPTyJv xDAfdsMQTJQyD3jNIsMtkSYfSwQO+Qf8Vm+9GLda0hwl/SEGyOdx2ktHmjcA0r6jK7a7 wDLfPXjdCxmUF+uKKUwQOCsNEoEUEETvKEXufK+7XqLEq9qCwge4pF3femxPEWK/+WrV BdMf7FdaXfnIglHP1kiR0jCJuf1+NLLT7YDgtYlAGZouijekpWEMAEHznidKNrkbOv9q LGPSr6n3HAHlA4qxaW3k95FyjlboViHjFuhcqQ+ZBF9q27B8tsjAP3ctvgO/D5iabvvD yIUg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jDaSNoZt; spf=pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163544002ddc76223fce487a-XJss4g@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715963746; x=1716568546; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WGmz+rNTshnLc5Asdp3kFaqdGNmh6ld7Wm26CdmgwAk=; b=f/3ZnBbAXqd3W1MNWqgy8TR2vTGP9NFCaC1YMEIian/gyYRYEzJRDEL4VxK96BhTel caO3nXwv/ZLDLLAbM42oKnS2oX735+hzjxSaZhXBFqMnBSjwcJLnhblrVP4JY8fHmLSd rQDARSwWvouVh8QGQc3SYl1cAaaraFY/erMBMeMZTQqkjmts7OXvtr6fE637krh82f0r wF4IdIJJbYpgoaJCE4kFPzxAq/YjXoPslbFg29alpGh/LHFmLkzjdYcIpmPNiG9JYcwv Zywg9AQIa111oMXUemIiTZOQ5Bhp23Wg4xFSxlqosGGObpqm1HqZOlXbdg88ML9yCNms cLZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715963746; x=1716568546; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WGmz+rNTshnLc5Asdp3kFaqdGNmh6ld7Wm26CdmgwAk=; b=kHNwa99hq+ThT8WKloy5W3n7wH6C6pZlPyNXIdJxU0YqXJ1My7ubhK0Y8WhZKji/49 oU5PW59mCTghpbQq4e5VbTSdQioqnjvR+ERoUSR3qAt71x8RqWC+QC+BsCudDig7kW1j tWPriqUPgbJq1BHfcIEbc3IanrW4IxOAeCQ8Hd0nqXjLzssDNgFUFrzYGAJn9EkgaKrP SI6suJfprF4vgxtSFTusv1AL8xflXAg9QwPGLSJ5iPGY3AerW//smSgnYKCjVFexbuRP WTlqxLEVnqkCXhMb8sNwpgg9hWM/HIh9nLBt3T1VoE5ixfoniX8FVfwaI4xMXVIu13UV +0Dg== X-Forwarded-Encrypted: i=2; AJvYcCUlN232Accad3KtwaX07H4kTz5+qqxkhWK139JOXUxyXG1FzRHF7DyrNrqLKTW32+UFz6SOJZjweZFX1tbeJHee5ek5E7o= X-Gm-Message-State: AOJu0YwsZ7WZiXPpXJCPBqe+vSAbtbjdocdkjByfw7HZbu1zVHnkozno 9s+m9AhuJaX55LjwsRm5eFBA8rIXuXf1MOxeIfx5tgm3UYisyHPi X-Google-Smtp-Source: AGHT+IFI5D7Om1trb3PfCZ50mmcgQgGAKHpJ852zc/C0ag1sp5dmZ+O7OSZFDpnKzquda5Vi8thVXQ== X-Received: by 2002:a05:6512:3d1a:b0:51e:f0e8:d70d with SMTP id 2adb3069b0e04-5220fc7d1camr28953517e87.21.1715963746662; Fri, 17 May 2024 09:35:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:15aa:b0:51f:2788:12da with SMTP id 2adb3069b0e04-521e462827dls1502486e87.2.-pod-prod-08-eu; Fri, 17 May 2024 09:35:44 -0700 (PDT) X-Received: by 2002:ac2:4d1c:0:b0:51e:f70c:88ec with SMTP id 2adb3069b0e04-5220fc7beebmr20418920e87.16.1715963744229; Fri, 17 May 2024 09:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715963744; cv=none; d=google.com; s=arc-20160816; b=xemRjkKOdDoXkCDxdujYDxkmm8+XGKXlDh1Abm2V7guavV0C22iU3xK1vO/mAlt8TI ZK27apmankF5M83OhLV7xhB7TT+DOEXFYw2HfXJcZcdSIyLXmuDJG1iBd9brWmj6y/4k 48FH0ysU+miF/wjsyJK2o8WiRCaP7g6c4Ey79av2Mn7EX56Z9IDl/Es1FWQRlOI/UAOs h8sTSXPvhG6FFidJTK/aN4t092XQoZZvz4qHCKLZ7b+qWW1he7HFsdzfsC/x81E/qzga I45pPlonnIGD77/r3GGreyhuhp+FEya/vdyN5PAfCV/ECTofer8PO69a2NHHymEfdjT0 +Qpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=M8TkqMYHSLLC5n5NqtVB/rsRK3iSYJT4yqG40/DLOck=; fh=XGT9su1InluIJlpNbfO5AhdONNgYrcrI0omn79eqbSQ=; b=esv2bMojh51XGShcirfkZH0PJOwVw6JGh5NetATLPhFeqSw2tsxyRzRoJCdbxH9KAl HLYRuZ2OkP4qPCCZ1uUYvD4/wtDgZILdtcrpLTODO3hIHZwqepgHssOQJsZxDbkTCqLV eYc5jfLUjzbW+2JmRf9wAci1Elxw8rhKWnEv+5IGyIiycp0/d0smdLazInUUCWM3AeSH yhKN/dVlISyrnR6FTteuZ2WldU2ISGc9ZN0DM2xdtSF53gqUYTelNn48MDYTeVcm8ZSY USQ4t1F9GktBRbB8KPPnCCKO0AyFIlyFL5ncB/QhJzS3Dffc1XxtEl6qlsZWmJLizlqz OOtg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jDaSNoZt; spf=pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163544002ddc76223fce487a-XJss4g@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-42024ca927esi1958325e9.2.2024.05.17.09.35.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2024 09:35:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20240517163544002ddc76223fce487a for ; Fri, 17 May 2024 18:35:44 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer , stefan-koch@siemens.com, Adriaan Schmidt , Anton Mikanovich Subject: [PATCH v3 4/5] dpkg: Retrieve Debian source name from variable Date: Fri, 17 May 2024 18:35:41 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jDaSNoZt; spf=pass (google.com: domain of fm-294854-20240517163544002ddc76223fce487a-xjss4g@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-20240517163544002ddc76223fce487a-XJss4g@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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?= From: Jan Kiszka Rather than reading this multiple times back from the changelog, define DEBIAN_SOURCE, by default BPN, and use that consistently. This will allow to fetch sources built by the base recipe in native and compat recipes later on without generating the changelog first. It also permits to clean up related code. Specifically do_deploy_source was expecting more than one source file (which was incorrect) and looked in the wrong folder. The equivalence between DEBIAN_SOURCE and the actual source field is checked in do_dpkg_source and enforced by failing the build otherwise. At this chance, also move global -maxdepth before -name in find statements. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-source.bbclass | 16 +++++++++++----- meta/classes/dpkg.bbclass | 3 +-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass index 7fd5d2ed..560f536b 100644 --- a/meta/classes/dpkg-source.bbclass +++ b/meta/classes/dpkg-source.bbclass @@ -7,10 +7,15 @@ inherit dpkg-base DPKG_SOURCE_EXTRA_ARGS ?= "-I" +DEBIAN_SOURCE ?= "${BPN}" + 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) - find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -delete + if [ "${DEB_SOURCE_NAME}" != "${DEBIAN_SOURCE}" ]; then + bbfatal "DEBIAN_SOURCE (${DEBIAN_SOURCE}) not aligned with source name used in control files (${DEB_SOURCE_NAME})" + fi + find ${WORKDIR} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc" -delete sh -c "cd ${WORKDIR}; dpkg-source ${DPKG_SOURCE_EXTRA_ARGS} -b ${PPS}" } addtask dpkg_source after do_prepare_build before do_dpkg_build @@ -20,12 +25,13 @@ do_deploy_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_source[dirs] = "${S}" do_deploy_source() { repo_del_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ - "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${BPN}" - find "${S}/../" -name '*\.dsc' -maxdepth 1 | while read package; do + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${DEBIAN_SOURCE}" + DSC_FILE=$(find ${WORKDIR} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc") + if [ -n "${DSC_FILE}" ]; then repo_add_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \ "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \ "${DEBDISTRONAME}" \ - "${package}" - done + "${DSC_FILE}" + fi } addtask deploy_source after do_dpkg_source before do_dpkg_build diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 0e25eb76..804fe5a6 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -109,8 +109,7 @@ dpkg_runbuild() { echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG} echo '$stalled_pkg_timeout = ${DPKG_BUILD_TIMEOUT};' >> ${SBUILD_CONFIG} - DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) - DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -print) + DSC_FILE=$(find ${WORKDIR} -maxdepth 1 -name "${DEBIAN_SOURCE}_*.dsc" -print) sbuild -A -n -c ${SBUILD_CHROOT} \ --host=${PACKAGE_ARCH} --build=${BUILD_ARCH} ${profiles} \