From f3a9dba0bea3529be577cd21068a883c81c9ed2b Mon Sep 17 00:00:00 2001 From: Andreas Barth Date: Sat, 5 Jun 2010 17:05:56 +0000 Subject: [PATCH] activate merge-v3 also for overlay / secondary suites (in addition to edb9f78e3b579ea0dc0e3ade4898439f8459281e so that it's now enabled for all) --- triggers/common | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/triggers/common b/triggers/common index eee3339..d6d60c8 100644 --- a/triggers/common +++ b/triggers/common @@ -70,13 +70,13 @@ do_wb_merge_all() { fi if [ "$4" = "overlay" ] then - wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE \ - Packages.$SUITE.$ARCH-all quinn-$SUITE.$ARCH Sources.$SUITE-all + #wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH-all quinn-$SUITE.$ARCH Sources.$SUITE-all + wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH-all . Sources.$SUITE-all fi if [ "$4" = "secondary" ] then - wanna-build -v --merge-all-secondary --arch=$ARCH --dist=$WB_SUITE \ - Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE Packages.$SUITE.$ARCH-all + #wanna-build -v --merge-all-secondary --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE Packages.$SUITE.$ARCH-all + wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH . Sources.$SUITE . Packages.$SUITE.$ARCH-all fi echo "do_wb_merge_all $SUITE/$ARCH done" } -- 2.39.2