From 2f73680071ea2bcac668de793246ea6a19026fd6 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Fri, 22 Feb 2019 14:06:57 +0100 Subject: [PATCH] jdk: use depot for 'java.run' Build JVM using packets. issue #136 --- ports/jdk_generated.hash | 2 +- ports/jdk_generated.port | 2 +- recipes/pkg/{jdk_demo => jdk}/README | 0 recipes/pkg/{jdk_demo => jdk}/archives | 0 recipes/pkg/jdk/hash | 1 + recipes/pkg/{jdk_demo => jdk}/runtime | 0 recipes/pkg/jdk_demo/hash | 1 - recipes/src/jdk/hash | 2 +- run/java.run | 26 ++------------------------ 9 files changed, 6 insertions(+), 28 deletions(-) rename recipes/pkg/{jdk_demo => jdk}/README (100%) rename recipes/pkg/{jdk_demo => jdk}/archives (100%) create mode 100644 recipes/pkg/jdk/hash rename recipes/pkg/{jdk_demo => jdk}/runtime (100%) delete mode 100644 recipes/pkg/jdk_demo/hash diff --git a/ports/jdk_generated.hash b/ports/jdk_generated.hash index 2fd789e..c59dc41 100644 --- a/ports/jdk_generated.hash +++ b/ports/jdk_generated.hash @@ -1 +1 @@ -29aa37f2c68c1f10ed798f48b34bdccecdb6b942 +c8620b50778f4ef1fc1b7a2b2261b60354c717e4 diff --git a/ports/jdk_generated.port b/ports/jdk_generated.port index 0967605..5686812 100644 --- a/ports/jdk_generated.port +++ b/ports/jdk_generated.port @@ -3,7 +3,7 @@ VERSION := git DOWNLOADS := jdk_generated.git URL(jdk_generated) := https://github.com/ssumpf/jdk_generated.git -REV(jdk_generated) := 481deffcb4a346c36f15f3b26c44be0dcb356218 +REV(jdk_generated) := 59d6c38e37f47474ff2a90e4efbfdb2e370a4a36 DIR(jdk_generated) := src/app/jdk # vi: set ft=make : diff --git a/recipes/pkg/jdk_demo/README b/recipes/pkg/jdk/README similarity index 100% rename from recipes/pkg/jdk_demo/README rename to recipes/pkg/jdk/README diff --git a/recipes/pkg/jdk_demo/archives b/recipes/pkg/jdk/archives similarity index 100% rename from recipes/pkg/jdk_demo/archives rename to recipes/pkg/jdk/archives diff --git a/recipes/pkg/jdk/hash b/recipes/pkg/jdk/hash new file mode 100644 index 0000000..d84e0b9 --- /dev/null +++ b/recipes/pkg/jdk/hash @@ -0,0 +1 @@ +2019-02-22 0882aa1326188a75628e5a3dbcea18ab6f8fa156 diff --git a/recipes/pkg/jdk_demo/runtime b/recipes/pkg/jdk/runtime similarity index 100% rename from recipes/pkg/jdk_demo/runtime rename to recipes/pkg/jdk/runtime diff --git a/recipes/pkg/jdk_demo/hash b/recipes/pkg/jdk_demo/hash deleted file mode 100644 index 9e34aed..0000000 --- a/recipes/pkg/jdk_demo/hash +++ /dev/null @@ -1 +0,0 @@ -2018-11-27 a8076069a98b771ef9fa425c5877dd57b469db2e diff --git a/recipes/src/jdk/hash b/recipes/src/jdk/hash index d3db728..36c3091 100644 --- a/recipes/src/jdk/hash +++ b/recipes/src/jdk/hash @@ -1 +1 @@ -2018-11-27 fd32f8448204c238c784486ad632f23a42c4785b +2019-02-22 ece7f05f1a7efd65be4944a12dbecac92cd81793 diff --git a/run/java.run b/run/java.run index 4431238..7c28049 100644 --- a/run/java.run +++ b/run/java.run @@ -1,13 +1,13 @@ - set build_components { core init timer - app/jdk/java } build $build_components create_boot_directory +import_from_depot [depot_user]/pkg/jdk + set config { @@ -83,32 +83,10 @@ install_config $config set boot_modules { core init ld.lib.so timer - java jli.lib.so hello.tar - java.lib.so jvm.lib.so jzip.lib.so jimage.lib.so - libc.lib.so libm.lib.so libc_pipe.lib.so - zlib.lib.so nio.lib.so jnet.lib.so - vfs.lib.so stdcxx.lib.so - classes.tar tzdb.dat management.lib.so } - -# return jdk_generated port path -proc jdk_generated { } { - set ::env(MAKEFLAGS) s - set jdk_generated_path [exec [genode_dir]/tool/ports/current jdk_generated] - return $jdk_generated_path -} - -file copy -force [jdk_generated]/src/app/jdk/bin/classes.tar bin -file copy -force [jdk_generated]/src/app/jdk/bin/tzdb.dat bin -file copy -force [jdk_generated]/src/app/jdk/bin/hello.tar bin - build_boot_image $boot_modules append qemu_args " -nographic -serial mon:stdio " run_genode_until "child \"java\" exited with exit value 0" 60 - -file delete -force bin/classes.tar -file delete -force bin/tzdb.dat -file delete -force bin/hello.tar