From 895de9d265b6167b539d4d1ed213d5c2f7e56956 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 5 Mar 2018 09:30:57 +0000 Subject: openjdk-8: rework do_patch (pt 2 - use bitbake variable overrides) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This currently uses a hand-crafted solution to distinguish between common, native-only and and target-only patches. That is a bit hard to follow as patches are being applied in strange order, and is also non-standard. Instead, we can just use bitbake variable overrides. This makes it much easier to work with this recipe, as: * it is clear in which order patches are going to be applied by looking at the recipe * it is clear which patches are meant to be common, for build, or target * old patches that are still lying around in WORKDIR (e.g. because rm_work is not enabled), but that have been removed from SRC_URI are no longer incorrectly applied * if patches fail to apply, we know exactly which patch has failed * we can use PATCHTOOL = without any ill effects Signed-off-by: André Draszik Signed-off-by: Maxin B. John --- recipes-core/openjdk/openjdk-8-common.inc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'recipes-core/openjdk/openjdk-8-common.inc') diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index cf14be9..dbdd053 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc @@ -155,16 +155,6 @@ def jdk_configure_options(d): do_unpack[postfuncs] += "do_unpack_extract_submodules" do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}" -do_patch_openjdk8() { - olddir=`pwd` - cd "${S}" - for OJ8P in ${WORKDIR}/openjdk8-*.patch; do - patch -p0 < ${OJ8P} - done -} - -do_patch[postfuncs] += "do_patch_openjdk8" - do_configure_prepend() { export ${@jdk_environment_options(d)} } -- cgit v1.2.3-54-g00ecf