summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/openslug.conf4
-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
5 files changed, 9 insertions, 6 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index e1c8c7d741..209764d1c1 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -14,13 +14,13 @@ IMAGE_FSTYPES = "jffs2"
OPENSLUG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-nslu2.txt')}"
EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DEVICE_TABLE}"
-OPENSLUG_EXTRA_DEPENDS += "virtual/kernel module-init-tools mtd-utils"
+OPENSLUG_EXTRA_DEPENDS += "virtual/kernel module-init-tools mtd-utils modutils-initscripts"
OPENSLUG_EXTRA_RDEPENDS += "kernel-module-usbnet kernel-module-usbserial \
kernel-module-usbcore kernel-module-usb-storage kernel-module-ohci-hcd \
kernel-module-pegasus kernel-module-p8022 kernel-module-kaweth \
kernel-module-ehci-hcd \
kernel-module-scsi-mod kernel-module-sd-mod kernel-module-ext3 kernel-module-jbd \
-module-init-tools mtd-utils"
+module-init-tools mtd-utils modutils-initscripts"
OPENSLUG_EXTRA_INSTALL += "${OPENSLUG_EXTRA_RDEPENDS}"
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
}