* [PATCH 0/3] Add and use kmod
@ 2012-05-02 20:58 Khem Raj
2012-05-02 20:58 ` [PATCH 1/3] kmod: Add recipes Khem Raj
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Khem Raj @ 2012-05-02 20:58 UTC (permalink / raw)
To: openembedded-core
We add kmod and use it for module management and remove module-init-tools
The following changes since commit 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457:
eglibc-package: remove /var (2012-05-01 12:36:18 +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 (3):
kmod: Add recipes
module-init-tools: Delete
image.bbclass,kernel.bbclass: Use kmod-native instead of
module-init-tools-cross
meta/classes/image.bbclass | 2 +-
meta/classes/kernel.bbclass | 7 +-
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 ++++++++++++++++++++
.../module-init-tools/files/disable_man.patch | 25 --------
.../files/grab_module_memset.patch | 21 -------
.../files/modutils_extension.patch | 25 --------
.../module-init-tools-cross_3.16.bb | 10 ---
.../module-init-tools/module-init-tools.inc | 24 --------
.../module-init-tools/module-init-tools_3.16.bb | 42 -------------
.../files/PD.patch | 0
.../files/modutils.sh | 0
.../modutils-initscripts.bb | 0
15 files changed, 117 insertions(+), 152 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
delete mode 100644 meta/recipes-kernel/module-init-tools/files/disable_man.patch
delete mode 100644 meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
delete mode 100644 meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools.inc
delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
rename meta/recipes-kernel/{module-init-tools => modutils-initscripts}/files/PD.patch (100%)
rename meta/recipes-kernel/{module-init-tools => modutils-initscripts}/files/modutils.sh (100%)
rename meta/recipes-kernel/{module-init-tools => modutils-initscripts}/modutils-initscripts.bb (100%)
--
1.7.5.4
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] kmod: Add recipes
2012-05-02 20:58 [PATCH 0/3] Add and use kmod Khem Raj
@ 2012-05-02 20:58 ` Khem Raj
2012-05-04 0:49 ` Saul Wold
` (2 more replies)
2012-05-02 20:58 ` [PATCH 2/3] module-init-tools: Delete Khem Raj
2012-05-02 20:58 ` [PATCH 3/3] image.bbclass, kernel.bbclass: Use kmod-native instead of module-init-tools-cross Khem Raj
2 siblings, 3 replies; 15+ messages in thread
From: Khem Raj @ 2012-05-02 20:58 UTC (permalink / raw)
To: openembedded-core
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
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"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/3] module-init-tools: Delete
2012-05-02 20:58 [PATCH 0/3] Add and use kmod Khem Raj
2012-05-02 20:58 ` [PATCH 1/3] kmod: Add recipes Khem Raj
@ 2012-05-02 20:58 ` Khem Raj
2012-05-02 20:58 ` [PATCH 3/3] image.bbclass, kernel.bbclass: Use kmod-native instead of module-init-tools-cross Khem Raj
2 siblings, 0 replies; 15+ messages in thread
From: Khem Raj @ 2012-05-02 20:58 UTC (permalink / raw)
To: openembedded-core
Since its provided by kmod
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../module-init-tools/files/disable_man.patch | 25 ------------
.../files/grab_module_memset.patch | 21 ----------
.../files/modutils_extension.patch | 25 ------------
.../module-init-tools-cross_3.16.bb | 10 -----
.../module-init-tools/module-init-tools.inc | 24 -----------
.../module-init-tools/module-init-tools_3.16.bb | 42 --------------------
.../files/PD.patch | 0
.../files/modutils.sh | 0
.../modutils-initscripts.bb | 0
9 files changed, 0 insertions(+), 147 deletions(-)
delete mode 100644 meta/recipes-kernel/module-init-tools/files/disable_man.patch
delete mode 100644 meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
delete mode 100644 meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools.inc
delete mode 100644 meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
rename meta/recipes-kernel/{module-init-tools => modutils-initscripts}/files/PD.patch (100%)
rename meta/recipes-kernel/{module-init-tools => modutils-initscripts}/files/modutils.sh (100%)
rename meta/recipes-kernel/{module-init-tools => modutils-initscripts}/modutils-initscripts.bb (100%)
diff --git a/meta/recipes-kernel/module-init-tools/files/disable_man.patch b/meta/recipes-kernel/module-init-tools/files/disable_man.patch
deleted file mode 100644
index 95ad9cf..0000000
--- a/meta/recipes-kernel/module-init-tools/files/disable_man.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# disable man page build
-#
-# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
-
-Upstream-Status: Inappropriate [disable feature]
-
-diff --git a/Makefile.am b/Makefile.am
-index 6f83c12..32972a8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -39,13 +39,12 @@ modindex_LDADD = $(LDADD) libmodtools.a
- MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5
- MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
- SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
--dist_man_MANS = $(MAN5) $(MAN8)
- # If they haven't overridden mandir, fix it (never /man!)
- mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
-
- TESTSUITE := $(shell test -e @srcdir@/tests && find @srcdir@/tests -type f ! -name '*~')
-
--EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
-+EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care
-
- sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo
- if BUILD_STATIC_UTILS
diff --git a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
deleted file mode 100644
index 31dc0e9..0000000
--- a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# this patch is from Mark Hatle <mark.hatle@windriver.com>, who ran into
-# a random segfault using the latest module-init-tools (3.12) and finally
-# trace back to depmod.c:grab_module, which appears that the new malloc(...)
-# setups up things, but never clears the memory that was just allocated.
-#
-# Kevin Tian <kevin.tian@intel.com>, 2010-08-06
-
-Upstream-Status: Pending
-
-diff --git a/depmod.c b/depmod.c
-index 647e5e6..46e03e0 100644
---- a/depmod.c
-+++ b/depmod.c
-@@ -313,6 +313,7 @@ static struct module *grab_module(const char *dirname, const char *filename)
-
- new = NOFAIL(malloc(sizeof(*new)
- + strlen(dirname?:"") + 1 + strlen(filename) + 1));
-+ memset(new, 0x00, sizeof(*new) + strlen(dirname?:"") + 1 + strlen(filename) + 1);
- if (dirname)
- sprintf(new->pathname, "%s/%s", dirname, filename);
- else
diff --git a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
deleted file mode 100644
index 4a6e0fe..0000000
--- a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# poky uses new name to differentiate from modutils, so reflect this new name in source
-#
-# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
-
-Upstream-Status: Inappropriate [embedded specific]
-
---- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
-+++ module-init-tools-3.0-pre10/generate-modprobe.conf
-@@ -45,12 +45,12 @@
- cp $TESTING_MODPROBE_CONF $MODPROBECONF
- elif [ "$STDIN" = "1" ]; then
- cat > $MODPROBECONF
--elif [ -x /sbin/modprobe.old ]; then
-+elif [ -x /sbin/modprobe.24 ]; then
- # In sbin.
-- /sbin/modprobe.old -c > $MODPROBECONF || modprobe_abort
--elif modprobe.old -c >/dev/null 2>&1; then
-+ /sbin/modprobe.24 -c > $MODPROBECONF || modprobe_abort
-+elif modprobe.24 -c >/dev/null 2>&1; then
- # Somewhere in path.
-- modprobe.old -c > $MODPROBECONF || modprobe_abort
-+ modprobe.24 -c > $MODPROBECONF || modprobe_abort
- elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
- # Running /sbin/modprobe gives old version.
- /sbin/modprobe -c > $MODPROBECONF || modprobe_abort
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
deleted file mode 100644
index dee163d..0000000
--- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require module-init-tools.inc
-PR = "r0"
-inherit cross
-PROVIDES += "virtual/${TARGET_PREFIX}depmod"
-RDEPENDS_${PN} = ""
-
-SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
-SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"
-
-EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX} --disable-static-utils"
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools.inc b/meta/recipes-kernel/module-init-tools/module-init-tools.inc
deleted file mode 100644
index c290c4f..0000000
--- a/meta/recipes-kernel/module-init-tools/module-init-tools.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Kernel Module Utilities"
-DESCRIPTION = "This package contains a set of programs for loading, inserting, and removing kernel modules for Linux (versions 2.5.48 and above). It serves the same function that the modutils package serves for Linux 2.4"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://lsmod.c;md5=743c873ec42632d2ce37d3c440f366dd"
-SECTION = "base"
-
-PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
-RDEPENDS_${PN} += "module-init-tools-depmod"
-
-FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
-FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
- file://modutils_extension.patch \
- file://disable_man.patch \
- file://grab_module_memset.patch"
-
-inherit autotools
-
-# module-init-tools uses AX_ENABLE_BUILDDIR to move rest of configuration steps
-# into a subdir. However this macro is not quite cross friendly. Instead of
-# mangling that macro, a easier way is to take the disable option
-EXTRA_OECONF = "--disable-builddir"
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
deleted file mode 100644
index 0248b46..0000000
--- a/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-require module-init-tools.inc
-PR = "r0"
-
-# autotools set prefix to /usr, however we want them in /bin and /sbin
-bindir = "/bin"
-sbindir = "/sbin"
-
-do_install() {
- autotools_do_install
- for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
- mv ${D}/$f ${D}/$f.26
- done
-}
-
-pkg_postinst_module-init-tools() {
- for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
- bn=`basename $f`
- update-alternatives --install /$f $bn /$f.26 60
- done
- update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
- update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
-}
-
-pkg_prerm_module-init-tools() {
- for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
- bn=`basename $f`
- update-alternatives --remove $bn /$f.26
- done
- update-alternatives --remove bin-lsmod /bin/lsmod.26
- update-alternatives --remove lsmod /bin/lsmod.26
-}
-
-pkg_postinst_module-init-tools-depmod() {
- update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
-}
-
-pkg_prerm_module-init-tools-depmod() {
- update-alternatives --remove depmod /sbin/depmod.26
-}
-
-SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
-SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"
diff --git a/meta/recipes-kernel/module-init-tools/files/PD.patch b/meta/recipes-kernel/modutils-initscripts/files/PD.patch
similarity index 100%
rename from meta/recipes-kernel/module-init-tools/files/PD.patch
rename to meta/recipes-kernel/modutils-initscripts/files/PD.patch
diff --git a/meta/recipes-kernel/module-init-tools/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
similarity index 100%
rename from meta/recipes-kernel/module-init-tools/files/modutils.sh
rename to meta/recipes-kernel/modutils-initscripts/files/modutils.sh
diff --git a/meta/recipes-kernel/module-init-tools/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
similarity index 100%
rename from meta/recipes-kernel/module-init-tools/modutils-initscripts.bb
rename to meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
--
1.7.5.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/3] image.bbclass, kernel.bbclass: Use kmod-native instead of module-init-tools-cross
2012-05-02 20:58 [PATCH 0/3] Add and use kmod Khem Raj
2012-05-02 20:58 ` [PATCH 1/3] kmod: Add recipes Khem Raj
2012-05-02 20:58 ` [PATCH 2/3] module-init-tools: Delete Khem Raj
@ 2012-05-02 20:58 ` Khem Raj
2 siblings, 0 replies; 15+ messages in thread
From: Khem Raj @ 2012-05-02 20:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/image.bbclass | 2 +-
meta/classes/kernel.bbclass | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 907c59b..4610731 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -178,7 +178,7 @@ fakeroot do_rootfs () {
KERNEL_VERSION=`cat ${STAGING_KERNEL_DIR}/kernel-abiversion`
mkdir -p ${IMAGE_ROOTFS}/lib/modules/$KERNEL_VERSION
- ${TARGET_PREFIX}depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
+ depmod -a -b ${IMAGE_ROOTFS} -F ${STAGING_KERNEL_DIR}/System.map-$KERNEL_VERSION $KERNEL_VERSION
fi
${IMAGE_PREPROCESS_COMMAND}
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 139bad9..6334510 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -1,7 +1,7 @@
inherit linux-kernel-base module_strip
PROVIDES += "virtual/kernel"
-DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
+DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
# we include gcc above, we dont need virtual/libc
INHIBIT_DEFAULT_DEPS = "1"
@@ -269,7 +269,7 @@ if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
mkdir -p $D/lib/modules/${KERNEL_VERSION}
fi
if [ -n "$D" ]; then
- ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
+ depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
else
depmod -a
fi
@@ -347,9 +347,8 @@ python populate_packages_prepend () {
if m:
kernelver_stripped = m.group(1)
path = d.getVar("PATH", True)
- host_prefix = d.getVar("HOST_PREFIX", True) or ""
- cmd = "PATH=\"%s\" %sdepmod -n -a -r -b %s -F %s/boot/System.map-%s %s" % (path, host_prefix, dvar, dvar, kernelver, kernelver_stripped)
+ cmd = "PATH=\"%s\" depmod -n -a -b %s -F %s/boot/System.map-%s %s" % (path, dvar, dvar, kernelver, kernelver_stripped)
f = os.popen(cmd, 'r')
deps = {}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-02 20:58 ` [PATCH 1/3] kmod: Add recipes Khem Raj
@ 2012-05-04 0:49 ` Saul Wold
2012-05-04 5:32 ` Martin Jansa
2012-05-07 16:14 ` Saul Wold
2012-05-07 19:46 ` Martin Jansa
2 siblings, 1 reply; 15+ messages in thread
From: Saul Wold @ 2012-05-04 0:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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?
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"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-04 0:49 ` Saul Wold
@ 2012-05-04 5:32 ` Martin Jansa
2012-05-04 5:36 ` Khem Raj
2012-05-04 6:09 ` Martin Jansa
0 siblings, 2 replies; 15+ messages in thread
From: Martin Jansa @ 2012-05-04 5:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 8452 bytes --]
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.
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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-04 5:32 ` Martin Jansa
@ 2012-05-04 5:36 ` Khem Raj
2012-05-04 6:08 ` Khem Raj
2012-05-04 6:09 ` Martin Jansa
1 sibling, 1 reply; 15+ messages in thread
From: Khem Raj @ 2012-05-04 5:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, May 3, 2012 at 10:32 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> Not sure why khem haven't used this commit/patch.
because my build machine has xsltproc installed. I will cherry pick this patch
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-04 5:36 ` Khem Raj
@ 2012-05-04 6:08 ` Khem Raj
0 siblings, 0 replies; 15+ messages in thread
From: Khem Raj @ 2012-05-04 6:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, May 3, 2012 at 10:36 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, May 3, 2012 at 10:32 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>
>> Not sure why khem haven't used this commit/patch.
>
> because my build machine has xsltproc installed. I will cherry pick this patch
Saul
I have update the tree with the patch from Martin imported from meta-oe
should fix your issue
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-04 5:32 ` Martin Jansa
2012-05-04 5:36 ` Khem Raj
@ 2012-05-04 6:09 ` Martin Jansa
2012-05-04 23:11 ` Saul Wold
1 sibling, 1 reply; 15+ messages in thread
From: Martin Jansa @ 2012-05-04 6:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 9123 bytes --]
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.
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
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-04 6:09 ` Martin Jansa
@ 2012-05-04 23:11 ` Saul Wold
2012-05-05 0:07 ` Khem Raj
0 siblings, 1 reply; 15+ messages in thread
From: Saul Wold @ 2012-05-04 23:11 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-04 23:11 ` Saul Wold
@ 2012-05-05 0:07 ` Khem Raj
0 siblings, 0 replies; 15+ messages in thread
From: Khem Raj @ 2012-05-05 0:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On Fri, May 4, 2012 at 4:11 PM, Saul Wold <sgw@linux.intel.com> wrote:
> 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?
yes it should be applied to native recipe as well. I have done it and
pushed the to the tree
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-02 20:58 ` [PATCH 1/3] kmod: Add recipes Khem Raj
2012-05-04 0:49 ` Saul Wold
@ 2012-05-07 16:14 ` Saul Wold
2012-05-07 19:46 ` Martin Jansa
2 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2012-05-07 16:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
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
>
> 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"
Merged into OE-Core with Martin's patch
Thanks
Sau!
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] kmod: Add recipes
2012-05-02 20:58 ` [PATCH 1/3] kmod: Add recipes Khem Raj
2012-05-04 0:49 ` Saul Wold
2012-05-07 16:14 ` Saul Wold
@ 2012-05-07 19:46 ` Martin Jansa
2012-05-07 21:12 ` [PATCH 1/2] kmod: include libkmod also from libdir Martin Jansa
2 siblings, 1 reply; 15+ messages in thread
From: Martin Jansa @ 2012-05-07 19:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, May 2, 2012 at 10:58 PM, Khem Raj <raj.khem@gmail.com> 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
>
> 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}"
this version sorts lower than what was in meta-oe, can we bump PE with
libkmod fix please?
> +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}"
why is this commented out?
it breaks libkmod packaging
FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS}"
doesn't matches anything
previous version of this patch had this enabled..
> +
> +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"
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/2] kmod: include libkmod also from libdir
2012-05-07 19:46 ` Martin Jansa
@ 2012-05-07 21:12 ` Martin Jansa
2012-05-07 21:12 ` [PATCH 2/2] kmod: fix upgrade path from module-init-tools Martin Jansa
0 siblings, 1 reply; 15+ messages in thread
From: Martin Jansa @ 2012-05-07 21:12 UTC (permalink / raw)
To: openembedded-core
* until it's decided it should be installed in base_libdir or libdir
* fixes libkmod packaging
Signed-off-by: Martin Jansa <Martin.Jansa@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 1ab9f44..8178f1c 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -54,5 +54,5 @@ pkg_prerm_kmod() {
PACKAGES =+ "libkmod"
-FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS}"
+FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"
FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d"
--
1.7.8.6
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] kmod: fix upgrade path from module-init-tools
2012-05-07 21:12 ` [PATCH 1/2] kmod: include libkmod also from libdir Martin Jansa
@ 2012-05-07 21:12 ` Martin Jansa
0 siblings, 0 replies; 15+ messages in thread
From: Martin Jansa @ 2012-05-07 21:12 UTC (permalink / raw)
To: openembedded-core
* 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>
---
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 8178f1c..28b5a68 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.8.6
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2012-05-07 21:22 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-02 20:58 [PATCH 0/3] Add and use kmod Khem Raj
2012-05-02 20:58 ` [PATCH 1/3] kmod: Add recipes Khem Raj
2012-05-04 0:49 ` Saul Wold
2012-05-04 5:32 ` Martin Jansa
2012-05-04 5:36 ` Khem Raj
2012-05-04 6:08 ` Khem Raj
2012-05-04 6:09 ` Martin Jansa
2012-05-04 23:11 ` Saul Wold
2012-05-05 0:07 ` Khem Raj
2012-05-07 16:14 ` Saul Wold
2012-05-07 19:46 ` Martin Jansa
2012-05-07 21:12 ` [PATCH 1/2] kmod: include libkmod also from libdir Martin Jansa
2012-05-07 21:12 ` [PATCH 2/2] kmod: fix upgrade path from module-init-tools Martin Jansa
2012-05-02 20:58 ` [PATCH 2/3] module-init-tools: Delete Khem Raj
2012-05-02 20:58 ` [PATCH 3/3] image.bbclass, kernel.bbclass: Use kmod-native instead of module-init-tools-cross Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox