summaryrefslogtreecommitdiff
path: root/packages/slugos-init
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-01-11 07:09:54 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-11 07:09:54 +0000
commit3333852bd0bc5b926374b919a6fd2794fbadffd6 (patch)
treefab3192bc108ec0bdaa76b0ddf1bd8ddfdb03caa /packages/slugos-init
parentc103910fd158f991efa64e1aefd0b267552b6767 (diff)
slugos-image: remove spurious DEPENDS in conf
- this upgrades slugos-image to the new RDEPENDS only world, some missing (R)dependencies are corrected slugos-init: remove virtual/ixp-eth in 0.10 - this stuff is no longer necessary and the modprobe.conf has been moved to the ixp-eth module rather than having it incorrectly introduced in a non-dependent module.
Diffstat (limited to 'packages/slugos-init')
-rw-r--r--packages/slugos-init/files/modprobe.conf3
-rw-r--r--packages/slugos-init/slugos-init_0.10.bb6
2 files changed, 1 insertions, 8 deletions
diff --git a/packages/slugos-init/files/modprobe.conf b/packages/slugos-init/files/modprobe.conf
deleted file mode 100644
index 08482e8c6d..0000000000
--- a/packages/slugos-init/files/modprobe.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Add an alias for eth0 to MODULE to cause the S40networking
-# init script to load the MODULE driver on the first boot
-alias eth0 MODULE
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 4bca35f47f..d22bdde4ad 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -24,7 +24,6 @@ SRC_URI = "file://linuxrc \
file://conffiles \
file://turnup \
file://reflash \
- file://modprobe.conf \
file://links.conf \
file://leds.h \
file://leds.c \
@@ -105,9 +104,6 @@ do_install() {
# Configuration files
install -m 0644 conffiles ${D}${sysconfdir}/default
- # Change MODULE in modprobe.conf to the correct module name
- rm -f ${D}${sysconfdir}/modprobe.conf
- sed 's/MODULE/'"$(echo '${PREFERRED_PROVIDER_virtual/ixp-eth}'|sed 's/-/_/g')"'/g' modprobe.conf >${D}${sysconfdir}/modprobe.conf
set +ex
}
@@ -148,4 +144,4 @@ FILES_${PN} = "/"
# It is bad to overwrite /linuxrc as it puts the system back to
# a flash boot (and the flash has potentially not been upgraded!)
-CONFFILES_${PN} = "${sysconfdir}/modprobe.conf /linuxrc ${sysconfdir}/default/conffiles"
+CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles"