summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Seiler <hws@denx.de>2022-11-24 11:52:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-23 23:05:56 +0000
commit2b7c23e08e94db018a535e78ef40db7226c1a98e (patch)
treea38e09d97b8487741cf6dd4dcaf581caa8ddf63b
parent6a6951f15a28e38c707c782b501a2fd4bb1d8645 (diff)
downloadpoky-2b7c23e08e94db018a535e78ef40db7226c1a98e.tar.gz
opkg: Set correct info_dir and status_file in opkg.conf
Distros can customize the location of OPKG data using OPKGLIBDIR. In OE-Core commit 11f1956cf5d7 ("package_manager.py: define info_dir and status_file when OPKGLIBDIR isn't the default"), a fix was applied to correctly set the info_dir and status_file options relative to OPKGLIBDIR. However, as the commit message notes, the opkg.conf file deployed as part of the opkg package must also be adjusted to correctly reflect the changed location. Otherwise, opkg running inside the image cannot find its data. Fix this by also setting the info_dir and status_file options in opkg.conf to the correct location relative to OPKGLIBDIR. Fixes: 11f1956cf5d7 ("package_manager.py: define info_dir and status_file when OPKGLIBDIR isn't the default") (From OE-Core rev: 2c7284c36398078b38271412ec3b2a457c197a5f) Signed-off-by: Harald Seiler <hws@denx.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit adb939ae3635de6e02208859fbf29cf0ed39f565) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.6.0.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/opkg/opkg_0.6.0.bb b/meta/recipes-devtools/opkg/opkg_0.6.0.bb
index 4cd589cd29..53c7399929 100644
--- a/meta/recipes-devtools/opkg/opkg_0.6.0.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.6.0.bb
@@ -47,7 +47,9 @@ EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedi
47do_install:append () { 47do_install:append () {
48 install -d ${D}${sysconfdir}/opkg 48 install -d ${D}${sysconfdir}/opkg
49 install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf 49 install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
50 echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf 50 echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf
51 echo "option info_dir ${OPKGLIBDIR}/opkg/info" >>${D}${sysconfdir}/opkg/opkg.conf
52 echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf
51 53
52 # We need to create the lock directory 54 # We need to create the lock directory
53 install -d ${D}${OPKGLIBDIR}/opkg 55 install -d ${D}${OPKGLIBDIR}/opkg