[PATCH 0/3] Kmod fixes

[PATCH 0/3] Kmod fixes

[Khem Raj]

This patchset fixes upgrade paths form kmod
Updates to .8 release that should fix meta-oe PR being ahead of oe-core
Packages libkmod in base_libdir instead of libdir

The following changes since commit 043871d7e5d2d19c2ff43e54d2ff180c09e8903e:

  kern-tools: integrate minor fixes (2012-05-08 16:06:15 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib kraj/kmod
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/kmod

Khem Raj (2):
  kmod: Update to .8 release
  kmod: Use base_libdir for installing libkmod

Martin Jansa (1):
  kmod: fix upgrade path from module-init-tools

 meta/recipes-kernel/kmod/kmod.inc    |    4 ++--
 meta/recipes-kernel/kmod/kmod_git.bb |   12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

-- 
1.7.5.4

[PATCH 1/3] kmod: fix upgrade path from module-init-tools

[Khem Raj]

From: Martin Jansa <martin.jansa@gmail.com>

* PROVIDES does not need _${PN}
* CONFLICTS should be RCONFLICTS
* opkg needs RREPLACES to automatically remove older module-init-tools
  instead of just reporting it conflicts with kmod

SHR root@gjama ~ $ opkg install kmod
Installing kmod (7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0) to root...
Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/kmod_7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0_armv4t.ipk.
Removing package module-init-tools-depmod from root...
update-alternatives: removing //sbin/depmod as no more alternatives exist for it
Removing package module-init-tools from root...
update-alternatives: Linking //sbin/insmod to ../bin/busybox
update-alternatives: Linking //sbin/modprobe to ../bin/busybox
update-alternatives: Linking //sbin/rmmod to ../bin/busybox
update-alternatives: removing //sbin/modinfo as no more alternatives exist for it
update-alternatives: removing //bin/lsmod as no more alternatives exist for it
update-alternatives: Linking //sbin/lsmod to ../bin/busybox
Configuring kmod.
update-alternatives: Linking //sbin/insmod to /sbin/insmod.kmod
update-alternatives: Linking //sbin/modprobe to /sbin/modprobe.kmod
update-alternatives: Linking //sbin/rmmod to /sbin/rmmod.kmod
update-alternatives: Linking //sbin/modinfo to /sbin/modinfo.kmod
update-alternatives: Linking //bin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/depmod to /sbin/depmod.kmod

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-kernel/kmod/kmod_git.bb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index 1ab9f44..4c860f0 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -3,11 +3,15 @@
 
 require kmod.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
-PROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+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"
-CONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
+
+# to force user to remove old module-init-tools and replace them with kmod variants
+RCONFLICTS_libkmod2 += "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}"
-- 
1.7.5.4

[PATCH 2/3] kmod: Update to .8 release

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-kernel/kmod/kmod.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 681e52b..70d376e 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"
 LICENSE = "GPL-2.0+ & LGPL-2.1+"
 LICENSE_libkmod = "LGPL-2.1+"
 SECTION = "base"
-PV = "7+git${SRCREV}"
+PV = "8+git${SRCREV}"
 INC_PR = "r0"
 DEPENDS += "gnome-doc-utils-native"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
@@ -20,7 +20,7 @@ SRC_URI = "git://git.profusion.mobi/kmod.git;protocol=git;branch=master \
            file://0001-man-disable-man-page-generation-because-we-don-t-hav.patch \
           "
 
-SRCREV = "02629fa02e96763db7460a930239cc93649a52f8"
+SRCREV = "819f79a24d58e3c8429f1631df2f8f85a2f95d4a"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.5.4

Re: [PATCH 2/3] kmod: Update to .8 release

[Koen Kooi]

Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-kernel/kmod/kmod.inc |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
> index 681e52b..70d376e 100644
> --- a/meta/recipes-kernel/kmod/kmod.inc
> +++ b/meta/recipes-kernel/kmod/kmod.inc
> @@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"
> LICENSE = "GPL-2.0+ & LGPL-2.1+"
> LICENSE_libkmod = "LGPL-2.1+"
> SECTION = "base"
> -PV = "7+git${SRCREV}"
> +PV = "8+git${SRCREV}"

Drop the +git$SRCREV, it's a release.

Re: [PATCH 2/3] kmod: Update to .8 release

[Martin Jansa]

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

On Wed, May 09, 2012 at 07:31:52AM +0200, Koen Kooi wrote:
> 
> Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
> 
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > meta/recipes-kernel/kmod/kmod.inc |    4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
> > index 681e52b..70d376e 100644
> > --- a/meta/recipes-kernel/kmod/kmod.inc
> > +++ b/meta/recipes-kernel/kmod/kmod.inc
> > @@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"
> > LICENSE = "GPL-2.0+ & LGPL-2.1+"
> > LICENSE_libkmod = "LGPL-2.1+"
> > SECTION = "base"
> > -PV = "7+git${SRCREV}"
> > +PV = "8+git${SRCREV}"
> 
> Drop the +git$SRCREV, it's a release.

Agreed, this should be 
8+git${SRCPV}
or no +git at all.

But other than that, this patchset looks good:
Tested-by: Martin Jansa <Martin.Jansa@gmail.com>

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/3] kmod: Update to .8 release

