From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.dream-property.net ([82.149.226.172]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SMqSZ-00071V-DH for openembedded-core@lists.openembedded.org; Wed, 25 Apr 2012 02:51:55 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.dream-property.net (Postfix) with ESMTP id 59AE7315B72D; Wed, 25 Apr 2012 02:42:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.dream-property.net Received: from mail.dream-property.net ([127.0.0.1]) by localhost (mail.dream-property.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id DVindjAgaOAj; Wed, 25 Apr 2012 02:42:12 +0200 (CEST) Received: from [172.22.22.61] (drms-590c5560.pool.mediaWays.net [89.12.85.96]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.dream-property.net (Postfix) with ESMTPSA id 1124C315B72B; Wed, 25 Apr 2012 02:42:11 +0200 (CEST) Message-ID: <4F974863.8000808@opendreambox.org> Date: Wed, 25 Apr 2012 02:42:11 +0200 From: Andreas Oberritter User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: Darren Hart References: <1335217712-10154-1-git-send-email-obi@opendreambox.org> <4F974557.1000006@linux.intel.com> In-Reply-To: <4F974557.1000006@linux.intel.com> Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCHv2] {kernel, module}.bbclass: don't run depmod for module packages during do_rootfs X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2012 00:51:55 -0000 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 25.04.2012 02:29, Darren Hart wrote: > > > On 04/23/2012 02:48 PM, Andreas Oberritter wrote: >> * depmod already gets executed by pkg_postinst_kernel-image. >> >> * If you build a module using module.bbclass, >> pkg_postinst returns 1 in do_rootfs, causing >> pkg_postinst to run again on first boot. To >> improve this situation, I copied pkg_postinst >> from kernel.bbclass to module.bbclass. This was >> rejected by Koen, because he doesn't like the >> code from kernel.bblcass, which uses >> ${STAGING_DIR_KERNEL}. Richard then suggested >> that calling depmod during do_rootfs wasn't >> necessary at all, because it already gets done by >> kernel-image. >> > > Thanks for adding that in. I'm fine not addressing the reliance on the > existence of $D for now (no worse than it was). Can you explain what could be improved? > Some whitespace issues > persist in this version though. No. See below. >> Signed-off-by: Andreas Oberritter >> --- >> meta/classes/kernel.bbclass | 4 +--- >> meta/classes/module.bbclass | 7 +++---- >> 2 files changed, 4 insertions(+), 7 deletions(-) >> >> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass >> index 3519e7c..c21ab96 100644 >> --- a/meta/classes/kernel.bbclass >> +++ b/meta/classes/kernel.bbclass >> @@ -276,9 +276,7 @@ fi >> } >> >> pkg_postinst_modules () { >> -if [ -n "$D" ]; then >> - ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} >> -else >> +if [ -z "$D" ]; then >> depmod -a >> update-modules || true >> fi >> diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass >> index 53c16b7..91628e4 100644 >> --- a/meta/classes/module.bbclass >> +++ b/meta/classes/module.bbclass >> @@ -37,15 +37,14 @@ module_do_install() { >> } >> >> pkg_postinst_append () { >> - if [ -n "$D" ]; then >> - exit 1 >> - fi >> +if [ -z "$D" ]; then >> depmod -a >> update-modules || true >> +fi >> } >> >> pkg_postrm_append () { >> - update-modules || true >> +update-modules || true > > This appears to be purely a whitespace change - and for the worse. > Please drop this from the patch. This just makes it equal to pkg_postrm from kernel.bbclass. Code in pkg_postrm etc. gets copied to the postinst scripts verbatim. Therefore any indentation results in strangely indented scripts inside the package. Regards, Andreas