X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=triggers%2Fcommon;h=94a7eb6d0a6b4e2ff500c3496834065126fbcf04;hb=9ef340664f076600ac35566d6a91911903ea3d0e;hp=d6d60c859696594d943654a2232c01e318c96de6;hpb=f3a9dba0bea3529be577cd21068a883c81c9ed2b;p=wannabuild.git diff --git a/triggers/common b/triggers/common index d6d60c8..94a7eb6 100644 --- a/triggers/common +++ b/triggers/common @@ -71,12 +71,13 @@ do_wb_merge_all() { 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 --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH-all . Sources.$SUITE-all + # this currently makes the packages unknown to wanna-build. Perhaps we should keep them in pseudo-installed or so. Hm. + wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH . Sources.$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 --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$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 . Sources.$SUITE-all fi echo "do_wb_merge_all $SUITE/$ARCH done" }