From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 20 Mar 2025 15:45:34 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f56.google.com (mail-pj1-f56.google.com [209.85.216.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52KEjW4e003140 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Mar 2025 15:45:33 +0100 Received: by mail-pj1-f56.google.com with SMTP id 98e67ed59e1d1-3011bee1751sf1259739a91.1 for ; Thu, 20 Mar 2025 07:45:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1742481926; cv=pass; d=google.com; s=arc-20240605; b=hURqocErp9OwA67YIxDnsY9qkgOS2GtJkWNNNhFJsM6Mk7ShKTElgVv9pIWrCn6w5Q xAdF7+74oRmSCTTGsFQh94b4sdxe17Q9+TVnWJ1W39dU1zYjmJ5D9bGpzluaCHY+giGK OOY9rZ0/WKPezTJjXPq5HYJTUNoRhpu43BFZFA300beA7qKVLqu+SptOHdVZebQxAdEv 0PhYSfCedXjJ93YNLALUL+BjB4pc2Is9MpMD6epwlC3hxDrOSUtzK5cRTY4Kb4wC9bye piSG7WSmkNSaegT18hu+B7RqTY7Y6JEjDKlcH36pRwu/vpwtZ59Tf+1vxmyhclgrIrnw P4fA== 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=FYIrvtwXcchCiugV8yM/sVBQpoyQVR4dSUkuhpZaErw=; fh=qWsjWyMVgQRJewiN0kODnWSbLt9NIwnAuFgtwaebDxg=; b=NBF+wQ+hnHItFNydG6ChtcQRQooB7JkflYkTeEoI5ji8B5spwfZESD+mxC7WxLEkt2 hz+Th06+7h1A7J0GxryBmLZhIuCkU+EKwKmikiU9idy7U3KnV+jOtGAyRkUvw1MnsBbk VfPxhDsV/+oRByuI17q3JBn3WU0xc0P/PH+gotXIJXFQESgmxwwgBQYCk97pxIvGPDyP LTKhYRpZoOOTC/M528RJTJVruok9upepV4JU0jIAuKH/WsOLwCVuxCMripz82bUPMHYg 6e8zDqRqfXCvk+aE0Kmm8g8UshYgE7Cl0b2+kp2sIgNZzZqwQPLRQz/lOAi9hxJV3YiY pS1A==; darn=ilbers.de 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=1742481926; x=1743086726; darn=ilbers.de; 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=FYIrvtwXcchCiugV8yM/sVBQpoyQVR4dSUkuhpZaErw=; b=c+uTx5m2RhPmzR08R26HE0BRD9R+4zFoYHQvUvS3ppYpQdT4wjRm+Y9yaIEuRGt9cY soOXQVvrvyPYfHTMQP3WyuEzzo9o9Z2dEE6suwLMhIh5Cxvafmtci0pbsFkYRKRhakIs WPjB1kYKwjX0gUQ+tX5ZAAJE4jUQs8AKa7qTHC7LJx12BH/swEzz0TqGxQnwvro8sRwq mWGrRQv+0+pOFSC6hqB8NtF2fhtBnzHnWOvifDErj2zf5Wl8mKoSRUDgdZUIkeWKcRer qfomdkKgKNvI3oGNwlms2Mly8bFX2kGF00QudWlMacx2Xpf7XRJeBWfpjYeZvH9tiEoc cCXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742481926; x=1743086726; 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=FYIrvtwXcchCiugV8yM/sVBQpoyQVR4dSUkuhpZaErw=; b=rTDGPpv4tZV9yYCXMwHomV/ntess9npHyyVBphlYiHTkY5e95kakZhmeuErvch5AAf FTSzS7ltRKuupRAfmrfm2gpODoGRLH5dWjuHujFfkmedzYwrXIRZPzkUQSYaM+7lj1DX iXAGftht0yTdj67p5FM8GlCf5QBZoNX/TOIgTOTdGcGmnqRDQPzYYfgPdDU77M0yj9i/ +K0jylr9WEsnn6aJfjPYjXjPu8CWwufqkg8B+658nE7OpUFcHPQ/VJy3dhdFSvDbJ2rA +GNnkuD3q3K9ngSIBV46mCfj8G6GodOIUKYfZnbNDIGDDShY1pjA9xzqhu5CEI7YbCB5 Rvig== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUnbZU4u15IBtbzTNeYTmNO61lRwgHNgOqOWrbM6LPoJjxz4WXxz+RwarN06h1kK5MVlhVn@ilbers.de X-Gm-Message-State: AOJu0YwXPXcH/GXUH4QZDRf2Z9U47Qr1Oi2ywoFP1xmUObRpkglbxNho dtmDpt9SxJgtj9kSofByS2k1l4XCPik93aaELwV7M9KLT4LnuKEY X-Google-Smtp-Source: AGHT+IEg7xq9odON+8nGHdmWNbZtzIC3EWYqvxqyZX2He6x1rlqjXhsLmhN920Oz//hzHGONSJBPqw== X-Received: by 2002:a17:90a:d407:b0:2ee:d63f:d73 with SMTP id 98e67ed59e1d1-301bde6e7b6mr11775549a91.11.1742481925872; Thu, 20 Mar 2025 07:45:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJbMed03tDyetAHwNLq0oa1wbekbifXvJngiju2l7R6Mw== Received: by 2002:a17:90b:1102:b0:2f9:b384:bcb8 with SMTP id 98e67ed59e1d1-301d4582038ls819663a91.0.-pod-prod-05-us; Thu, 20 Mar 2025 07:45:24 -0700 (PDT) X-Received: by 2002:a17:90b:3889:b0:2ff:62f3:5b19 with SMTP id 98e67ed59e1d1-301bde73a7amr10159171a91.13.1742481922485; Thu, 20 Mar 2025 07:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742481922; cv=none; d=google.com; s=arc-20240605; b=iGxz+LVDzq/pH9Tp0WPn5FdRimZivyTExbWRkg4OTVHdFGchbGUkQxu2Zs2Ix6YwGH xpT5ivkxUErAhWzTIWxUu6pUyim2qdCDdbL//kfhVZi3UiKJLeNbseAvQIAChzOZ77Mc nLaRnKTzaB7H5JwkTx7aYPqMUuQJxk7EReXJ87C6nVZC62W0QeIgWZwZjI+u9pTsHzzP L2hkdT/6nCORRJ15bBu5JQ8jZIt4kkHe/6ALZtyyIkNxrAQ6EWPwK7SshHsGmeol+hNN 6aFv0cibwWEzBUFQLekxqb4NoKz8IFfIUU42v7BhGXNfcjp6puOKV6ewW+cXbLBl5a7L 01rg== 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=3n08XzG5H7p0qxyqAE/xZ4y5Lcjo3fXwaWjSaT0lzGg=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=DRydyzYFtDuiBDBlRyoQOSXx3SYunz/b7qvibZQj8x4elyuKrOv0PxDlQtFkgHh4JN XlVVi9QTIzAk3v3EpdjBfkhYR6ljyNFZjjNENhzHrxgYPoMZvi8HlbasrOdzjWeYQg9k HqfaefKrlI0J5ULpiL+5kEBJbvMKl562r3I0b3xh1mTPBxKiiai/9+3yy1jxy3M7NXTL SY8/2RIDjDCfHc9JnMWSp2kBHEdNOPPaCiK2H1a0bv8HJ33TD4LoJ2EJTiMt0wUjZC8G CDFf2LE3PJ6YDXgL1JhMu5ZxF9K3dkAqA213cfMxpaGnBnWsEWUNhnFWAxNZK5M2E6O6 2gJQ==; 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 98e67ed59e1d1-301a5e92b3esi506356a91.1.2025.03.20.07.45.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Mar 2025 07:45:22 -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 52KEjIb3003127 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Mar 2025 15:45:19 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3] debianize: Fix unexpected characters in package lists Date: Thu, 20 Mar 2025 16:45:12 +0200 Message-Id: <20250320144512.342515-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_H3, RCVD_IN_MSPIKE_WL,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 Content-Type: text/plain; charset="UTF-8" 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-TUID: REhiAMSmy101 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 v2: - Fix missing vardeps. Changes since v1: - Update also file headers. meta/classes/base.bbclass | 16 ++++++++++++++++ meta/classes/debianize.bbclass | 21 +++++++++++++++------ 2 files changed, 31 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..4989c601 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}" @@ -66,6 +69,12 @@ EOF } +deb_create_control[vardeps] += "DEBIANIZE_BUILD_DEPENDS \ + DEBIAN_DEPENDS \ + DEBIAN_PROVIDES \ + DEBIAN_REPLACES \ + DEBIAN_BREAKS \ + DEBIAN_CONFLICTS" deb_create_control() { cat << EOF > ${S}/debian/control Source: ${BPN} @@ -73,15 +82,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 -- 2.34.1 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250320144512.342515-1-amikan%40ilbers.de.