diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-11-21 12:03:17 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-11-23 14:28:16 +0100 |
| commit | cd6d1d1ce7ab161c42b712dafa04f9fd7d1de862 (patch) | |
| tree | 7f4c1f7dd4d323aee0d24ea5113cd1ae60ecafd5 | |
| parent | d364270362ad40e998abd2d93550d5585148e8e4 (diff) | |
| download | ptxdist-cd6d1d1ce7ab161c42b712dafa04f9fd7d1de862.tar.gz ptxdist-cd6d1d1ce7ab161c42b712dafa04f9fd7d1de862.tar.xz | |
patchin: run autogen.sh for local-src/ packages
This is useful when working with local-src/ symlinks. autogen.sh needs to
run there as well and this way it will be executed in the correct
environment.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_world_common.sh | 1 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_patchin.sh | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index 10ad0c714..90f1c70b3 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -250,7 +250,6 @@ ptxd_make_world_init() { if [ -d "$(readlink -f "${wip_sources}")" ]; then pkg_url="file://${wip_sources}" unset pkg_src - pkg_pkg=${pkg_pkg}-wip # don't apply patches fi unset wip_sources diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh index 81537f55a..e57da6406 100644 --- a/scripts/lib/ptxd_make_world_patchin.sh +++ b/scripts/lib/ptxd_make_world_patchin.sh @@ -221,6 +221,15 @@ ptxd_make_world_patchin_apply() pkg_patch_series \ pkg_patch_tool + if [[ "${pkg_url}" =~ ^file:// ]]; then + local url="$(ptxd_file_url_path "${pkg_url}")" + # local directories are not intended to be patched + if [ -d "${url}" ]; then + echo "Local source directory detected, skipping patch-in step" + return + fi + fi + ptxd_make_world_patchin_apply_init || return if [ -z "${pkg_patch_dir}" ]; then return @@ -438,15 +447,6 @@ ptxd_make_world_patchin_init() return fi - if [[ "${pkg_url}" =~ ^file:// ]]; then - local url="$(ptxd_file_url_path "${pkg_url}")" - # local directories are not intended to be patched - if [ -d "${url}" ]; then - echo "Local source directory detected, skipping patch-in step" - return - fi - fi - if [ -n "${pkg_deprecated_patchin_series}" ]; then ptxd_bailout "a 3rd parameter to patchin ('${pkg_deprecated_patchin_series}') is obsolete, please define <PKG>_SERIES instead" fi |