Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for pbuilder --override-config #183

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for pbuilder --override-config #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions scripts/build-and-provide-package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,14 @@ cowbuilder_init() {
echo "*** Skipping cowbuilder update as requested via SKIP_COWBUILDER_UPDATE ***"
else
echo "*** Updating cowbuilder cow base ***"
if [ "${OVERRIDE_COWBUILDER_CONFIG:-}" = "true" ] ; then
OVERRIDE_CONFIG="--override-config"
else
OVERRIDE_CONFIG=""
fi
sudo DIST="${distribution:-}" ARCH="${architecture:-}" ${ADT:+ADT=$ADT} \
cowbuilder --update --basepath "${COWBUILDER_BASE}" --configfile="${pbuilderrc}"
cowbuilder --update --basepath "${COWBUILDER_BASE}" --distribution "${COWBUILDER_DIST}" \
${OVERRIDE_CONFIG} --configfile="${pbuilderrc}"
[ $? -eq 0 ] || exit 3
fi
fi
Expand Down Expand Up @@ -741,15 +747,15 @@ EOF
i386)
linux32 sudo DIST="${distribution:-}" ARCH="${architecture:-}" ${ADT:+ADT=$ADT} \
cowbuilder --buildresult "$WORKSPACE"/binaries/ \
--build $sourcefile \
--build $sourcefile --distribution ${COWBUILDER_DIST} \
--basepath "${COWBUILDER_BASE}" --debbuildopts "${DEBBUILDOPTS:-}" \
--hookdir "${PBUILDER_HOOKDIR}" --bindmounts "$BINDMOUNTS" --configfile="${pbuilderrc}"
[ $? -eq 0 ] || bailout 1 "Error: Failed to build with cowbuilder."
;;
amd64|all|*)
sudo DIST="${distribution:-}" ARCH="${architecture:-}" ${ADT:+ADT=$ADT} \
cowbuilder --buildresult "$WORKSPACE"/binaries/ \
--build $sourcefile \
--build $sourcefile --distribution ${COWBUILDER_DIST} \
--basepath "${COWBUILDER_BASE}" --debbuildopts "${DEBBUILDOPTS:-}" \
--hookdir "${PBUILDER_HOOKDIR}" --bindmounts "$BINDMOUNTS" --configfile="${pbuilderrc}"
[ $? -eq 0 ] || bailout 1 "Error: Failed to build with cowbuilder."
Expand Down