This patch removes external/x64/misc.bin and any dependencies on it in manifest files.
In java-base case it turns out that both libraries - libjpeg and libexpat - are not needed to run java applications at least with those tested - java-example, jetty and tomcat. In case of libz this patch changes it to pull a version of it from the host. Refs #743 Signed-off-by: Waldemar Kozaczuk <[email protected]> --- .gitmodules | 4 ---- Makefile | 3 +-- external/x64/misc.bin | 1 - modules/java-base/module.py | 1 - modules/java-base/usr.manifest | 2 -- modules/libz/usr.manifest | 1 - scripts/build | 7 +++---- 7 files changed, 4 insertions(+), 15 deletions(-) delete mode 160000 external/x64/misc.bin delete mode 100644 modules/libz/usr.manifest diff --git a/.gitmodules b/.gitmodules index a9fc9c64..c16e4488 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,10 +10,6 @@ path = external/x64/acpica url = ../../cloudius-systems/acpica ignore = dirty -[submodule "external/x64/misc.bin"] - path = external/x64/misc.bin - url = ../../cloudius-systems/misc.bin.git - ignore = dirty [submodule "apps"] path = apps url = ../../cloudius-systems/osv-apps diff --git a/Makefile b/Makefile index 51f76cd6..b849a672 100644 --- a/Makefile +++ b/Makefile @@ -1938,8 +1938,7 @@ $(bootfs_manifest_dep): phony $(out)/bootfs.bin: scripts/mkbootfs.py $(bootfs_manifest) $(bootfs_manifest_dep) $(tools:%=$(out)/%) \ $(out)/zpool.so $(out)/zfs.so $(out)/libenviron.so $(out)/libvdso.so $(call quiet, olddir=`pwd`; cd $(out); "$$olddir"/scripts/mkbootfs.py -o bootfs.bin -d bootfs.bin.d -m "$$olddir"/$(bootfs_manifest) \ - -D jdkbase="$$olddir"/$(jdkbase) -D gccbase="$$olddir"/$(gccbase) \ - -D miscbase="$$olddir"/$(miscbase), MKBOOTFS $@) + -D jdkbase="$$olddir"/$(jdkbase) -D gccbase="$$olddir"/$(gccbase), MKBOOTFS $@) $(out)/bootfs.o: $(out)/bootfs.bin $(out)/bootfs.o: ASFLAGS += -I$(out) diff --git a/external/x64/misc.bin b/external/x64/misc.bin deleted file mode 160000 index bdb69d95..00000000 --- a/external/x64/misc.bin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bdb69d953f5daf2fe5d97954c77aaec768b01a0c diff --git a/modules/java-base/module.py b/modules/java-base/module.py index 3589a53b..f480736c 100644 --- a/modules/java-base/module.py +++ b/modules/java-base/module.py @@ -1,5 +1,4 @@ from osv.modules import api -api.require('fonts') api.require('ca-certificates') api.require('libz') diff --git a/modules/java-base/usr.manifest b/modules/java-base/usr.manifest index bb23a227..b7da9091 100644 --- a/modules/java-base/usr.manifest +++ b/modules/java-base/usr.manifest @@ -6,6 +6,4 @@ # [manifest] -/usr/lib/&/libexpat.so.1: %(miscbase)s/usr/lib64/& -/usr/lib/&/libjpeg.so.62: %(miscbase)s/usr/lib64/& /usr/lib/jni/monitor.so: ${MODULE_DIR}/obj/jni/monitor.so diff --git a/modules/libz/usr.manifest b/modules/libz/usr.manifest deleted file mode 100644 index 6ecb2936..00000000 --- a/modules/libz/usr.manifest +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 diff --git a/scripts/build b/scripts/build index 2a4ba957..bf8a69a1 100755 --- a/scripts/build +++ b/scripts/build @@ -172,7 +172,6 @@ modules=${vars[modules]-!$image} # TODO: some modules need these... Would be better if they wouldn't... jdkbase=${vars[jdkbase]-`find "$SRC"/external/$arch/openjdk.bin/usr/lib/jvm -maxdepth 1 -type d -name 'java*'`} gccbase=${vars[gccbase]-"$SRC"/external/$arch/gcc.bin} -miscbase=${vars[miscbase]-"$SRC"/external/$arch/misc.bin} case $OUT in /*) OSV_BUILD_PATH=$OUT;; @@ -269,15 +268,15 @@ zfs) if [ "$export" == "none" ] then - "$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase" + "$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" else export_dir=${vars[export_dir]-$SRC/build/export} - "$SRC"/scripts/export_manifest.py -e "$export_dir" -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase" + "$SRC"/scripts/export_manifest.py -e "$export_dir" -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" fi ;; rofs) rm -rf rofs.img - "$SRC"/scripts/gen-rofs-img.py -o rofs.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase" + "$SRC"/scripts/gen-rofs-img.py -o rofs.img -m usr.manifest -D jdkbase="$jdkbase" -D gccbase="$gccbase" rofs_size=`stat --printf %s rofs.img` img_size=$((kernel_end + rofs_size)) cp loader.img bare.raw -- 2.20.1 -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/osv-dev/20200116131237.13305-1-jwkozaczuk%40gmail.com.
