From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6465966180629741568 X-Received: by 10.25.219.206 with SMTP id t75mr136473lfi.7.1505475068091; Fri, 15 Sep 2017 04:31:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.115.90 with SMTP id o87ls279534lfc.15.gmail; Fri, 15 Sep 2017 04:31:07 -0700 (PDT) X-Google-Smtp-Source: AOwi7QATqOfsnILak71gFhBrpsUQ4QMetff+XZUev9oEZq/LIbXcm8ZLb+e4xnVXDh/on1kyYd14 X-Received: by 10.25.219.206 with SMTP id t75mr136469lfi.7.1505475067669; Fri, 15 Sep 2017 04:31:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505475067; cv=none; d=google.com; s=arc-20160816; b=ZRQX8OIn0UAf1ccVhGCw4vrGnc2yfLqGJ79DWe2FD85v74lIDU2e+Wr5VqRCHXSbfb 3DYBQa+2W2sHPEbTwn834hOD04O8M0LIj4pv9doRgJmDmN05W93XwnxeNTDvDstFME3Y ZS5YV5I/OT+5/mhDbHzPQjHiIecX95BU2iXHUtb4NmO7TUgF32ZTkxsp3S0xwdSWMJ+A Pb5f0v35uMTdgqrtXUY9bnCezF/NDMpFYWJ/NWpEMZ+Bpcpzdkoooh40pP3pnmi9Z4w6 hFrjZgrF78BYtuJ8/Rl9XmospQW2t+KyYHTPxF6W5GJSgElXevBBXsXfQ7Em9G8RftIm 7WiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=dHh54ODlzmvw+KokYb0Quh9zEWwMdF9491Sgavc0Lpg=; b=fTSE+/43MUFuwxys9eWwXDO/HbVfrwvVKCNTrsa+GYehfWZEdAI4wCVR7BWlw5TkNH 6nAQ7QuXx40ytyCRqjGpOKeDfJszGUYT5hA3DksWq6dDlIFK4Zn/UBXDFlKZ3l0TljnE NqAVJFtLMHsy14LZdcnihMLWgaYPr2FrjWSgr9Q+57qYGuFu4927pbWJwpf69F1jURbF 3CxZEdbSepdvWytafdlek1IA/+bbD6EVOWSogV48mSxQwm7DhJqE8llPK+7XsxotNq+x Sv6J6WOG3ilpXJH5eAJ9MyygTYkM/ug2R2pfN/5BfZMLOvpUFe/AQv+JugXO3VwnVLeS X4RA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id m74si13918wma.0.2017.09.15.04.31.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 04:31:07 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v8FBV71W016481 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 15 Sep 2017 13:31:07 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id v8FBV7DF020267; Fri, 15 Sep 2017 13:31:07 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Alexander Smirnov , Henning Schild Subject: [PATCH 2/2] meta: dpkg-raw: rename 'populate_package' to 'install' Date: Fri, 15 Sep 2017 13:31:18 +0200 Message-Id: <85fee89cc579e52f72ac49f55860eaf697963bdb.1505474867.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: X-TUID: elmA3dSqIAVw Issue: dpkg-raw uses an unfamiliar name for the step where files make it into ${D}, people coming from OE or gentoo could be confused Change: Rename the task from to 'install' which in this case fits the expectations of people coming from other/similar build systems. Impact: Everyone that already based recipes on dpdk-raw.bbclass will have to change the name in these recipes as well. Signed-off-by: Henning Schild --- doc/technical_overview.md | 2 +- meta-isar/recipes-app/example-raw/example-raw_0.1.bb | 2 +- meta/classes/dpkg-raw.bbclass | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/technical_overview.md b/doc/technical_overview.md index c73cf08..3b150b1 100644 --- a/doc/technical_overview.md +++ b/doc/technical_overview.md @@ -170,7 +170,7 @@ Both consist of the following steps: 2. Task `do_unpack`: unpack those files to `${WORKDIR}` -3. Task `do_populate_package` _only_ for `dpkg-raw`: copy all you want in your +3. Task `do_install` _only_ for `dpkg-raw`: copy all you want in your debian package to `${D}`, install hooks in `${D}/DEBIAN` 4. Task `do_build`: mount folder with unpacked files to buildchroot, execute diff --git a/meta-isar/recipes-app/example-raw/example-raw_0.1.bb b/meta-isar/recipes-app/example-raw/example-raw_0.1.bb index 8cd2626..08c7277 100644 --- a/meta-isar/recipes-app/example-raw/example-raw_0.1.bb +++ b/meta-isar/recipes-app/example-raw/example-raw_0.1.bb @@ -12,7 +12,7 @@ SRC_URI = "file://README \ inherit dpkg-raw -do_populate_package() { +do_install() { bbnote "Creating ${PN} binary" echo "#!/bin/sh" > ${WORKDIR}/${PN} echo "echo Hello ISAR! ${PN}_${PV}" >> ${WORKDIR}/${PN} diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index 6c6a89c..af62be4 100644 --- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -9,16 +9,15 @@ MAINTAINER ?= "FIXME Unknown maintainer" D = "${WORKDIR}/image/" # Populate folder that will be picked up as package -# TODO this should be called 'do_install' -do_populate_package() { +do_install() { bbnote "Put your files for this package in ${D}" } -do_populate_package[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" -addtask populate_package after do_unpack before do_deb_package_prepare +do_install[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" +addtask install after do_unpack before do_deb_package_prepare # so we can put hooks etc. in there already -do_populate_package[dirs] = "${D}/DEBIAN" +do_install[dirs] = "${D}/DEBIAN" do_deb_package_prepare() { cat<<-__EOF__ > ${D}/DEBIAN/control @@ -41,7 +40,7 @@ do_deb_package_prepare() { } do_deb_package_prepare[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" -addtask deb_package_prepare after do_populate_package before do_deb_package_conffiles +addtask deb_package_prepare after do_install before do_deb_package_conffiles do_deb_package_conffiles() { CONFFILES=${D}/DEBIAN/conffiles -- 2.13.5