From patchwork Wed Mar 19 13:04:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4118 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 19 Mar 2025 14:04:54 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f64.google.com (mail-oo1-f64.google.com [209.85.161.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52JD4rwF029988 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 19 Mar 2025 14:04:54 +0100 Received: by mail-oo1-f64.google.com with SMTP id 006d021491bc7-5f32b797245sf8456456eaf.1 for ; Wed, 19 Mar 2025 06:04:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1742389488; cv=pass; d=google.com; s=arc-20240605; b=SxjdyNTVI/zQHrGl860/gCbZxds5GXrPXBwjl57Z1X7kOXi5F/xo3JDZSBwqxwBi9V nBoKlcweD2GG34o5fVUDP3VS1gd9/xtDCKhIgpjaDFKBDjR3OwuScD6Vz7Gwlw/uT8fW 932W+GQ/kfLVCO1vEJeu/uJknWSsNwnx+bpqpX/2kh/R2kKBS9x1OkOLfrI8kEgP5Ebd WmltfLwkJ8ADF+En6UJjz9mjZaSXkfBkBYQRPYic61Arl6nLnZS/En3+85h7lTCTQu5I hgSvYcz+ma5uzDs2D7Q49rqAW87oXd/qk0IxebDNwxU/v/xTEbj/C2mRzQviv4JdUf9+ gswA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=1LBOEcAG1Nn/JYqhLU1a236n4Kb+xxEZ52b2u6tOp9Q=; fh=MpgQFO+W0tQnAVi2vBVNLyWsVuIhTxpOsUsU5QYx0F8=; b=Sp0DZHSNXIIzBRQbNMvhV2ajQJwYyJqfhYltxbQT9o37vM9orDvOu9R2SdHPrLw10o KP6DHaPIfJVIENqGXEyYUSsAyK6v8THwVX8ByGA9W/5FL/ptTQJprqrAe0K8fbvGz0Ey veVRg1KZZnKvMKLeK4re1EYH1BWzsJ2LvHZS92fZGfY/ktYGLduhhJXPGfBpsX9a5lR+ Gdh6b0Aeav6+KIyC4Tiz5CYy22J9K1sRgB6ueFYhGh/LMynZwmKfsowR6Z5CRMbbyhUB qIH0rkfBstQP9xXTt+He+Qcw+ILK3UxodrEDNElpysDQllLptqFPFd//w57Z0fy9sY5V Z0bg==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1742389488; x=1742994288; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=1LBOEcAG1Nn/JYqhLU1a236n4Kb+xxEZ52b2u6tOp9Q=; b=gm2UPQEUD+r0iIWv30LPrLe8/LSTeDM+E6X1RCQJmZfeFgdaxn+E4Fo0ouOWLVbeKf z96D2GlWUqBYKlk8zFEvKvKMI8J+G3SzxMNTBR1KBKbJv3V6F7ezwcLg75jo5vmKSGj2 PLR8bKpzR0gsVcX8UF3ZdfXNzLy7+F2PlaP94gX8zHHaHhFS2DL6UfNn28DffzuVD3JG bBTKPLAPz9xkxmeEmIj8lvE/hOiRVJ0ISfNRRLAcrWjAlsLl/TmBRVEa03GhUjTDEpFC j0Iys75P7HA1HXuk+U6nTZrxY3BFXa9Xr7H5jCNDpGiJR2jHF/Hvcabnc+FwJbbEIzH4 Hddg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742389488; x=1742994288; 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:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=1LBOEcAG1Nn/JYqhLU1a236n4Kb+xxEZ52b2u6tOp9Q=; b=Q0wVaIGMcO/RLdDHPdFvsGF/whyXIEEBeHdkw7rEn4jukiMRky/pVWjMacf2+MY2L7 ojuqRndw9+bUFb0AFQiWJPwl3a0eXxZmhyF7W3wL/qbmSen5Yi5yGUD1PDPslxhMpZ76 ct2r4sCaMcSm0a3U/zPBDIHVkwBXhZD85txzVgHIMUxtSqAZzEzreySU/mDCkOQBwX5E LIzjUVht2snRk+wWTDmjadw6Wv5pvpAaypVKjDfPMWJqsqOeH457OrH9Mqd/2LpAFWy1 U6IQtJjsolmpXqMQihwg/LcPWDIOgwou+L7rot9qiIeXrpXiZVOC2y45ZGdI6n7oQ1EJ qCJw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXaqXtnnqyHD24apjkae+O2Bz3V4hO/e7CgFwfxqLPQipWPBCZ3wkdCrHW5M/td0UZHiul4dy8=@isar-build.org X-Gm-Message-State: AOJu0Yy4++2ezHfGZj5QRugJQM7oiCoSk6y2fpLL3y3+uaFLXlueAAN6 JXzyVvvM5s3sSCUZu9mQLExgZ3fh3xnTJJhHdYTwbq9086YP54Wz X-Google-Smtp-Source: AGHT+IGRJhc/qAzyqA5bcynpcutKtAgFjHu4g0MQIGT7d7BsieixSriUd+xM/iBHQ/ls+je/IwwvTQ== X-Received: by 2002:a05:6820:216:b0:601:a813:5f22 with SMTP id 006d021491bc7-6021e3cab5cmr1964772eaf.6.1742389487750; Wed, 19 Mar 2025 06:04:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJnzIYz/0omGU4Sywpbf2HItlrsCXy1kG2JFmA5E9p+LA== Received: by 2002:a05:6820:1043:b0:600:7c5e:1a45 with SMTP id 006d021491bc7-601d899b943ls1668683eaf.2.-pod-prod-09-us; Wed, 19 Mar 2025 06:04:46 -0700 (PDT) X-Received: by 2002:a54:470a:0:b0:3fa:4320:1a80 with SMTP id 5614622812f47-3fead61591fmr1586091b6e.39.1742389486461; Wed, 19 Mar 2025 06:04:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742389486; cv=none; d=google.com; s=arc-20240605; b=YU7UhyRGM8q/NUlB9Py/k14Y5WoobY1LiirMKVjO+mtrqLIQT1BbamsoOa2d+s7bYX A2A7+q/uSkG8L9Qwc1Ald3UIrVzdzYQfgaw4WeKn2CL/UZZDdaKO5vB0RA97woKdjZup cJYST1o2fQNwdfaEFyHcPKDATG0a53sgAmpp6m1gcY7b2+pDfTNJzPyhPA4fQmkeqdFA cYrZb9qqjGCunuDp8MejDFHf7myx5k9RfK22EywWvev3jZQh3gHCyQLRACs3t6a210KG nRLUN5kmZo5FZKQ7UfmI9nxd/Suc0wQrGUiytGKP3ay1J57vQ+pnCeJk+sBifeMRtLnA 2OHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=z17WHZK7S8Dzs6EczAkJd/6sb2ZMdV6rGpgYMJ9LVvk=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=dd48NTkBFXejfUO7tnumOLbgF2t6OuOAFBSArpykh6nDEa9T0wYpPMOWQoncseIfoA fIWO3NTJnuq2FdKfOJvbmt/n/s4YvpJ98KO0sl8UmbF4rkvAFjU+emtKkfPVJjOPmk33 pLGBKS55awoeZW7W9Hn8Ue0Gbf5L54ABSHi2PJBF8WqJoPEtuRlW8HKJN9ocW0O65QH/ MgsadmqDDyvul0mwil9ukjBksIokExTc0oKfD0tUEKbNGPR/YSwCD1xV4MeKQw34lQQ+ inNmvAevbdt177RdZ3C01lll2FWar5Egkyq9T8tBsaAK1smwW9e0SFZcLfy6qfPa18b/ mbgA==; dara=google.com 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5614622812f47-3fcd59ff7a2si96813b6e.3.2025.03.19.06.04.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:04:46 -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; 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 52JD4h2r029973 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 19 Mar 2025 14:04:44 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2] debianize: Fix unexpected characters in package lists Date: Wed, 19 Mar 2025 15:04:36 +0200 Message-Id: <20250319130436.292674-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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-Original-Sender: amikan@ilbers.de X-Original-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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Newer dpkg-deb versions got more pedantic to the control file format. Introduce debian package list format helper to cleanup empty items or unexpected commas in dependency options passing to the default control file. This prevents errors like: | dpkg-deb: error: unexpected end of file in archive magic version number in *.deb | Unexpected character ')' parsing formula 'Package (= ), Architecture (= ), $PackageType (= deb)'! | There have been errors! caused by empty DEBIAN_BUILD_DEPENDS value in the line: | Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS} which results in: | Build-Depends: debhelper-compat (= 13), Signed-off-by: Anton Mikanovich --- Changes since v1: - Update also file headers. meta/classes/base.bbclass | 16 ++++++++++++++++ meta/classes/debianize.bbclass | 15 +++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7d4ab49f..c730eec9 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -1,4 +1,8 @@ +# This software is a part of ISAR. +# # Copyright (C) 2003 Chris Larson +# Copyright (C) 2015-2025 ilbers GmbH +# Copyright (C) 2017-2025 Siemens AG # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -334,3 +338,15 @@ do_unpack[postfuncs] += "create_source_date_epoch_stamp" def get_source_date_epoch_value(d): return oe.reproducible.epochfile_read(d.getVar('SDE_FILE'), d) + +def deb_list_beautify(d, varname): + line = d.getVar(varname) + if not line: + return '' + + var_list = [] + for a in line.split(','): + stripped = a.strip() + if stripped: + var_list.append(stripped) + return ', '.join(var_list) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index 5e9d76f3..9d9507d9 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -1,6 +1,7 @@ # This software is a part of ISAR. # Copyright (C) 2017-2019 Siemens AG # Copyright (C) 2021 Siemens Mobility GmbH +# Copyright (C) 2025 ilbers GmbH # # SPDX-License-Identifier: MIT @@ -18,6 +19,8 @@ DEBIAN_CHANGELOG_TIMESTAMP ??= "3600" DESCRIPTION ??= "must not be empty" MAINTAINER ??= "Unknown maintainer " +DEBIANIZE_BUILD_DEPENDS ?= "debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS}" + deb_add_changelog() { changelog_v="${CHANGELOG_V}" timestamp="${DEBIAN_CHANGELOG_TIMESTAMP}" @@ -73,15 +76,15 @@ Section: misc Priority: optional Standards-Version: 3.9.6 Maintainer: ${MAINTAINER} -Build-Depends: debhelper-compat (= ${DEBIAN_COMPAT}), ${DEBIAN_BUILD_DEPENDS} +Build-Depends: ${@ deb_list_beautify(d, 'DEBIANIZE_BUILD_DEPENDS')} Package: ${BPN} Architecture: ${DPKG_ARCH} -Depends: ${DEBIAN_DEPENDS} -Provides: ${DEBIAN_PROVIDES} -Replaces: ${DEBIAN_REPLACES} -Breaks: ${DEBIAN_BREAKS} -Conflicts: ${DEBIAN_CONFLICTS} +Depends: ${@ deb_list_beautify(d, 'DEBIAN_DEPENDS')} +Provides: ${@ deb_list_beautify(d, 'DEBIAN_PROVIDES')} +Replaces: ${@ deb_list_beautify(d, 'DEBIAN_REPLACES')} +Breaks: ${@ deb_list_beautify(d, 'DEBIAN_BREAKS')} +Conflicts: ${@ deb_list_beautify(d, 'DEBIAN_CONFLICTS')} Multi-Arch: ${DEBIAN_MULTI_ARCH} Description: ${DESCRIPTION} EOF