summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-10-12 11:03:40 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:26 +0100
commit34c33a10ea75616fc023cd3a435893255bf3395e (patch)
tree507cc2315cf4598a3a636781a50bac1916ec1e9b /scripts/build
parent0113bca783514068c1b1e1185f2f2747302fddb6 (diff)
downloadlive-build-34c33a10ea75616fc023cd3a435893255bf3395e.zip
live-build-34c33a10ea75616fc023cd3a435893255bf3395e.tar.gz
Updating special handling for backports.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_config12
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index fa69271..bd6bd8d 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1346,27 +1346,23 @@ then
cat > config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot << EOF
# Backports Maintainers
-deb http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
-deb-src http://backports.debian-maintainers.org/ ${LB_DISTRIBUTION}/backports main contrib non-free
+deb http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}
+deb-src http://backports.debian.org/debian-backports/ ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}
EOF
cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot config/chroot_sources/${LB_DISTRIBUTION}-backports.binary
# Adding apt preferences
- if ! grep -qs "^Pin: release o=backports.debian-maintainers.org" config/chroot_apt/preferences
+ if ! grep -qs "^Pin: release o=Debian Backports" config/chroot_apt/preferences
then
cat >> config/chroot_apt/preferences << EOF
Package: *
-Pin: release o=backports.debian-maintainers.org
+Pin: release o=Debian Backports
Pin-Priority: 999
EOF
fi
-
- # Addding archive signing key
- wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg
- cp config/chroot_sources/${LB_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LB_DISTRIBUTION}-backports.binary.gpg
fi
# Checking defaults again