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

Remove deprecated vivid overlays #7

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

Remove deprecated vivid overlays #7

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
11 changes: 0 additions & 11 deletions crossbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,6 @@ shell_container () {
lxc exec $LXD_CONTAINER -- su --login $USERNAME
}

enable_overlay_source () {
OVERLAY_APT="/etc/apt/sources.list.d/ci-train-ppa-service-ubuntu-stable-phone-overlay-vivid.list"
if exec_container_root "grep '#.*deb-src' $OVERLAY_APT" ; then
exec_container_root "sed -i 's/#.*deb-src/deb-src/' $OVERLAY_APT"
exec_container_root "DEBIAN_FRONTEND=noninteractive apt-get update --allow-unauthenticated"
fi
}

get_source_package () {
echo "${POSITIVE_COLOR}Downloading source package $PACKAGE for Ubuntu $TARGET_UBUNTU.${NC}"

Expand All @@ -383,8 +375,6 @@ get_source_package () {
exec_container_root add-apt-repository --remove --enable-source \"deb file://$SOURCE_REPOSITORY/ /\"
exec_container_root "sudo rm -f /etc/apt/preferences.d/localrepo.pref"

enable_overlay_source

if ! lxc exec $LXD_CONTAINER -- su -l -c "cd $MOUNT_POINT; apt-get source --only-source $PACKAGE" $USERNAME ; then
echo "${ERROR_COLOR}No source package exists with the name $PACKAGE.${NC}"
echo "${ERROR_COLOR}Deleting container $LXD_CONTAINER.${NC}"
Expand Down Expand Up @@ -415,7 +405,6 @@ restore_changelog () {
ensure_upstream_tarball () {
if grep quilt debian/source/format > /dev/null 2>&1 ; then
echo "${POSITIVE_COLOR}Downloading upstream tarball of $PACKAGE in container.${NC}"
enable_overlay_source
# FIXME: try using dget instead so that we can specify a precise version
exec_container "cd $USERDIR && apt-get source --download-only --allow-unauthenticated $PACKAGE"
fi
Expand Down