From d376a63b49fe4ba1ab65796c822e698850be867d Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 5 Jul 2019 16:32:38 +0100 Subject: [PATCH] buildsystem: support absolute paths in PKG_PATCH_DIRS --- scripts/unpack | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/unpack b/scripts/unpack index d3aa480329..673fc4f08f 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -122,9 +122,14 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ]; then PATCH_DIRS_PRJ="" if [ -n "${PKG_PATCH_DIRS}" ]; then for patch_dir in ${PKG_PATCH_DIRS}; do - [ -d ${PKG_DIR}/patches/${patch_dir} ] && PATCH_DIRS_PKG+=" ${PKG_DIR}/patches/${patch_dir}/*.patch" - [ -d ${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${patch_dir} ] && PATCH_DIRS_PRJ+=" ${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${patch_dir}/*.patch" - [ -d ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/${PKG_NAME}/${patch_dir} ] && PATCH_DIRS_PRJ+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/${PKG_NAME}/${patch_dir}/*.patch" + if [[ ${patch_dir} =~ ^/ ]]; then + [ -f ${patch_dir} ] && PATCH_DIRS_PKG+=" ${patch_dir}" + [ -d ${patch_dir} ] && PATCH_DIRS_PKG+=" ${patch_dir}/*.patch" + else + [ -d ${PKG_DIR}/patches/${patch_dir} ] && PATCH_DIRS_PKG+=" ${PKG_DIR}/patches/${patch_dir}/*.patch" + [ -d ${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${patch_dir} ] && PATCH_DIRS_PRJ+=" ${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${patch_dir}/*.patch" + [ -d ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/${PKG_NAME}/${patch_dir} ] && PATCH_DIRS_PRJ+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/${PKG_NAME}/${patch_dir}/*.patch" + fi done fi @@ -165,7 +170,7 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ]; then elif [[ "${thisdir}" =~ ^${PROJECT_DIR}/.* ]]; then PATCH_DESC="(project - $(basename "${thisdir}"))" else - PATCH_DESC="(unknown - $(basename "${thisdir}"))" + PATCH_DESC="(absolute - ${i})" fi fi