From b1dc1e0064fb19c12e2bf00ea5074ad65ca316ef Mon Sep 17 00:00:00 2001 From: jiangcuo Date: Sun, 3 Nov 2024 23:00:25 +0800 Subject: [PATCH] fix quilt error --- build.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index 8cd8d33..11b9514 100755 --- a/build.sh +++ b/build.sh @@ -48,20 +48,23 @@ update_submodues(){ update_submodues || errlog "Failed to update submodule" -if [ -f "$SH_PATH/packages/$PKGNAME/series" ];then - cd "$SH_PATH/packages/$PKGNAME/$PKGNAME" - QUILT_PATCHES=../ \ - QUILT_SERIES=../series \ - quilt --quiltrc /dev/null --color=always push -a || test $$? = 2 -fi ARCH=$(arch) +if [ -f "$SH_PATH/packages/$PKGNAME/series" ];then + cat $SH_PATH/packages/$PKGNAME/series > $SH_PATH/packages/$PKGNAME/series.all +fi + if [ -f "$SH_PATH/packages/$PKGNAME/series.$ARCH" ];then - cd "$SH_PATH/packages/$PKGNAME/$PKGNAME" - QUILT_PATCHES=../ \ - QUILT_SERIES=../series.$ARCH \ - quilt --quiltrc /dev/null --color=always push -a || test $$? = 2 + cat $SH_PATH/packages/$PKGNAME/series.$ARCH >> $SH_PATH/packages/$PKGNAME/series.all +fi + +if [ -f "$SH_PATH/packages/$PKGNAME/series.all" ];then + echo "apply patches for series.all" + cd "$SH_PATH/packages/$PKGNAME/$PKGNAME" + QUILT_PATCHES=../ \ + QUILT_SERIES=../series.all \ + quilt --quiltrc /dev/null --color=always push -a || test $$? = 2 fi cd $SH_PATH