Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/21 20:54:29+02:00 uni-frankfurt.de!mickey
ship modinfo in bootstrap

BKrev: 40febbefCuzyLcz5DDlRdlICh7IQ0w

diff --git a/meta/task-bootstrap.oe b/meta/task-bootstrap.oe
index a087af6..80afe87 100644 (file)
--- a/meta/task-bootstrap.oe
+++ b/meta/task-bootstrap.oe
@@ -12,7 +12,7 @@ DEPENDS = 'base-files base-passwd-3.5.7 \
        ${BOOTSTRAP_EXTRA_DEPENDS}'
 
 RDEPENDS = 'base-files base-passwd busybox \
-       hotplug ipkg initscripts modutils-depmod \
+       hotplug ipkg initscripts modutils-depmod modutils-modinfo \
        netbase resolvconf sysvinit tinylogin \
        modutils-initscripts \
        ${BOOTSTRAP_EXTRA_RDEPENDS}'

diff --git a/modutils/modutils_2.4.27.oe b/modutils/modutils_2.4.27.oe
index bff810e..77c2c49 100644 (file)
--- a/modutils/modutils_2.4.27.oe
+++ b/modutils/modutils_2.4.27.oe
@@ -1,8 +1,7 @@
-PR = "r2"
 DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
-manageable for all users, administrators and distribution \
-maintainers."
+manageable for all users, administrators and distribution maintainers."
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \
            file://lex.l.diff;patch=1 \
@@ -43,8 +42,8 @@ pkg_prerm_modutils () {
        update-rc.d $D modutils remove
 }
 
-PACKAGES = "modutils-depmod modutils-doc modutils"
+PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils"
 
 FILES_modutils-depmod = "sbin/depmod"
-
+FILES_modutils-modinfo = "sbin/modinfo"
 RDEPENDS_modutils = "modutils-depmod"