From 7e7d05ccc3064aaef5969e8d50c06ce86a03b6f9 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Sun, 3 Sep 2017 22:28:50 +0200 Subject: [PATCH 1/7] newlib: lstat, dup, dup2, getrusage and setjmp/longjmp --- cross/pkgs/newlib/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/pkgs/newlib/src b/cross/pkgs/newlib/src index bae05fe..7928dac 160000 --- a/cross/pkgs/newlib/src +++ b/cross/pkgs/newlib/src @@ -1 +1 @@ -Subproject commit bae05fec4e6f51181a47798030abd942477142fa +Subproject commit 7928dac6c679dcf4ca883501067c3ad59ecf6a3d From c67d96c26244a4ddb663a77c7b52a3543923f9b4 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Sun, 3 Sep 2017 23:58:59 +0200 Subject: [PATCH 2/7] newlib: add readlink and readlinkat --- cross/pkgs/newlib/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/pkgs/newlib/src b/cross/pkgs/newlib/src index 7928dac..9e4ae4b 160000 --- a/cross/pkgs/newlib/src +++ b/cross/pkgs/newlib/src @@ -1 +1 @@ -Subproject commit 7928dac6c679dcf4ca883501067c3ad59ecf6a3d +Subproject commit 9e4ae4bc971ae259d69a16a60fe67b3dd722828e From 39de8b385117b2cf192356eeca7e9fda14e92c5a Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Mon, 4 Sep 2017 00:01:03 +0200 Subject: [PATCH 3/7] mksh: no need for MKSH_NO_SIGSETJMP --- cross/pkgs/mksh/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/pkgs/mksh/src b/cross/pkgs/mksh/src index af47ee8..ff16a6d 160000 --- a/cross/pkgs/mksh/src +++ b/cross/pkgs/mksh/src @@ -1 +1 @@ -Subproject commit af47ee8d8e192240698959d418840cb9d8a8f645 +Subproject commit ff16a6d4fc14ad833764e008369b96a6fadf7c6f From e286892bf9828801c42b36748e219ccbfa8d0a4f Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Mon, 4 Sep 2017 22:56:36 +0200 Subject: [PATCH 4/7] fix #4 (really): use -device and -netdev options instead of -redir The correct arguments to qemu are -netdev user,id=ethernet.0,hostfwd=tcp::5555-:1522,hostfwd=tcp::9999-:9,hostfwd=tcp::17010-:17010,hostfwd=tcp::17013-:17013 to forward several host ports to the guests ports on ethernet.0 -device rtl8139,netdev=ethernet.0 to define the emulated hardware of ethernet.0 They are both required and the netdev's value of the -device option must match the id's value of the -netdev option. --- QA.sh | 8 ++------ runDisk.sh | 8 ++------ runOver9P.sh | 10 ++++------ 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/QA.sh b/QA.sh index 4e67f6c..8132dd1 100755 --- a/QA.sh +++ b/QA.sh @@ -66,12 +66,8 @@ $kvmdo qemu-system-x86_64 -s -cpu $CPU_MODEL -smp $NCPU -m 2048 $kvmflag \ --monitor /dev/null \ --machine $machineflag \ $bootDisk \ --net nic,model=rtl8139 \ --net user,hostfwd=tcp::5555-:1522 \ --net dump,file=/tmp/vm0.pcap \ --netdev user,id=tcp9,hostfwd=tcp::9999-:9 \ --netdev user,id=tcp17010,hostfwd=tcp::17010-:17010 \ --netdev user,id=tcp17013,hostfwd=tcp::17013-:17013 \ +-netdev user,id=ethernet.0,hostfwd=tcp::5555-:1522,hostfwd=tcp::9999-:9,hostfwd=tcp::17010-:17010,hostfwd=tcp::17013-:17013 \ +-device rtl8139,netdev=ethernet.0 \ $appendLine $kernelLine EOF diff --git a/runDisk.sh b/runDisk.sh index 5ca3b2a..3556894 100755 --- a/runDisk.sh +++ b/runDisk.sh @@ -58,12 +58,8 @@ $kvmdo qemu-system-x86_64 -s -cpu Haswell -smp $NCPU -m 2048 $kvmflag \ -no-reboot -serial mon:stdio \ --machine $machineflag \ $bootDisk \ --net nic,model=rtl8139 \ --net user,hostfwd=tcp::5555-:1522 \ --net dump,file=/tmp/vm0.pcap \ --netdev user,id=tcp9,hostfwd=tcp::9999-:9 \ --netdev user,id=tcp17010,hostfwd=tcp::17010-:17010 \ --netdev user,id=tcp17013,hostfwd=tcp::17013-:17013 +-netdev user,id=ethernet.0,hostfwd=tcp::5555-:1522,hostfwd=tcp::9999-:9,hostfwd=tcp::17010-:17010,hostfwd=tcp::17013-:17013 \ +-device rtl8139,netdev=ethernet.0 EOF # To enable qemu log: diff --git a/runOver9P.sh b/runOver9P.sh index 4fb44b0..e5b0bf9 100755 --- a/runOver9P.sh +++ b/runOver9P.sh @@ -58,12 +58,8 @@ $kvmdo qemu-system-x86_64 -s -cpu Haswell -smp $NCPU -m 2048 $kvmflag \ -no-reboot -serial mon:stdio \ --machine $machineflag \ $bootDisk \ --net nic,model=rtl8139 \ --net user,hostfwd=tcp::5555-:1522 \ --net dump,file=/tmp/vm0.pcap \ --netdev user,id=tcp9,hostfwd=tcp::9999-:9 \ --netdev user,id=tcp17010,hostfwd=tcp::17010-:17010 \ --netdev user,id=tcp17013,hostfwd=tcp::17013-:17013 \ +-netdev user,id=ethernet.0,hostfwd=tcp::5555-:1522,hostfwd=tcp::9999-:9,hostfwd=tcp::17010-:17010,hostfwd=tcp::17013-:17013 \ +-device rtl8139,netdev=ethernet.0 \ $usbDev \ -append "maxcores=1024 nvram=$NVRAM nvrlen=512 nvroff=0 console=0 qemu-user=$QEMU_USER *acpi= $FS $KAPPEND" \ -initrd ./initrd \ @@ -73,6 +69,8 @@ EOF # To enable qemu log: #-D $JEHANNE/../qemu.log -d int,cpu_reset,in_asm \ +#-net dump,file=/tmp/vm0.pcap \ + echo $cmd eval $cmd From ba50776c9078775bbe292b65a722ede833933766 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Wed, 6 Sep 2017 23:03:27 +0200 Subject: [PATCH 5/7] newlib: add umask, chmod and fchmodat --- cross/pkgs/newlib/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/pkgs/newlib/src b/cross/pkgs/newlib/src index 9e4ae4b..dc3e8f8 160000 --- a/cross/pkgs/newlib/src +++ b/cross/pkgs/newlib/src @@ -1 +1 @@ -Subproject commit 9e4ae4bc971ae259d69a16a60fe67b3dd722828e +Subproject commit dc3e8f850e0d0d39170e2b6edb31df50db5ed068 From 5384da007aff05b4b783126e4cb152a726817911 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Thu, 7 Sep 2017 23:35:48 +0200 Subject: [PATCH 6/7] newlib: add rename and getpgid --- cross/pkgs/newlib/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/pkgs/newlib/src b/cross/pkgs/newlib/src index dc3e8f8..cb02879 160000 --- a/cross/pkgs/newlib/src +++ b/cross/pkgs/newlib/src @@ -1 +1 @@ -Subproject commit dc3e8f850e0d0d39170e2b6edb31df50db5ed068 +Subproject commit cb02879013de4aef03460a5a7cffcba516eef295 From d4017ca6a9573633225c57dd0d313a540351a2c9 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Thu, 7 Sep 2017 23:36:46 +0200 Subject: [PATCH 7/7] mksh: define MKSH__NO_SYMLINK since Jehanne does not support them --- cross/pkgs/mksh/src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cross/pkgs/mksh/src b/cross/pkgs/mksh/src index ff16a6d..8debd3a 160000 --- a/cross/pkgs/mksh/src +++ b/cross/pkgs/mksh/src @@ -1 +1 @@ -Subproject commit ff16a6d4fc14ad833764e008369b96a6fadf7c6f +Subproject commit 8debd3a2024a5733b8b4688f94399b4e1ff87df0