Skip to contentSkip to conversation

Resend: multilib: change hard coded /usr/lib path.

GIT PULL In review Dongxiao Xu 6 participants 15 messages Jul 18, 2011 – Jul 20, 2011

lore
Share & tools
lore
#1 lore raw

PATCH 1/4 xcb-proto: add multilib support.

In reply to Dongxiao Xu

There is hardcode of /usr/lib dir for some python files. Fix it to support multilib.

---
 .../xcb/xcb-proto-1.6/aclocal.patch                |   22 ++++++++++++++++++++
 meta/recipes-graphics/xcb/xcb-proto.inc            |    3 +-
 meta/recipes-graphics/xcb/xcb-proto_1.6.bb         |    2 +-
 meta/recipes-graphics/xcb/xcb-proto_git.bb         |    2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch new file +22 -0
new file mode 100644
index 0000000..124f146
@@ -0,0 +1,22 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN xcb-proto-1.6-orig/aclocal.m4 xcb-proto-1.6/aclocal.m4
+--- xcb-proto-1.6-orig/aclocal.m4	2011-07-08 15:45:33.000000000 +0800
++++ xcb-proto-1.6/aclocal.m4	2011-07-08 15:48:19.000000000 +0800
+@@ -518,6 +518,7 @@
+   dnl general consensus is that you shouldn't need this ability.
+ 
+   AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
++  AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
+   AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+ 
+   dnl At times (like when building shared libraries) you may want
+@@ -546,7 +547,7 @@
+        am_py_prefix=$prefix
+      fi
+      am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
+      case $am_cv_python_pythondir in
+      $am_py_prefix*)
+        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
meta/recipes-graphics/xcb/xcb-proto.inc +2 -1
index cd7e115..76688c9 100644
@@ -9,7 +9,8 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \
+           file://aclocal.patch"
 
 inherit autotools pkgconfig
 
meta/recipes-graphics/xcb/xcb-proto_1.6.bb +1 -1
index 3133977..1868f1a 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
                     file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b"
 SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2"
meta/recipes-graphics/xcb/xcb-proto_git.bb +1 -1
index 01a7d91..2711213 100644
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
 include xcb-proto.inc
 SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 PV = "1.2+gitr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git"
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.1
#2 lore raw

PATCH 2/4 pciutils: Change the hardcoded /usr/lib to support multilib.

In reply to Dongxiao Xu
---
 .../pciutils/pciutils-3.1.7/makefile.patch         |   14 ++++++++++++++
 meta/recipes-bsp/pciutils/pciutils_3.1.7.bb        |    5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch
meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch new file +14 -0
new file mode 100644
index 0000000..811aac8
@@ -0,0 +1,14 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN pciutils-3.1.7-orig/Makefile pciutils-3.1.7/Makefile
+--- pciutils-3.1.7-orig/Makefile	2011-07-11 14:41:59.000000000 +0800
++++ pciutils-3.1.7/Makefile	2011-07-11 14:42:31.000000000 +0800
+@@ -31,7 +31,7 @@
+ IDSDIR=$(SHAREDIR)
+ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+ INCDIR=$(PREFIX)/include
+-LIBDIR=$(PREFIX)/lib
++LIBDIR=$(libdir)
+ PKGCFDIR=$(LIBDIR)/pkgconfig
+ 
+ # Commands
meta/recipes-bsp/pciutils/pciutils_3.1.7.bb +3 -2
index 4e6d4e1..b48aaf0 100644
@@ -9,13 +9,14 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = "zlib"
 RDEPENDS_${PN} = "${PN}-ids"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
            file://configure.patch \
            file://pcimodules-pciutils.diff \
            file://lib-build-fix.patch \
-           file://guess-fix.patch"
+           file://guess-fix.patch \
+           file://makefile.patch"
 
 SRC_URI[md5sum] = "35222edb86b50a6641352c66fe829b2e"
 SRC_URI[sha256sum] = "d8fe23b6966c1abf29b3b38b08b0cf33f731cd6e6a89d9b8d2b8d5e982c3f544"
Signature · 1 line
1.7.1
#3 lore raw

PATCH 3/4 udev: Change hard coded /usr/lib to support multilib

In reply to Dongxiao Xu
---
 meta/recipes-core/udev/udev-164/makefile.patch |   16 ++++++++++++++++
 meta/recipes-core/udev/udev-new.inc            |    1 +
 meta/recipes-core/udev/udev_164.bb             |    2 +-
 3 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch
