diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-17 15:23:21 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-17 15:23:21 +0100 |
| commit | e4ca68f6b5e6d7c386a9cee785bec7f5a6c13288 (patch) | |
| tree | 3eaca01d6bbd433c4ab2b17f4f59516da790a7ff /conf | |
| parent | 26fb0c21a80670c0e03c03c812d02687a2b972b9 (diff) | |
| parent | 3255081d3899381a49d6524936fdef592acdca85 (diff) | |
Merge branch 'org.openembedded.dev' of ssh://git@git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/machine/wrap.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 5705ad8a90..ac27d0d3ab 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3019,8 +3019,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 |