Skip to content
Permalink
Browse files
8278163: --with-cacerts-src variable resolved after GenerateCacerts r… 
…ecipe setup

Reviewed-by: ihse
  • Loading branch information
Andrew Leonard committed Dec 3, 2021
1 parent 8907003 commit 45da3aea22fd85f214e661b2c98631cb91ddb55d
Showing 1 changed file with 5 additions and 4 deletions.
9 make/modules/java.base/Gendata.gmk
View file
@@ -60,7 +60,11 @@ TARGETS += $(GENDATA_CURDATA)

################################################################################

GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
ifneq ($(CACERTS_SRC), )
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
else
GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
endif
GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts

$(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
@@ -71,9 +75,6 @@ $(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
ifeq ($(CACERTS_FILE), )
TARGETS += $(GENDATA_CACERTS)
endif
ifneq ($(CACERTS_SRC), )
GENDATA_CACERTS_SRC := $(CACERTS_SRC)
endif

################################################################################

7 comments on commit 45da3ae

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 45da3ae Dec 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@andrew-m-leonard
Copy link

@andrew-m-leonard andrew-m-leonard commented on 45da3ae Feb 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 45da3ae Feb 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrew-m-leonard the backport was successfully created on the branch andrew-m-leonard-backport-45da3aea in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 45da3aea from the openjdk/jdk repository.

The commit being backported was authored by Andrew Leonard on 3 Dec 2021 and was reviewed by Magnus Ihse Bursie.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev andrew-m-leonard-backport-45da3aea:andrew-m-leonard-backport-45da3aea
$ git checkout andrew-m-leonard-backport-45da3aea
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev andrew-m-leonard-backport-45da3aea

@andrew-m-leonard
Copy link

@andrew-m-leonard andrew-m-leonard commented on 45da3ae Feb 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev pr/164

@openjdk
Copy link

@openjdk openjdk bot commented on 45da3ae Feb 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrew-m-leonard the backport was successfully created on the branch andrew-m-leonard-backport-45da3aea in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:pr/164, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 45da3aea from the openjdk/jdk repository.

The commit being backported was authored by Andrew Leonard on 3 Dec 2021 and was reviewed by Magnus Ihse Bursie.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev andrew-m-leonard-backport-45da3aea:andrew-m-leonard-backport-45da3aea
$ git checkout andrew-m-leonard-backport-45da3aea
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev andrew-m-leonard-backport-45da3aea

@andrew-m-leonard
Copy link

@andrew-m-leonard andrew-m-leonard commented on 45da3ae Feb 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 45da3ae Feb 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrew-m-leonard the backport was successfully created on the branch andrew-m-leonard-backport-45da3aea in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 45da3aea from the openjdk/jdk repository.

The commit being backported was authored by Andrew Leonard on 3 Dec 2021 and was reviewed by Magnus Ihse Bursie.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev andrew-m-leonard-backport-45da3aea:andrew-m-leonard-backport-45da3aea
$ git checkout andrew-m-leonard-backport-45da3aea
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev andrew-m-leonard-backport-45da3aea

Please sign in to comment.