From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mga14.intel.com ([143.182.124.37])
	by linuxtogo.org with esmtp (Exim 4.72)
	(envelope-from <sgw@linux.intel.com>) id 1SNsW6-0008Ll-3j
	for openembedded-core@lists.openembedded.org;
	Fri, 27 Apr 2012 23:15:50 +0200
Received: from azsmga002.ch.intel.com ([10.2.17.35])
	by azsmga102.ch.intel.com with ESMTP; 27 Apr 2012 14:06:10 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="93981447"
Received: from unknown (HELO [10.255.12.123]) ([10.255.12.123])
	by AZSMGA002.ch.intel.com with ESMTP; 27 Apr 2012 14:06:10 -0700
Message-ID: <4F9B0A42.3040209@linux.intel.com>
Date: Fri, 27 Apr 2012 14:06:10 -0700
From: Saul Wold <sgw@linux.intel.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
	rv:11.0) Gecko/20120329 Thunderbird/11.0.1
MIME-Version: 1.0
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
References: <1335217712-10154-1-git-send-email-obi@opendreambox.org>
In-Reply-To: <1335217712-10154-1-git-send-email-obi@opendreambox.org>
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
	<openembedded-core@lists.openembedded.org>
List-Id: Patches and discussions about the oe-core layer
	<openembedded-core.lists.openembedded.org>
List-Unsubscribe: <http://lists.linuxtogo.org/cgi-bin/mailman/options/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=unsubscribe>
List-Archive: <http://lists.linuxtogo.org/pipermail/openembedded-core>
List-Post: <mailto:openembedded-core@lists.openembedded.org>
List-Help: <mailto:openembedded-core-request@lists.openembedded.org?subject=help>
List-Subscribe: <http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2012 21:15:50 -0000
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

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.
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
>   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
>   }
>
>   EXPORT_FUNCTIONS do_compile do_install

Merged into OE-Core

Thanks
	Sau!