From: Martin Jansa <martin.jansa@gmail.com>
To: Robert Yang <liezhi.yang@windriver.com>,
openembedded-core@lists.openembedded.org
Subject: [PATCH 10/11] package_manager.py: define info_dir and status_file when OPKGLIBDIR isn't the default
Date: Thu, 10 Dec 2015 14:48:31 +0100 [thread overview]
Message-ID: <1449755316-17611-10-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <cover.1449754341.git.Martin.Jansa@gmail.com>
* without this the do_rootfs task doesn't respect OPKGLIBDIR and
info, status are created in different directory than opkg on
target expects
* people who modify OPKGLIBDIR need to make sure that opkg.conf included
in opkg package also sets info_dir and status_file options
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/lib/oe/package_manager.py | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 964fddc..b9fa6d8 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1471,6 +1471,16 @@ class OpkgPM(PackageManager):
self.d.getVar('FEED_DEPLOYDIR_BASE_URI', True),
arch))
+ if self.opkg_dir != '/var/lib/opkg':
+ # There is no command line option for this anymore, we need to add
+ # info_dir and status_file to config file, if OPKGLIBDIR doesn't have
+ # the default value of "/var/lib" as defined in opkg:
+ # libopkg/opkg_conf.h:#define OPKG_CONF_DEFAULT_INFO_DIR "/var/lib/opkg/info"
+ # libopkg/opkg_conf.h:#define OPKG_CONF_DEFAULT_STATUS_FILE "/var/lib/opkg/status"
+ cfg_file.write("option info_dir %s\n" % os.path.join(self.d.getVar('OPKGLIBDIR', True), 'opkg', 'info'))
+ cfg_file.write("option status_file %s\n" % os.path.join(self.d.getVar('OPKGLIBDIR', True), 'opkg', 'status'))
+
+
def _create_config(self):
with open(self.config_file, "w+") as config_file:
priority = 1
@@ -1486,6 +1496,15 @@ class OpkgPM(PackageManager):
config_file.write("src oe-%s file:%s\n" %
(arch, pkgs_dir))
+ if self.opkg_dir != '/var/lib/opkg':
+ # There is no command line option for this anymore, we need to add
+ # info_dir and status_file to config file, if OPKGLIBDIR doesn't have
+ # the default value of "/var/lib" as defined in opkg:
+ # libopkg/opkg_conf.h:#define OPKG_CONF_DEFAULT_INFO_DIR "/var/lib/opkg/info"
+ # libopkg/opkg_conf.h:#define OPKG_CONF_DEFAULT_STATUS_FILE "/var/lib/opkg/status"
+ config_file.write("option info_dir %s\n" % os.path.join(self.d.getVar('OPKGLIBDIR', True), 'opkg', 'info'))
+ config_file.write("option status_file %s\n" % os.path.join(self.d.getVar('OPKGLIBDIR', True), 'opkg', 'status'))
+
def insert_feeds_uris(self):
if self.feed_uris == "":
return
--
2.6.3
next prev parent reply other threads:[~2015-12-10 13:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-10 13:48 [PATCH][jethro][RESEND 00/11] Backports for jethro Martin Jansa
2015-12-10 13:48 ` [PATCH 01/11] icu: force arm mode Martin Jansa
2015-12-10 13:48 ` [PATCH 02/11] guile, mailx, gcc, opensp, gstreamer1.0-libav, libunwind: disable thumb where it fails for qemuarm Martin Jansa
2015-12-10 13:48 ` [PATCH 03/11] directfb: add fPIC to CFLAGS Martin Jansa
2015-12-10 15:00 ` Martin Jansa
2015-12-10 13:48 ` [PATCH 04/11] libunwind: fix build for qemuarm Martin Jansa
2015-12-10 13:48 ` [PATCH 05/11] gstreamer1.0-plugins-{base, good}: update PACKAGECONFIGs Martin Jansa
2015-12-10 13:48 ` [PATCH 06/11] gstreamer1.0-plugins-bad: fix dependencies for uvch264 PACKAGECONFIG Martin Jansa
2015-12-10 13:48 ` [PATCH 07/11] gstreamer1.0-plugins-good: fix PACKAGECONFIG for gudev and add one for v4l2 and libv4l2 Martin Jansa
2015-12-10 13:48 ` [PATCH 08/11] gst-plugins-bad: add PACKAGECONFIGs for voamrwbenc, voaacenc, resindvd Martin Jansa
2015-12-10 13:48 ` [PATCH 09/11] libsdl2: require GLES when building Wayland support Martin Jansa
2015-12-10 13:48 ` Martin Jansa [this message]
2015-12-10 13:48 ` [PATCH 11/11] texinfo: don't create dependency on INHERIT variable Martin Jansa
2015-12-18 18:09 ` [PATCH][jethro][RESEND 00/11] Backports for jethro Martin Jansa
2015-12-18 18:23 ` Burton, Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449755316-17611-10-git-send-email-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=liezhi.yang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.