From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QX0o4-0003l9-21 for garchives@archives.gentoo.org; Thu, 16 Jun 2011 00:51:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C90211C00C; Thu, 16 Jun 2011 00:51:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8412E1C00C for ; Thu, 16 Jun 2011 00:51:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8C521BC002 for ; Thu, 16 Jun 2011 00:51:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F13678003C for ; Thu, 16 Jun 2011 00:51:24 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: Subject: [gentoo-commits] proj/gentoaster:master commit in: /, configs/ X-VCS-Repository: proj/gentoaster X-VCS-Files: configs/fluxbox.ini create_image.sh parse_config.sh X-VCS-Directories: / configs/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: a5238a1738df4ccb5885257264017cd17192a689 Date: Thu, 16 Jun 2011 00:51:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c31c27519453a1196bfaf9d58afa8a13 commit: a5238a1738df4ccb5885257264017cd17192a689 Author: Liam McLoughlin hexxeh net> AuthorDate: Thu Jun 16 00:44:25 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Thu Jun 16 00:50:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3Da5238a17 Bugfixes and tidy up --- configs/fluxbox.ini | 2 +- create_image.sh | 45 +++++++++++++++++++++++++++++---------------- parse_config.sh | 1 + 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/configs/fluxbox.ini b/configs/fluxbox.ini index cdc2e1f..596d0c7 100644 --- a/configs/fluxbox.ini +++ b/configs/fluxbox.ini @@ -8,7 +8,7 @@ TIMEZONE=3D'Europe/London' HOSTNAME=3D'gentoo' ROOT_PASSWORD=3D'g3nt00' DEFAULT_USERNAME=3D'gentoo' -DEEFAULT_PASSWORD=3D'g3nt00' +DEFAULT_PASSWORD=3D'g3nt00' USE_FLAGS=3D'-qt4 kde X dbus gtk gnome xorg udev truetype nls imlib' PACKAGE_USE=3D'media-libs/imlib2 X' FEATURES=3D'parallel-fetch userfetch userpriv getbinpkg' diff --git a/create_image.sh b/create_image.sh index 27d439b..5b7340a 100755 --- a/create_image.sh +++ b/create_image.sh @@ -14,14 +14,15 @@ IMAGE_NAME=3D"${BUILD_ID}.image" ROOT_MEGABYTES=3D$(( ${IMAGE_MEGABYTES} - ( ${BOOT_MEGABYTES} + ${SWAP_M= EGABYTES} + 1 ) )) IMAGE_BYTES=3D$(( ${IMAGE_MEGABYTES} * 1024 * 1024 )) IMAGES_OUTPUT_PATH=3D`pwd` -IMAGE_WORK_PATH=3D"/root/gentoo/${BUILD_ID}" +IMAGE_WORK_PATH=3D"${IMAGES_OUTPUT_PATH}/${BUILD_ID}" LOG_FILE=3D"${IMAGE_WORK_PATH}/log.txt" TOOL_RES_PATH=3D`pwd`/res =20 -CPU_CORES=3D`grep -c processor /proc/cpuinfo` +NUM_JOBS=3D$(( `grep -c processor /proc/cpuinfo`+1 )) STAGE3_URL=3D"http://distfiles.gentoo.org/releases/x86/current-stage3/st= age3-i486-20110607.tar.bz2" PORTAGE_URL=3D"http://distfiles.gentoo.org/snapshots/portage-latest.tar.= bz2" BINHOST_URL=3D"http://tinderbox.dev.gentoo.org/default-linux/x86" +EMERGE_PROXY=3D"http://127.0.0.1:3128" =20 echo "Creating build working directory" mkdir -p ${IMAGE_WORK_PATH} @@ -121,16 +122,21 @@ cp -L /etc/resolv.conf etc/resolv.conf =20 echo "Setting up make.conf" mkdir -p usr/portage/packages -echo 'PORTAGE_BINHOST=3D"${BINHOST_URL}"' >> etc/make.conf -echo 'PKGDIR=3D"/usr/portage/packages"' >> etc/make.conf -echo 'FEATURES=3D"${FEATURES}"' >> etc/make.conf -echo 'USE=3D"${USE_FLAGS}"' >> etc/make.conf -if [[ ${OUTPUT_FORMAT} =3D "vbox" ]] -then +echo "PORTAGE_BINHOST=3D\"${BINHOST_URL}\"" >> etc/make.conf +echo "PKGDIR=3D\"/usr/portage/packages\"" >> etc/make.conf +echo "FEATURES=3D\"${FEATURES}\"" >> etc/make.conf +echo "USE=3D\"${USE_FLAGS}\"" >> etc/make.conf + +if [[ ${OUTPUT_FORMAT} =3D "vbox" ]]; then echo 'INPUT_DEVICES=3D"virtualbox evdev"' >> etc/make.conf echo 'VIDEO_CARDS=3D"virtualbox"' >> etc/make.conf fi =20 +if [ -n $EMERGE_PROXY ]; then + echo "Enabling HTTP proxy" + echo "http_proxy=3D\"${EMERGE_PROXY}\"" >> etc/make.conf +fi + echo "Setting up package.use" mkdir -p etc/portage echo ${PACKAGE_USE} >> etc/portage/package.use @@ -156,7 +162,7 @@ cp ${TOOL_RES_PATH}/fstab etc/fstab &>> ${LOG_FILE} echo "Setting up networking" echo 'config_eth0=3D( "dhcp" )' > etc/conf.d/net cp etc/init.d/net.lo etc/init.d/net.eth0 -linux32 chroot . rc-update add net.eth0 default +linux32 chroot . rc-update add net.eth0 default &>> ${LOG_FILE} =20 echo "Downloading/installing kernel sources" linux32 chroot . emerge gentoo-sources &>> ${LOG_FILE} @@ -165,7 +171,7 @@ echo "Copying kernel configuration" cp ${TOOL_RES_PATH}/kernelconfig usr/src/linux/.config =20 echo "Building kernel" -linux32 chroot . make -C /usr/src/linux -j$(( ${CPU_CORES}+1 )) &>> ${LO= G_FILE} +linux32 chroot . make -C /usr/src/linux -j${NUM_JOBS} &>> ${LOG_FILE} =20 echo "Installing kernel" linux32 chroot . make -C /usr/src/linux modules_install &>> ${LOG_FILE} @@ -174,8 +180,11 @@ linux32 chroot . cp /usr/src/linux/arch/i386/boot/bz= Image /boot/kernel &>> ${LOG echo "Setting root password" linux32 chroot . /bin/bash -c "echo 'root:${ROOT_PASSWORD}' | chpasswd" = &>> ${LOG_FILE} =20 -echo "Installing packages list" -linux32 chroot . emerge ${PACKAGES_LIST} &>> ${LOG_FILE} +echo "Processing packages list" +for PACKAGE in ${PACKAGES_LIST}; do + echo "Installing ${PACKAGE}" + linux32 chroot . emerge --jobs=3D${NUM_JOBS} ${PACKAGE} &>> ${LOG_FILE} +done =20 echo "Adding default user" linux32 chroot . useradd -g users -G lp,wheel,audio,cdrom,portage -m ${D= EFAULT_USERNAME} @@ -186,10 +195,14 @@ then echo "Installing VirtualBox additions/drivers" linux32 chroot . emerge xf86-video-virtualbox xf86-input-virtualbox vir= tualbox-guest-additions &>> ${LOG_FILE} linux32 chroot . rc-update add virtualbox-guest-additions default &>> $= {LOG_FILE} - linux32 chroot . mv /etc/X11/xorg.conf /etc/X11/xorg.conf.bak &>> ${LOG= _FILE} + mv etc/X11/xorg.conf etc/X11/xorg.conf.bak &>> ${LOG_FILE} linux32 chroot . usermod -a vboxguest ${DEFAULT_USERNAME} fi =20 +if [ -n ${EMERGE_PROXY} ]; then + sed -i '/http_proxy/ d' etc/make.conf +fi + echo "Installing extlinux" extlinux --heads 255 --sectors 63 --install boot dd if=3D/usr/lib/extlinux/mbr.bin of=3D../${IMAGE_NAME} conv=3Dnotrunc @@ -200,19 +213,19 @@ cleanup_mounts case "${OUTPUT_FORMAT}" in "raw" ) echo "Already in raw format, not converting" - IMAGE_OUT=3D"${IMAGE_NAME}.image" + IMAGE_OUT=3D"${BUILD_ID}.image" ;; "vbox" ) echo "Converting image from RAW to VDI" qemu-img convert -O vdi ${IMAGE_NAME} ${BUILD_ID}.vdi rm -rf ${IMAGE_NAME} - IMAGE_OUT=3D"${IMAGE_NAME}.vdi" + IMAGE_OUT=3D"${BUILD_ID}.vdi" ;; "vmware" ) echo "Converting image from RAW to VMDK" qemu-img convert -O vmdk ${IMAGE_NAME} ${BUILD_ID}.vmdk rm -rf ${IMAGE_NAME} - IMAGE_OUT=3D"${IMAGE_NAME}.vmdk" + IMAGE_OUT=3D"${BUILD_ID}.vmdk" ;; esac mv ${IMAGE_OUT} ${IMAGES_OUTPUT_PATH}/${IMAGE_OUT} diff --git a/parse_config.sh b/parse_config.sh index 24aba14..090954a 100755 --- a/parse_config.sh +++ b/parse_config.sh @@ -23,6 +23,7 @@ cfg_parser () ini[0]=3D"" # remove first element ini[${#ini[*]} + 1]=3D'}' # add the last brace eval "$(echo "${ini[*]}")" # eval the result + IFS=3D" " } =20 =20