diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-03-17 15:56:32 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-03-17 15:56:32 +0100 |
| commit | e0d26e422f3f151f4a99a16945d22bba0e06197b (patch) | |
| tree | 56221b8b28f35657731b6f12f142ef4f05a907b9 /conf | |
| parent | 3b1c82c59e3d1a2cbc5510d2572385493f0af711 (diff) | |
| parent | 6041d2d7eb0d9a4885bff1aa38ddffd75388ca64 (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.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/machine/wrap.conf | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 022e81b186..88cc732056 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/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e0b8dba733..4e8d4fa9dc 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -233,8 +233,6 @@ SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" SRCREV_pn-webkit-gtk ?= "40814" -SRCREV_pn-webkit-qt ?= "28656" -SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" 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 |