Changes in / [bfa4ffa:73d8600] in mainline

Files:

• .bzrignore (modified) (7 diffs)
• contrib/qemu/build-from-scratch.sh (modified) (3 diffs)
• contrib/qemu/integratorcm_init_memsz.patch (added)

.bzrignore

@@ -7 +7 @@
 *.so.*
 Makefile.depend
-Makefile.ag.depend
 Makefile.common
 Makefile.config
@@ -81 +80 @@
 uspace/app/trace/trace
 uspace/app/usbinfo/usbinfo
-uspace/app/vcalc/vcalc
 uspace/app/vdemo/vdemo
 uspace/app/vlaunch/images.c
@@ -143 +141 @@
 uspace/dist/app/trace
 uspace/dist/app/usbinfo
-uspace/dist/app/vcalc
 uspace/dist/app/vdemo
 uspace/dist/app/vlaunch
@@ -184 +181 @@
 uspace/dist/drv/vhc/
 uspace/dist/drv/xtkbd/
-uspace/dist/drv/atkbd/
 uspace/dist/srv/apic
 uspace/dist/srv/cdfs
@@ -237 +233 @@
 uspace/drv/char/ps2mouse/ps2mouse
 uspace/drv/char/xtkbd/xtkbd
-uspace/drv/char/atkbd/atkbd
 uspace/drv/fb/kfb/kfb
 uspace/drv/root/root/root
@@ -341 +336 @@
 kernel/arch/ia32/include/arch/context_struct.h
 kernel/arch/ia32/include/arch/istate_struct.h
-kernel/arch/ia32/include/arch/boot/memmap_struct.h
 kernel/arch/ppc32/include/arch/context_struct.h
 kernel/arch/ppc32/include/arch/fpu_context_struct.h
@@ -352 +346 @@
 kernel/arch/ia64/include/arch/context_struct.h
 kernel/arch/ia64/include/arch/istate_struct.h
-kernel/genarch/include/genarch/multiboot/multiboot_info_struct.h
-kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.h
 uspace/lib/c/arch/sparc64/include/libarch/fibril_context.h
 uspace/lib/c/arch/sparc64/include/libarch/istate_struct.h

contrib/qemu/build-from-scratch.sh

@@ -29 +29 @@
 #
 
-VERSION=2.8.0
+VERSION=2.7.0
 BASENAME=qemu-${VERSION}
 BASENAME_MASTER=qemu-master
@@ -36 +36 @@
 URL=http://wiki.qemu-project.org/download/${TARBALL}
 REPO=git://git.qemu.org/qemu.git
-MD5="17940dce063b6ce450a12e719a6c9c43"
+MD5="08d4d06d1cb598efecd796137f4844ab"
 
 if [ "$1" == "--master" ]; then
@@ -53 +53 @@
         tar xvfj ${TARBALL}
         cd ${SOURCEDIR}
+        patch -p 1 <../integratorcm_init_memsz.patch
 fi
 
-./configure --target-list=i386-softmmu,x86_64-softmmu,arm-softmmu,ppc-softmmu,sparc64-softmmu,mips-softmmu,mipsel-softmmu --audio-drv-list=pa
+./configure --target-list=i386-softmmu,x86_64-softmmu,arm-softmmu,ppc-softmmu,sparc-softmmu,sparc64-softmmu,mips-softmmu,mipsel-softmmu --audio-drv-list=pa
 make -j 4
 sudo make install