aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-11-18 06:59:31 +0000
committerRod Whitby <rod@whitby.id.au>2006-11-18 06:59:31 +0000
commitf9fa013a67614490729c3a4a514637ec54bf4430 (patch)
treebcd0003329e72454892f1dffe9e1b5b8a03a7c97
parent0d51f3fa948db396ee6bbbc90ffac5b65d449e7a (diff)
parenta4fcf5e986b12b575947dcc3074d8bca693eec04 (diff)
downloadopenembedded-f9fa013a67614490729c3a4a514637ec54bf4430.tar.gz
merge of '098ecd6f9272018d813f8ffd6659f743b8aa0394'
and '3ef89846e91bf5f30231b6119392a9e1f03dfea0'
-rw-r--r--conf/distro/debianslug.conf5
-rw-r--r--packages/images/slugos-image.bb2
2 files changed, 1 insertions, 6 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index e86ffa028c..c570d7c18f 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -77,7 +77,6 @@ DEBIANSLUG_STANDARD_RDEPENDS += "\
kernel-module-ext2 \
kernel-module-jbd \
kernel-module-ext3 \
-kernel-module-nfs \
kernel-module-vfat \
kernel-module-ntfs \
kernel-module-isofs \
@@ -86,10 +85,6 @@ kernel-module-reiserfs \
kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
-# Add modules required for firmware loading
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-firmware-class \
-"
# Add module to create i2c chardev
DEBIANSLUG_STANDARD_RDEPENDS += "\
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index df057fe643..231dcd8891 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Generic SlugOS image"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r39"
+PR = "r40"
COMPATIBLE_MACHINE = "nslu2"