meta/recipes-core/udev/udev-164/makefile.patch new file +16 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN udev-164-orig/Makefile.am udev-164/Makefile.am
+--- udev-164-orig/Makefile.am	2011-07-11 16:10:26.000000000 +0800
++++ udev-164/Makefile.am	2011-07-11 16:11:14.000000000 +0800
+@@ -468,8 +468,8 @@
+ libexec_PROGRAMS += extras/udev-acl/udev-acl
+ 
+ udevacl-install-hook:
+-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
++	mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
++	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck
+ 
+ INSTALL_EXEC_HOOKS += udevacl-install-hook
+ 
meta/recipes-core/udev/udev-new.inc +1 -0
index 4c4451f..b482a5a 100644
@@ -16,6 +16,7 @@ RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
 RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://makefile.patch \
            file://run.rules \
            file://udev.rules \
            file://devfs-udev.rules \
meta/recipes-core/udev/udev_164.bb +1 -1
index 567e62e..518d37a 100644
@@ -1,6 +1,6 @@
 include udev-new.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI[md5sum] = "fddac2d54761ea34865af9467377ca9f"
 SRC_URI[sha256sum] = "c12e66280b5e1465f6587a8cfa47d7405c4caa7e52ce5dd13478d04f6ec05e5c"
Signature · 1 line
1.7.1
#13 lore raw

PATCH 4/4 perl: revise the RRECOMMENDS_perl-modules for multilib case

In reply to Dongxiao Xu

From: Yu Ke <[email protected]>

current RRECOMMENDS_perl-modules replace the hardcode "perl-dbg", "perl-misc" etc. which does not work in multilib case. Instead, it should replace the "lib64-perl-dbg", "lib-64-perl-misc". without doing this, current code will produce RRECOMMENDS=lib64-lib64-xxx etc

This patch revise the code to fix this issue

---
 meta/recipes-devtools/perl/perl_5.12.3.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/perl/perl_5.12.3.bb +1 -1
index c75a532..4b6b5a7 100644
@@ -282,7 +282,7 @@ FILES_perl-module-unicore += "${libdir}/perl/${PV}/unicore"
 # packages (actually the non modules packages and not created too)
 ALLOW_EMPTY_perl-modules = "1"
 PACKAGES_append = " perl-modules "
-RRECOMMENDS_perl-modules = "${@bb.data.getVar('PACKAGES', d, 1).replace('perl-modules ', '').replace('perl-dbg ', '').replace('perl-misc ', '').replace('perl-dev ', '').replace('perl-pod ', '').replace('perl-doc ', '')}"
+RRECOMMENDS_perl-modules = "${@bb.data.getVar('PACKAGES', d, 1).replace('${PN}-modules ', '').replace('${PN}-dbg ', '').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ', '').replace('${PN}-doc ', '')}"
 
 python populate_packages_prepend () {
         libdir = bb.data.expand('${libdir}/perl/${PV}', d)
Signature · 1 line
1.7.1
#0 lore raw

Hi Richard,

(Please ignore the previous pull request which doesn't contain the latest code.)

This pull request fixes some hard coded /usr/lib path in recipes within minimal image. Please help to review and pull.

Thanks,
Dongxiao

The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:

bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:23:09 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/multilib
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/multilib

Dongxiao Xu (3):
xcb-proto: add multilib support.
pciutils: Change the hardcoded /usr/lib to support multilib.
udev: Change hard coded /usr/lib to support multilib

Yu Ke (1):
perl: revise the RRECOMMENDS_perl-modules for multilib case

 .../pciutils/pciutils-3.1.7/makefile.patch         |   14 ++++++++++++
 meta/recipes-bsp/pciutils/pciutils_3.1.7.bb        |    5 ++-
 meta/recipes-core/udev/udev-164/makefile.patch     |   16 ++++++++++++++
 meta/recipes-core/udev/udev-new.inc                |    1 +
 meta/recipes-core/udev/udev_164.bb                 |    2 +-
 meta/recipes-devtools/perl/perl_5.12.3.bb          |    2 +-
 .../xcb/xcb-proto-1.6/aclocal.patch                |   22 ++++++++++++++++++++
 meta/recipes-graphics/xcb/xcb-proto.inc            |    3 +-
 meta/recipes-graphics/xcb/xcb-proto_1.6.bb         |    2 +-
 meta/recipes-graphics/xcb/xcb-proto_git.bb         |    2 +-
 10 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch
 create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch
 create mode 100644 meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
#4 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

In reply to Dongxiao Xu

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 14 lines

---

meta/recipes-core/udev/udev-164/makefile.patch |   16 ++++++++++++++++
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-)

create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch

meta/recipes-core/udev/udev-164/makefile.patch new file +0 -0
new file mode 100644
index 0000000..c46ff4b

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 1 line
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it here?

#5 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 11 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 8 lines

---

meta/recipes-core/udev/udev-164/makefile.patch |   16 ++++++++++++++++
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-)

