From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6522487392227557376 X-Received: by 10.223.169.133 with SMTP id b5mr613337wrd.8.1518634937983; Wed, 14 Feb 2018 11:02:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.141.4 with SMTP id p4ls2259083wmd.12.canary-gmail; Wed, 14 Feb 2018 11:02:17 -0800 (PST) X-Google-Smtp-Source: AH8x2262aeLMfZNlFQmv+If2x24RrM6qhyzpr7bd4yXNDnVTDUWpDIykKVIXzqi4TYwnbWsW9ImS X-Received: by 10.28.239.20 with SMTP id n20mr650133wmh.23.1518634937407; Wed, 14 Feb 2018 11:02:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518634937; cv=none; d=google.com; s=arc-20160816; b=AspjA/5exmMVo3XwZQwKLt7ulIqsZejr6Tp3dGXzOmE7aMJuTco2vQsnq/kBnvhjmw 0JgIa7sN5RUKVqdxuGxfQBM32N90gcmjC8zWs03rObX2XZFDIIF7tma2zHB3Ju8yYNcn swSJYuuMGNYLoDOimGpQK80vVi3FKdj0RzxB5O7Z+xp2GEBETBIszeilIviCDkDRyv+9 sPSW19dgsQ2f89RlL3bl2BvHES0Qmn5MSMa/yOwN4eDoO4myF/qOUjM2RPfZ0dKcSC1s bhrgZrCWiOYHeOhKVtJ9q7A/C+cM2uoVazUnv9yavraKNuyX4sPQ+98eT7tgZhOC+Eqx S4yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to:arc-authentication-results; bh=XmQHLAR0jy53dpcrjuEeJ7iTfUO/T+zzsM8i2d2bKc0=; b=F8V0ynyxRuR7zN1y/5XcVVyAW3Quw4sBfDskvJPOmpQBdcmKbBBPMNwVqUkoy9xBaX e0wFHnmksWvTlSpO1U/8maelQJz7YrbqBa9uUsLOSEeAKGqYqeZRzXYXW2xv1HnmQGWE 2F1UourNLmiQZJSgSexvdDPPtK4yInqSYYALn3+ti523i3GwPzYd2tQuu7iNkWrBqVHg oPTKf/TzU5sbPzVmTXBtUXqqYVUXpuwsD4wOIIQJuMa/mbYqm+0r38rWhta/ighxlW3M 991iPzfQpAqzmKAH/aQwjZ+3hXVIUL64qv84G2UBX7hBVA/EZcAs6kQiYbf0rXrSsIyc 3GTg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id f8si572543wmc.2.2018.02.14.11.02.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 11:02:17 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w1EJ2GVo025092 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 14 Feb 2018 20:02:16 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w1EJ2GVT026623; Wed, 14 Feb 2018 20:02:16 +0100 To: isar-users Cc: Henning Schild From: Jan Kiszka Subject: [PATCH] dpkg-raw: Make conffiles identification more robust Message-ID: Date: Wed, 14 Feb 2018 20:02:16 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: vPpnCLSR70o8 From: Jan Kiszka We should only filter our files that are under ${D}/etc/, not every file that may have "/etc/" in its path. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-raw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index e3ae9e8..e0ea811 100644 --- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -47,7 +47,7 @@ addtask deb_package_prepare after do_install before do_deb_package_conffiles do_deb_package_conffiles() { CONFFILES=${D}/DEBIAN/conffiles - find ${D} -type f -path '*/etc/*' | sed -e 's|^${D}|/|' >> $CONFFILES + find ${D} -type f -path '${D}/etc/*' | sed -e 's|^${D}|/|' >> $CONFFILES test -s $CONFFILES || rm $CONFFILES } -- 2.13.6