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 --- mk/build.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mk') 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; \ -- cgit v1.2.3 From 00fa581bc6acc3158b3008019e81802a5d70418c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 15:22:50 +0100 Subject: remove REAL_GNU_TARGET_NAME, it is a relict from buildroot days, I do not know why this is required. the names are not unique between arch with different abi --- mk/vars.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index ef50e59d8..3798757bc 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -49,11 +49,9 @@ TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bi HOST_PATH= ${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH} AUTOTOOL_PATH= ${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} ifeq ($(ADK_TARGET_ABI_X32),y) -REAL_GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux else -REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) -GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux +GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) endif ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),) @@ -67,7 +65,7 @@ TARGET_CROSS:= TARGET_COMPILER_PREFIX?= CONFIGURE_TRIPLE:= else -TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)- +TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME} endif -- 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 --- mk/build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 37f27b12b..8c1e73743 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -561,8 +561,8 @@ test-framework: for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ - for arch in arm mips mipsel x86 x86_64;do \ - tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#"); \ + for arch in arm mips mipsel i686 x86_64;do \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=archive COLLECTION=test defconfig; \ -- cgit v1.2.3 From b8baf73967b23844f8a15a9a58f0fb623a95d4f1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Mar 2014 08:37:34 +0100 Subject: do not put the intermediate file into firmware dir --- mk/image.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 3f199c9cc..ec61ff374 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -145,7 +145,7 @@ ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR} sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@ -${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR} +${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR} $(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \ ${TARGET_DIR}/ >$@ ( \ @@ -159,8 +159,8 @@ ${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR} echo "nod /dev/ram 0655 0 0 b 1 1"; \ ) >>$@ -${FW_DIR}/${INITRAMFS}: ${FW_DIR}/${INITRAMFS}_list - ${LINUX_DIR}/usr/gen_init_cpio ${FW_DIR}/${INITRAMFS}_list | \ +${FW_DIR}/${INITRAMFS}: ${STAGING_TARGET_DIR}/${INITRAMFS}_list + ${LINUX_DIR}/usr/gen_init_cpio ${STAGING_TARGET_DIR}/${INITRAMFS}_list | \ ${ADK_COMPRESSION_TOOL} -c >$@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} @@ -172,13 +172,13 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) -createinitramfs: ${FW_DIR}/${INITRAMFS}_list +createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list ${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \ ${LINUX_DIR}/.config ( \ echo "CONFIG_BLK_DEV_INITRD=y"; \ echo "CONFIG_ACPI_INITRD_TABLE_OVERRIDE=n"; \ - echo 'CONFIG_INITRAMFS_SOURCE="${FW_DIR}/${INITRAMFS}_list"'; \ + echo 'CONFIG_INITRAMFS_SOURCE="${STAGING_TARGET_DIR}/${INITRAMFS}_list"'; \ echo '# CONFIG_INITRAMFS_COMPRESSION_NONE is not set'; \ echo 'CONFIG_INITRAMFS_ROOT_UID=0'; \ echo 'CONFIG_INITRAMFS_ROOT_GID=0'; \ -- cgit v1.2.3 From 7d2b38ba6e51a5da5250ef394b9fe69a72783459 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 17:47:21 +0100 Subject: fix qemu-ppc64 building on Darwin, use --with-cpu=ultrasparc for qemu-sparc64, still another issue exist. --- mk/build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 8c1e73743..ce0f88ae0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -561,7 +561,7 @@ test-framework: for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ - for arch in arm mips mipsel i686 x86_64;do \ + for arch in arm mips mipsel mips64 mips64el ppc ppc64 sparc sparc64 i686 x86_64;do \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ -- cgit v1.2.3 From 8742eed1875b53d62216f03f132cea48fa61dec5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 18:16:33 +0100 Subject: remove visible parts of guiconfig, I don't like it, don't wanna support it --- mk/build.mk | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index ce0f88ae0..8efd7becc 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -80,7 +80,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ - guiconfig \ _config \ _mconfig \ distclean \ @@ -506,15 +505,6 @@ menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -guiconfig: $(CONFIG)/gconf defconfig .menu package/Config.in.auto - @${BASH} ${TOPDIR}/scripts/update-sys - @${BASH} ${TOPDIR}/scripts/update-pkg - @if [ ! -f .config ];then \ - $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ - fi - @$(CONFIG)/gconf $(CONFIG_CONFIG_IN) - ${POSTCONFIG} - _config: $(CONFIG)/conf .menu package/Config.in.auto -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) -- cgit v1.2.3