X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=triggers%2Fcommon;h=18408e6ccc56359ead1ba63114b2677c721c1d87;hb=636fd44b6b3b8f343eb53c4ef2dd053fb91bd4d6;hp=78fe9306782769fb2dcefb85e42d9035b4d9b1ed;hpb=29f14b9b1479ba71454ac82fbf169d3eef451f59;p=wannabuild.git

diff --git a/triggers/common b/triggers/common
index 78fe930..18408e6 100644
--- a/triggers/common
+++ b/triggers/common
@@ -39,13 +39,12 @@ get_architectures() {
 do_quinn() {
     SUITE="$1"
     ARCH="$2"
-    WHITELIST_FILE="$3"
     quinn-diff \
         -A $ARCH \
         -a "$PAS_BASE/$SUITE/Packages-arch-specific" \
         -s Sources.$SUITE \
         -p Packages.$SUITE.$ARCH \
-        | filter-q-d "${WHITELIST_FILE}" > quinn-$SUITE.$ARCH 2>/dev/null
+        > quinn-$SUITE.$ARCH 2>/dev/null
 }
 
 # Call wanna-build's importing function.  WB_SUITE might differ from SUITE
@@ -106,11 +105,15 @@ trigger_wb_update() {
 
     echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
 
-    new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
-    parallel -l 5 -i trigger_wb_update_arch_loop "${SUITE}" "{}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" -- ${ARCHS}
-    #for ARCH in ${ARCHS}; do
-    #trigger_wb_update_arch_loop "${SUITE}" "${ARCH}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}"
-    #done
+    new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}.full
+    for ARCH in ${ARCHS}; do
+        new-keep-latest ${ARCH} $(eval echo $(echo ${PACKAGES} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}.full
+    done
+    filter-nonfree .full /org/wanna-build/etc/non-free-include-list Sources.${SUITE}.full $(for ARCH in ${ARCHS}; do echo Packages.${SUITE}.${ARCH}.full; done)
+    for ARCH in ${ARCHS}; do
+        do_quinn ${SUITE} ${ARCH}
+        do_wb_merge_all ${SUITE} ${ARCH} ${WB_SUITE}
+    done
 
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }
@@ -132,13 +135,18 @@ trigger_wb_update_for_overlay() {
 
     echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
 
-    new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
+    new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}.full
     new-keep-latest source $(eval echo Sources.${SUITE} ${SOURCES_BASE}) > Sources.${SUITE}-all
 
-    parallel -l 5 -i trigger_wb_update_for_overlay_arch_loop "${SUITE}" "{}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS}
-    #for ARCH in ${ARCHS}; do
-    #trigger_wb_update_for_overlay_arch_loop "${SUITE}" "${ARCH}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
-    #done
+    for ARCH in ${ARCHS}; do
+        new-keep-latest ${ARCH} $(eval echo $(echo ${PACKAGES} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}.full
+        new-keep-latest ${ARCH} Packages.${SUITE}.${ARCH} $(eval echo $(echo ${PACKAGES_BASE} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}-all.full
+    done
+    filter-nonfree .full /org/wanna-build/etc/non-free-include-list Sources.${SUITE}.full $(for ARCH in ${ARCHS}; do echo Packages.${SUITE}.${ARCH}.full; done)
+    for ARCH in ${ARCHS}; do
+        do_quinn ${SUITE} ${ARCH}
+        do_wb_merge_all ${SUITE} ${ARCH} ${WB_SUITE} overlay
+    done
 
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }
@@ -164,12 +172,17 @@ trigger_wb_update_with_secondary() {
 
     echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
 
-    new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
-
-    parallel -l 5 -i trigger_wb_update_arch_loop_with_secondary "${SUITE}" "{}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS}
-    #for ARCH in ${ARCHS}; do
-    #trigger_wb_update_arch_loop_with_secondary "${SUITE}" "${ARCH}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
-    #done
+    new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}.full
+
+    for ARCH in ${ARCHS}; do
+        new-keep-latest ${ARCH} $(eval echo $(echo ${PACKAGES} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}.full
+        new-keep-latest ${ARCH} Packages.${SUITE}.${ARCH} $(eval echo $(echo ${PACKAGES_BASE} | sed -e 's/%ARCH%/${ARCH}/g')) > Packages.${SUITE}.${ARCH}-all.full
+    done
+    filter-nonfree .full /org/wanna-build/etc/non-free-include-list Sources.${SUITE}.full $(for ARCH in ${ARCHS}; do echo Packages.${SUITE}.${ARCH}.full Packages.${SUITE}.${ARCH}-all.full; done)
+    for ARCH in ${ARCHS}; do
+        do_quinn ${SUITE} ${ARCH}
+        do_wb_merge_all ${SUITE} ${ARCH} ${WB_SUITE} secondary
+    done
 
     echo "`date`: ${ARCHIVE}/${SUITE} done"
 }