From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master
externals: eliminate unused glibcbase build parameter
References #743
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,6 @@ local-includes =
INCLUDES = $(local-includes) -Iarch/$(arch) -I. -Iinclude -Iarch/common
INCLUDES += -isystem include/glibc-compat
-glibcbase = external/$(arch)/glibc.bin
gccbase = external/$(arch)/gcc.bin
miscbase = external/$(arch)/misc.bin
jdkbase := $(shell find external/$(arch)/openjdk.bin/usr/lib/jvm \
@@ -1941,8 +1940,8 @@ $(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 \
- glibcbase="$$olddir"/$(glibcbase) -D miscbase="$$olddir"/$(miscbase),
MKBOOTFS $@)
+ -D jdkbase="$$olddir"/$(jdkbase) -D
gccbase="$$olddir"/$(gccbase) \
+ -D miscbase="$$olddir"/$(miscbase), MKBOOTFS $@)
$(out)/bootfs.o: $(out)/bootfs.bin
$(out)/bootfs.o: ASFLAGS += -I$(out)
diff --git a/scripts/build b/scripts/build
--- 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}
-glibcbase=${vars[glibcbase]-"$SRC"/external/$arch/glibc.bin}
miscbase=${vars[miscbase]-"$SRC"/external/$arch/misc.bin}
case $OUT in
@@ -270,15 +269,15 @@ zfs)
if [ "$export" == "none" ]
then
- "$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D
jdkbase="$jdkbase" -D gccbase="$gccbase" -D glibcbase="$glibcbase" -D
miscbase="$miscbase"
+ "$SRC"/scripts/upload_manifest.py -o usr.img -m usr.manifest -D
jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase"
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 glibcbase="$glibcbase" -D
miscbase="$miscbase"
+ "$SRC"/scripts/export_manifest.py -e "$export_dir" -m usr.manifest -D
jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase"
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 glibcbase="$glibcbase" -D
miscbase="$miscbase"
+ "$SRC"/scripts/gen-rofs-img.py -o rofs.img -m usr.manifest -D
jdkbase="$jdkbase" -D gccbase="$gccbase" -D miscbase="$miscbase"
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 osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/000000000000156244059c251f04%40google.com.
