Skip to content

Commit b1dc1e0

Browse files
committed
fix quilt error
1 parent ad6595d commit b1dc1e0

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

‎build.sh‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,23 @@ update_submodues(){
4848

4949
update_submodues || errlog "Failed to update submodule"
5050

51-
if [ -f "$SH_PATH/packages/$PKGNAME/series" ];then
52-
cd "$SH_PATH/packages/$PKGNAME/$PKGNAME"
53-
QUILT_PATCHES=../ \
54-
QUILT_SERIES=../series \
55-
quilt --quiltrc /dev/null --color=always push -a || test $$? = 2
56-
fi
5751

5852
ARCH=$(arch)
5953

54+
if [ -f "$SH_PATH/packages/$PKGNAME/series" ];then
55+
cat $SH_PATH/packages/$PKGNAME/series > $SH_PATH/packages/$PKGNAME/series.all
56+
fi
57+
6058
if [ -f "$SH_PATH/packages/$PKGNAME/series.$ARCH" ];then
61-
cd "$SH_PATH/packages/$PKGNAME/$PKGNAME"
62-
QUILT_PATCHES=../ \
63-
QUILT_SERIES=../series.$ARCH \
64-
quilt --quiltrc /dev/null --color=always push -a || test $$? = 2
59+
cat $SH_PATH/packages/$PKGNAME/series.$ARCH >> $SH_PATH/packages/$PKGNAME/series.all
60+
fi
61+
62+
if [ -f "$SH_PATH/packages/$PKGNAME/series.all" ];then
63+
echo "apply patches for series.all"
64+
cd "$SH_PATH/packages/$PKGNAME/$PKGNAME"
65+
QUILT_PATCHES=../ \
66+
QUILT_SERIES=../series.all \
67+
quilt --quiltrc /dev/null --color=always push -a || test $$? = 2
6568
fi
6669

6770
cd $SH_PATH

0 commit comments

Comments
 (0)