All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] bitbake.conf: change libexecdir to ${libdir}/${BPN}
@ 2012-10-15 22:19 Saul Wold
  2012-10-15 22:19 ` [PATCH 2/2] sato-icon-theme: update mapping program location Saul Wold
  0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-10-15 22:19 UTC (permalink / raw)
  To: openembedded-core

In order to be more compliant with the Filesystem Hierarchs
Standard (FHS), this change removes the /usr/libexec default
in favor of ${libdir}/${BPN} (which is typically /usr/lib).

http://www.pathname.com/fhs/pub/fhs-2.3.html

This also address the native and STAGING variations

[YOCTO #2915]

(From OE-Core rev: 68c31b095a1cb20bd297df596024fc568614f5e8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/bitbake.conf |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 324dc9f..64bcd42 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -35,8 +35,8 @@ export docdir = "${datadir}/doc"
 # Architecture dependent paths
 export bindir = "${exec_prefix}/bin"
 export sbindir = "${exec_prefix}/sbin"
-export libexecdir = "${exec_prefix}/libexec"
 export libdir = "${exec_prefix}/${baselib}"
+export libexecdir = "${libdir}/${BPN}"
 export includedir = "${exec_prefix}/include"
 export oldincludedir = "${exec_prefix}/include"
 export systemd_unitdir = "${base_libdir}/systemd"
@@ -51,6 +51,7 @@ bindir_native = "${prefix_native}/bin"
 sbindir_native = "${prefix_native}/sbin"
 includedir_native = "${prefix_native}/include"
 libdir_native = "${prefix_native}/lib"
+libexecdir_native = "${libdir_native}/${BPN}"
 base_libdir_native = "/lib"
 datadir_native = "${prefix_native}/share"
 bindir_cross = "/bin"
@@ -350,6 +351,7 @@ STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
 STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts"
 STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
 STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
+STAGING_LIBEXECDIR_NATIVE = "${STAGING_DIR_NATIVE}${libexecdir_native}"
 STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}"
 STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
 STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
@@ -358,6 +360,7 @@ STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
 STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}"
 STAGING_BINDIR = "${STAGING_DIR_HOST}${bindir}"
 STAGING_LIBDIR = "${STAGING_DIR_HOST}${libdir}"
+STAGING_LIBEXECDIR = "${STAGING_DIR_HOST}${libexecdir}"
 STAGING_BASELIBDIR = "${STAGING_DIR_HOST}${base_libdir}"
 STAGING_INCDIR = "${STAGING_DIR_HOST}${includedir}"
 STAGING_DATADIR = "${STAGING_DIR_HOST}${datadir}"
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] sato-icon-theme: update mapping program location
  2012-10-15 22:19 [PATCH 1/2] bitbake.conf: change libexecdir to ${libdir}/${BPN} Saul Wold
@ 2012-10-15 22:19 ` Saul Wold
  2012-10-16  4:14   ` Saul Wold
  0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-10-15 22:19 UTC (permalink / raw)
  To: openembedded-core

When we changed the /usr/libexec default to be
/usr/lib/<pn>, the icon name mapping needed to
be updated also.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../sato-icon-theme/sato-icon-theme.inc            |    2 +-
 .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
index 0bd4814..b07d8c3 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
@@ -12,7 +12,7 @@ inherit autotools pkgconfig allarch gtk-icon-cache
 
 FILES_${PN} += "${datadir}"
 
-EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
+EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping"
 
 # Explictly setting "Sato" as the default icon theme to avoid flickering from
 # the desktop and settings daemon racing.  This shouldn't be done here but in the sato image
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index 6405359..cd34cac 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -2,7 +2,7 @@ require sato-icon-theme.inc
 
 DEPENDS += "icon-naming-utils-native"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
            file://iconpath-option.patch \
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] sato-icon-theme: update mapping program location
  2012-10-15 22:19 ` [PATCH 2/2] sato-icon-theme: update mapping program location Saul Wold
@ 2012-10-16  4:14   ` Saul Wold
  2012-10-16 11:37     ` Richard Purdie
  0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-10-16  4:14 UTC (permalink / raw)
  Cc: openembedded-core

On 10/15/2012 03:19 PM, Saul Wold wrote:
> When we changed the /usr/libexec default to be
> /usr/lib/<pn>, the icon name mapping needed to
> be updated also.
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>   .../sato-icon-theme/sato-icon-theme.inc            |    2 +-
>   .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> index 0bd4814..b07d8c3 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> @@ -12,7 +12,7 @@ inherit autotools pkgconfig allarch gtk-icon-cache
>
>   FILES_${PN} += "${datadir}"
>
> -EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
> +EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping"
>
This is still wrong apparently since icon-naming-mapping is not placed 
in sato-icon-theme, but in /usr/lib/icon-naming-utils.  So my original 
patch should be correct.

Sau!


>   # Explictly setting "Sato" as the default icon theme to avoid flickering from
>   # the desktop and settings daemon racing.  This shouldn't be done here but in the sato image
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> index 6405359..cd34cac 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> @@ -2,7 +2,7 @@ require sato-icon-theme.inc
>
>   DEPENDS += "icon-naming-utils-native"
>
> -PR = "r4"
> +PR = "r5"
>
>   SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
>              file://iconpath-option.patch \
>



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] sato-icon-theme: update mapping program location
  2012-10-16  4:14   ` Saul Wold
@ 2012-10-16 11:37     ` Richard Purdie
  0 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2012-10-16 11:37 UTC (permalink / raw)
  To: Saul Wold; +Cc: openembedded-core

On Mon, 2012-10-15 at 21:14 -0700, Saul Wold wrote:
> On 10/15/2012 03:19 PM, Saul Wold wrote:
> > When we changed the /usr/libexec default to be
> > /usr/lib/<pn>, the icon name mapping needed to
> > be updated also.
> >
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> >   .../sato-icon-theme/sato-icon-theme.inc            |    2 +-
> >   .../sato-icon-theme/sato-icon-theme_0.4.1.bb       |    2 +-
> >   2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > index 0bd4814..b07d8c3 100644
> > --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> > @@ -12,7 +12,7 @@ inherit autotools pkgconfig allarch gtk-icon-cache
> >
> >   FILES_${PN} += "${datadir}"
> >
> > -EXTRA_OECONF += "--with-iconmap=${STAGING_LIBDIR_NATIVE}/../libexec/icon-name-mapping"
> > +EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/icon-name-mapping"
> >
> This is still wrong apparently since icon-naming-mapping is not placed 
> in sato-icon-theme, but in /usr/lib/icon-naming-utils.  So my original 
> patch should be correct.

No, it should be:

EXTRA_OECONF += "--with-iconmap=${STAGING_LIBEXECDIR_NATIVE}/../icon-name-mapping"

Cheers,

Richard




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-10-16 11:50 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-15 22:19 [PATCH 1/2] bitbake.conf: change libexecdir to ${libdir}/${BPN} Saul Wold
2012-10-15 22:19 ` [PATCH 2/2] sato-icon-theme: update mapping program location Saul Wold
2012-10-16  4:14   ` Saul Wold
2012-10-16 11:37     ` Richard Purdie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.