add non-free files to quinn-diff (and to wanna-build)

[wannabuild.git] / triggers / common

diff --git a/triggers/common b/triggers/common
index d48cbfc5dfe7eb5bf860645e2d7d8e62eace4ea2..18408e6ccc56359ead1ba63114b2677c721c1d87 100644 (file)
--- 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
@@ -61,14 +60,23 @@ do_wb_merge_all() {
         WB_SUITE="$SUITE"
     fi
 
-    if [ "$4" != "overlay" ]
+    echo "do_wb_merge_all $SUITE/$ARCH started"
+    if test "$4" != "overlay" && test "$4" != "secondary"
     then
         wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE \
             Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE
-    else
+    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
     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
+    fi
+    echo "do_wb_merge_all $SUITE/$ARCH done"
 }
 
 cleanup() {
@@ -97,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"
 }
@@ -123,13 +135,54 @@ 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"
+}
+
+# This is for the case where you get also get packages from
+# a secondary unrelated suite, the buildd's chroot also has
+# those packages files in it.
+# Examples are *-{volatile,backports,edu} and experimental
+# This is not for something like stable and proposed-updates
+trigger_wb_update_with_secondary() {
+    SUITE="$1"
+    ARCHS="$2"
+    PACKAGES_BASE="$3"
+    SOURCES="$4"
+    PACKAGES="$5"
+    WB_SUITE="$6"
+    WHITELIST_FILE="$7"
+
+    if [ -z "$WB_SUITE" ]
+    then
+        WB_SUITE="${SUITE}"
+    fi
+
+    echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
+
+    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"
 }