From: Waldemar Kozaczuk <[email protected]> Committer: Nadav Har'El <[email protected]> Branch: master
external x64: remove misc.bin In essence this patch removes some obsolete libraries from java-base manifest, changes libz module to pull libz.so.1 from host and eliminates unneeded dependency on fonts app. It also removes external/x64/misc.bin module. References #743 Signed-off-by: Waldemar Kozaczuk <[email protected]> Message-Id: <[email protected]> --- diff --git a/.gitmodules b/.gitmodules --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,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 --- a/Makefile +++ b/Makefile @@ -1926,8 +1926,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 gccbase="$$olddir"/$(gccbase) \ - -D miscbase="$$olddir"/$(miscbase), MKBOOTFS $@) + -D gccbase="$$olddir"/$(gccbase), MKBOOTFS $@) $(out)/bootfs.o: $(out)/bootfs.bin $(out)/bootfs.o: ASFLAGS += -I$(out) diff --git a/modules/java-base/module.py b/modules/java-base/module.py --- 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 --- 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/.gitignore b/modules/libz/.gitignore --- a/modules/libz/.gitignore +++ b/modules/libz/.gitignore @@ -0,0 +1 @@ +usr.manifest diff --git a/modules/libz/Makefile b/modules/libz/Makefile --- a/modules/libz/Makefile +++ b/modules/libz/Makefile @@ -0,0 +1,4 @@ +# Take libz.so from the build machine and put it in the image. +libz = $(shell $(CC) -print-file-name=libz.so.1) +module: + echo /usr/lib/libz.so.1: $(libz) > usr.manifest diff --git a/modules/libz/usr.manifest b/modules/libz/usr.manifest --- a/modules/libz/usr.manifest +++ b/modules/libz/usr.manifest @@ -1 +0,0 @@ -/usr/lib/libz.so.1: %(miscbase)s/usr/lib64/libz.so.1 diff --git a/scripts/build b/scripts/build --- a/scripts/build +++ b/scripts/build @@ -171,7 +171,6 @@ modules=${vars[modules]-!$image} # TODO: some modules need these... Would be better if they wouldn't... gccbase=${vars[gccbase]-"$SRC"/external/$arch/gcc.bin} -miscbase=${vars[miscbase]-"$SRC"/external/$arch/misc.bin} case $OUT in /*) OSV_BUILD_PATH=$OUT;; @@ -268,15 +267,15 @@ zfs) if [ "$export" == "none" ] then - "$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D gccbase="$gccbase" -D miscbase="$miscbase" + "$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D gccbase="$gccbase" else export_dir=${vars[export_dir]-$SRC/build/export} - "$SRC"/scripts/export_manifest.py -e "$export_dir" -m usr.manifest -D gccbase="$gccbase" -D miscbase="$miscbase" + "$SRC"/scripts/export_manifest.py -e "$export_dir" -m usr.manifest -D gccbase="$gccbase" fi ;; rofs) rm -rf rofs.img - "$SRC"/scripts/gen-rofs-img.py -o rofs.img -m usr.manifest -D gccbase="$gccbase" -D miscbase="$miscbase" + "$SRC"/scripts/gen-rofs-img.py -o rofs.img -m usr.manifest -D gccbase="$gccbase" rofs_size=`stat --printf %s rofs.img` img_size=$((kernel_end + rofs_size)) cp loader.img bare.raw -- 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/000000000000e97f4c059cb79090%40google.com.
