From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6521571834197966848 X-Received: by 10.28.172.4 with SMTP id v4mr381920wme.2.1518421767550; Sun, 11 Feb 2018 23:49:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.45.209 with SMTP id t200ls887006wmt.11.gmail; Sun, 11 Feb 2018 23:49:27 -0800 (PST) X-Google-Smtp-Source: AH8x225N9cpnitiPvXrJkmmg54CaRNFSTIPc4hwgEvNS2pSRo1JjZi/Ihk+RMjEV+QDpWaWeFA60 X-Received: by 10.28.129.195 with SMTP id c186mr386412wmd.10.1518421766978; Sun, 11 Feb 2018 23:49:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518421766; cv=none; d=google.com; s=arc-20160816; b=zX2GF96yxqlBwKHFpibwm+9K/WsWdHu2+d1gEmftC7tUfgWhvV4zStQFjCXNhCwIXl 2xMigeMaYSqlqTbs+uO4EzuQft4sj9DYfdXblRJe5aW0mf3vs/mI7XmNh3+3fwa89pd7 bsI/6HQLVs1y4CBsyjKuTcatgyL2JRWKoEt45+DsGROBWhX3/Mcff3nTEjBueSAGTboX Rjih1lSFTAEuYNqHwcCyyJk0vXW55f0dus2Q6AcnwMJDJuAe3lbeb/xd2JA55PjmtHvs ZFw7I0VdlhcvDmEcCsjH7Mn/v/i6s94vmIOylxdRhb9Tfk4zn/ImQ+cBywrjG8B56E80 3J8w== 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=vfYVeKz9Wl1iX8ys5ejTNmQwC0f87IWVpUHSNTbuNig=; b=SyckmEUGdTejOAByaKUpV0lEHm7aa3pR5EvAWTn1YdoSvBCPg1Hv1g6ILNaIVK+Wix U2ksO3W4QvTYTpJDrVoRkLoWE1bK4B180gP9hFtDwXJ/yF76VsrIn4pxINcBodLJAO4w V5NTDBTfk0oBzy5eTJt71t3oEsclS/xVefVYa1INtXjx/5AAZszayeoANkUgyuVKm5qC nq/01lIDxzgA0/XVRzdLqV0FlRDDV1TLOAt/bGI8yOM2nvCeIWZvgi/4tiFUu3dCklQK 98XE2vfp7Fg+Y0KWDWJ3lkCTtrojt95jz8gByzWHAq4RsVVjb/PtLL2iPRvkVvsxN+cU 9bBA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q6si350855wrc.4.2018.02.11.23.49.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2018 23:49:26 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id w1C7nQcs005560 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 12 Feb 2018 08:49:26 +0100 Received: from [167.87.31.168] ([167.87.31.168]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w1C7nQZV007474; Mon, 12 Feb 2018 08:49:26 +0100 To: isar-users Cc: Henning Schild From: Jan Kiszka Subject: [PATCH] dpkg-raw: Install hooks automatically Message-ID: <40599595-4b52-3814-9f92-f77b23e50057@siemens.com> Date: Mon, 12 Feb 2018 08:49:26 +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: q5WxfpxUgzGR From: Jan Kiszka Simplify the process of adding a pre/postinst or -rm script to a dpkg-raw package by auto-installing all files of that name from the WORKDIR. Signed-off-by: Jan Kiszka --- In fact, no do_install should mess with the DEBIAN folder directly. meta-isar/recipes-app/example-raw/example-raw_0.2.bb | 8 -------- meta-isar/recipes-app/example-raw/files/postinst | 4 ++++ meta/classes/dpkg-raw.bbclass | 5 ++++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta-isar/recipes-app/example-raw/example-raw_0.2.bb b/meta-isar/recipes-app/example-raw/example-raw_0.2.bb index 657430e..9200e0d 100644 --- a/meta-isar/recipes-app/example-raw/example-raw_0.2.bb +++ b/meta-isar/recipes-app/example-raw/example-raw_0.2.bb @@ -25,14 +25,6 @@ do_install() { install -v -d ${D}/usr/local/doc/ install -v -m 644 ${WORKDIR}/README ${D}/usr/local/doc/README-${P} - bbnote "Now for a debian hook, see dpkg-deb" - install -v -m 755 ${WORKDIR}/postinst ${D}/DEBIAN/postinst - - # this wins over meta-isar/recipes-core/images/files/*configscript.sh - # but we take the same password for this example - bbnote "Set the root password" - echo 'echo "root:root" | chpasswd' >> ${D}/DEBIAN/postinst - bbnote "Now for a fake config file" echo "# empty config file" > ${WORKDIR}/${PN}.conf install -v -d ${D}/usr/local/etc/ diff --git a/meta-isar/recipes-app/example-raw/files/postinst b/meta-isar/recipes-app/example-raw/files/postinst index a28afa3..b82fccd 100644 --- a/meta-isar/recipes-app/example-raw/files/postinst +++ b/meta-isar/recipes-app/example-raw/files/postinst @@ -14,3 +14,7 @@ if ! getent passwd isar >/dev/null; then fi chown -R isar:isar /var/lib/isar + +# this wins over meta-isar/recipes-core/images/files/*configscript.sh +# but we take the same password for this example +echo "root:root" | chpasswd diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index d132066..44aa078 100644 --- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -35,7 +35,10 @@ do_deb_package_prepare() { do for a in inst rm do - chmod -f +x ${D}/DEBIAN/${t}${a} || true + if [ -f ${WORKDIR}/${t}${a} ]; then + install -v -m 755 ${WORKDIR}/${t}${a} \ + ${D}/DEBIAN/${t}${a} + fi done done } -- 2.13.6