Skip to content

add cvm kind of vm in jvm.cfg #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2025
Merged

add cvm kind of vm in jvm.cfg #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/get-bootjdk/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ runs:
# Download BootJDK and verify checksum
mkdir -p bootjdk/jdk
mkdir -p bootjdk/unpacked
wget --progress=dot:mega -O bootjdk/jdk.${{ steps.ext.outputs.value }} '${{ steps.url.outputs.value }}'
wget -q --progress=dot:mega -O bootjdk/jdk.${{ steps.ext.outputs.value }} '${{ steps.url.outputs.value }}'
echo '${{ steps.sha256.outputs.value }} bootjdk/jdk.${{ steps.ext.outputs.value }}' | sha256sum -c >/dev/null -
shell: bash
if: steps.get-cached-bootjdk.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-cvm8+25.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:

- name: 'Run sanity test jvm patch'
run: |
wget -nc https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_${{ inputs.arch }}_linux_hotspot_8u372b07.tar.gz
wget -nc -q https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_${{ inputs.arch }}_linux_hotspot_8u372b07.tar.gz
tar xzf OpenJDK8U-jdk_${{ inputs.arch }}_linux_hotspot_8u372b07.tar.gz
tar xzf CompoundVM_${{ steps.version.outputs.version }}_jvm_patch_${{ inputs.platform }}.tar.gz -C jdk8u372-b07/
jdk8u372-b07/bin/java -version 2>&1 | grep "CompoundVM"
Expand Down
13 changes: 8 additions & 5 deletions cvm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ define setup_download_artifact
rm -rf $(DIR) && mkdir -p $(DIR); \
for i in `seq 4`; do \
[[ $$i -gt 1 ]] && echo "Retrying to download $(URL)"; \
[[ ! -f $(LPATH) ]] && wget -nc $(URL) -O $(LPATH); \
[[ ! -f $(LPATH) ]] && wget -nc -q $(URL) -O $(LPATH); \
if [[ x$$MD5_EXP = x ]]; then break; fi; \
MD5SUM=`md5sum $(LPATH) | awk '{print $$1}'`; \
if [[ $$MD5SUM = $(MD5_EXP) ]]; then \
Expand Down Expand Up @@ -142,20 +142,21 @@ cvm8: jdk8vm25

cvm8default25: jdk8vm25
echo "-server25 KNOWN" > $(CVM8_LIBDIR)/jvm.cfg
echo "-cvm KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg
echo "-server KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg
echo "-client IGNORE" >> $(CVM8_LIBDIR)/jvm.cfg
echo "-server25 KNOWN" > $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/amd64/jvm.cfg
echo "-server KNOWN" >> $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/amd64/jvm.cfg
echo "-client IGNORE" >> $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/amd64/jvm.cfg
cp -f $(CVM8_LIBDIR)/jvm.cfg $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/amd64/jvm.cfg

JVM_PATCH_ARTIFACTS := jre/lib/rt25.jar jre/lib/rt8.jar jre/lib/amd64/libjava25.so jre/lib/amd64/libjimage25.so jre/lib/amd64/libjdwp25.so jre/lib/amd64/server25 jre/lib/amd64/jvm.cfg
JVM_PATCH_ARTIFACTS_SOFTLINK := jre/lib/amd64/cvm

jvm-patch: cvm8default25
@echo "###### Composing CVM8 jvm patch ######"
mkdir -p $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)
for file in $(JVM_PATCH_ARTIFACTS); do \
cd $(OUTPUTDIR)/$(DISTRO_NAME) && cp -rf --parents $$file $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)/; \
done
cd $(OUTPUTDIR)/$(DISTRO_NAME) && cp -a --parents $(JVM_PATCH_ARTIFACTS_SOFTLINK) $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)/;

-clean-jdk8vm25:
rm -fr $(BUILDDIR)/alt_kernel
Expand Down Expand Up @@ -201,6 +202,8 @@ jdk8vm25: build_jdk8u build_jdk25u altkernel
cp -f $(SRC_BUILDDIR_25)/jdk/lib/libjdwp.debuginfo $(CVM8_LIBDIR)/libjdwp25.debuginfo && \
cp -f $(SRC_BUILDDIR_25)/jdk/lib/server/libjvm.debuginfo $(CVM8_LIBDIR)/server25/libjvm.debuginfo; \
[[ "x$$(grep server25 $(CVM8_LIBDIR)/jvm.cfg)" = "x" ]] && echo "-server25 KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg; \
[[ "x$$(grep cvm $(CVM8_LIBDIR)/jvm.cfg)" = "x" ]] && echo "-cvm KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg; \
pushd $(CVM8_LIBDIR) && ln -sf server25 cvm && popd; \
cp -rf $(CVM8DIR)/* $(OUTPUTDIR)/$(DISTRO_NAME)/; \
}
ifeq ($(MODE), release)
Expand Down Expand Up @@ -289,7 +292,7 @@ ifeq ($(SKIP_BUILD), true)
else
-setup_jtreg8: $(JTREG) jdk8vm25
endif
$(eval JT8_OPTS=-jdk:${CVM8DIR} -w:${JT8_WORKDIR} -r:${JT8_REPORTDIR} -a -ea -esa -ignore:quiet -ovm -v:fail,error,time -javaoption:-server25 ${JT8_OPTS})
$(eval JT8_OPTS=-jdk:${CVM8DIR} -w:${JT8_WORKDIR} -r:${JT8_REPORTDIR} -a -ea -esa -ignore:quiet -ovm -v:fail,error,time -javaoption:-cvm ${JT8_OPTS})

# Setup bootstrap JDK from a given URL
# $1 root directory of jtreg
Expand Down
Loading