[OE-core] [PATCH][master][jethro] package_manager.py: define info_dir and status_file when OPKGLIBDIR isn't the default

[Martin Jansa]

On Wed, Nov 25, 2015 at 10:08:43AM +0100, Martin Jansa wrote:
> * 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 at 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..7b71174 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.opkg_dir, 'info'))
> +                cfg_file.write("option status_file  %s\n" % os.path.join(self.opkg_dir, 'status'))

This is older revision than what I was testing, v2 coming soon
(self.opkg_dir isn't good, because it is absolute path).

> +
> +
>      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.opkg_dir, 'info'))
> +                config_file.write("option status_file  %s\n" % os.path.join(self.opkg_dir, 'status'))
> +
>      def insert_feeds_uris(self):
>          if self.feed_uris == "":
>              return
> -- 
> 2.6.3
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20151125/cfb688a9/attachment-0002.sig>