References #743
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
.gitmodules | 4 ----
Makefile | 3 +--
modules/java-base/module.py | 1 -
modules/java-base/usr.manifest | 2 --
modules/libz/.gitignore | 1 +
modules/libz/Makefile | 4 ++++
modules/libz/usr.manifest | 1 -
scripts/build | 7 +++----
8 files changed, 9 insertions(+), 14 deletions(-)
create mode 100644 modules/libz/.gitignore
create mode 100644 modules/libz/Makefile
delete mode 100644 modules/libz/usr.manifest
diff --git a/.gitmodules b/.gitmodules
index 8244a0e7..a7588448 100644
--- 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
index a4b000d6..76ee8e43 100644
--- 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
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/.gitignore b/modules/libz/.gitignore
new file mode 100644
index 00000000..f9235a6b
--- /dev/null
+++ b/modules/libz/.gitignore
@@ -0,0 +1 @@
+usr.manifest
diff --git a/modules/libz/Makefile b/modules/libz/Makefile
new file mode 100644
index 00000000..8d077a10
--- /dev/null
+++ 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
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 b72a8d67..1fa11b0f 100755
--- 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
--
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 osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/20200121052350.13896-2-jwkozaczuk%40gmail.com.
