[PATCH 0/2] BASELIB != lib fixes

[PATCH 0/2] BASELIB != lib fixes

[Dan McGregor]

From: Dan McGregor <dan.mcgregor@usask.ca>

These solve a few issues when libdir is /usr/lib64. The
commits are also available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib.git dankm/libdir

Daniel McGregor (2):
  bitbake.conf: make localedir nonarch
  opkg-utils: store alternatives in nonarch_libdir

 meta/conf/bitbake.conf                             | 2 +-
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.7.0

[PATCH 1/2] bitbake.conf: make localedir nonarch

[Dan McGregor]

From: Daniel McGregor <daniel.mcgregor@vecima.com>

systemd and others expect locales to be in nonarch_libdir, regardless
of the base library directory.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2fe6b24..47f8a43 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -44,7 +44,7 @@ export libdir = "${exec_prefix}/${baselib}"
 export libexecdir = "${libdir}/${BPN}"
 export includedir = "${exec_prefix}/include"
 export oldincludedir = "${exec_prefix}/include"
-localedir = "${libdir}/locale"
+localedir = "${nonarch_libdir}/locale"
 
 # Linkage between native/cross/nativesdk layouts
 base_bindir_native = "/bin"
-- 
2.7.0

Re: [PATCH 1/2] bitbake.conf: make localedir nonarch

[Burton, Ross]

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

On 14 January 2016 at 20:47, Dan McGregor <danismostlikely@gmail.com> wrote:

> -localedir = "${libdir}/locale"
> +localedir = "${nonarch_libdir}/locale"
>

As was recently discovered, this variable isn't really used in many places:

$ dpkg -c xz-locale-de_5.2.2-r0.1_corei7-64.ipk|grep mo
-rw-r--r-- root/root     26533 2016-01-12 16:50
./usr/share/locale/de/LC_MESSAGES/xz.mo

I'd suggest that localedir should be ${datadir}/locale, and then any
explicit users of ${datadir}/locale/ replaced with ${localedir}.

Ross

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

Re: [PATCH 1/2] bitbake.conf: make localedir nonarch

[Christopher Larson]

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

On Mon, Jan 18, 2016 at 5:18 AM, Burton, Ross <ross.burton@intel.com> wrote:

> On 14 January 2016 at 20:47, Dan McGregor <danismostlikely@gmail.com>
> wrote:
>
>> -localedir = "${libdir}/locale"
>> +localedir = "${nonarch_libdir}/locale"
>>
>
> As was recently discovered, this variable isn't really used in many places:
>
> $ dpkg -c xz-locale-de_5.2.2-r0.1_corei7-64.ipk|grep mo
> -rw-r--r-- root/root     26533 2016-01-12 16:50
> ./usr/share/locale/de/LC_MESSAGES/xz.mo
>
> I'd suggest that localedir should be ${datadir}/locale, and then any
> explicit users of ${datadir}/locale/ replaced with ${localedir}.
>

Isn't the current localedir used for binary locales, whereas datadir/locale
is the location of the non-binary locale files? So we'd be changing the
meaning/semantics of the variable? Admittedly to a version which would be
used in more recipes, but I think we should make it clear that we're
changing its meaning in that way, if so.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

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

[PATCH 2/2] opkg-utils: store alternatives in nonarch_libdir

[Dan McGregor]

From: Daniel McGregor <daniel.mcgregor@vecima.com>

opkg-utils-native stores alternative info in /usr/lib, so do the
same on the target.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index b242d1f..1bc561c 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -34,7 +34,7 @@ do_install() {
 
 do_install_append_class-target() {
 	if [ -e "${D}${bindir}/update-alternatives" ]; then
-		sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${libdir},g'
+		sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g'
 	fi
 }
 
-- 
2.7.0