summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-05-18 10:30:53 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-05-19 08:36:23 +0200
commit7382619678b171ae4eba44842fb619ebcdee3aff (patch)
tree849e48dd740c6f6092757ec28facc470b58ba02c
parentc40af97dd200adc43f08c6d78d9b3d860a24677e (diff)
downloadptxdist-7382619678b171ae4eba44842fb619ebcdee3aff.tar.gz
ptxdist-7382619678b171ae4eba44842fb619ebcdee3aff.tar.xz
ptxd_make_world_patchin_apply_git: make sure the series file exists
The series file for 'git quiltimport' was only created if the original series file is not empty. In this case, with newer git versions (at least 2.8.1) 'git quiltimport' returns an error if the series file is missing. An empty series file is usefull to start creating new patches. Create the series file for 'git quiltimport' to make sure this works with new git versions. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--scripts/lib/ptxd_make_world_patchin.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
index d021d6043..c93ba62b9 100644
--- a/scripts/lib/ptxd_make_world_patchin.sh
+++ b/scripts/lib/ptxd_make_world_patchin.sh
@@ -116,7 +116,8 @@ ptxd_make_world_patchin_apply_git_compat()
"${pkg_patchin_dir}/.ptxdist/git-patches/${patch_file%.*}"
echo "${patch_file%.*}" "${para}" >> "${pkg_patchin_dir}/.ptxdist/git-patches/series" || return
- done < "${pkg_patchin_dir}/.ptxdist/series"
+ done < "${pkg_patchin_dir}/.ptxdist/series" &&
+ touch "${pkg_patchin_dir}/.ptxdist/git-patches/series"
}
export -f ptxd_make_world_patchin_apply_git_compat