From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bastet.se.axis.com (bastet.se.axis.com [195.60.68.11]) by mail.openembedded.org (Postfix) with ESMTP id 3998871B27 for ; Wed, 3 Oct 2018 12:33:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id B7D051847D; Wed, 3 Oct 2018 14:33:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id f6Y_LJpUEuij; Wed, 3 Oct 2018 14:33:26 +0200 (CEST) Received: from boulder03.se.axis.com (boulder03.se.axis.com [10.0.8.17]) by bastet.se.axis.com (Postfix) with ESMTPS id C662D182DC; Wed, 3 Oct 2018 14:33:26 +0200 (CEST) Received: from boulder03.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B01B11E075; Wed, 3 Oct 2018 14:33:26 +0200 (CEST) Received: from boulder03.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A475B1E072; Wed, 3 Oct 2018 14:33:26 +0200 (CEST) Received: from seth.se.axis.com (unknown [10.0.2.172]) by boulder03.se.axis.com (Postfix) with ESMTP; Wed, 3 Oct 2018 14:33:26 +0200 (CEST) Received: from XBOX02.axis.com (xbox02.axis.com [10.0.5.16]) by seth.se.axis.com (Postfix) with ESMTP id 97FABE3A; Wed, 3 Oct 2018 14:33:26 +0200 (CEST) Received: from XBOX02.axis.com (10.0.5.16) by XBOX02.axis.com (10.0.5.16) with Microsoft SMTP Server (TLS) id 15.0.1365.1; Wed, 3 Oct 2018 14:33:26 +0200 Received: from lnxolani1 (10.0.5.60) by xbox02.axis.com (10.0.5.16) with Microsoft SMTP Server id 15.0.1365.1 via Frontend Transport; Wed, 3 Oct 2018 14:33:26 +0200 References: <20181003090036.508-1-andrej.valek@siemens.com> <20181003090036.508-2-andrej.valek@siemens.com> User-agent: mu4e 1.0; emacs 27.0.50 From: Ola x Nilsson To: Andrej Valek In-Reply-To: <20181003090036.508-2-andrej.valek@siemens.com> Date: Wed, 3 Oct 2018 14:33:16 +0200 Message-ID: MIME-Version: 1.0 X-TM-AS-GCONF: 00 Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 1/1] feat(dbg-packages): possibility to add packages to debug rootfs 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: Wed, 03 Oct 2018 12:33:28 -0000 Content-Type: text/plain On Wed, Oct 03 2018, Andrej Valek wrote: > Static libraries are not included in rootfs, it means, that sources are > not going into debug rootfs. This option enables to install additional > packages even if the standard package is not installed. > > Signed-off-by: Andrej Valek > --- > meta/classes/image.bbclass | 4 +++- > meta/classes/populate_sdk_base.bbclass | 2 +- > meta/lib/oe/package_manager.py | 4 ++++ > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 34fdbb0850..289978e000 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -101,6 +101,8 @@ LDCONFIGDEPEND_libc-musl = "" > # don't want this dependency, which is causing dependency loop > KERNELDEPMODDEPEND ?= "virtual/kernel:do_packagedata" > > +ADDITIONAL_DBG_ROOTFS ?= "" This variable shoulde follow the image "naming convention". IMAGE_INSTALL_DEBUGFS? > + > do_rootfs[depends] += " \ > makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \ > virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \ > @@ -125,7 +127,7 @@ def rootfs_variables(d): > 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS', > 'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS', > 'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS', > - 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS'] > + 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED', 'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'REPRODUCIBLE_TIMESTAMP_ROOTFS', 'ADDITIONAL_DBG_ROOTFS'] > variables.extend(rootfs_command_variables(d)) > variables.extend(variable_depends(d)) > return " ".join(variables) > diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass > index e07ad0cc6b..982c30cfa2 100644 > --- a/meta/classes/populate_sdk_base.bbclass > +++ b/meta/classes/populate_sdk_base.bbclass > @@ -293,7 +293,7 @@ def sdk_command_variables(d): > def sdk_variables(d): > variables = ['BUILD_IMAGES_FROM_FEEDS','SDK_OS','SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT', > 'SDKTARGETSYSROOT','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS', > - 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI', 'PACKAGE_EXCLUDE_COMPLEMENTARY'] > + 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI', 'PACKAGE_EXCLUDE_COMPLEMENTARY', 'ADDITIONAL_DBG_ROOTFS'] > variables.extend(sdk_command_variables(d)) > return " ".join(variables) > > diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py > index 8f4b42b0da..63d3d0f609 100644 > --- a/meta/lib/oe/package_manager.py > +++ b/meta/lib/oe/package_manager.py > @@ -581,6 +581,10 @@ class PackageManager(object, metaclass=ABCMeta): > bb.note("Installing complementary packages ...") > bb.note('Running %s' % cmd) > complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") > + # install additional debug packages > + if globs == '*-dbg': > + for add_dbg_pkgs in self.d.getVar('ADDITIONAL_DBG_ROOTFS').split(): > + complementary_pkgs += "\n%s-dbg" % add_dbg_pkgs > self.install(complementary_pkgs.split(), attempt_only=True) > except subprocess.CalledProcessError as e: > bb.fatal("Could not compute complementary packages list. Command " This should not be done in PackageManager. If it should be done like this it should be done from Rootfs._setup_dbg_rootfs in rootfs.py. -- Ola x Nilsson