create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 9 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 7 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it here?

I asked the udev maintainer:

14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ? 14:29 < kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

regards,

Koen

#6 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Op 18 jul 2011, om 14:32 heeft Koen Kooi het volgende geschreven:

Quoted 24 lines

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 11 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 8 lines

---

meta/recipes-core/udev/udev-164/makefile.patch |   16 ++++++++++++++++
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-)

create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 9 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 7 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it here?

Quoted 6 lines

I asked the udev maintainer:

14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ? 14:29 < kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

Some more:

14:33 < kay> koen: yeah, libdir can never be used for any "app private dir"
14:34 < kay> koen: /lib/<pkgname>/ /usr/lib/<pkgname>/ is app-priv-dir and never libdir
14:34 < kay> koen: but you should not use udev-acl anyway, i guess :)
14:34 < koen> that's another thing :)
14:34 < kay> koen: i disabled it by default now
14:34 < kay> all in sysyemd
14:34 < koen> the patch was for 164, I'm at 172 now without acl
14:35 < koen> we're adding multilib support to our buildsystem and we're having trouble judging when to use ${libdir} or ${prefix}/lib in some cases 14:35 < koen> I expected udev to be fairly sane by now, hence the question
14:35 < kay> koen: libdir only for .so, never anything else

#7 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

In reply to Koen Kooi
Quoted 24 lines · Koen Kooi

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 11 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 8 lines

---

meta/recipes-core/udev/udev-164/makefile.patch |   16 ++++++++++++++++
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-)

create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 9 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 7 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it here?

Quoted 6 lines

I asked the udev maintainer:

14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ? 14:29 < kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

This is likely a problem with the multilib fix. "libexecdir" is often /usr/lib on many distribuions.. however as your other email mentioned.. setting it to /usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the associated multilib packages should work correctly and no conflicts introduced with this package (file contents should be identical.)

It should be permissible for libexecdir to be changed in the configuration if someone really wants it to be. By default (in bitbake.conf) it is:

export libexecdir = "${exec_prefix}/libexec"

--Mark

Quoted 9 lines

regards,

Koen

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#8 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Replying to myself.. sorry, I misunderstood the concern.. see below for a new explanation..

Quoted 41 lines · Mark Hatle
Quoted 24 lines · Koen Kooi

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 11 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 8 lines

---

meta/recipes-core/udev/udev-164/makefile.patch |   16 ++++++++++++++++
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-)

create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 9 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 7 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it here?

Quoted 6 lines

I asked the udev maintainer:

14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ? 14:29 < kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

This is likely a problem with the multilib fix. "libexecdir" is often /usr/lib on many distribuions.. however as your other email mentioned.. setting it to /usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the associated multilib packages should work correctly and no conflicts introduced with this package (file contents should be identical.)

It should be permissible for libexecdir to be changed in the configuration if someone really wants it to be. By default (in bitbake.conf) it is:

Quoted 6 lines

export libexecdir = "${exec_prefix}/libexec"

+-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck

++ mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
++ ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck

I see libexecdir CAN be changed.. so the above is already possible..

The part they had hard coded is "/usr/lib/ConsoleKit"... There is only one location in the system for ConsoleKit configuration files/scripts.. and that is distro specific. Assuming the oe based distributions use $(PREFIX)/lib/ConsoleKit.. then the previous was correct.

