[PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Li Zhou]

When update-alternatives is moved from opkg to opkg-utils, a line in
the file is changed
from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
 in oe-core build by configuring --with-opkglibdir.
opkg-utils can't get the var value in opkg, so here change back the
directory in update-alternatives only.

Signed-off-by: Li Zhou <li.zhou@windriver.com>
---
 ...Change-alternatives-lib-path-from-usr-lib.patch |   36 ++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    4 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch
new file mode 100644
index 0000000..60d2a1f
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch
@@ -0,0 +1,36 @@
+From 5ca5f2f4a6b1bd82a1349542f4541c017cb5c132 Mon Sep 17 00:00:00 2001
+From: Li Zhou <li.zhou@windriver.com>
+Date: Wed, 13 May 2015 15:12:10 +0800
+Subject: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg
+ to /var/lib/opkg
+
+When update-alternatives is moved from opkg to opkg-utils, a line in
+the file is changed
+from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
+to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
+But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
+ in oe-core build by configuring --with-opkglibdir.
+opkg-utils can't get the var value in opkg, so here change back the
+directory in update-alternatives only.
+Upstream-Status: Inappropriate [It is related with oe-core configuration.]
+Signed-off-by: Li Zhou <li.zhou@windriver.com>
+---
+ update-alternatives |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-alternatives b/update-alternatives
+index c332309..b08ecc0 100644
+--- a/update-alternatives
++++ b/update-alternatives
+@@ -21,7 +21,7 @@
+ set -e
+ 
+ # admin dir
+-ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"
++ad="$OPKG_OFFLINE_ROOT/var/lib/opkg/alternatives"
+ 
+ usage() {
+ 	echo "update-alternatives: $*
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 2800a5d..68d9a19 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -10,7 +10,9 @@ PROVIDES += "virtual/update-alternatives"
 SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a"
 PV = "0.1.8+git${SRCPV}"
 
-SRC_URI = "git://git.yoctoproject.org/opkg-utils"
+SRC_URI = "git://git.yoctoproject.org/opkg-utils \
+           file://0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch \
+"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.9.5

Re: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3694 bytes --]

Please make it respect the variable used in opkg.

On Wed, May 13, 2015 at 11:41 AM, Li Zhou <li.zhou@windriver.com> wrote:

> When update-alternatives is moved from opkg to opkg-utils, a line in
> the file is changed
> from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
> to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
> But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
>  in oe-core build by configuring --with-opkglibdir.
> opkg-utils can't get the var value in opkg, so here change back the
> directory in update-alternatives only.
>
> Signed-off-by: Li Zhou <li.zhou@windriver.com>
> ---
>  ...Change-alternatives-lib-path-from-usr-lib.patch |   36
> ++++++++++++++++++++
>  meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    4 ++-
>  2 files changed, 39 insertions(+), 1 deletion(-)
>  create mode 100644
> meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch
>
> diff --git
> a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch
> b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch
> new file mode 100644
> index 0000000..60d2a1f
> --- /dev/null
> +++
> b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch
> @@ -0,0 +1,36 @@
> +From 5ca5f2f4a6b1bd82a1349542f4541c017cb5c132 Mon Sep 17 00:00:00 2001
> +From: Li Zhou <li.zhou@windriver.com>
> +Date: Wed, 13 May 2015 15:12:10 +0800
> +Subject: [PATCH] opkg-utils: Change alternatives lib path from
> /usr/lib/opkg
> + to /var/lib/opkg
> +
> +When update-alternatives is moved from opkg to opkg-utils, a line in
> +the file is changed
> +from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
> +to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
> +But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
> + in oe-core build by configuring --with-opkglibdir.
> +opkg-utils can't get the var value in opkg, so here change back the
> +directory in update-alternatives only.
> +Upstream-Status: Inappropriate [It is related with oe-core configuration.]
> +Signed-off-by: Li Zhou <li.zhou@windriver.com>
> +---
> + update-alternatives |    2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/update-alternatives b/update-alternatives
> +index c332309..b08ecc0 100644
> +--- a/update-alternatives
> ++++ b/update-alternatives
> +@@ -21,7 +21,7 @@
> + set -e
> +
> + # admin dir
> +-ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"
> ++ad="$OPKG_OFFLINE_ROOT/var/lib/opkg/alternatives"
> +
> + usage() {
> +       echo "update-alternatives: $*
> +--
> +1.7.9.5
> +
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 2800a5d..68d9a19 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -10,7 +10,9 @@ PROVIDES += "virtual/update-alternatives"
>  SRCREV = "53274f087565fd45d8452c5367997ba6a682a37a"
>  PV = "0.1.8+git${SRCPV}"
>
> -SRC_URI = "git://git.yoctoproject.org/opkg-utils"
> +SRC_URI = "git://git.yoctoproject.org/opkg-utils \
> +
>  file://0001-opkg-utils-Change-alternatives-lib-path-from-usr-lib.patch \
> +"
>
>  S = "${WORKDIR}/git"
>
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 5139 bytes --]

[PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Li Zhou]

When update-alternatives is moved from opkg to opkg-utils, a line in
the file is changed
from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
 in oe-core build by configuring --with-opkglibdir.
opkg-utils can't get the var value in opkg, so here define opkglibdir to
set the path.

Signed-off-by: Li Zhou <li.zhou@windriver.com>
---
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 2800a5d..fc12d91 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -22,8 +22,11 @@ PYTHONRDEPS_class-native = ""
 PACKAGECONFIG = "python"
 PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
 
+opkglibdir = "/var/lib"
+
 do_install() {
 	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+	sed -i s:/usr/lib/opkg:${opkglibdir}/opkg: ${D}${bindir}/update-alternatives
 }
 
 PACKAGES =+ "update-alternatives-opkg"
-- 
1.7.9.5

Re: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1936 bytes --]

Please use the same variable with weak assignment like opkg recipes (so
that it can be easily changed from distro config).

This also breaks all upgrade paths, is it acceptable? In oe-classic days
I've created postinst script which were migrating existing
update-alternatives in the rootfs when update-alternatives-cworth was
upgraded with different path.

On Wed, May 20, 2015 at 3:31 AM, Li Zhou <li.zhou@windriver.com> wrote:

> When update-alternatives is moved from opkg to opkg-utils, a line in
> the file is changed
> from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
> to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
> But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
>  in oe-core build by configuring --with-opkglibdir.
> opkg-utils can't get the var value in opkg, so here define opkglibdir to
> set the path.
>
> Signed-off-by: Li Zhou <li.zhou@windriver.com>
> ---
>  meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> index 2800a5d..fc12d91 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
> @@ -22,8 +22,11 @@ PYTHONRDEPS_class-native = ""
>  PACKAGECONFIG = "python"
>  PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
>
> +opkglibdir = "/var/lib"
> +
>  do_install() {
>         oe_runmake PREFIX=${prefix} DESTDIR=${D} install
> +       sed -i s:/usr/lib/opkg:${opkglibdir}/opkg:
> ${D}${bindir}/update-alternatives
>  }
>
>  PACKAGES =+ "update-alternatives-opkg"
> --
> 1.7.9.5
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 2988 bytes --]

Re: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Zhou, Li]

