diff options
| -rw-r--r-- | mk/build.mk | 11 | ||||
| -rw-r--r-- | target/config/Config.in | 31 | ||||
| -rw-r--r-- | target/packages/pkg-available/test | 8 |
3 files changed, 34 insertions, 16 deletions
diff --git a/mk/build.mk b/mk/build.mk index 2d4523e75..37f27b12b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -389,6 +389,12 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi + @if [ ! -z "$(COLLECTION)" ];then \ + grep -h "^config" target/packages/pkg-available/* \ + |grep -i "$(COLLECTION)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/.defconfig; \ + fi @if [ ! -z "$(PKG)" ];then \ grep "^config" target/config/Config.in \ |grep -i "$(PKG)" \ @@ -556,9 +562,10 @@ test-framework: mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ for arch in arm mips mipsel x86 x86_64;do \ - echo === building qemu-$$arch for $$libc on $$(date); \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive defconfig; \ + $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ done; \ 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" 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. |