Kmod fixes
cover Kmod fixes
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(-)
Signature · 1 line
1.7.5.4
PATCH 1/3 kmod: fix upgrade path from module-init-tools
From: Martin Jansa <[email protected]>
* 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
--- meta/recipes-kernel/kmod/kmod_git.bb | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
meta/recipes-kernel/kmod/kmod_git.bb +7 -3
@@ -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}"
Signature · 1 line
1.7.5.4
PATCH 2/3 kmod: Update to .8 release
--- meta/recipes-kernel/kmod/kmod.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/kmod/kmod.inc +2 -2
@@ -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"
Signature · 1 line
1.7.5.4
Re: [PATCH 2/3] kmod: Update to .8 release
Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
Quoted 13 lines
Signed-off-by Khem Raj <[email protected]>---
meta/recipes-kernel/kmod/kmod.inc | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)meta/recipes-kernel/kmod/kmod.inc +0
-0@@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"LICENSE = "GPL-2.0+ & LGPL-2.1+"
LICENSE_libkmod= "LGPL-2.1+"
SECTION = "base"
meta/recipes-kernel/kmod/kmod.inc HOMEPAGE = "http://packages.profusion.mobi/kmod/" · line 10
Quoted 2 lines
meta/recipes-kernel/kmod/kmod.inc +1
-1-PV = "7+git${SRCREV}" +PV = "8+git${SRCREV}"
Drop the +git$SRCREV, it's a release.
Martin Jansa
Tested-byRe: [PATCH 2/3] kmod: Update to .8 release
Quoted 8 lines · Koen Kooi
Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
Quoted 5 lines
Signed-off-by Khem Raj <[email protected]>---
meta/recipes-kernel/kmod/kmod.inc | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)
Quoted 12 lines
meta/recipes-kernel/kmod/kmod.inc HOMEPAGE = "http://packages.profusion.mobi/kmod/" · line 10
Quoted 10 lines
meta/recipes-kernel/kmod/kmod.inc +0
-0@@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"LICENSE = "GPL-2.0+ & LGPL-2.1+"
LICENSE_libkmod= "LGPL-2.1+"
SECTION = "base"meta/recipes-kernel/kmod/kmod.inc +1
-1-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:
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 2/3] kmod: Update to .8 release
Quoted 9 lines · Martin Jansa
Quoted 8 lines · Koen Kooi
Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
Quoted 5 lines
Signed-off-by Khem Raj <[email protected]>---
meta/recipes-kernel/kmod/kmod.inc | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-kernel/kmod/kmod.inc +0
-0Quoted 8 lines
meta/recipes-kernel/kmod/kmod.inc HOMEPAGE = "http://packages.profusion.mobi/kmod/" · line 10
Quoted 6 lines
meta/recipes-kernel/kmod/kmod.inc +0
-0@@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"LICENSE = "GPL-2.0+ & LGPL-2.1+"
LICENSE_libkmod= "LGPL-2.1+"
SECTION = "base"meta/recipes-kernel/kmod/kmod.inc +1
-1-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.
Quoted 16 lines
Agreed, this should be
8+git${SRCPV}
or no +git at all.But other than that, this patchset looks good:
Tested-by Martin Jansa <[email protected]>--
Martin 'JaMa' Jansa jabber: [email protected]_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [PATCH 2/3] kmod: Update to .8 release
Op 9 mei 2012, om 17:42 heeft Khem Raj het volgende geschreven:
Quoted 23 lines · Martin Jansa
Quoted 9 lines · Koen Kooi
Quoted 8 lines
Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
Quoted 5 lines
Signed-off-by Khem Raj <[email protected]>---
meta/recipes-kernel/kmod/kmod.inc | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
meta/recipes-kernel/kmod/kmod.inc +0
-0Quoted 8 lines
meta/recipes-kernel/kmod/kmod.inc HOMEPAGE = "http://packages.profusion.mobi/kmod/" · line 10
Quoted 6 lines
meta/recipes-kernel/kmod/kmod.inc +0
-0@@ -7,7 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"LICENSE = "GPL-2.0+ & LGPL-2.1+"
LICENSE_libkmod= "LGPL-2.1+"
SECTION = "base"meta/recipes-kernel/kmod/kmod.inc +1
-1-PV = "7+git${SRCREV}" +PV = "8+git${SRCREV}"Drop the +git$SRCREV, it's a release.
Quoted 2 lines
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
Quoted 2 lines · Koen Kooi
Please drop the SRCPV, it's version '8', not 8+giter8735827548237582758293
Alright. Done.
PATCH 3/3 kmod: Use base_libdir for installing libkmod
In reply to Khem RajThis 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
--- meta/recipes-kernel/kmod/kmod_git.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/kmod/kmod_git.bb +1 -1
@@ -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}
Signature · 1 line
1.7.5.4
Re: [PATCH 3/3] kmod: Use base_libdir for installing libkmod
Op 9 mei 2012, om 00:53 heeft Khem Raj het volgende geschreven:
Quoted 19 lines
This also helps avoid QA errors about binaries
accessing contents from/usr/libAlso fixes emptry libkmod problem since now
the files are installed in expected placeSigned-off-by Khem Raj <[email protected]>---
meta/recipes-kernel/kmod/kmod_git.bb | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)meta/recipes-kernel/kmod/kmod_git.bb +0
-0@@ -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 /sbinbindir = "${base_bindir}"
sbindir = "${base_sbindir}"
meta/recipes-kernel/kmod/kmod_git.bb RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod · line 19
Quoted 2 lines
meta/recipes-kernel/kmod/kmod_git.bb +1
-1-# 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
Saul Wold
AppliedQuoted 16 lines · 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 inbase_libdirinstead of libdirThe 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-contribkraj/kmod
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/kmodKhem Raj (2):
kmod: Update to .8 release
kmod: Usebase_libdirfor installing libkmod
Quoted 7 lines
Martin Jansa (1):
kmod: fix upgrade path from module-init-toolsmeta/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!