diff mbox series

opkg: Set correct info_dir and status_file in opkg.conf

Message ID 20221124105259.130383-1-hws@denx.de
State New
Headers show
Series opkg: Set correct info_dir and status_file in opkg.conf | expand

Commit Message

Harald Seiler Nov. 24, 2022, 10:52 a.m. UTC
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")
Signed-off-by: Harald Seiler <hws@denx.de>
---
 meta/recipes-devtools/opkg/opkg_0.5.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Ross Burton Nov. 25, 2022, 3:02 p.m. UTC | #1
We’ve had opkg 0.6.0 in master since June, so can you rebase to current master and resend?

Thanks,
Ross

> On 24 Nov 2022, at 10:52, Harald Seiler via lists.openembedded.org <hws=denx.de@lists.openembedded.org> wrote:
> 
> 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")
> Signed-off-by: Harald Seiler <hws@denx.de>
> ---
> meta/recipes-devtools/opkg/opkg_0.5.0.bb | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/opkg/opkg_0.5.0.bb b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
> index e91d7250bc..7bddaa3016 100644
> --- a/meta/recipes-devtools/opkg/opkg_0.5.0.bb
> +++ b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
> @@ -46,7 +46,9 @@ EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedi
> do_install:append () {
> install -d ${D}${sysconfdir}/opkg
> install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
> - echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf
> + echo "option lists_dir   ${OPKGLIBDIR}/opkg/lists"  >>${D}${sysconfdir}/opkg/opkg.conf
> + echo "option info_dir    ${OPKGLIBDIR}/opkg/info"   >>${D}${sysconfdir}/opkg/opkg.conf
> + echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf
> 
> # We need to create the lock directory
> install -d ${D}${OPKGLIBDIR}/opkg
> -- 
> 2.38.1
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#173740): https://lists.openembedded.org/g/openembedded-core/message/173740
> Mute This Topic: https://lists.openembedded.org/mt/95235592/6875888
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/opkg/opkg_0.5.0.bb b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
index e91d7250bc..7bddaa3016 100644
--- a/meta/recipes-devtools/opkg/opkg_0.5.0.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.5.0.bb
@@ -46,7 +46,9 @@  EXTRA_OECONF:class-native = "--localstatedir=/${@os.path.relpath('${localstatedi
 do_install:append () {
 	install -d ${D}${sysconfdir}/opkg
 	install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
-	echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf
+	echo "option lists_dir   ${OPKGLIBDIR}/opkg/lists"  >>${D}${sysconfdir}/opkg/opkg.conf
+	echo "option info_dir    ${OPKGLIBDIR}/opkg/info"   >>${D}${sysconfdir}/opkg/opkg.conf
+	echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf
 
 	# We need to create the lock directory
 	install -d ${D}${OPKGLIBDIR}/opkg