oasis

commit: 5a1e8ee09062969521dee5609d144ecf727805e1
parent f213892dd19dcea59c4ae6b6b3a1c324bff424fb
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 18 Mar 2019 13:24:28 -0700

tinyemu: Update to 2019-02-10

Diffstat:
M
pkg/tinyemu/.gitignore
3
+--
M
pkg/tinyemu/gen.lua
3
++-
D
pkg/tinyemu/patch/0001-Include-sys-select.h-from-virtio.h-for-fd_set.patch
25
-------------------------
D
pkg/tinyemu/patch/0002-Fix-ram-size-2048-MiB.patch
39
---------------------------------------
M
pkg/tinyemu/sha256
2
+-
M
pkg/tinyemu/url
2
+-
M
pkg/tinyemu/ver
2
+-

7 files changed, 6 insertions(+), 70 deletions(-)
diff --git a/pkg/tinyemu/.gitignore b/pkg/tinyemu/.gitignore
@@ -1,2 +1,2 @@
 /src
-/tinyemu-2018-09-23.tar.gz
-\ No newline at end of file
+/tinyemu-2019-02-10.tar.gz
diff --git a/pkg/tinyemu/gen.lua b/pkg/tinyemu/gen.lua
@@ -3,7 +3,8 @@ cflags{
 	'-D CONFIG_FS_NET',
 	'-D CONFIG_RISCV_MAX_XLEN=64',
 	'-D CONFIG_SLIRP',
-	[[-D 'CONFIG_VERSION="2018-09-23"']],
+	'-D CONFIG_X86EMU',
+	[[-D 'CONFIG_VERSION="2019-02-10"']],
 	'-I $builddir/pkg/curl/include',
 	'-I $builddir/pkg/libressl/include',
 }
diff --git a/pkg/tinyemu/patch/0001-Include-sys-select.h-from-virtio.h-for-fd_set.patch b/pkg/tinyemu/patch/0001-Include-sys-select.h-from-virtio.h-for-fd_set.patch
@@ -1,25 +0,0 @@
-From 262d679517a8867f38e15369414a6cabe897ccb1 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 17 Oct 2018 16:48:16 -0700
-Subject: [PATCH] Include sys/select.h from virtio.h for fd_set
-
----
- virtio.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/virtio.h b/virtio.h
-index 92b1070..d53c8c4 100644
---- a/virtio.h
-+++ b/virtio.h
-@@ -24,6 +24,8 @@
- #ifndef VIRTIO_H
- #define VIRTIO_H
- 
-+#include <sys/select.h>
-+
- #include "iomem.h"
- #include "pci.h"
- 
--- 
-2.19.0
-
diff --git a/pkg/tinyemu/patch/0002-Fix-ram-size-2048-MiB.patch b/pkg/tinyemu/patch/0002-Fix-ram-size-2048-MiB.patch
@@ -1,39 +0,0 @@
-From 2554a4ba54ce78fd3c568bb74bdaa626935dc152 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Wed, 17 Oct 2018 16:49:06 -0700
-Subject: [PATCH] Fix ram size >= 2048 MiB
-
----
- machine.c | 2 +-
- temu.c    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/machine.c b/machine.c
-index eab92b4..bc8edac 100644
---- a/machine.c
-+++ b/machine.c
-@@ -260,7 +260,7 @@ static int virt_machine_parse_config(VirtMachineParams *p,
-     tag_name = "memory_size";
-     if (vm_get_int(cfg, tag_name, &val) < 0)
-         goto tag_fail;
--    p->ram_size = val << 20;
-+    p->ram_size = (uint64_t)val << 20;
-     
-     tag_name = "bios";
-     if (vm_get_str_opt(cfg, tag_name, &str) < 0)
-diff --git a/temu.c b/temu.c
-index e8886ff..a5eba31 100644
---- a/temu.c
-+++ b/temu.c
-@@ -719,7 +719,7 @@ int main(int argc, char **argv)
-     /* override some config parameters */
- 
-     if (ram_size > 0) {
--        p->ram_size = ram_size << 20;
-+        p->ram_size = (uint64_t)ram_size << 20;
-     }
-     if (accel_enable != -1)
-         p->accel_enable = accel_enable;
--- 
-2.19.0
-
diff --git a/pkg/tinyemu/sha256 b/pkg/tinyemu/sha256
@@ -1 +1 @@
-9b58d5521df8356c3be09a520387d3e4adcb510cf8d2fd6bdd971287bd57d734  tinyemu-2018-09-23.tar.gz
+0a2ded13a51bc3d6e69afd29c6a4709b327256ea36e562a5d9fa253cd224fa5b  tinyemu-2019-02-10.tar.gz
diff --git a/pkg/tinyemu/url b/pkg/tinyemu/url
@@ -1 +1 @@
-url = "https://bellard.org/tinyemu/tinyemu-2018-09-23.tar.gz"
+url = "https://bellard.org/tinyemu/tinyemu-2019-02-10.tar.gz"
diff --git a/pkg/tinyemu/ver b/pkg/tinyemu/ver
@@ -1 +1 @@
-20180923 r0
+20190210 r0