From: Phil Blundell <philb@gnu.org>
Date: Fri, 2 Jul 2004 22:59:24 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~18414
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23fb33d546bfc790bad46c3847ecba30345951f0;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages

2004/07/02 23:59:10+01:00 (none)!pb
don't ship /etc/modules{.conf} in modutils; those files are in modutils-collateral.

BKrev: 40e5e8cclrDXUVmqGngqfIj4C8PT9Q
---

diff --git a/modutils/modutils_2.4.27.oe b/modutils/modutils_2.4.27.oe
index 4b328d5913..53f66863af 100644
--- a/modutils/modutils_2.4.27.oe
+++ b/modutils/modutils_2.4.27.oe
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "These utilities are intended to make a Linux modular kernel \
 manageable for all users, administrators and distribution \
 maintainers."
@@ -8,9 +8,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${
            file://lex.l.diff;patch=1 \
            file://modutils-notest.patch;patch=1 \
            file://configure.patch;patch=1 \
-           file://program_prefix.patch;patch=1 \
-           file://modules \
-           file://modules.conf"
+           file://program_prefix.patch;patch=1"
 
 inherit autotools
 
@@ -22,8 +20,6 @@ export BUILDCC = "${BUILD_CC}"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}/${sysconfdir}
-	install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules
-	install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf
 }
 
 pkg_postinst_modutils () {