diff options
| author | John Klug <john.klug@multitech.com> | 2017-06-09 10:22:39 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2017-06-09 10:22:39 -0500 |
| commit | ca966936bec806fc5ed30b8af904a0e2398b7404 (patch) | |
| tree | b4757b38d4c53dd396972b969ab383785db70408 /recipes-java | |
| parent | c23502dc821f6b7b17551e24d5287d8c8220fd26 (diff) | |
| parent | 140d44a8557acffbdda3d344c23a4e3481a3997a (diff) | |
| download | meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.tar.gz meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.tar.bz2 meta-mlinux-ca966936bec806fc5ed30b8af904a0e2398b7404.zip | |
Merge yocto-2.2 (morty) into master
Diffstat (limited to 'recipes-java')
| -rw-r--r-- | recipes-java/openjdk/openjdk-8/jvm.cfg (renamed from recipes-java/openjdk/openjdk-7/jvm.cfg) | 0 | ||||
| -rw-r--r-- | recipes-java/openjdk/openjdk-8_102b14.bbappend (renamed from recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend) | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/recipes-java/openjdk/openjdk-7/jvm.cfg b/recipes-java/openjdk/openjdk-8/jvm.cfg index 5a21e4e..5a21e4e 100644 --- a/recipes-java/openjdk/openjdk-7/jvm.cfg +++ b/recipes-java/openjdk/openjdk-8/jvm.cfg diff --git a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend b/recipes-java/openjdk/openjdk-8_102b14.bbappend index c7a6e78..4a258d2 100644 --- a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend +++ b/recipes-java/openjdk/openjdk-8_102b14.bbappend @@ -3,4 +3,4 @@ # openjdk-7 recipe is prepending to FILESPATH, so use # FILESPATH instead of FILESEXTRAPATH or our file doesn't # get picked up -FILESPATH_prepend := "${THISDIR}/openjdk-7:" +FILESPATH_prepend := "${THISDIR}/openjdk-8:" |