The point being it doesn't matter if it's 32-bit, 64-bit or 24-bit... only one ConsoleKit per system should exist. (There are potentially other files on the system like this. I know a recent RPM patch went in that separated /usr/lib/rpm and /usr/lib64/rpm.. this is also a similar mistake, I just haven't had time to get a patch out to revert that chunk.)

--Mark

Quoted 17 lines

--Mark

Quoted 9 lines

regards,

Koen

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#9 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Quoted 81 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Mark Hatle
Sent: Monday, July 18, 2011 11:30 PM
To: [email protected]
Subject: Re: [OE-core] [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Replying to myself.. sorry, I misunderstood the concern.. see below for a new explanation..

Quoted 10 lines · Mark Hatle
Quoted 9 lines · Koen Kooi

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 6 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 3 lines

---
meta/recipes-core/udev/udev-164/makefile.patch | 16

++++++++++++++++

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-) create mode

100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 8 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it

here?

Quoted 4 lines
Quoted 4 lines

I asked the udev maintainer:

14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ?

Quoted 3 lines
Quoted 3 lines

14:29 < kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a

non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

Quoted 11 lines

This is likely a problem with the multilib fix. "libexecdir" is often /usr/lib on many distribuions.. however as your other email mentioned.. setting it to
/usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the associated multilib packages should work correctly and no conflicts introduced with this package (file contents should be identical.)

It should be permissible for libexecdir to be changed in the configuration if someone really wants it to be. By default (in bitbake.conf) it

is:

Quoted 5 lines

export libexecdir = "${exec_prefix}/libexec"

+-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck

Quoted 3 lines

++ mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
++ ln -sf $(libexecdir)/udev-acl
++$(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck

I see libexecdir CAN be changed.. so the above is already possible..

The part they had hard coded is "/usr/lib/ConsoleKit"... There is only one location in the system for ConsoleKit configuration files/scripts.. and that is distro specific. Assuming the oe based distributions use $(PREFIX)/lib/ConsoleKit.. then the previous was correct.

Quoted 5 lines

The point being it doesn't matter if it's 32-bit, 64-bit or 24-bit... only one ConsoleKit per system should exist. (There are potentially other files on the system like this. I know a recent RPM patch went in that separated /usr/lib/rpm and /usr/lib64/rpm.. this is also a similar mistake, I just haven't had time to get a patch out to revert that chunk.)

So for multilib system, we have /usr/lib32 and /usr/lib64 to contain only *.so files, while there is still /usr/lib directory which contains other types of files, right?

Thanks,
Dongxiao

Quoted 26 lines

--Mark

Quoted 13 lines

--Mark

Quoted 9 lines

regards,

Koen

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#10 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Op 19 jul 2011, om 02:30 heeft Xu, Dongxiao het volgende geschreven:

Quoted 81 lines
Quoted 81 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Mark Hatle
Sent: Monday, July 18, 2011 11:30 PM
To: [email protected]
Subject: Re: [OE-core] [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Replying to myself.. sorry, I misunderstood the concern.. see below for a new explanation..

Quoted 10 lines · Mark Hatle
Quoted 9 lines · Koen Kooi

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 6 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 3 lines

---
meta/recipes-core/udev/udev-164/makefile.patch | 16

++++++++++++++++

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-) create mode

100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 8 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it

here?

Quoted 4 lines
Quoted 4 lines

I asked the udev maintainer:

14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ?

Quoted 3 lines
Quoted 3 lines

14:29 < kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a

non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

Quoted 11 lines

This is likely a problem with the multilib fix. "libexecdir" is often /usr/lib on many distribuions.. however as your other email mentioned.. setting it to
/usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the associated multilib packages should work correctly and no conflicts introduced with this package (file contents should be identical.)

It should be permissible for libexecdir to be changed in the configuration if someone really wants it to be. By default (in bitbake.conf) it

is:

Quoted 5 lines

export libexecdir = "${exec_prefix}/libexec"

+-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck

Quoted 3 lines

++ mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
++ ln -sf $(libexecdir)/udev-acl
++$(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck

I see libexecdir CAN be changed.. so the above is already possible..

The part they had hard coded is "/usr/lib/ConsoleKit"... There is only one location in the system for ConsoleKit configuration files/scripts.. and that is distro specific. Assuming the oe based distributions use $(PREFIX)/lib/ConsoleKit.. then the previous was correct.

Quoted 7 lines
Quoted 5 lines

The point being it doesn't matter if it's 32-bit, 64-bit or 24-bit... only one ConsoleKit per system should exist. (There are potentially other files on the system like this. I know a recent RPM patch went in that separated /usr/lib/rpm and /usr/lib64/rpm.. this is also a similar mistake, I just haven't had time to get a patch out to revert that chunk.)

So for multilib system, we have /usr/lib32 and /usr/lib64 to contain only *.so files, while there is still /usr/lib directory which contains other types of files, right?

That's how I read it, but again, I'm no (multi)lib expert :)

#11 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Quoted 89 lines · Koen Kooi

Op 19 jul 2011, om 02:30 heeft Xu, Dongxiao het volgende geschreven:

Quoted 87 lines
Quoted 86 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Mark Hatle
Sent: Monday, July 18, 2011 11:30 PM
To: [email protected]
Subject: Re: [OE-core] [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Replying to myself.. sorry, I misunderstood the concern.. see below for a new explanation..

Quoted 10 lines · Mark Hatle
Quoted 9 lines · Koen Kooi

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 6 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 3 lines

---
meta/recipes-core/udev/udev-164/makefile.patch | 16

++++++++++++++++

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-) create mode

100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 8 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it

here?

Quoted 4 lines
Quoted 4 lines

I asked the udev maintainer:

14:25 < koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ?

Quoted 3 lines
Quoted 3 lines

14:29 < kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a

non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

Quoted 11 lines

This is likely a problem with the multilib fix. "libexecdir" is often /usr/lib on many distribuions.. however as your other email mentioned.. setting it to
/usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the associated multilib packages should work correctly and no conflicts introduced with this package (file contents should be identical.)

It should be permissible for libexecdir to be changed in the configuration if someone really wants it to be. By default (in bitbake.conf) it

is:

Quoted 5 lines

export libexecdir = "${exec_prefix}/libexec"

+-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck

Quoted 3 lines

++ mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
++ ln -sf $(libexecdir)/udev-acl
++$(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck

I see libexecdir CAN be changed.. so the above is already possible..

The part they had hard coded is "/usr/lib/ConsoleKit"... There is only one location in the system for ConsoleKit configuration files/scripts.. and that is distro specific. Assuming the oe based distributions use $(PREFIX)/lib/ConsoleKit.. then the previous was correct.

The point being it doesn't matter if it's 32-bit, 64-bit or 24-bit... only one ConsoleKit per system should exist. (There are potentially other files on the system like this. I know a recent RPM patch went in that separated /usr/lib/rpm and /usr/lib64/rpm.. this is also a similar mistake, I just haven't had time to get a patch out to revert that chunk.)

Quoted 5 lines
Quoted 1 line

So for multilib system, we have /usr/lib32 and /usr/lib64 to contain

only *.so files, while there is still /usr/lib directory which contains other types of files, right?

That's how I read it, but again, I'm no (multi)lib expert :)

Correct.

I would argue that architecture independent data files should really be in $datadir and that configuration files should be in $sysconfdir. $libdir should be used for architecture specific library files (likewise libexecdir for executables). Not everyone is doing this sanely though. I can understand the rpm issue from a history perspective but consolekit doing it is plain wrong :/.

Architecture independent executables in the form of scripts are an interesting case I guess.

Cheers,

Richard

#14 lore raw
In reply to Dongxiao Xu
Quoted 14 lines · Dongxiao Xu

Hi Richard,

(Please ignore the previous pull request which doesn't contain the latest code.)

This pull request fixes some hard coded /usr/lib path in recipes within minimal image. Please help to review and pull.

Thanks,
Dongxiao

The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:

bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:23:09 +0100)

Quoted 7 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/multilib
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/multilib

Dongxiao Xu (3):
xcb-proto: add multilib support.
pciutils: Change the hardcoded /usr/lib to support multilib.

There two were merged into OE-Core

Quoted 1 line

udev: Change hard coded /usr/lib to support multilib

There is some discussion about this one not being needed on the list.

Quoted 3 lines

Yu Ke (1):
perl: revise the RRECOMMENDS_perl-modules for multilib case

This has been merged also,

Thanks to both of you.

Sau!

Quoted 22 lines
  .../pciutils/pciutils-3.1.7/makefile.patch         |   14 ++++++++++++
  meta/recipes-bsp/pciutils/pciutils_3.1.7.bb        |    5 ++-
  meta/recipes-core/udev/udev-164/makefile.patch     |   16 ++++++++++++++
  meta/recipes-core/udev/udev-new.inc                |    1 +
  meta/recipes-core/udev/udev_164.bb                 |    2 +-
  meta/recipes-devtools/perl/perl_5.12.3.bb          |    2 +-
  .../xcb/xcb-proto-1.6/aclocal.patch                |   22 ++++++++++++++++++++
  meta/recipes-graphics/xcb/xcb-proto.inc            |    3 +-
  meta/recipes-graphics/xcb/xcb-proto_1.6.bb         |    2 +-
  meta/recipes-graphics/xcb/xcb-proto_git.bb         |    2 +-
  10 files changed, 62 insertions(+), 7 deletions(-)

create mode 100644 meta/recipes-bsp/pciutils/pciutils-3.1.7/makefile.patch create mode 100644 meta/recipes-core/udev/udev-164/makefile.patch create mode 100644 meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#12 lore raw

Re: [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

In reply to Xu, Dongxiao
Quoted 81 lines · Dongxiao
Quoted 81 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Mark Hatle
Sent: Monday, July 18, 2011 11:30 PM
To: [email protected]
Subject: Re: [OE-core] [PATCH 3/4] udev: Change hard coded /usr/lib to support multilib

Replying to myself.. sorry, I misunderstood the concern.. see below for a new explanation..

Quoted 10 lines · Mark Hatle
Quoted 9 lines · Koen Kooi

Op 18 jul 2011, om 09:08 heeft Koen Kooi het volgende geschreven:

Quoted 6 lines

Op 18 jul 2011, om 08:13 heeft Dongxiao Xu het volgende geschreven:

Quoted 3 lines

---
meta/recipes-core/udev/udev-164/makefile.patch | 16

++++++++++++++++

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/recipes-core/udev/udev-new.inc            |    1 +
meta/recipes-core/udev/udev_164.bb             |    2 +-
3 files changed, 18 insertions(+), 1 deletions(-) create mode

100644 meta/recipes-core/udev/udev-164/makefile.patch

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

meta/recipes-core/udev/udev-164/makefile.patch line 1

Quoted 8 lines
meta/recipes-core/udev/udev-164/makefile.patch new file +1 -0
new file mode 100644
index 0000000..c46ff4b
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]

Could you explain why it's inappropriate for upstream but why we do need it

here?

Quoted 4 lines
Quoted 4 lines

I asked the udev maintainer:

14:25< koen> kay: the udev Makefile.am has 'ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck', any reason for not using ${libdir} over ${prefix}/lib ?

Quoted 3 lines
Quoted 3 lines

14:29< kay> koen: libdir is /usr/lib64 here, can't use that

So upstream is aware of multilib, but wants to put these scripts in a

non-multilib dir. Since I don't have any experience with the fedora/opensuse way of multilib nor the new oe-core one, could you please explain why oe-core needs this patch, but fedora/opensuse don't?

Quoted 11 lines

This is likely a problem with the multilib fix. "libexecdir" is often /usr/lib on many distribuions.. however as your other email mentioned.. setting it to
/usr/lib64 is a mistake. It should be /usr/libexec or /usr/lib64. All of the associated multilib packages should work correctly and no conflicts introduced with this package (file contents should be identical.)

It should be permissible for libexecdir to be changed in the configuration if someone really wants it to be. By default (in bitbake.conf) it

is:

Quoted 5 lines

export libexecdir = "${exec_prefix}/libexec"

+-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+-	ln -sf $(libexecdir)/udev-acl

$(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck

Quoted 3 lines

++ mkdir -p $(DESTDIR)$(libdir)/ConsoleKit/run-seat.d
++ ln -sf $(libexecdir)/udev-acl
++$(DESTDIR)$(libdir)/ConsoleKit/run-seat.d/udev-acl.ck

I see libexecdir CAN be changed.. so the above is already possible..

The part they had hard coded is "/usr/lib/ConsoleKit"... There is only one location in the system for ConsoleKit configuration files/scripts.. and that is distro specific. Assuming the oe based distributions use $(PREFIX)/lib/ConsoleKit.. then the previous was correct.

Quoted 7 lines
Quoted 5 lines

The point being it doesn't matter if it's 32-bit, 64-bit or 24-bit... only one ConsoleKit per system should exist. (There are potentially other files on the system like this. I know a recent RPM patch went in that separated /usr/lib/rpm and /usr/lib64/rpm.. this is also a similar mistake, I just haven't had time to get a patch out to revert that chunk.)

So for multilib system, we have /usr/lib32 and /usr/lib64 to contain only *.so files, while there is still /usr/lib directory which contains other types of files, right?

in ideal world /usr/lib could just be a symlink to default multilib