[oe-commits] [openembedded-core] 02/07: opkg/package/rootfs_ipk: allow overwriting OPKGLIBDIR

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit f61f222b4e408c4262dbdc056253fb2fd21ae7ff
Author: Adrian Ratiu <adrian.ratiu at collabora.com>
AuthorDate: Wed Jul 17 00:55:58 2019 +0300

    opkg/package/rootfs_ipk: allow overwriting OPKGLIBDIR
    
    Some distributions for various reasons (like for example mounting a
    tmpfs over /var at runtime) can't use /var/lib to store the opkg
    metadata, so a different path is required to have a functioning
    package manager.
    
    ${localstatedir} can't be modified to something other than the
    hardcoded value in bitbake.conf because other recipes depending on it
    will fail to install.
    
    So the only recourse, which is also the least invasive, is to allow
    distros to overwrite the OPKGLIBDIR variable just like they are also
    allowed to overwrite OPKGBUILDCMD.
    
    Signed-off-by: Adrian Ratiu <adrian.ratiu at collabora.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package_ipk.bbclass         | 2 +-
 meta/classes/rootfs_ipk.bbclass          | 2 +-
 meta/recipes-devtools/opkg/opkg_0.4.1.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index d1b317b..9f9da2f 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -14,7 +14,7 @@ OPKG_ARGS += "--force_postinstall --prefer-arch-to-version"
 OPKG_ARGS += "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS") == "1"]}"
 OPKG_ARGS += "${@['', '--add-exclude ' + ' --add-exclude '.join((d.getVar('PACKAGE_EXCLUDE') or "").split())][(d.getVar("PACKAGE_EXCLUDE") or "").strip() != ""]}"
 
-OPKGLIBDIR = "${localstatedir}/lib"
+OPKGLIBDIR ??= "${localstatedir}/lib"
 
 python do_package_ipk () {
     workdir = d.getVar('WORKDIR')
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index aabc370..e73d2bf 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -21,7 +21,7 @@ OPKG_PREPROCESS_COMMANDS = ""
 
 OPKG_POSTPROCESS_COMMANDS = ""
 
-OPKGLIBDIR = "${localstatedir}/lib"
+OPKGLIBDIR ??= "${localstatedir}/lib"
 
 MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"
 
diff --git a/meta/recipes-devtools/opkg/opkg_0.4.1.bb b/meta/recipes-devtools/opkg/opkg_0.4.1.bb
index 663eaec..6270862 100644
--- a/meta/recipes-devtools/opkg/opkg_0.4.1.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.4.1.bb
@@ -28,7 +28,7 @@ PACKAGES =+ "libopkg"
 inherit autotools pkgconfig systemd ptest
 
 target_localstatedir := "${localstatedir}"
-OPKGLIBDIR = "${target_localstatedir}/lib"
+OPKGLIBDIR ??= "${target_localstatedir}/lib"
 
 PACKAGECONFIG ??= "libsolv"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.