Patchwork [1/1] kmod: fix installation path of pkgconfig files

login
register
mail settings
Submitter Otavio Salvador
Date May 15, 2012, 8:39 p.m.
Message ID <1a12675b146fbaf56ff3e9505885c5f9f4ecbd26.1337114347.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/27787/
State New
Headers show

Comments

Otavio Salvador - May 15, 2012, 8:39 p.m.
The pkgconfig files need to be installed in ${libdir} instead of
${base_libdir}.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-kernel/kmod/kmod_git.bb |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
Khem Raj - May 15, 2012, 8:58 p.m.
On Tue, May 15, 2012 at 1:39 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> The pkgconfig files need to be installed in ${libdir} instead of
> ${base_libdir}.
>


Looks ok to me


> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta/recipes-kernel/kmod/kmod_git.bb |   10 ++++++++--
>  1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
> index d9c4d8b..11dfe57 100644
> --- a/meta/recipes-kernel/kmod/kmod_git.bb
> +++ b/meta/recipes-kernel/kmod/kmod_git.bb
> @@ -3,7 +3,7 @@
>
>  require kmod.inc
>
> -PR = "${INC_PR}.1"
> +PR = "${INC_PR}.2"
>
>  PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
>  RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
> @@ -16,7 +16,8 @@ RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod
>  # autotools set prefix to /usr, however we want them in /bin and /sbin
>  bindir = "${base_bindir}"
>  sbindir = "${base_sbindir}"
> -libdir = "${base_libdir}"
> +
> +EXTRA_OECONF += "--libdir=${base_libdir}"
>
>  do_install_append () {
>         install -dm755 ${D}${base_bindir}
> @@ -34,6 +35,10 @@ do_install_append () {
>
>         # install depmod.d file for search/ dir
>         install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf"
> +
> +        # fix pkgconfig installation path
> +        install -dm755 ${D}${libdir}
> +        mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
>  }
>
>  pkg_postinst_kmod() {
> @@ -59,4 +64,5 @@ pkg_prerm_kmod() {
>  PACKAGES =+ "libkmod"
>
>  FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"
> +FILES_${PN}-dev += "${base_libdir}/libkmod*${SOLIBSDEV} ${base_libdir}/*.la"
>  FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d"
> --
> 1.7.2.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Otavio Salvador - May 15, 2012, 9:05 p.m.
On Tue, May 15, 2012 at 5:58 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, May 15, 2012 at 1:39 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> The pkgconfig files need to be installed in ${libdir} instead of
>> ${base_libdir}.
>
> Looks ok to me

As discussed on IRC we ought to move the .so file to ${libdir}; I am
busy at work fixing other stuff to support gcc 4.7 and cannot work on
that now but will look at it later.
Koen Kooi - May 17, 2012, 7:48 a.m.
Op 15 mei 2012, om 22:39 heeft Otavio Salvador het volgende geschreven:

> The pkgconfig files need to be installed in ${libdir} instead of
> ${base_libdir}.
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Acked-by: Koen Kooi <koen@dominion.thruhere.net>

Udev have been broken for a week now, can this please to in ASAP?
Andrei Gherzan - May 17, 2012, 7:52 a.m.
Yes. I need this too. Hope it will make it soon.
On May 17, 2012 10:49 AM, "Koen Kooi" <koen@dominion.thruhere.net> wrote:

>
> Op 15 mei 2012, om 22:39 heeft Otavio Salvador het volgende geschreven:
>
> > The pkgconfig files need to be installed in ${libdir} instead of
> > ${base_libdir}.
> >
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
>
> Udev have been broken for a week now, can this please to in ASAP?
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index d9c4d8b..11dfe57 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -3,7 +3,7 @@ 
 
 require kmod.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
 RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
@@ -16,7 +16,8 @@  RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod
 # autotools set prefix to /usr, however we want them in /bin and /sbin
 bindir = "${base_bindir}"
 sbindir = "${base_sbindir}"
-libdir = "${base_libdir}"
+
+EXTRA_OECONF += "--libdir=${base_libdir}"
 
 do_install_append () {
         install -dm755 ${D}${base_bindir}
@@ -34,6 +35,10 @@  do_install_append () {
 
         # install depmod.d file for search/ dir
         install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf"
+
+        # fix pkgconfig installation path
+        install -dm755 ${D}${libdir}
+        mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
 }
 
 pkg_postinst_kmod() {
@@ -59,4 +64,5 @@  pkg_prerm_kmod() {
 PACKAGES =+ "libkmod"
 
 FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"
+FILES_${PN}-dev += "${base_libdir}/libkmod*${SOLIBSDEV} ${base_libdir}/*.la"
 FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d"