From fa5640d143beea4be101d6622d3fa133d04272f2 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 9 Jul 2012 14:15:08 +0100 Subject: Rework installation of dev, dbg, doc, and locale packages Use a similar mechanism that was previously used to install locales at rootfs generation time to install other "complementary" packages (e.g. *-dev packages) - i.e. install all of the explicitly requested packages and their dependencies, then get a list of the packages that were installed, and use that list to install the complementary packages. This has been implemented by using a list of globs which should make it easier to extend in future. The previous locale package installation code assumed that the locale packages did not have any dependencies that were not already installed; now that we are installing non-locale packages this is no longer correct. In practice only the rpm backend actually made use of this assumption, so it needed to be changed to call into the existing package backend code to do the complementary package installation rather than calling rpm directly. This fixes the doc-pkgs IMAGE_FEATURES feature to work correctly, and also ensures that all dev/dbg packages get installed for dev-pkgs/dbg-pkgs respectively even if the dependency chains between those packages was not ensuring that already. The code has also been adapted to work correctly with the new SDK-from-image functionality. To that end, an SDKIMAGE_FEATURES variable has been added to allow specifying what extra image features should go into the SDK (extra, because by virtue of installing all of the packages in the image into the target part of the SDK, we already include all of IMAGE_FEATURES) with a default value of "dev-pkgs dbg-pkgs". Fixes [YOCTO #2614]. (From OE-Core rev: 72d1048a8381fa4a8c4c0d082047536727b4be47) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/opkg-query-helper.py | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100755 scripts/opkg-query-helper.py (limited to 'scripts/opkg-query-helper.py') diff --git a/scripts/opkg-query-helper.py b/scripts/opkg-query-helper.py new file mode 100755 index 0000000000..b52284b325 --- /dev/null +++ b/scripts/opkg-query-helper.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python + +# OpenEmbedded opkg query helper utility +# +# Written by: Paul Eggleton +# +# Copyright 2012 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# + + +import sys +import fileinput +import re + +archmode = False +filemode = False + +args = [] +for arg in sys.argv[1:]: + if arg == '-a': + archmode = True + elif arg == '-f': + filemode = True + else: + args.append(arg) + +# Regex for removing version specs after dependency items +verregex = re.compile(' \([=<>]* [^ )]*\)') + +pkg = "" +ver = "" +for line in fileinput.input(args): + line = line.rstrip() + if ': ' in line: + if line.startswith("Package:"): + pkg = line.split(": ")[1] + ver = "" + else: + if archmode: + if line.startswith("Architecture:"): + arch = line.split(": ")[1] + print("%s %s" % (pkg,arch)) + elif filemode: + if line.startswith("Version:"): + ver = line.split(": ")[1] + elif line.startswith("Architecture:"): + arch = line.split(": ")[1] + print("%s %s_%s_%s.ipk" % (pkg,pkg,ver,arch)) + else: + if line.startswith("Depends:"): + depval = line.split(": ")[1] + deps = depval.split(", ") + for dep in deps: + dep = verregex.sub('', dep) + print("%s|%s" % (pkg,dep)) + elif line.startswith("Recommends:"): + recval = line.split(": ")[1] + recs = recval.split(", ") + for rec in recs: + rec = verregex.sub('', rec) + print("%s|%s [REC]" % (pkg, rec)) + -- cgit v1.2.3-54-g00ecf