[Khem Raj]

On Wed, May 9, 2012 at 2:42 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, May 09, 2012 at 07:31:52AM +0200, Koen Kooi wrote:
>>
>> Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
>>
>> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > ---
>> > meta/recipes-kernel/kmod/kmod.inc |    4 ++--
>> > 1 files changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
>> > index 681e52b..70d376e 100644
>> > --- a/meta/recipes-kernel/kmod/kmod.inc
>> > +++ b/meta/recipes-kernel/kmod/kmod.inc
>> > @@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"
>> > LICENSE = "GPL-2.0+ & LGPL-2.1+"
>> > LICENSE_libkmod = "LGPL-2.1+"
>> > SECTION = "base"
>> > -PV = "7+git${SRCREV}"
>> > +PV = "8+git${SRCREV}"
>>
>> Drop the +git$SRCREV, it's a release.

it does have 2 commits on top of .8 so  I have changed SRCREV to SRCPV
and updated the pull tree.

>
> Agreed, this should be
> 8+git${SRCPV}
> or no +git at all.
>
> But other than that, this patchset looks good:
> Tested-by: Martin Jansa <Martin.Jansa@gmail.com>
>
> --
> 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
>

Re: [PATCH 2/3] kmod: Update to .8 release

[Koen Kooi]

Op 9 mei 2012, om 17:42 heeft Khem Raj het volgende geschreven:

> On Wed, May 9, 2012 at 2:42 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Wed, May 09, 2012 at 07:31:52AM +0200, Koen Kooi wrote:
>>> 
>>> Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
>>> 
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>> ---
>>>> meta/recipes-kernel/kmod/kmod.inc |    4 ++--
>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>> 
>>>> diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
>>>> index 681e52b..70d376e 100644
>>>> --- a/meta/recipes-kernel/kmod/kmod.inc
>>>> +++ b/meta/recipes-kernel/kmod/kmod.inc
>>>> @@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"
>>>> LICENSE = "GPL-2.0+ & LGPL-2.1+"
>>>> LICENSE_libkmod = "LGPL-2.1+"
>>>> SECTION = "base"
>>>> -PV = "7+git${SRCREV}"
>>>> +PV = "8+git${SRCREV}"
>>> 
>>> Drop the +git$SRCREV, it's a release.
> 
> it does have 2 commits on top of .8 so  I have changed SRCREV to SRCPV
> and updated the pull tree.

Please drop the SRCPV, it's version '8', not 8+giter8735827548237582758293

Re: [PATCH 2/3] kmod: Update to .8 release

[Khem Raj]

On Wed, May 9, 2012 at 9:28 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>
> Please drop the SRCPV, it's version '8', not 8+giter8735827548237582758293

Alright. Done.

[PATCH 3/3] kmod: Use base_libdir for installing libkmod

[Khem Raj]

This also helps avoid QA errors about binaries
accessing contents from /usr/lib

Also fixes emptry libkmod problem since now
the files are installed in expected place

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-kernel/kmod/kmod_git.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index 4c860f0..fed068f 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -16,7 +16,7 @@ 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}"
+libdir = "${base_libdir}"
 
 do_install_append () {
         install -dm755 ${D}${base_bindir}
-- 
1.7.5.4

Re: [PATCH 3/3] kmod: Use base_libdir for installing libkmod

[Koen Kooi]

Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:

> This also helps avoid QA errors about binaries
> accessing contents from /usr/lib
> 
> Also fixes emptry libkmod problem since now
> the files are installed in expected place
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-kernel/kmod/kmod_git.bb |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
> index 4c860f0..fed068f 100644
> --- a/meta/recipes-kernel/kmod/kmod_git.bb
> +++ b/meta/recipes-kernel/kmod/kmod_git.bb
> @@ -16,7 +16,7 @@ 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}"
> +libdir = "${base_libdir}"

That breaks udev because the .pc is in the wrong place:

[koen@revo Angstrom]$ tar ztvf build/sstate-cache/sstate-kmod-armv7a-angstrom-linux-gnueabi-8-r0.1-armv7a-2-183860d867b80d514ca2f42ac90501a4_populate-sysroot.tgz
[..]
-rw-r--r-- koen/koen       205 2012-05-10 23:31 lib/pkgconfig/libkmod.pc

Re: [PATCH 0/3] Kmod fixes

[Saul Wold]

On 05/08/2012 03:53 PM, Khem Raj wrote:
> This patchset fixes upgrade paths form kmod
> Updates to .8 release that should fix meta-oe PR being ahead of oe-core
> Packages libkmod in base_libdir instead of libdir
>
> The following changes since commit 043871d7e5d2d19c2ff43e54d2ff180c09e8903e:
>
>    kern-tools: integrate minor fixes (2012-05-08 16:06:15 +0100)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib kraj/kmod
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/kmod
>
> Khem Raj (2):
>    kmod: Update to .8 release
>    kmod: Use base_libdir for installing libkmod
>
> Martin Jansa (1):
>    kmod: fix upgrade path from module-init-tools
>
>   meta/recipes-kernel/kmod/kmod.inc    |    4 ++--
>   meta/recipes-kernel/kmod/kmod_git.bb |   12 ++++++++----
>   2 files changed, 10 insertions(+), 6 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!