diff options
| -rwxr-xr-x | builder-patches.sh | 20 | ||||
| -rwxr-xr-x | common.sh | 9 |
2 files changed, 24 insertions, 5 deletions
diff --git a/builder-patches.sh b/builder-patches.sh index 4934a56..114ad5f 100755 --- a/builder-patches.sh +++ b/builder-patches.sh @@ -28,6 +28,8 @@ local_repositories="\ ../manifest \ " +. $(dirname $0)/releasevars.sh + local_tmpdir="$(mktemp -d)" usage() @@ -173,14 +175,22 @@ apply_patches_to_remote() repositories_dirs="" for repository in ${local_repositories} ; do - patch="$(git -C ${repository} format-patch -1)" + nr_patches=1 destdir="${local_tmpdir}/$(basename ${repository})" - mkdir -p "${destdir}/" - mv -f "${repository}/${patch}" "${destdir}/" - - append "patches" "$(basename ${repository})/${patch}" append "repositories_dirs" "$(basename ${repository})" + + if is_transition_release ; then + if [ "${repository}" = "../vendor_replicant" ] ; then + nr_patches=2 + fi + fi + + _patches="$(git -C ${repository} format-patch -${nr_patches})" + for patch in ${_patches} ; do + mv -f "${repository}/${patch}" "${destdir}/" + append "patches" "$(basename ${repository})/${patch}" + done done queue_patches_for_remote "${patches}" @@ -25,6 +25,15 @@ is_replicant_11() match_replicant_version '^11-' } +is_transition_release() +{ + if echo "${RELEASE}" | grep '\-transition$' > /dev/null ; then + true + else + false + fi +} + match_replicant_version() { regex="$1" |