[-- Attachment #1: Type: text/plain, Size: 3557 bytes --]

Hi, Martin:
         I have tried to use <opkglibdir = "${localstatedir}/lib">, but 
opkg-utils is built for both native and target. localstatedir will get 
different value in the two cases. It causes that update-alternative for 
native can't get the right path. I can't find a proper variable to do 
this by now. Do you have any suggestion?
         Also, it's not a good way. But in 
poky/meta/recipes-devtools/installer/adt-installer/scripts/data_define, 
we could also see like this: OPKG_LIBDIR="/var/lib"

         You mention <This also breaks all upgrade paths>, and could you 
give me an example for it?
         I'm not quite clear about the history you mentioned, and could 
you give an detail about this? Does this issue still exist on current 
version?
         As my git log say: the old version oe-core get the directory as 
/var/lib/opkg, while the new version get the directory as /usr/lib/opkg. 
This cause issues in the users' place. That is why I do this change.
         Thank you.

Zhou Li

On 05/20/2015 02:07 PM, Martin Jansa wrote:
> Please use the same variable with weak assignment like opkg recipes 
> (so that it can be easily changed from distro config).
>
> This also breaks all upgrade paths, is it acceptable? In oe-classic 
> days I've created postinst script which were migrating existing 
> update-alternatives in the rootfs when update-alternatives-cworth was 
> upgraded with different path.
>
> On Wed, May 20, 2015 at 3:31 AM, Li Zhou <li.zhou@windriver.com 
> <mailto:li.zhou@windriver.com>> wrote:
>
>     When update-alternatives is moved from opkg to opkg-utils, a line in
>     the file is changed
>     from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
>     to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
>     But opkglibdir doesn't equal to "/usr/lib" here, but equal to
>     "/var/lib"
>      in oe-core build by configuring --with-opkglibdir.
>     opkg-utils can't get the var value in opkg, so here define
>     opkglibdir to
>     set the path.
>
>     Signed-off-by: Li Zhou <li.zhou@windriver.com
>     <mailto:li.zhou@windriver.com>>
>     ---
>      meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>     <http://opkg-utils_git.bb> |    3 +++
>      1 file changed, 3 insertions(+)
>
>     diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>     <http://opkg-utils_git.bb>
>     b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>     <http://opkg-utils_git.bb>
>     index 2800a5d..fc12d91 100644
>     --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>     <http://opkg-utils_git.bb>
>     +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
>     <http://opkg-utils_git.bb>
>     @@ -22,8 +22,11 @@ PYTHONRDEPS_class-native = ""
>      PACKAGECONFIG = "python"
>      PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}"
>
>     +opkglibdir = "/var/lib"
>     +
>      do_install() {
>             oe_runmake PREFIX=${prefix} DESTDIR=${D} install
>     +       sed -i s:/usr/lib/opkg:${opkglibdir}/opkg:
>     ${D}${bindir}/update-alternatives
>      }
>
>      PACKAGES =+ "update-alternatives-opkg"
>     --
>     1.7.9.5
>
>     --
>     _______________________________________________
>     Openembedded-core mailing list
>     Openembedded-core@lists.openembedded.org
>     <mailto:Openembedded-core@lists.openembedded.org>
>     http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

-- 
Best Regards!
Zhou Li
Phone number: 86-10-84778511


[-- Attachment #2: Type: text/html, Size: 5897 bytes --]

Re: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Richard Purdie]

On Wed, 2015-05-20 at 09:31 +0800, Li Zhou wrote:
> When update-alternatives is moved from opkg to opkg-utils, a line in
> the file is changed
> from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
> to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
> But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
>  in oe-core build by configuring --with-opkglibdir.
> opkg-utils can't get the var value in opkg, so here define opkglibdir to
> set the path.
> 
> Signed-off-by: Li Zhou <li.zhou@windriver.com>
> ---
>  meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    3 +++
>  1 file changed, 3 insertions(+)

https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/387/steps/BuildImages_3/logs/stdio

Seems related to this :/

Cheers,

Richard

Re: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Rongqing Li]

