From d271ee74799355d5322a9f539561660f458d0ad2 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Thu, 16 Apr 2020 10:19:01 +0800 Subject: [PATCH] obs: let patch set in order before apply them obs ci for linuxcontainer will fail when apply patch set which have dependency within. so patch set should be made in order before feed to apply. Fixes: #1015 Signed-off-by: Jianyong Wu --- obs-packaging/scripts/pkglib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-packaging/scripts/pkglib.sh b/obs-packaging/scripts/pkglib.sh index f889c4308..2d72c0622 100644 --- a/obs-packaging/scripts/pkglib.sh +++ b/obs-packaging/scripts/pkglib.sh @@ -375,7 +375,7 @@ function find_patches() { export RPM_APPLY_PATCHES="#Apply patches"$'\n' [ ! -d patches ] && info "No patches found" && return local patches - patches=$(find patches/ -type f -name '*.patch' -exec basename {} \;) + patches=$(find patches/ -type f -name '*.patch' -exec basename {} \; | sort -t- -k1,1n) n="1" rm -f debian.series for p in ${patches}; do