From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mail.openembedded.org (Postfix) with ESMTP id A97C361604 for ; Thu, 5 Sep 2013 08:57:09 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 05 Sep 2013 01:54:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,845,1371106800"; d="scan'208";a="373819083" Received: from lpalcu-linux.rb.intel.com (HELO lpalcu-linux) ([10.237.105.165]) by orsmga001.jf.intel.com with ESMTP; 05 Sep 2013 01:57:09 -0700 Date: Thu, 5 Sep 2013 11:57:08 +0300 From: Laurentiu Palcu To: Martin Jansa Message-ID: <20130905085708.GA17481@lpalcu-linux> References: <728bbce2f20eefd81accfbbe48c6f5f4e85aabb2.1378366233.git.laurentiu.palcu@intel.com> <20130905081516.GI11500@jama> MIME-Version: 1.0 In-Reply-To: <20130905081516.GI11500@jama> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 1/1] image.bbclass: leave metadata in place if a PM is installed in the image X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2013 08:57:11 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Sep 05, 2013 at 10:15:16AM +0200, Martin Jansa wrote: > On Thu, Sep 05, 2013 at 10:31:10AM +0300, Laurentiu Palcu wrote: > > If IMAGE_FEATURES does not contain 'package-management' but the user > > manually installs a package manager (opkg/dpkg/rpm) using > > CORE_IMAGE_EXTRA_INSTALL (for example), then do not remove update-rc.d, > > base-passwd and package metadata because these will be needed by the > > package manager to function correcly. > > > > [YOCTO #4484] > > > > Signed-off-by: Laurentiu Palcu > > --- > > meta/classes/image.bbclass | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > > index 84f638c..e1a7367 100644 > > --- a/meta/classes/image.bbclass > > +++ b/meta/classes/image.bbclass > > @@ -498,7 +498,12 @@ rootfs_install_complementary() { > > } > > > > rootfs_uninstall_unneeded () { > > - if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then > > + rpm_installed=${@base_contains("PACKAGE_INSTALL", "rpm", "true", "false", d)} > > + opkg_installed=${@base_contains("PACKAGE_INSTALL", "opkg", "true", "false", d)} > > + dpkg_installed=${@base_contains("PACKAGE_INSTALL", "dpkg", "true", "false", d)} > > + > > + if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)} &&\ > > is this first condition still needed? Do we have some case where > package-management is enabled without rpm/opkg/dpkg installed? I believe you're right. That condition can be removed. Thanks, Laurentiu > > > + ! $rpm_installed && ! $opkg_installed && ! $dpkg_installed; then > > if [ -z "$(delayed_postinsts)" ]; then > > # All packages were successfully configured. > > # update-rc.d, base-passwd, run-postinsts are no further use, remove them now > > -- > > 1.7.9.5 > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com