diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:49:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:49:43 +0100 |
| commit | 1fbe897e9990647a234e92e68cb709c42ac3f558 (patch) | |
| tree | 1dc0e917ab249c013defbf1e6b904e756968c30d /mk | |
| parent | eadad3e1d3a9163b2c9255db528c2fd0eab73d32 (diff) | |
| parent | a6bd08a675d42aca175f5b1cdc281c8f07fca497 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 13 | ||||
| -rw-r--r-- | mk/mirrors.mk | 13 | ||||
| -rw-r--r-- | mk/rootfs.mk | 3 |
3 files changed, 16 insertions, 13 deletions
diff --git a/mk/build.mk b/mk/build.mk index 0da34de85..66472657a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -507,15 +507,15 @@ bulktoolchain: done test-framework: - if [ -z "$(LIBC)" ];then \ + @if [ -z "$(LIBC)" ];then \ libc="glibc uclibc musl"; \ else \ libc="$(LIBC)"; \ fi; \ for libc in $$libc;do \ ( \ - for arch in arm microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \ - tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#"); \ + for arch in arm armhf microblaze microblazeel mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc sparc64 i686 x86_64;do \ + tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##"); \ 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; \ @@ -523,12 +523,11 @@ test-framework: tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ if [ -d root ];then rm -rf root;fi; \ - echo cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ cp -a root_qemu_$${arch}_$${libc}$${abi} root; \ - mkdir -p $(TOPDIR)/firmware/qemu/$$tarch; \ - tar cJvf $(TOPDIR)/firmware/qemu/$$tarch/root.tar.xz root; \ + mkdir -p $(TOPDIR)/firmware/qemu/$$arch; \ + tar cJvf $(TOPDIR)/firmware/qemu/$$arch/root.tar.xz root; \ cp $(TOPDIR)/firmware/qemu_$${arch}_$${libc}$${abi}/qemu-$${arch}-archive-kernel \ - $(TOPDIR)/firmware/qemu/$$tarch/kernel; \ + $(TOPDIR)/firmware/qemu/$$arch/kernel; \ rm .config; \ done; \ ) 2>&1 | tee $(TOPDIR)/firmware/test-framework-build.log; \ diff --git a/mk/mirrors.mk b/mk/mirrors.mk index 4de2fdded..ab7349288 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -15,12 +15,19 @@ MASTER_SITE_KERNEL?= \ http://www.kernel.org/pub/linux/ \ MASTER_SITE_XORG?= \ - http://www.x.org/releases/X11R7.7/src/everything/ \ - http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \ - http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \ + http://www.x.org/releases/individual/xserver/ \ + http://www.x.org/releases/individual/proto/ \ + http://www.x.org/releases/individual/app/ \ + http://www.x.org/releases/individual/xcb/ \ + http://www.x.org/releases/individual/lib/ \ + http://www.x.org/releases/individual/driver/ \ + http://www.x.org/releases/individual/util/ \ http://xorg.freedesktop.org/releases/individual/app/ \ http://xorg.freedesktop.org/releases/individual/lib/ \ http://xorg.freedesktop.org/releases/individual/driver/ \ + http://www.x.org/releases/X11R7.7/src/everything/ \ + http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \ + http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \ MASTER_SITE_GNU?= \ http://ftp.gnu.org/gnu/ \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 55830b23c..812c90680 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -10,9 +10,6 @@ endef ifeq ($(ADK_HARDWARE_QEMU),y) MTDDEV:= root=/dev/mtdblock0 -ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) -ROOTFS:= root=/dev/sda1 -endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) ROOTFS:= root=/dev/vda1 endif |