From bc6ae3bd97162e25aff366acabbf80f096ccd8b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 10:35:12 +0100 Subject: goodbye eglibc, see my blog http://blog.waldemar-brodkorb.de/ --- target/arm/sys-available/keyasic-ka2000 | 4 ++-- target/config/Config.in | 37 +++++-------------------------- target/config/Config.in.tools | 4 ---- target/packages/pkg-available/development | 1 - 4 files changed, 8 insertions(+), 38 deletions(-) (limited to 'target') diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000 index 3c9573ebe..36434269c 100644 --- a/target/arm/sys-available/keyasic-ka2000 +++ b/target/arm/sys-available/keyasic-ka2000 @@ -7,8 +7,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000 select ADK_EABI select ADK_CPU_ARM926EJ_S select ADK_TOOLCHAIN - select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL - select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL + select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL + select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL help KeyASIC KA2000 aka Transcend WifiSD. Build a toolchain only and make all binaries static. diff --git a/target/config/Config.in b/target/config/Config.in index 2982fd088..d001826c6 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -622,9 +622,6 @@ config ADK_TARGET_CMDLINE config ADK_uclibc boolean -config ADK_eglibc - boolean - config ADK_glibc boolean @@ -637,7 +634,6 @@ config ADK_libc config ADK_TARGET_LIBC string default "uclibc" if ADK_uclibc - default "eglibc" if ADK_eglibc default "glibc" if ADK_glibc default "musl" if ADK_musl default "libc" if ADK_libc @@ -659,27 +655,6 @@ config ADK_TARGET_LIB_UCLIBC help http://uclibc.org -config ADK_TARGET_LIB_EGLIBC - prompt "Embedded GNU C library" - boolean - select ADK_eglibc - select ADK_HOST_NEED_GPERF - depends on \ - ADK_LINUX_ARM || \ - ADK_LINUX_ARMEB || \ - ADK_LINUX_M68K || \ - ADK_LINUX_MICROBLAZE || \ - ADK_LINUX_MIPS || \ - ADK_LINUX_PPC || \ - ADK_LINUX_PPC64 || \ - ADK_LINUX_SH || \ - ADK_LINUX_SPARC || \ - ADK_LINUX_SPARC64 || \ - ADK_LINUX_X86 || \ - ADK_LINUX_X86_64 - help - http://www.eglibc.org - config ADK_TARGET_LIB_GLIBC prompt "GNU C library" boolean @@ -725,12 +700,12 @@ endchoice config ADK_TARGET_SUFFIX string - default "gnueabihf" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABIHF - default "gnueabi" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABI - default "gnuabi64" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n64 - default "gnuabin32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n32 - default "gnuabi32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_o32 - default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI + default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF + default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI + default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 + default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 + default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 + default "gnu" if ADK_TARGET_LIB_GLIBC && !ADK_EABI default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index cf92eadee..d863179b8 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -6,10 +6,6 @@ config ADK_HOST_NEED_SYSLINUX boolean default n -config ADK_HOST_NEED_GPERF - boolean - default n - config ADK_HOST_NEED_SQUASHFS boolean default n diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 6da3a5564..b4a9bff9f 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -13,7 +13,6 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_TAR select ADK_PACKAGE_MUSL_DEV if ADK_TARGET_LIB_MUSL select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC - select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC select ADK_PACKAGE_LIBNCURSES select ADK_PACKAGE_LIBNCURSES_DEV -- cgit v1.2.3 From b6a661c63978689f7c70274159f1ce0318e4c28b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 15:10:04 +0100 Subject: rework suffix naming, use unique names for all arch abi combinations --- target/config/Config.in | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index d001826c6..c8e566cc8 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -702,25 +702,28 @@ config ADK_TARGET_SUFFIX string default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI - default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 - default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 - default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 - default "gnu" if ADK_TARGET_LIB_GLIBC && !ADK_EABI + default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64 + default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64 + default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64 + default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64 + default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64 + default "gnu" if ADK_TARGET_LIB_GLIBC default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI - default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 - default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 - default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 - default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI + default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64 + default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64 + default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64 + default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64 + default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64 + default "uclibc" if ADK_TARGET_LIB_UCLIBC default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI - default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 - default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 - default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 + default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64 + default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64 + default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64 + default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_TARGET_KERNEL64 + default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64 default "musl" if ADK_TARGET_LIB_MUSL - default "32" if ADK_32 - default "x32" if ADK_x32 - default "gnu" choice prompt "Target firmware type" -- cgit v1.2.3 From 9e32d91c27e484f868d263cb757c56df50ebdb66 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 15:10:20 +0100 Subject: some fixes for test-framework target --- target/packages/pkg-available/test | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 target/packages/pkg-available/test (limited to 'target') diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test new file mode 100644 index 000000000..8af24a816 --- /dev/null +++ b/target/packages/pkg-available/test @@ -0,0 +1,8 @@ +config ADK_PKG_TEST + bool "Compile a ADK test framework system" + default n + select ADK_PACKAGE_STRACE + select ADK_PACKAGE_SOCAT + help + Package collection used to build adk-test-framework root + filesystem. -- cgit v1.2.3 From beb47ef07ddcd99d751088c588bc8135f6aae7ce Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Mar 2014 07:41:20 +0100 Subject: only strip toolchain and target dirs for ADK_TOOLCHAIN --- target/packages/pkg-available/test | 1 + 1 file changed, 1 insertion(+) (limited to 'target') diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index 8af24a816..d7bbcf26a 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -3,6 +3,7 @@ config ADK_PKG_TEST default n select ADK_PACKAGE_STRACE select ADK_PACKAGE_SOCAT + select ADK_PACKAGE_MAKE help Package collection used to build adk-test-framework root filesystem. -- cgit v1.2.3