From b575bc9520162e6bf809a5175fd91eff8d9c9df6 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 27 Mar 2019 21:09:16 +0900 Subject: [PATCH] dist/debian: change jessie-backport repo URL Since jessie-backports repo is no longer maintained, repo URL need to change to archive.debian.org, also need to specify Acquire::Check-Valid-Until=false. Signed-off-by: Takuya ASADA Message-Id: <20190327120916.25036-1-syuu@scylladb.com> --- dist/debian/apt/apt.conf.d/99jessie-backports | 1 + dist/debian/build_deb.sh | 2 +- dist/debian/pbuilderrc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 dist/debian/apt/apt.conf.d/99jessie-backports diff --git a/dist/debian/apt/apt.conf.d/99jessie-backports b/dist/debian/apt/apt.conf.d/99jessie-backports new file mode 100644 index 0000000..97b9c90 --- /dev/null +++ b/dist/debian/apt/apt.conf.d/99jessie-backports @@ -0,0 +1 @@ +Acquire::Check-Valid-Until "false"; diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh index bef80b2..32d0b8f 100755 --- a/dist/debian/build_deb.sh +++ b/dist/debian/build_deb.sh @@ -133,7 +133,7 @@ fi sudo rm -fv /var/cache/pbuilder/scylla-jmx-$TARGET.tgz sudo -E DIST=$TARGET /usr/sbin/pbuilder clean --configfile ./dist/debian/pbuilderrc -sudo -E DIST=$TARGET /usr/sbin/pbuilder create --configfile ./dist/debian/pbuilderrc +sudo -E DIST=$TARGET /usr/sbin/pbuilder create --configfile ./dist/debian/pbuilderrc --aptconfdir dist/debian/apt sudo -E DIST=$TARGET /usr/sbin/pbuilder update --configfile ./dist/debian/pbuilderrc if [ "$TARGET" = "jessie" ]; then echo "apt-get install -y -t jessie-backports ca-certificates-java" > build/jessie-pkginst.sh diff --git a/dist/debian/pbuilderrc b/dist/debian/pbuilderrc index 77427e4..1227dd8 100644 --- a/dist/debian/pbuilderrc +++ b/dist/debian/pbuilderrc @@ -18,7 +18,7 @@ elif [ "$DIST" = "jessie" ] || [ "$DIST" = "stretch" ] || [ "$DIST" = "buster" ] COMPONENTS="main contrib non-free" DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/debian-archive-keyring.gpg" if [ "$DIST" = "jessie" ]; then - OTHERMIRROR="deb http://httpredir.debian.org/debian jessie-backports main" + OTHERMIRROR="deb http://archive.debian.org/debian jessie-backports main" fi else echo "Unknown distribution: $DIST"