Skip to contentSkip to conversation

(image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes

PATCH In review Laurentiu Palcu 4 participants 9 messages Feb 12, 2014 – Feb 14, 2014

lore
Share & tools
lore
#0 lore raw

cover (image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes

The following changes since commit 92cad721d764ec28c3570dfe4a80847c3df19453:

curl: fix https certificate problems (2014-02-11 17:15:55 +0000)

are available in the git repository at:

git://mirror.rb.intel.com/git.yoctoproject.org/poky-contrib lpalcu/rootfs_refactoring_multilib_fixes

for you to fetch changes up to f1d4b1de74f2c69b444ed50977263245440ed071:

(image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes (2014-02-12 16:26:35 +0200)

----------------------------------------------------------------
Laurentiu Palcu (1):
(image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes

 meta/classes/image.bbclass      |    2 +-
 meta/classes/rootfs_ipk.bbclass |    2 +-
 meta/lib/oe/rootfs.py           |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

Laurentiu Palcu (1):
(image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes

 meta/classes/image.bbclass      |    2 +-
 meta/classes/rootfs_ipk.bbclass |    2 +-
 meta/lib/oe/rootfs.py           |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 (image|rootfs_ipk).bbclass, rootfs.py: ipk multilib fixes

This commit whitelists some common directories, so the multilib sanity checks pass and also fixes an issue in lib/oe/rootfs.py when the compared files do not exist.

---
 meta/classes/image.bbclass      |    2 +-
 meta/classes/rootfs_ipk.bbclass |    2 +-
 meta/lib/oe/rootfs.py           |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)
meta/classes/image.bbclass +1 -1
index 8f4be13..28b68f9 100644
@@ -264,7 +264,7 @@ insert_feed_uris () {
 	done
 }
 
-MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|"
+MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|"
 MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
 MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
 
meta/classes/rootfs_ipk.bbclass +1 -1
index 6d4f9fa..1887dd3 100644
@@ -21,7 +21,7 @@ OPKG_POSTPROCESS_COMMANDS = ""
 
 OPKGLIBDIR = "${localstatedir}/lib"
 
-MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg"
+MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"
 
 python () {
 
meta/lib/oe/rootfs.py +3 -1
index b6baf77..4fd17de 100644
@@ -496,7 +496,9 @@ class OpkgRootfs(Rootfs):
                         if allow_rep.match(key):
                             valid = True
                         else:
-                            if not filecmp.cmp(files[key], item):
+                            if os.path.exists(files[key]) and \
+                               os.path.exists(item) and \
+                               not filecmp.cmp(files[key], item):
                                 valid = False
                                 bb.fatal("%s duplicate files %s %s is not the same\n" %
                                          (error_prompt, item, files[key]))
Signature · 1 line
1.7.9.5
#2 lore raw

meta/classes/rootfs_ipk.bbclass OPKG_POSTPROCESS_COMMANDS = "" · line 24

Quoted 10 lines · Laurentiu Palcu
meta/classes/rootfs_ipk.bbclass +1 -1
index 6d4f9fa..1887dd3 100644
@@ -21,7 +21,7 @@ OPKG_POSTPROCESS_COMMANDS = ""
 
 OPKGLIBDIR = "${localstatedir}/lib"
 
-MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg"
+MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"

Why is that change needed? Doesn't this imply that ${OPKGLIBDIR} is wrong?

p.

#3 lore raw
Quoted 7 lines · Phil Blundell
Quoted 6 lines · Laurentiu Palcu
meta/classes/rootfs_ipk.bbclass +0 -0
index 6d4f9fa..1887dd3 100644
@@ -21,7 +21,7 @@ OPKG_POSTPROCESS_COMMANDS = ""
 
Quoted 7 lines

meta/classes/rootfs_ipk.bbclass OPKG_POSTPROCESS_COMMANDS = "" · line 24

Quoted 4 lines
meta/classes/rootfs_ipk.bbclass +1 -1
 OPKGLIBDIR = "${localstatedir}/lib"
 
-MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg"
+MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg"

Why is that change needed? Doesn't this imply that ${OPKGLIBDIR} is wrong?

It's needed for the multilib sanity checks. I managed to make these checks actually work in the new code and I had to adjust the directory whitelist.

* ${OPKGLIBDIR}/opkg is for opkg's metadata and stuff;
* /usr/lib/opkg is where the alternatives go;

laurentiu

Quoted 4 lines

p.

#4 lore raw
Quoted 1 line · Laurentiu Palcu

* /usr/lib/opkg is where the alternatives go;

Isn't that a bug?

p.

#5 lore raw
Quoted 4 lines · Phil Blundell
Quoted 1 line · Laurentiu Palcu

* /usr/lib/opkg is where the alternatives go;

Isn't that a bug?

I'm far from being an expert in opkg or update-alternatives, but, looking in /usr/bin/update-alternatives I can see:

# admin dir
ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"

Isn't that expected since the u-a provider is opkg-utils recipe?

laurentiu

Quoted 4 lines

p.

#6 lore raw
Quoted 4 lines · Laurentiu Palcu
Quoted 3 lines · Phil Blundell
Quoted 1 line · Laurentiu Palcu

* /usr/lib/opkg is where the alternatives go;

Quoted 8 lines
Quoted 1 line

Isn't that a bug?

I'm far from being an expert in opkg or update-alternatives, but, looking in /usr/bin/update-alternatives I can see:

# admin dir
ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"

Isn't that expected since the u-a provider is opkg-utils recipe?

Its certainly desirable to have one set of alternatives files on a multilib system, not two. The variables/paths could probably do with being better however I've prefer not to trigger autobuilder failures on this until that gets resolved so I did take this.

Cheers,

Richard

#7 lore raw
Quoted 14 lines · Richard Purdie
Quoted 4 lines · Laurentiu Palcu
Quoted 3 lines · Phil Blundell
Quoted 1 line · Laurentiu Palcu

* /usr/lib/opkg is where the alternatives go;

Quoted 8 lines
Quoted 1 line

Isn't that a bug?

I'm far from being an expert in opkg or update-alternatives, but, looking in /usr/bin/update-alternatives I can see:

# admin dir
ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"

Isn't that expected since the u-a provider is opkg-utils recipe?

Quoted 9 lines

Its certainly desirable to have one set of alternatives files on a multilib system, not two. The variables/paths could probably do with being better however I've prefer not to trigger autobuilder failures on this until that gets resolved so I did take this.

Cheers,

Richard

I should add some flexibility here. The problem is opkg-utils doesn't know what value OPKGLIBDIR has in the opkg recipe. It also isn't processed by a configure script to replace variables as it was in the opkg recipe.

I'll have a think about a cleaner upgrade path for opkg and opkg-utils. I'd like to have a postinstall script compare the old and new OPKGLIBDIR paths and move data if needed. That would let me move everything from /usr/lib to /var/lib.

Signature · 4 lines
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk
#8 lore raw
Quoted 23 lines · Paul Barker
Quoted 21 lines · Richard Purdie
Quoted 4 lines · Laurentiu Palcu
Quoted 3 lines · Phil Blundell
Quoted 1 line · Laurentiu Palcu

* /usr/lib/opkg is where the alternatives go;

Quoted 8 lines
Quoted 1 line

Isn't that a bug?

I'm far from being an expert in opkg or update-alternatives, but, looking in /usr/bin/update-alternatives I can see:

# admin dir
ad="$OPKG_OFFLINE_ROOT/usr/lib/opkg/alternatives"

Isn't that expected since the u-a provider is opkg-utils recipe?

Its certainly desirable to have one set of alternatives files on a multilib system, not two. The variables/paths could probably do with being better however I've prefer not to trigger autobuilder failures on this until that gets resolved so I did take this.

Cheers,

Quoted 8 lines
Quoted 2 lines

Richard

I should add some flexibility here. The problem is opkg-utils doesn't know what value OPKGLIBDIR has in the opkg recipe. It also isn't processed by a configure script to replace variables as it was in the opkg recipe.

Actually, OPKGLIBDIR is set in two places:

meta/classes/package_ipk.bbclass:

    OPKGLIBDIR = "${localstatedir}/lib"

meta/recipes-devtools/opkg/opkg.inc:

    target_localstatedir := "${localstatedir}"
    OPKGLIBDIR = "${target_localstatedir}/lib"

Should this be cleaned up so it's just set once globally and then we can substitute that variable into the update-alternatives script again?

Signature · 4 lines
Paul Barker

Email: [email protected]
http://www.paulbarker.me.uk