ARCHIVE_MAIN="/org/wanna-build/tmp/archive/debian"
ARCHIVE_BASE="/org/wanna-build/tmp/archive/${ARCHIVE}"
PAS_BASE="/org/buildd.debian.org/web/quinn-diff"
+PAS_FILE="$PAS_BASE/$SUITE/Packages-arch-specific"
LOCKFILE="${ARCHIVE_BASE}/lock"
ARCHS_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
ARCHS_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
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 \
- > quinn-$SUITE.$ARCH 2>/dev/null
+ | filter-q-d "${WHITELIST_FILE}" > quinn-$SUITE.$ARCH 2>/dev/null
}
# Call wanna-build's importing function. WB_SUITE might differ from SUITE
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
+ #wanna-build -v --merge-all --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH quinn-$SUITE.$ARCH Sources.$SUITE
+ wanna-build -v --Pas ${PAS_FILE} --merge-v3 --arch=$ARCH --dist=$WB_SUITE Packages.$SUITE.$ARCH . Sources.$SUITE
fi
if [ "$4" = "overlay" ]
then
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
- 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
+ new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
+ parallel -l 5 -i trigger_wb_update_arch_loop "${SUITE}" "{}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" -- ${ARCHS} || true
+ #for ARCH in ${ARCHS}; do
+ #trigger_wb_update_arch_loop "${SUITE}" "${ARCH}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}"
+ #done
echo "`date`: ${ARCHIVE}/${SUITE} done"
}
echo "`date`: Processing ${ARCHIVE}/${SUITE} ..."
- new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}.full
+ new-keep-latest source $(eval echo ${SOURCES}) > Sources.${SUITE}
new-keep-latest source $(eval echo Sources.${SUITE} ${SOURCES_BASE}) > Sources.${SUITE}-all
- 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
+ parallel -l 5 -i trigger_wb_update_for_overlay_arch_loop "${SUITE}" "{}" "${SOURCES_BASE}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}" -- ${ARCHS} || true
+ #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
echo "`date`: ${ARCHIVE}/${SUITE} done"
}
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
+ 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} || true
+ #for ARCH in ${ARCHS}; do
+ #trigger_wb_update_arch_loop_with_secondary "${SUITE}" "${ARCH}" "${PACKAGES_BASE}" "${SOURCES}" "${PACKAGES}" "${WB_SUITE}" "${WHITELIST_FILE}"
+ #done
echo "`date`: ${ARCHIVE}/${SUITE} done"
}