From 2e2242356f0bc72a56bc52259d497fa143f27e0a Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 3 Oct 2019 18:59:35 +0200 Subject: ptxd_make_world_patchin: allow specifying a custom patch directory If _PATCHES is set, then it is used instead of $() to find the patch directory. It must be a relativ directory name that can be found in the usual search path. Signed-off-by: Michael Olbrich --- scripts/lib/ptxd_make_world_patchin.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/lib/ptxd_make_world_patchin.sh') diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh index e181e1cb8..1e11249e0 100644 --- a/scripts/lib/ptxd_make_world_patchin.sh +++ b/scripts/lib/ptxd_make_world_patchin.sh @@ -479,10 +479,9 @@ ptxd_make_world_patchin_init() "is no longer supported. Move patches to" \ "$(ptxd_print_path "$(dirname "${ptxd_reply}")")" fi - if ! ptxd_in_path PTXDIST_PATH_PATCHES ${pkg_pkg} ; then + if [ -z "${pkg_patch_dir}" ]; then return fi - pkg_patch_dir="${ptxd_reply}" } export -f ptxd_make_world_patchin_init -- cgit v1.2.3