diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-03-12 08:57:53 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-03-12 08:57:53 +0100 |
| commit | d5977a2bfe215b1b862bb3e849dd35692171d213 (patch) | |
| tree | 06ab1f80fcd47508d09ad6e26b5fde2dfc129d7b | |
| parent | d454200a4395e7b7244b71defa5a9e9b3903166c (diff) | |
| parent | 7bd302c37ff3b7d6ff06e7a4700a714c9e823593 (diff) | |
Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb | 3 | ||||
| -rw-r--r-- | recipes/tasks/task-shr-minimal.bb | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb index 85c5901f25..29d52cfc51 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb @@ -2,12 +2,13 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://export_sa_family_t.patch;patch=1 \ + file://scsi-use-__u8.patch;patch=1 \ " S = "${WORKDIR}/linux-${PV}" diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb index 39763975dd..097129292e 100644 --- a/recipes/tasks/task-shr-minimal.bb +++ b/recipes/tasks/task-shr-minimal.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Lite Image Feed" -PR = "r27" +PR = "r28" PV = "2.0" LICENSE = "GPL" @@ -120,6 +120,8 @@ RDEPENDS_${PN}-x = "\ " RDEPENDS_${PN}-apps = "\ +# because of new opimd doesn't support SIM contacts itself + pisi \ fso-abyss \ task-fso2-compliance \ phoneui-apps-messages \ |