summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorg2@giantshoulder.com <g2@giantshoulder.com>2005-02-21 19:15:18 +0000
committerg2@giantshoulder.com <g2@giantshoulder.com>2005-02-21 19:15:18 +0000
commit561b04dc8656435625c159a77d39cd95563923d3 (patch)
tree12bfcdd46ff03645ebb7972b220c5af176d9d168 /packages
parent289081ace1d9f300fbe9cec21b05585c5526baef (diff)
Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
into giantshoulder.com:/home/tom/dev/openslug/openembedded 2005/02/21 14:14:40-05:00 giantshoulder.com!g2 Fix modutils punchlist issues BKrev: 421a3346xVeRAw_E-eUn0iYI-1SaCw
Diffstat (limited to 'packages')
-rw-r--r--packages/openslug-init/openslug-init-0.10/modprobe.conf0
-rw-r--r--packages/openslug-init/openslug-init-0.10/modutils.txt0
-rw-r--r--packages/openslug-init/openslug-init-0.10/sysconfsetup4
-rw-r--r--packages/openslug-init/openslug-init_0.10.bb7
4 files changed, 7 insertions, 4 deletions
diff --git a/packages/openslug-init/openslug-init-0.10/modprobe.conf b/packages/openslug-init/openslug-init-0.10/modprobe.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openslug-init/openslug-init-0.10/modprobe.conf
diff --git a/packages/openslug-init/openslug-init-0.10/modutils.txt b/packages/openslug-init/openslug-init-0.10/modutils.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openslug-init/openslug-init-0.10/modutils.txt
diff --git a/packages/openslug-init/openslug-init-0.10/sysconfsetup b/packages/openslug-init/openslug-init-0.10/sysconfsetup
index 533354b71f..47f0387192 100644
--- a/packages/openslug-init/openslug-init-0.10/sysconfsetup
+++ b/packages/openslug-init/openslug-init-0.10/sysconfsetup
@@ -32,6 +32,4 @@ EOF
echo "Configured /etc/network/interfaces with IP Static linksysconf Information"
fi
-modprobe ixp425_eth
-modprobe ehci-hcd
-
+# Module loading handled more properly by update-modules and modprobe.conf
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 897f70f27f..aeb2265c6d 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "Openslug initial network config via sysconf"
SECTION = "console/network"
LICENSE = "GPL"
DEPENDS = "base-files"
-PR = "r5"
+PR = "r6"
OPENSLUG_VERSION = "1.1-alpha"
SRC_URI = "file://sysconfsetup \
+ file://modutils.txt \
+ file://modprobe.conf \
file://kern_header.c"
inherit autotools update-rc.d
@@ -23,6 +25,7 @@ do_install() {
install -d ${D}/${sysconfdir} \
${D}/${sysconfdir}/init.d \
+ ${D}/${sysconfdir}/modutils \
${D}/${sysconfdir}/rcS.d \
${D}/${sbindir}
@@ -30,6 +33,8 @@ do_install() {
install -m 0755 ${D}/../kern_header ${D}/${sbindir}/kern_header
install -m 0755 ${D}/../sysconfsetup ${D}/${sysconfdir}/init.d/
+ install -m 0644 ${D}/../modutils.txt ${D}/${sysconfdir}/modutils/
+ install -m 0644 ${D}/../modprobe.conf ${D}/${sysconfdir}/
ln -s /etc/init.d/sysconfsetup ${D}/${sysconfdir}/rcS.d/S39sysconfsetup
}