summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2009-03-17 15:24:47 +0100
committerStefan Schmidt <stefan@datenfreihafen.org>2009-03-17 15:24:47 +0100
commitc26d2cb4e11e3f175b931d8920fc35eb5d01770c (patch)
tree5f7b1991a0a9d5d2cb3acd3b5166db654c9b91ea /conf
parent158be4c48fd1b86cd4f58eee8d1d10958d1be195 (diff)
parente4ca68f6b5e6d7c386a9cee785bec7f5a6c13288 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini4
-rw-r--r--conf/machine/wrap.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 578a6d8b57..775908327e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3035,8 +3035,8 @@ md5=a72d169e9545e26257032e0e367feb95
sha256=fd4a64c6a83e07586de0360258162c5bf431f164b3980301185743e4029940df
[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-modprobe.patch]
-md5=6eeb6efcd71e57082d6654a9a6a368eb
-sha256=a02007661cf2f318a66468456f8fc8ae1177e12c3c66c59ff2de4d98863a388e
+md5=b2b9d0992b055816077ec9e0e4ee7775
+sha256=ba540cad8a029ff2eec7b078e31a308f408c074a13160aa7eba80f5ca18ee703
[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-tar.patch]
md5=90d093817855bc63ad16fbb8524f80df
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index 92720043f2..1fc75ebe94 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -5,7 +5,7 @@
TARGET_ARCH = "i486"
PACKAGE_EXTRA_ARCHS = "i386 x86"
-PREFERRED_PROVIDER_virtual/kernel = "linux-wrap-geode"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
# Serial console settings for sysvinit