null+****@clear*****
null+****@clear*****
2010年 10月 28日 (木) 16:15:23 JST
Kouhei Sutou 2010-10-28 07:15:23 +0000 (Thu, 28 Oct 2010) New Revision: d6210757289149d37e84f8a77f6c9edbb4813bd0 Log: setup lenny-backports apt list in build-in-chroot not build-deb. Modified files: apt/build-deb.sh apt/build-in-chroot.sh Modified: apt/build-deb.sh (+0 -10) =================================================================== --- apt/build-deb.sh 2010-10-27 14:38:11 +0000 (6c5ad9e) +++ apt/build-deb.sh 2010-10-28 07:15:23 +0000 (c9d82f2) @@ -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 Modified: apt/build-in-chroot.sh (+9 -0) =================================================================== --- apt/build-in-chroot.sh 2010-10-27 14:38:11 +0000 (b41efcc) +++ apt/build-in-chroot.sh 2010-10-28 07:15:23 +0000 (f2b8465) @@ -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