On 2015年07月12日 06:39, Richard Purdie wrote:
> On Wed, 2015-05-20 at 09:31 +0800, Li Zhou wrote:
>> When update-alternatives is moved from opkg to opkg-utils, a line in
>> the file is changed
>> from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
>> to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
>> But opkglibdir doesn't equal to "/usr/lib" here, but equal to "/var/lib"
>>   in oe-core build by configuring --with-opkglibdir.
>> opkg-utils can't get the var value in opkg, so here define opkglibdir to
>> set the path.
>>
>> Signed-off-by: Li Zhou <li.zhou@windriver.com>
>> ---
>>   meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    3 +++
>>   1 file changed, 3 insertions(+)
>
> https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/387/steps/BuildImages_3/logs/stdio
>
> Seems related to this :/

I can not reproduce it,

do you see this error in yocto autobuilder recently? I see this patch 
still is in master-next2

-Roy





>
> Cheers,
>
> Richard
>

-- 
Best Reagrds,
Roy | RongQing Li

Re: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[ChenQi]

On 07/31/2015 10:55 AM, Rongqing Li wrote:
>
>
> On 2015年07月12日 06:39, Richard Purdie wrote:
>> On Wed, 2015-05-20 at 09:31 +0800, Li Zhou wrote:
>>> When update-alternatives is moved from opkg to opkg-utils, a line in
>>> the file is changed
>>> from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
>>> to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
>>> But opkglibdir doesn't equal to "/usr/lib" here, but equal to 
>>> "/var/lib"
>>>   in oe-core build by configuring --with-opkglibdir.
>>> opkg-utils can't get the var value in opkg, so here define 
>>> opkglibdir to
>>> set the path.
>>>
>>> Signed-off-by: Li Zhou <li.zhou@windriver.com>
>>> ---
>>>   meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    3 +++
>>>   1 file changed, 3 insertions(+)
>>
>> https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/387/steps/BuildImages_3/logs/stdio 
>>
>>
>> Seems related to this :/
>
> I can not reproduce it,
>
> do you see this error in yocto autobuilder recently? I see this patch 
> still is in master-next2
>
> -Roy
>
>
>

Did you enable multilib?

Regards,
Chen Qi

>
>
>>
>> Cheers,
>>
>> Richard
>>
>

Re: [PATCH] opkg-utils: Change alternatives lib path from /usr/lib/opkg to /var/lib/opkg

[Rongqing Li]

On 2015年07月31日 11:20, ChenQi wrote:
> On 07/31/2015 10:55 AM, Rongqing Li wrote:
>>
>>
>> On 2015年07月12日 06:39, Richard Purdie wrote:
>>> On Wed, 2015-05-20 at 09:31 +0800, Li Zhou wrote:
>>>> When update-alternatives is moved from opkg to opkg-utils, a line in
>>>> the file is changed
>>>> from <ad="$OPKG_OFFLINE_ROOT@opkglibdir@/opkg/alternatives">
>>>> to <ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives">.
>>>> But opkglibdir doesn't equal to "/usr/lib" here, but equal to
>>>> "/var/lib"
>>>>   in oe-core build by configuring --with-opkglibdir.
>>>> opkg-utils can't get the var value in opkg, so here define
>>>> opkglibdir to
>>>> set the path.
>>>>
>>>> Signed-off-by: Li Zhou <li.zhou@windriver.com>
>>>> ---
>>>>   meta/recipes-devtools/opkg-utils/opkg-utils_git.bb |    3 +++
>>>>   1 file changed, 3 insertions(+)
>>>
>>> https://autobuilder.yoctoproject.org/main/builders/nightly-multilib/builds/387/steps/BuildImages_3/logs/stdio
>>>
>>>
>>> Seems related to this :/
>>
>> I can not reproduce it,
>>
>> do you see this error in yocto autobuilder recently? I see this patch
>> still is in master-next2
>>
>> -Roy
>>
>>
>>
>
> Did you enable multilib?
>
> Regards,
> Chen Qi
>

Yes

-Roy

>>
>>
>>>
>>> Cheers,
>>>
>>> Richard
>>>
>>
>
>
>

-- 
Best Reagrds,
Roy | RongQing Li