setup lenny-backports apt list in build-in-chroot not build-deb.

mroonga · Oct 28, 2010 · d621075 · d621075
1 parent f559521
commit d621075
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/apt/build-deb.sh b/apt/build-deb.sh
@@ -22,16 +22,6 @@ run()
 grep '^deb ' /etc/apt/sources.list | \
     sed -e 's/^deb /deb-src /' > /etc/apt/sources.list.d/base-source.list
 
-if grep '^5\.0' /etc/debian_version > /dev/null; then
-    backports_list=/etc/apt/sources.list.d/backports.list
-    if [ ! -f $backports_list ]; then
-	cat <<EOF > $backports_list
-deb http://backports.debian.org/debian-backports lenny-backports main
-deb-src http://backports.debian.org/debian-backports lenny-backports main
-EOF
-    fi
-fi
-
 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 1C837F31
 
 if [ ! -x /usr/bin/aptitude ]; then

diff --git a/apt/build-in-chroot.sh b/apt/build-in-chroot.sh
@@ -107,6 +107,15 @@ deb-src http://packages.groonga.org/${distribution}/ ${code_name} ${component}
 EOF
     run_sudo cp /tmp/groonga.list \
 	${CHROOT_BASE}/${target}/etc/apt/sources.list.d/
+    if [ "${code_name}" = "lenny" ]; then
+	backports_list=/tmp/backports.list
+	run cat <<EOF > ${backports_list}
+deb http://backports.debian.org/debian-backports lenny-backports main
+deb-src http://backports.debian.org/debian-backports lenny-backports main
+EOF
+	run_sudo cp ${backports_list} \
+	    ${CHROOT_BASE}/${target}/etc/apt/sources.list.d/
+    fi
     run_sudo rm -rf $build_dir
     run_sudo su -c "/usr/sbin/chroot ${CHROOT_BASE}/$target /tmp/build-deb.sh"
     run mkdir -p $pool_dir