From 558f6d44365f062523fbba3926ab46e5cd1984b8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 3 Sep 2009 15:22:46 -0700 Subject: OpenEmbedded: Switch to using linux-uclibceabi and linux-gnu for TARGET_OS * Bump the ABI_LAYOUT. Build from scratch will be needed. * Replace using TARGET_OS from linux->linux-gnu. * Replace using linux-uclibcgnueabi->linux-uclibceabi. * Add 'eabi' to DISTRO_FEATURES (only for minimal and micro). * Use eabi and BASE_PACKAGE_ARCH to compute real TARGET_OS. * Fix the micro conf to get console image building. * Fix the linux-uclibcgnueabi overrides in all recipes. Signed-off-by: Khem Raj Acked-by: Phill Blundell Acked-by: Michael 'Mickey' Lauer --- recipes/alsa/alsa-utils_1.0.13.bb | 2 +- recipes/avahi/avahi.inc | 2 +- recipes/diffutils/diffutils_2.8.1.bb | 2 +- recipes/eibd/eibd.inc | 2 +- recipes/gcc/gcc-configure-canadian-sdk.inc | 2 +- recipes/gcc/gcc-configure-common.inc | 4 ++-- recipes/gcc/gcc-configure-sdk.inc | 2 +- recipes/gettext/gettext_0.14.1.bb | 2 +- recipes/gettext/gettext_0.17.bb | 2 +- recipes/klibc/klibc-common.inc | 2 +- recipes/libffi/libffi_2.0+gcc4.3.2.bb | 2 +- recipes/libffi/libffi_3.0.8.bb | 2 +- recipes/linknx/linknx.inc | 2 +- recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb | 2 +- recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb | 2 +- recipes/linux/gumstix-linux.inc | 2 +- recipes/linux/ixp4xx-kernel.inc | 2 +- recipes/linux/linux-bd-neon-2.6_2.6.22.bb | 2 +- recipes/linux/linux-hackndev-2.6_git.bb | 2 +- recipes/linux/linux-handhelds-2.6.inc | 2 +- recipes/linux/linux-navman_2.6.18.bb | 2 +- recipes/linux/linux-nokia800.inc | 2 +- recipes/linux/linux-palm-omap1_2.6.22-omap1.bb | 2 +- recipes/linux/linux-rp.inc | 2 +- recipes/linux/linux-tornado-omap2_2.6.16.16.bb | 2 +- recipes/linux/linux.inc | 2 +- recipes/linux/mx21ads-kernel_2.6.19rc6.bb | 2 +- recipes/linux/netbook-pro-kernel_2.6.17.bb | 2 +- recipes/make/make.inc | 2 +- recipes/openssl/openssl.inc | 3 +++ recipes/perl/perl_5.8.8.bb | 2 +- recipes/qmake/qmake-native_1.07a.bb | 2 +- recipes/qmake/qmake2-native.inc | 2 +- recipes/qte/qte-common_2.3.10.inc | 4 ++-- recipes/samba/samba_3.0.34.bb | 2 +- recipes/tasks/task-sdk-bare.bb | 2 +- recipes/uclibc/uclibc.inc | 11 ++++++----- recipes/util-linux-ng/util-linux-ng_2.14.bb | 2 +- 38 files changed, 47 insertions(+), 43 deletions(-) (limited to 'recipes') diff --git a/recipes/alsa/alsa-utils_1.0.13.bb b/recipes/alsa/alsa-utils_1.0.13.bb index 1e6af1ec09..e77c2d97f7 100644 --- a/recipes/alsa/alsa-utils_1.0.13.bb +++ b/recipes/alsa/alsa-utils_1.0.13.bb @@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" # please close bug and remove this comment when properly fixed # EXTRA_OECONF_linux-uclibc = "--disable-nls" -EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls" +EXTRA_OECONF_linux-uclibceabi = "--disable-nls" inherit autotools diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc index f5e68e26fe..cefb2bed64 100644 --- a/recipes/avahi/avahi.inc +++ b/recipes/avahi/avahi.inc @@ -25,7 +25,7 @@ AVAHI_PYTHON = "--disable-python" AVAHI_GTK = "--disable-gtk" LDFLAGS_append_linux-uclibc = " -lintl" -LDFLAGS_append_linux-uclibcgnueabi = " -lintl " +LDFLAGS_append_linux-uclibceabi = " -lintl " LDFLAGS_append_uclinux-uclibc = " -lintl" PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils" diff --git a/recipes/diffutils/diffutils_2.8.1.bb b/recipes/diffutils/diffutils_2.8.1.bb index b979fa89f6..590d7f4af9 100644 --- a/recipes/diffutils/diffutils_2.8.1.bb +++ b/recipes/diffutils/diffutils_2.8.1.bb @@ -15,7 +15,7 @@ inherit autotools update-alternatives # because it uses __mempcpy, there are other things (TBD: # see diffutils.mk in buildroot) EXTRA_OECONF_linux-uclibc = "--without-included-regex" -EXTRA_OECONF_linux-uclibcgnueabi = "--without-included-regex" +EXTRA_OECONF_linux-uclibceabi = "--without-included-regex" do_install_append () { mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN} diff --git a/recipes/eibd/eibd.inc b/recipes/eibd/eibd.inc index f021d96f3f..e509764f64 100644 --- a/recipes/eibd/eibd.inc +++ b/recipes/eibd/eibd.inc @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = " pthsem libxml2" DEPENDS_append_linux-uclibc = " argp-standalone " -DEPENDS_append_linux-uclibcgnueabi = " argp-standalone " +DEPENDS_append_linux-uclibceabi = " argp-standalone " SRC_URI += " file://eibd " diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc index 738b120a45..83ae6f548d 100644 --- a/recipes/gcc/gcc-configure-canadian-sdk.inc +++ b/recipes/gcc/gcc-configure-canadian-sdk.inc @@ -1,7 +1,7 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' +USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}' # # We need to override this and make sure the compiler can find staging diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index 9363585de1..1c605a132d 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -9,7 +9,7 @@ JAVA_arm ?= "" JAVA_armeb ?= "" JAVA_mipsel ?= "" JAVA_sh3 ?= "" -OBJC_linux-uclibcgnueabi ?= "" +OBJC_linux-uclibceabi ?= "" OBJC_linux-uclibc ?= "" OBJC_avr ?= "" OBJC ?= ",objc" @@ -41,7 +41,7 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" -EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" +EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit" EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" CPPFLAGS = "" diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc index d04f6080ee..205b1067ef 100644 --- a/recipes/gcc/gcc-configure-sdk.inc +++ b/recipes/gcc/gcc-configure-sdk.inc @@ -2,7 +2,7 @@ require gcc-configure-common.inc # The two lines below conflict, this needs fixing - RP USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' +USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}' EXTRA_OECONF_PATHS = "--with-sysroot=${prefix}/${TARGET_SYS} \ --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \ diff --git a/recipes/gettext/gettext_0.14.1.bb b/recipes/gettext/gettext_0.14.1.bb index 30fb92d351..b383525d88 100644 --- a/recipes/gettext/gettext_0.14.1.bb +++ b/recipes/gettext/gettext_0.14.1.bb @@ -15,7 +15,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://disable_java.patch;patch=1" SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" -SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" +SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1" PARALLEL_MAKE = "" diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb index 04dee4c4f2..9f9f695b6a 100644 --- a/recipes/gettext/gettext_0.17.bb +++ b/recipes/gettext/gettext_0.17.bb @@ -14,7 +14,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ " SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" -SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" +SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1" PARALLEL_MAKE = "" diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc index b66bc616ef..3b0eb1c45b 100644 --- a/recipes/klibc/klibc-common.inc +++ b/recipes/klibc/klibc-common.inc @@ -31,7 +31,7 @@ ARM_INSTRUCTION_SET = "arm" SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1 \ " -SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1 \ +SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch;patch=1 \ " EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ diff --git a/recipes/libffi/libffi_2.0+gcc4.3.2.bb b/recipes/libffi/libffi_2.0+gcc4.3.2.bb index be98050961..3b59b6a4d7 100644 --- a/recipes/libffi/libffi_2.0+gcc4.3.2.bb +++ b/recipes/libffi/libffi_2.0+gcc4.3.2.bb @@ -50,7 +50,7 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \ EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" -EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" +EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit" EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( diff --git a/recipes/libffi/libffi_3.0.8.bb b/recipes/libffi/libffi_3.0.8.bb index cef09aeb28..d24e9715d4 100644 --- a/recipes/libffi/libffi_3.0.8.bb +++ b/recipes/libffi/libffi_3.0.8.bb @@ -46,7 +46,7 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \ EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" -EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" +EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit" EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" #Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( diff --git a/recipes/linknx/linknx.inc b/recipes/linknx/linknx.inc index ff2492fff5..1feb2b7c05 100644 --- a/recipes/linknx/linknx.inc +++ b/recipes/linknx/linknx.inc @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = " pthsem lua5.1 curl libesmtp" DEPENDS_append_linux-uclibc = " argp-standalone" -DEPENDS_append_linux-uclibcgnueabi = " argp-standalone" +DEPENDS_append_linux-uclibceabi = " argp-standalone" SRC_URI += "file://configure-libcurl.patch;patch=1 \ file://linknx.start " diff --git a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb index 79d90bc4c7..b233dd7870 100644 --- a/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb +++ b/recipes/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb @@ -27,7 +27,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb index 642b13f607..9aab5d8bed 100644 --- a/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb +++ b/recipes/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb @@ -26,7 +26,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/gumstix-linux.inc b/recipes/linux/gumstix-linux.inc index 50111cb545..030abf2c88 100644 --- a/recipes/linux/gumstix-linux.inc +++ b/recipes/linux/gumstix-linux.inc @@ -17,7 +17,7 @@ do_deploy[dirs] = "${S}" do_configure_prepend() { echo "" > ${S}/.config - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/ixp4xx-kernel.inc b/recipes/linux/ixp4xx-kernel.inc index 8ec06e2682..910819e666 100644 --- a/recipes/linux/ixp4xx-kernel.inc +++ b/recipes/linux/ixp4xx-kernel.inc @@ -192,7 +192,7 @@ do_configure_prepend() { echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb index 400fe782db..3fca851ef2 100644 --- a/recipes/linux/linux-bd-neon-2.6_2.6.22.bb +++ b/recipes/linux/linux-bd-neon-2.6_2.6.22.bb @@ -22,7 +22,7 @@ ALLOW_EMPTY = "1" do_configure() { cp arch/arm/configs/neon_defconfig .config || die "No default configuration for ${MACHINE} available." -# if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then +# if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then # echo "CONFIG_AEABI=y" >> ${S}/.config # echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config # else diff --git a/recipes/linux/linux-hackndev-2.6_git.bb b/recipes/linux/linux-hackndev-2.6_git.bb index 2f9f902bf7..5c093a1674 100644 --- a/recipes/linux/linux-hackndev-2.6_git.bb +++ b/recipes/linux/linux-hackndev-2.6_git.bb @@ -27,7 +27,7 @@ do_configure() { || die "No default configuration for ${MACHINE} available." fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/linux-handhelds-2.6.inc b/recipes/linux/linux-handhelds-2.6.inc index 5270c1465b..fe482830f8 100644 --- a/recipes/linux/linux-handhelds-2.6.inc +++ b/recipes/linux/linux-handhelds-2.6.inc @@ -50,7 +50,7 @@ do_configure() { echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/linux-navman_2.6.18.bb b/recipes/linux/linux-navman_2.6.18.bb index b37b68e8c9..2c9aef9e62 100644 --- a/recipes/linux/linux-navman_2.6.18.bb +++ b/recipes/linux/linux-navman_2.6.18.bb @@ -26,7 +26,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/linux-nokia800.inc b/recipes/linux/linux-nokia800.inc index 0fc4740a94..0f52b7c3b3 100644 --- a/recipes/linux/linux-nokia800.inc +++ b/recipes/linux/linux-nokia800.inc @@ -14,7 +14,7 @@ do_configure_prepend() { rm -f ${S}/.config || true - if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb index 786e4901c3..16fe38bf5c 100644 --- a/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb +++ b/recipes/linux/linux-palm-omap1_2.6.22-omap1.bb @@ -25,7 +25,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/linux-rp.inc b/recipes/linux/linux-rp.inc index bdeb9f364a..041a095d91 100644 --- a/recipes/linux/linux-rp.inc +++ b/recipes/linux/linux-rp.inc @@ -105,7 +105,7 @@ do_configure() { echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config - if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config if [ "${ARM_KEEP_OABI}" = "1" ] ; then echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config diff --git a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb index a9ebee14cd..9c6e133c28 100644 --- a/recipes/linux/linux-tornado-omap2_2.6.16.16.bb +++ b/recipes/linux/linux-tornado-omap2_2.6.16.16.bb @@ -24,7 +24,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 3dbb1ecb40..044d4130c5 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -68,7 +68,7 @@ do_configure_prepend() { # # oabi / eabi support # - if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config if [ "${ARM_KEEP_OABI}" = "1" ] ; then echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config diff --git a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb index 47f363d7df..bc8e6242a7 100644 --- a/recipes/linux/mx21ads-kernel_2.6.19rc6.bb +++ b/recipes/linux/mx21ads-kernel_2.6.19rc6.bb @@ -26,7 +26,7 @@ RPROVIDES_kernel-image += "hostap-modules" do_configure_prepend() { install -m 0644 ${WORKDIR}/mx21ads_defconfig ${S}/defconfig - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/linux/netbook-pro-kernel_2.6.17.bb b/recipes/linux/netbook-pro-kernel_2.6.17.bb index 1d24646b3b..37704dcb64 100644 --- a/recipes/linux/netbook-pro-kernel_2.6.17.bb +++ b/recipes/linux/netbook-pro-kernel_2.6.17.bb @@ -27,7 +27,7 @@ do_configure() { fi - if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibceabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config else diff --git a/recipes/make/make.inc b/recipes/make/make.inc index 8a43f40a24..af21861c2e 100644 --- a/recipes/make/make.inc +++ b/recipes/make/make.inc @@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ inherit autotools do_configure_prepend() { - if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then export make_cv_sys_gnu_glob="no" export GLOBINC=-I`pwd`/glob export GLOBLIB=glob/libglob.a diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc index fea05f84e9..9031b7b3bb 100644 --- a/recipes/openssl/openssl.inc +++ b/recipes/openssl/openssl.inc @@ -34,6 +34,9 @@ do_configure () { if [ "x$os" = "xlinux-uclibc" ]; then os=linux fi + if [ "x$os" = "xlinux-uclibceabi" ]; then + os=linux + fi target="$os-${HOST_ARCH}" case $target in linux-arm) diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb index 521cdf65e5..8d9719959c 100644 --- a/recipes/perl/perl_5.8.8.bb +++ b/recipes/perl/perl_5.8.8.bb @@ -63,7 +63,7 @@ do_configure() { done # Fixups for uclibc - if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibceabi" ]; then sed -i -e "s,\(d_crypt_r=\)'define',\1'undef',g" \ -e "s,\(crypt_r_proto=\)'\w+',\1'0',g" \ -e "s,\(d_getnetbyname_r=\)'define',\1'undef',g" \ diff --git a/recipes/qmake/qmake-native_1.07a.bb b/recipes/qmake/qmake-native_1.07a.bb index a80bb1bb92..bb3e79bca2 100644 --- a/recipes/qmake/qmake-native_1.07a.bb +++ b/recipes/qmake/qmake-native_1.07a.bb @@ -18,7 +18,7 @@ EXTRA_OEMAKE = "-e" do_configure() { # Install the OE build templates - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibcgnueabi-oe-g++ + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++ do install -d ${S}/mkspecs/$template install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf diff --git a/recipes/qmake/qmake2-native.inc b/recipes/qmake/qmake2-native.inc index f84da2ad52..990820066a 100644 --- a/recipes/qmake/qmake2-native.inc +++ b/recipes/qmake/qmake2-native.inc @@ -26,7 +26,7 @@ do_configure() { # Make sure we regenerate all Makefiles find ${S} -name "Makefile" | xargs rm # Install the OE build templates - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibcgnueabi-oe-g++ + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibceabi-oe-g++ do install -d ${S}/mkspecs/$template install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf diff --git a/recipes/qte/qte-common_2.3.10.inc b/recipes/qte/qte-common_2.3.10.inc index 6f0b1344b3..f24a265bf0 100644 --- a/recipes/qte/qte-common_2.3.10.inc +++ b/recipes/qte/qte-common_2.3.10.inc @@ -116,8 +116,8 @@ do_configure() { > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'` sed -e 's,-linux-,-linux-gnueabi-,g' < $f \ > `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'` - sed -e 's,-linux-,-linux-uclibcgnueabi-,g' < $f \ - > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibcgnueabi-,'` + sed -e 's,-linux-,-linux-uclibceabi-,g' < $f \ + > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibceabi-,'` done echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qte failed. EXTRA_OECONF was ${EXTRA_OECONF}" } diff --git a/recipes/samba/samba_3.0.34.bb b/recipes/samba/samba_3.0.34.bb index d43c50dcdb..5ef9da5bb0 100644 --- a/recipes/samba/samba_3.0.34.bb +++ b/recipes/samba/samba_3.0.34.bb @@ -4,7 +4,7 @@ require samba-basic.inc SRC_URI += "file://configure.patch;patch=1 \ " SRC_URI_append_linux-uclibc = "file://uclibc-strlcpy-strlcat.patch;patch=1" -SRC_URI_append_linux-uclibcgnueabi = "file://uclibc-strlcpy-strlcat.patch;patch=1" +SRC_URI_append_linux-uclibceabi = "file://uclibc-strlcpy-strlcat.patch;patch=1" PR = "r5" diff --git a/recipes/tasks/task-sdk-bare.bb b/recipes/tasks/task-sdk-bare.bb index 85d362612f..9c78cfa45d 100644 --- a/recipes/tasks/task-sdk-bare.bb +++ b/recipes/tasks/task-sdk-bare.bb @@ -23,7 +23,7 @@ GLIBC_PKGS = "\ LIBC_PKGS_linux = "${GLIBC_PKGS}" LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}" LIBC_PKGS_linux-uclibc = "uclibc uclibc-dev uclibc-thread-db" -LIBC_PKGS_linux-uclibcgnueabi = "uclibc uclibc-dev uclibc-thread-db" +LIBC_PKGS_linux-uclibceabi = "uclibc uclibc-dev uclibc-thread-db" RDEPENDS_${PN} = "\ ${LIBC_PKGS} \ diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc index 2ed7d82378..88f62fa557 100644 --- a/recipes/uclibc/uclibc.inc +++ b/recipes/uclibc/uclibc.inc @@ -146,12 +146,13 @@ do_configure() { sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config - if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then - echo "CONFIG_ARM_EABI=y" >> ${S}/.config - else - echo "# CONFIG_ARM_EABI is not set" >> ${S}/.config + if [ `echo ${TARGET_ARCH} | grep -e '^arm'` ]; then + if [ `echo ${TARGET_OS} | grep -e 'eabi$'` ]; then + echo "CONFIG_ARM_EABI=y" >> ${S}/.config + else + echo "# CONFIG_ARM_EABI is not set" >> ${S}/.config + fi fi - yes '' | oe_runmake oldconfig } diff --git a/recipes/util-linux-ng/util-linux-ng_2.14.bb b/recipes/util-linux-ng/util-linux-ng_2.14.bb index d7eafd3602..7385324fdb 100644 --- a/recipes/util-linux-ng/util-linux-ng_2.14.bb +++ b/recipes/util-linux-ng/util-linux-ng_2.14.bb @@ -6,6 +6,6 @@ SRC_URI += "file://util-linux-ng-uclibc-versionsort.patch;patch=1 \ file://util-linux-ng-replace-siginterrupt.patch;patch=1 \ " LDFLAGS_append_linux-uclibc = " -lintl" -LDFLAGS_append_linux-uclibcgnueabi = " -lintl " +LDFLAGS_append_linux-uclibceabi = " -lintl " LDFLAGS_append_uclinux-uclibc = " -lintl" -- cgit 1.2.3-korg