diff options
| author |   Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-29 10:48:54 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-29 10:48:54 +0000 |
| commit | ff065cec2b8af6c29c20f7d5937daafae928f02b (patch) | |
| tree | 20bfcf347ddbc36669032c4996249d7441d773d0 | |
| parent | a25796619817e56ce1bf96fce39c967de137e09a (diff) | |
| download | openembedded-core-contrib-ff065cec2b8af6c29c20f7d5937daafae928f02b.tar.gz | |
linux-rp: disable OABI support for non-qemu targets
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4979 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/linux/linux-rp.inc | 6 | ||||
| -rw-r--r-- | meta/packages/linux/linux-rp_2.6.23.bb | 2 | ||||
| -rw-r--r-- | meta/packages/linux/linux-rp_2.6.24.bb | 2 | ||||
| -rw-r--r-- | meta/packages/linux/linux-rp_2.6.26.bb | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc index c92dc99e5c..39d0f0525d 100644 --- a/meta/packages/linux/linux-rp.inc +++ b/meta/packages/linux/linux-rp.inc @@ -103,7 +103,11 @@ do_configure() { if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config - echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + if [ "${MACHINE}" = "qemuarm" -o "${MACHINE}" = "qemuarmv6" -o "${MACHINE}" = "qemuarmv7" -o ]; then + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi else echo "# CONFIG_AEABI is not set" >> ${S}/.config echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb index 4bb06b60b1..7d50e696ef 100644 --- a/meta/packages/linux/linux-rp_2.6.23.bb +++ b/meta/packages/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r34" +PR = "r35" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/meta/packages/linux/linux-rp_2.6.24.bb b/meta/packages/linux/linux-rp_2.6.24.bb index a7418d89fc..945f6135ea 100644 --- a/meta/packages/linux/linux-rp_2.6.24.bb +++ b/meta/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r12" +PR = "r13" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" diff --git a/meta/packages/linux/linux-rp_2.6.26.bb b/meta/packages/linux/linux-rp_2.6.26.bb index 7b46fc4fce..13d72ce03f 100644 --- a/meta/packages/linux/linux-rp_2.6.26.bb +++ b/meta/packages/linux/linux-rp_2.6.26.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "1" |