Re: [PATCH 1/3] kmod: Add recipes

[Saul Wold <sgw@linux.intel.com>]

On 05/03/2012 11:09 PM, Martin Jansa wrote:
> On Fri, May 04, 2012 at 07:32:58AM +0200, Martin Jansa wrote:
>> On Thu, May 03, 2012 at 05:49:38PM -0700, Saul Wold wrote:
>>> On 05/02/2012 01:58 PM, Khem Raj wrote:
>>>> kmod is replacement for module-init-tools
>>>>
>>>> Signed-off-by: Khem Raj<raj.khem@gmail.com>
>>>> ---
>>>>    meta/recipes-kernel/kmod/kmod-native_git.bb      |   14 +++++
>>>>    meta/recipes-kernel/kmod/kmod.inc                |   31 +++++++++++
>>>>    meta/recipes-kernel/kmod/kmod/depmod-search.conf |    6 ++
>>>>    meta/recipes-kernel/kmod/kmod_git.bb             |   62 ++++++++++++++++++++++
>>>>    4 files changed, 113 insertions(+), 0 deletions(-)
>>>>    create mode 100644 meta/recipes-kernel/kmod/kmod-native_git.bb
>>>>    create mode 100644 meta/recipes-kernel/kmod/kmod.inc
>>>>    create mode 100644 meta/recipes-kernel/kmod/kmod/depmod-search.conf
>>>>    create mode 100644 meta/recipes-kernel/kmod/kmod_git.bb
>>>>
>>>
>>> I have been seeing build failures in the man section of kmod:
>>>
>>> | Making all in man
>>> |
>>> /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/bin/xsltproc
>>> --nonet --param funcsynopsis.style "'ansi'" \
>>> |
>>> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
>>> depmod.d.xml
>>> |
>>> /srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/bin/xsltproc
>>> --nonet --param funcsynopsis.style "'ansi'" \
>>> |
>>> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
>>> modprobe.d.xml
>>> | I/O error : Attempt to load network entity
>>> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
>>> | warning: failed to load external entity
>>> "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
>>> | cannot parse
>>> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
>>> | make[2]: *** [depmod.d.5] Error 4
>>> | make[2]: *** Waiting for unfinished jobs....
>>> | I/O error : Attempt to load network entity
>>> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
>>> | warning: failed to load external entity
>>> "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"
>>> | cannot parse
>>> http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
>>> | make[2]: *** [modprobe.d.5] Error 4
>>> | make[1]: *** [all-recursive] Error 1
>>> | make: *** [all] Error 2
>>> | ERROR: oe_runmake failed
>>>
>>> Can you confirm this issue?
>>
>> I can from meta-oe version of kmod
>>
>> http://git.openembedded.org/meta-openembedded/commit/?id=f75e91c48cfc58f91dc8f70f80a154d97d2d6c60
>>
>> Not sure why khem haven't used this commit/patch.
>
> I've filled https://bugzilla.yoctoproject.org/show_bug.cgi?id=2416 so
> maybe someone will fix it properly.
>

There also seems to be an issue with kmod-native, should this be a 
generic patch?

Sau!

