null+****@clear*****
null+****@clear*****
2012年 4月 23日 (月) 18:16:12 JST
Kouhei Sutou 2012-04-23 18:16:12 +0900 (Mon, 23 Apr 2012)
New Revision: 7a9260c193402a0c81478b0d01d38bca023b4173
Log:
apt: use lsb-release
Modified files:
packages/apt/build-deb.sh
packages/apt/build-in-chroot.sh
Modified: packages/apt/build-deb.sh (+29 -19)
===================================================================
--- packages/apt/build-deb.sh 2012-04-23 17:51:26 +0900 (f999daf)
+++ packages/apt/build-deb.sh 2012-04-23 18:16:12 +0900 (5e9e56e)
@@ -7,7 +7,6 @@ USER_NAME=$(cat /tmp/build-user)
VERSION=$(cat /tmp/build-version)
DEPENDED_PACKAGES=$(cat /tmp/depended-packages)
BUILD_SCRIPT=/tmp/build-deb-in-chroot.sh
-CODE_NAME=$(cat /tmp/code-name)
mysql_server_package=mysql-server-5.1
@@ -23,24 +22,6 @@ run()
grep '^deb ' /etc/apt/sources.list | \
sed -e 's/^deb /deb-src /' > /etc/apt/sources.list.d/base-source.list
-case $CODE_NAME in
- lenny|squeeze|wheezy)
- cat <<EOF > /etc/apt/sources.list.d/security.list
-deb http://security.debian.org/ ${CODE_NAME}/updates main
-deb-src http://security.debian.org/ ${CODE_NAME}/updates main
-EOF
- ;;
- unstable)
- :
- ;;
- *)
- cat <<EOF > /etc/apt/sources.list.d/security.list
-deb http://security.ubuntu.com/ubuntu ${CODE_NAME}-security main restricted
-deb-src http://security.ubuntu.com/ubuntu ${CODE_NAME}-security main restricted
-EOF
- ;;
-esac
-
groonga_apt_key=1C837F31
if ! apt-key list | grep -q ${groonga_apt_key}; then
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com ${groonga_apt_key}
@@ -53,6 +34,35 @@ fi
run aptitude update -V -D
run aptitude safe-upgrade -V -D -y
+security_list=/etc/apt/sources.list.d/security.list
+if [ ! -d "${security_list}" ]; then
+ run aptitude install -V -D -y lsb-release
+
+ distribution=$(lsb_release --id --short)
+ code_name=$(lsb_release --codename --short)
+ case ${distribution} in
+ Debian)
+ if [ "${code_name}" = "sid" ]; then
+ touch "${security_list}"
+ else
+ cat <<EOF > "${security_list}"
+deb http://security.debian.org/ ${code_name}/updates main
+deb-src http://security.debian.org/ ${code_name}/updates main
+EOF
+ ;;
+ fi
+ Ubuntu)
+ cat <<EOF > "${security_list}"
+deb http://security.ubuntu.com/ubuntu ${code_name}-security main restricted
+deb-src http://security.ubuntu.com/ubuntu ${code_name}-security main restricted
+EOF
+ ;;
+ esac
+
+ run aptitude update -V -D
+ run aptitude safe-upgrade -V -D -y
+fi
+
run aptitude install -V -D -y devscripts ${DEPENDED_PACKAGES}
run aptitude build-dep -V -D -y ${mysql_server_package}
run aptitude clean
Modified: packages/apt/build-in-chroot.sh (+0 -1)
===================================================================
--- packages/apt/build-in-chroot.sh 2012-04-23 17:51:26 +0900 (211abb0)
+++ packages/apt/build-in-chroot.sh 2012-04-23 18:16:12 +0900 (df55c5f)
@@ -103,7 +103,6 @@ build()
run echo $PACKAGE > ${CHROOT_BASE}/$target/tmp/build-package
run echo $VERSION > ${CHROOT_BASE}/$target/tmp/build-version
run echo $build_user > ${CHROOT_BASE}/$target/tmp/build-user
- run echo $code_name > ${CHROOT_BASE}/$target/tmp/code-name
run cp ${script_base_dir}/${PACKAGE}-depended-packages \
${CHROOT_BASE}/$target/tmp/depended-packages
run cp ${script_base_dir}/build-deb.sh \