From a6fa1f162b62c58ed01b73bd1d790a7a566ce778 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Sep 2006 09:27:00 +0000 Subject: linux kernels: fix uclibcgnueabi detection --- packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb | 4 ++-- packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb | 2 +- packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb | 4 +++- packages/linux/linux-ezx_2.6.16.13.bb | 2 +- packages/linux/linux-openzaurus.inc | 2 +- packages/linux/netbook-pro-kernel_2.6.17.bb | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb index fa95d66dc6..9f79f3a643 100644 --- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb +++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb @@ -29,8 +29,8 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" ]; then - echo "CONFIG_AEABI=y" >> ${S}/.config + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else echo "# CONFIG_AEABI is not set" >> ${S}/.config diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb index 9ddc30a916..d1b708c02e 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb @@ -44,7 +44,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb index e8048ae641..4199f5662d 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb @@ -2,6 +2,8 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." LICENSE = "GPL" +DEFAULT_PREFERENCE ="-1" + COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = '(h3900|h2200|h4000|h5xxx|htcuniversal|ipaq-pxa270)' @@ -43,7 +45,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index 6da8a32a21..fc52169244 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -66,7 +66,7 @@ do_configure() { echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - if [ "${TARGET_OS}" == "linux-gnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index 88ee712143..abb9b3af76 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -103,7 +103,7 @@ do_configure() { # echo "# CONFIG_FB_ELPP is not set" >> ${S}/.config #fi - if [ "${TARGET_OS}" == "linux-gnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb index fe0edb6c18..cef88d785a 100644 --- a/packages/linux/netbook-pro-kernel_2.6.17.bb +++ b/packages/linux/netbook-pro-kernel_2.6.17.bb @@ -29,7 +29,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else -- cgit v1.2.3