> Cheers,
>
>>
>> Cheers,
>>
>>>
>>> Sau!
>>>
>>>> diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
>>>> new file mode 100644
>>>> index 0000000..96de8b8
>>>> --- /dev/null
>>>> +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
>>>> @@ -0,0 +1,14 @@
>>>> +# Copyright (C) 2012 Khem Raj<raj.khem@gmail.com>
>>>> +# Released under the MIT license (see COPYING.MIT for the terms)
>>>> +
>>>> +require kmod.inc
>>>> +inherit native
>>>> +
>>>> +PR = "${INC_PR}.0"
>>>> +
>>>> +do_install_append (){
>>>> +	for tool in depmod insmod lsmod modinfo modprobe rmmod
>>>> +	do
>>>> +		ln -s kmod ${D}${bindir}/$tool
>>>> +	done
>>>> +}
>>>> diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
>>>> new file mode 100644
>>>> index 0000000..940a317
>>>> --- /dev/null
>>>> +++ b/meta/recipes-kernel/kmod/kmod.inc
>>>> @@ -0,0 +1,31 @@
>>>> +# Copyright (C) 2012 Khem Raj<raj.khem@gmail.com>
>>>> +# Released under the MIT license (see COPYING.MIT for the terms)
>>>> +
>>>> +DESCRIPTION = "kmod is a set of tools to handle common tasks with Linux kernel modules like \
>>>> +               insert, remove, list, check properties, resolve dependencies and aliases."
>>>> +HOMEPAGE = "http://packages.profusion.mobi/kmod/"
>>>> +LICENSE = "GPL-2.0+&   LGPL-2.1+"
>>>> +LICENSE_libkmod = "LGPL-2.1+"
>>>> +SECTION = "base"
>>>> +PV = "7+git${SRCREV}"
>>>> +INC_PR = "r0"
>>>> +DEPENDS += "gnome-doc-utils-native"
>>>> +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>>>> +                    file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>>>> +                   "
>>>> +inherit autotools
>>>> +
>>>> +SRC_URI = "git://git.profusion.mobi/kmod.git;protocol=git;branch=master \
>>>> +           file://depmod-search.conf \
>>>> +          "
>>>> +
>>>> +SRCREV = "02629fa02e96763db7460a930239cc93649a52f8"
>>>> +
>>>> +S = "${WORKDIR}/git"
>>>> +
>>>> +EXTRA_AUTORECONF += "--install --symlink"
>>>> +EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools"
>>>> +
>>>> +do_configure_prepend () {
>>>> +        gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make
>>>> +}
>>>> diff --git a/meta/recipes-kernel/kmod/kmod/depmod-search.conf b/meta/recipes-kernel/kmod/kmod/depmod-search.conf
>>>> new file mode 100644
>>>> index 0000000..527c0bb
>>>> --- /dev/null
>>>> +++ b/meta/recipes-kernel/kmod/kmod/depmod-search.conf
>>>> @@ -0,0 +1,6 @@
>>>> +#
>>>> +# /etc/depmod.d/depmod.conf
>>>> +#
>>>> +
>>>> +search updates extramodules built-in
>>>> +
>>>> diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
>>>> new file mode 100644
>>>> index 0000000..928fa88
>>>> --- /dev/null
>>>> +++ b/meta/recipes-kernel/kmod/kmod_git.bb
>>>> @@ -0,0 +1,62 @@
>>>> +# Copyright (C) 2012 Khem Raj<raj.khem@gmail.com>
>>>> +# Released under the MIT license (see COPYING.MIT for the terms)
>>>> +
>>>> +require kmod.inc
>>>> +
>>>> +PR = "${INC_PR}.0"
>>>> +
>>>> +PROVIDES_${PN} += "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"
>>>> +CONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
>>>> +
>>>> +# autotools set prefix to /usr, however we want them in /bin and /sbin
>>>> +bindir = "${base_bindir}"
>>>> +sbindir = "${base_sbindir}"
>>>> +# libdir = "${base_libdir}"
>>>> +
>>>> +SRC_URI += " \
>>>> +            file://depmod-search.conf \
>>>> +           "
>>>> +
>>>> +do_install_append () {
>>>> +        install -dm755 ${D}${base_bindir}
>>>> +        install -dm755 ${D}${base_sbindir}
>>>> +        # add symlinks to kmod
>>>> +        ln -s ..${base_bindir}/kmod ${D}${base_bindir}/lsmod.kmod
>>>> +        for tool in {ins,rm,dep}mod mod{info,probe}; do
>>>> +                ln -s ..${base_bindir}/kmod ${D}${base_sbindir}/${tool}.kmod
>>>> +        done
>>>> +        # configuration directories
>>>> +        install -dm755 ${D}${base_libdir}/depmod.d
>>>> +        install -dm755 ${D}${base_libdir}/modprobe.d
>>>> +        install -dm755 ${D}${sysconfdir}/depmod.d
>>>> +        install -dm755 ${D}${sysconfdir}/modprobe.d
>>>> +
>>>> +        # install depmod.d file for search/ dir
>>>> +        install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf"
>>>> +}
>>>> +
>>>> +pkg_postinst_kmod() {
>>>> +        for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
>>>> +                bn=`basename $f`
>>>> +                update-alternatives --install /$f $bn /$f.kmod 60
>>>> +        done
>>>> +        update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.kmod 60
>>>> +        update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.kmod 60
>>>> +        update-alternatives --install /sbin/depmod depmod /sbin/depmod.kmod 60
>>>> +}
>>>> +
>>>> +pkg_prerm_kmod() {
>>>> +        for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
>>>> +                bn=`basename $f`
>>>> +                update-alternatives --remove $bn /$f.kmod
>>>> +        done
>>>> +        update-alternatives --remove bin-lsmod /bin/lsmod.kmod
>>>> +        update-alternatives --remove lsmod /bin/lsmod.kmod
>>>> +        update-alternatives --remove depmod /sbin/depmod.kmod
>>>> +}
>>>> +
>>>> +PACKAGES =+ "libkmod"
>>>> +
>>>> +FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS}"
>>>> +FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d"
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>> --
>> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
>
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core