public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gentoaster:master commit in: /, configs/
@ 2011-06-16 15:58 Liam McLoughlin
  0 siblings, 0 replies; 7+ messages in thread
From: Liam McLoughlin @ 2011-06-16 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     e122ee9d7ad7fbb4a14db0391073c158e95992e7
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Thu Jun 16 15:58:22 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Thu Jun 16 15:58:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=e122ee9d

Fix minimal config and incorrect cachedkernel logic

---
 configs/minimal.ini |    2 +-
 create_image.sh     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/minimal.ini b/configs/minimal.ini
index 92c2924..458d113 100644
--- a/configs/minimal.ini
+++ b/configs/minimal.ini
@@ -8,7 +8,7 @@ TIMEZONE='Europe/London'
 HOSTNAME='gentoo'
 ROOT_PASSWORD='g3nt00'
 DEFAULT_USERNAME='gentoo'
-DEEFAULT_PASSWORD='g3nt00'
+DEFAULT_PASSWORD='g3nt00'
 USE_FLAGS=''
 PACKAGE_USE=''
 FEATURES='parallel-fetch userfetch userpriv getbinpkg'

diff --git a/create_image.sh b/create_image.sh
index d56d36f..03466b1 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -190,7 +190,7 @@ cp etc/init.d/net.lo etc/init.d/net.eth0
 linux32 chroot . rc-update add net.eth0 default &>> ${LOG_FILE}
 
 # If we got the flag, used a cached kernel to reduce build times for testing
-if [ ${FLAGS_cachedkernel} ]; then
+if [[ ${FLAGS_cachedkernel} = ${FLAGS_true} ]]; then
 	echo "Using cached kernel"
 	cp ${TOOL_RES_PATH}/bzImage boot/kernel
 	cp -R ${TOOL_RES_PATH}/kernelmodules/* lib/modules/



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gentoaster:webui commit in: /, configs/
@ 2011-08-02 16:48 Liam McLoughlin
  2011-08-12 23:17 ` [gentoo-commits] proj/gentoaster:master " Liam McLoughlin
  0 siblings, 1 reply; 7+ messages in thread
From: Liam McLoughlin @ 2011-08-02 16:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Tue Aug  2 00:27:47 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Tue Aug  2 00:27:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=6a2a5827

Add more drivers to XFCE config, fix some cachedkernel logic

---
 configs/xfce.ini |    2 +-
 create_image.sh  |   13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/configs/xfce.ini b/configs/xfce.ini
index 1173228..6c249ee 100644
--- a/configs/xfce.ini
+++ b/configs/xfce.ini
@@ -13,5 +13,5 @@ USE_FLAGS='-gnome -kde -minimal -qt4 dbus jpeg lock session startup-notification
 PACKAGE_USE=''
 FEATURES='parallel-fetch userfetch userpriv'
 PACKAGE_ACCEPT_KEYWORDS=''
-PACKAGES_LIST='dhcpcd =dev-lang/python-2.6.6-r2 xorg-server xfce4-meta x11-terms/terminal firefox'
+PACKAGES_LIST='dhcpcd =dev-lang/python-2.6.6-r2 xorg-server xfce4-meta x11-terms/terminal firefox xf86-video-cirrus xf86-input-evdev'
 OUTPUT_FORMAT='raw'

diff --git a/create_image.sh b/create_image.sh
index 9adbc8e..2da2d6f 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -206,13 +206,12 @@ linux32 chroot . rc-update add net.eth0 default &>> ${LOG_FILE}
 echo "Step 17: Setting up kernel"
 # If we got the flag, used a cached kernel to reduce build times for testing
 if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then
-	echo "Using cached kernel" &>> ${LOG_FILE}
-	cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying cached kernel"
-	cp -R ${TOOL_RES_PATH}/modules.tar.gz lib/modules/ || handle_error "Error copying cached kernel modules"
-	tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_error "Error extracting cached kernel modules"
-	ROOTDIR=`pwd`
-	KERNEL=`ls -l ${ROOTDIR}/lib/modules/ | cut -d" " -f9 | tr "\n" " "`
-	linux32 chroot . depmod -a ${KERNEL}
+        echo "Using cached kernel" &>> ${LOG_FILE}
+        cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying cached kernel"
+        mkdir lib/modules && cp  ${TOOL_RES_PATH}/modules.tar.gz lib/modules/ || handle_error "Error copying cached kernel modules"
+        tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_error "Error extracting cached kernel modules"
+        KERNEL=`ls -l lib/modules/ | cut -d" " -f9 | tr "\n" " "`
+        linux32 chroot . depmod -a ${KERNEL}
 else
 	echo "Downloading/installing kernel sources" &>> ${LOG_FILE}
 	linux32 chroot . emerge gentoo-sources &>> ${LOG_FILE} || handle_error "Error emerging kernel sources"



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gentoaster:webui commit in: /, configs/
@ 2011-07-28  4:51 Liam McLoughlin
  2011-08-12 23:17 ` [gentoo-commits] proj/gentoaster:master " Liam McLoughlin
  0 siblings, 1 reply; 7+ messages in thread
From: Liam McLoughlin @ 2011-07-28  4:51 UTC (permalink / raw
  To: gentoo-commits

commit:     69c8f16a4dfd3966183f5a68e304d343fc88430d
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Thu Jul 28 04:50:53 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Thu Jul 28 04:50:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=69c8f16a

Update XFCE config and fix cachedkernel modules

---
 configs/xfce.ini |    2 +-
 create_image.sh  |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configs/xfce.ini b/configs/xfce.ini
index 4ffcdfd..1173228 100644
--- a/configs/xfce.ini
+++ b/configs/xfce.ini
@@ -9,7 +9,7 @@ HOSTNAME='gentoo'
 ROOT_PASSWORD='g3nt00'
 DEFAULT_USERNAME='gentoo'
 DEFAULT_PASSWORD='g3nt00'
-USE_FLAGS='-gnome -kde -minimal -qt4 dbus jpeg lock session startup-notification thunar udev X branding'
+USE_FLAGS='-gnome -kde -minimal -qt4 dbus jpeg lock session startup-notification thunar udev X branding device-mapper gdu policykit extras'
 PACKAGE_USE=''
 FEATURES='parallel-fetch userfetch userpriv'
 PACKAGE_ACCEPT_KEYWORDS=''

diff --git a/create_image.sh b/create_image.sh
index 30084ba..0ef56d0 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -207,9 +207,10 @@ echo "Step 17: Setting up kernel"
 # If we got the flag, used a cached kernel to reduce build times for testing
 if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then
 	echo "Using cached kernel" &>> ${LOG_FILE}
-	KERNEL=`ls -l lib/modules/ | cut -d" " -f9`
 	cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying cached kernel"
-	cp -R ${TOOL_RES_PATH}/modules/* lib/modules/ || handle_error "Error copying cached kernel modules"
+	cp -R ${TOOL_RES_PATH}/modules.tar.gz lib/modules/ || handle_error "Error copying cached kernel modules"
+	tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_error "Error extracting cached kernel modules"
+	KERNEL=`ls -l lib/modules/ | cut -d" " -f9 | tr "\n" " "`
 	linux32 chroot . depmod -a ${KERNEL}
 else
 	echo "Downloading/installing kernel sources" &>> ${LOG_FILE}



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gentoaster:master commit in: /, configs/
@ 2011-06-16  0:51 Liam McLoughlin
  0 siblings, 0 replies; 7+ messages in thread
From: Liam McLoughlin @ 2011-06-16  0:51 UTC (permalink / raw
  To: gentoo-commits

commit:     a5238a1738df4ccb5885257264017cd17192a689
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Thu Jun 16 00:44:25 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Thu Jun 16 00:50:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=a5238a17

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='Europe/London'
 HOSTNAME='gentoo'
 ROOT_PASSWORD='g3nt00'
 DEFAULT_USERNAME='gentoo'
-DEEFAULT_PASSWORD='g3nt00'
+DEFAULT_PASSWORD='g3nt00'
 USE_FLAGS='-qt4 kde X dbus gtk gnome xorg udev truetype nls imlib'
 PACKAGE_USE='media-libs/imlib2 X'
 FEATURES='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="${BUILD_ID}.image"
 ROOT_MEGABYTES=$(( ${IMAGE_MEGABYTES} - ( ${BOOT_MEGABYTES} + ${SWAP_MEGABYTES} + 1 ) ))
 IMAGE_BYTES=$(( ${IMAGE_MEGABYTES} * 1024 * 1024 ))
 IMAGES_OUTPUT_PATH=`pwd`
-IMAGE_WORK_PATH="/root/gentoo/${BUILD_ID}"
+IMAGE_WORK_PATH="${IMAGES_OUTPUT_PATH}/${BUILD_ID}"
 LOG_FILE="${IMAGE_WORK_PATH}/log.txt"
 TOOL_RES_PATH=`pwd`/res
 
-CPU_CORES=`grep -c processor /proc/cpuinfo`
+NUM_JOBS=$(( `grep -c processor /proc/cpuinfo`+1 ))
 STAGE3_URL="http://distfiles.gentoo.org/releases/x86/current-stage3/stage3-i486-20110607.tar.bz2"
 PORTAGE_URL="http://distfiles.gentoo.org/snapshots/portage-latest.tar.bz2"
 BINHOST_URL="http://tinderbox.dev.gentoo.org/default-linux/x86"
+EMERGE_PROXY="http://127.0.0.1:3128"
 
 echo "Creating build working directory"
 mkdir -p ${IMAGE_WORK_PATH}
@@ -121,16 +122,21 @@ cp -L /etc/resolv.conf etc/resolv.conf
 
 echo "Setting up make.conf"
 mkdir -p usr/portage/packages
-echo 'PORTAGE_BINHOST="${BINHOST_URL}"' >> etc/make.conf
-echo 'PKGDIR="/usr/portage/packages"' >> etc/make.conf
-echo 'FEATURES="${FEATURES}"' >> etc/make.conf
-echo 'USE="${USE_FLAGS}"' >> etc/make.conf
-if [[ ${OUTPUT_FORMAT} = "vbox" ]]
-then
+echo "PORTAGE_BINHOST=\"${BINHOST_URL}\"" >> etc/make.conf
+echo "PKGDIR=\"/usr/portage/packages\"" >> etc/make.conf
+echo "FEATURES=\"${FEATURES}\"" >> etc/make.conf
+echo "USE=\"${USE_FLAGS}\"" >> etc/make.conf
+
+if [[ ${OUTPUT_FORMAT} = "vbox" ]]; then
 	echo 'INPUT_DEVICES="virtualbox evdev"' >> etc/make.conf
 	echo 'VIDEO_CARDS="virtualbox"' >> etc/make.conf
 fi
 
+if [ -n $EMERGE_PROXY ]; then
+	echo "Enabling HTTP proxy"
+	echo "http_proxy=\"${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=( "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}
 
 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
 
 echo "Building kernel"
-linux32 chroot . make -C /usr/src/linux -j$(( ${CPU_CORES}+1 )) &>> ${LOG_FILE}
+linux32 chroot . make -C /usr/src/linux -j${NUM_JOBS} &>> ${LOG_FILE}
 
 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/bzImage /boot/kernel &>> ${LOG
 echo "Setting root password"
 linux32 chroot . /bin/bash -c "echo 'root:${ROOT_PASSWORD}' | chpasswd" &>> ${LOG_FILE}
 
-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=${NUM_JOBS} ${PACKAGE} &>> ${LOG_FILE}
+done
 
 echo "Adding default user"
 linux32 chroot . useradd -g users -G lp,wheel,audio,cdrom,portage -m ${DEFAULT_USERNAME}
@@ -186,10 +195,14 @@ then
 	echo "Installing VirtualBox additions/drivers"
 	linux32 chroot . emerge xf86-video-virtualbox xf86-input-virtualbox virtualbox-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
 
+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=/usr/lib/extlinux/mbr.bin of=../${IMAGE_NAME} conv=notrunc
@@ -200,19 +213,19 @@ cleanup_mounts
 case "${OUTPUT_FORMAT}" in
 	"raw" )
 		echo "Already in raw format, not converting"
-		IMAGE_OUT="${IMAGE_NAME}.image"
+		IMAGE_OUT="${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="${IMAGE_NAME}.vdi"
+		IMAGE_OUT="${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="${IMAGE_NAME}.vmdk"
+		IMAGE_OUT="${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]="" # remove first element
     ini[${#ini[*]} + 1]='}'    # add the last brace
     eval "$(echo "${ini[*]}")" # eval the result
+    IFS=" "
 }
 
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gentoaster:master commit in: /, configs/
@ 2011-06-16  0:44 Liam McLoughlin
  2011-06-16  1:01 ` Liam McLoughlin
  0 siblings, 1 reply; 7+ messages in thread
From: Liam McLoughlin @ 2011-06-16  0:44 UTC (permalink / raw
  To: gentoo-commits

commit:     db0cb1e0971201ff81a595247b24db874e5bc1fb
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Thu Jun 16 00:44:25 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Thu Jun 16 00:44:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=db0cb1e0

Bugfixes and tidy up

---
 configs/fluxbox.ini |    2 +-
 create_image.sh     |   43 ++++++++++++++++++++++++++++---------------
 parse_config.sh     |    1 +
 3 files changed, 30 insertions(+), 16 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='Europe/London'
 HOSTNAME='gentoo'
 ROOT_PASSWORD='g3nt00'
 DEFAULT_USERNAME='gentoo'
-DEEFAULT_PASSWORD='g3nt00'
+DEFAULT_PASSWORD='g3nt00'
 USE_FLAGS='-qt4 kde X dbus gtk gnome xorg udev truetype nls imlib'
 PACKAGE_USE='media-libs/imlib2 X'
 FEATURES='parallel-fetch userfetch userpriv getbinpkg'

diff --git a/create_image.sh b/create_image.sh
index 27d439b..1f58e83 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -18,10 +18,11 @@ IMAGE_WORK_PATH="/root/gentoo/${BUILD_ID}"
 LOG_FILE="${IMAGE_WORK_PATH}/log.txt"
 TOOL_RES_PATH=`pwd`/res
 
-CPU_CORES=`grep -c processor /proc/cpuinfo`
+NUM_JOBS=$(( `grep -c processor /proc/cpuinfo`+1 ))
 STAGE3_URL="http://distfiles.gentoo.org/releases/x86/current-stage3/stage3-i486-20110607.tar.bz2"
 PORTAGE_URL="http://distfiles.gentoo.org/snapshots/portage-latest.tar.bz2"
 BINHOST_URL="http://tinderbox.dev.gentoo.org/default-linux/x86"
+EMERGE_PROXY="http://127.0.0.1:3128"
 
 echo "Creating build working directory"
 mkdir -p ${IMAGE_WORK_PATH}
@@ -121,16 +122,21 @@ cp -L /etc/resolv.conf etc/resolv.conf
 
 echo "Setting up make.conf"
 mkdir -p usr/portage/packages
-echo 'PORTAGE_BINHOST="${BINHOST_URL}"' >> etc/make.conf
-echo 'PKGDIR="/usr/portage/packages"' >> etc/make.conf
-echo 'FEATURES="${FEATURES}"' >> etc/make.conf
-echo 'USE="${USE_FLAGS}"' >> etc/make.conf
-if [[ ${OUTPUT_FORMAT} = "vbox" ]]
-then
+echo "PORTAGE_BINHOST=\"${BINHOST_URL}\"" >> etc/make.conf
+echo "PKGDIR=\"/usr/portage/packages\"" >> etc/make.conf
+echo "FEATURES=\"${FEATURES}\"" >> etc/make.conf
+echo "USE=\"${USE_FLAGS}\"" >> etc/make.conf
+
+if [[ ${OUTPUT_FORMAT} = "vbox" ]]; then
 	echo 'INPUT_DEVICES="virtualbox evdev"' >> etc/make.conf
 	echo 'VIDEO_CARDS="virtualbox"' >> etc/make.conf
 fi
 
+if [ -n $EMERGE_PROXY ]; then
+	echo "Enabling HTTP proxy"
+	echo "http_proxy=\"${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=( "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}
 
 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
 
 echo "Building kernel"
-linux32 chroot . make -C /usr/src/linux -j$(( ${CPU_CORES}+1 )) &>> ${LOG_FILE}
+linux32 chroot . make -C /usr/src/linux -j${NUM_JOBS} &>> ${LOG_FILE}
 
 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/bzImage /boot/kernel &>> ${LOG
 echo "Setting root password"
 linux32 chroot . /bin/bash -c "echo 'root:${ROOT_PASSWORD}' | chpasswd" &>> ${LOG_FILE}
 
-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=${NUM_JOBS} ${PACKAGE} &>> ${LOG_FILE}
+done
 
 echo "Adding default user"
 linux32 chroot . useradd -g users -G lp,wheel,audio,cdrom,portage -m ${DEFAULT_USERNAME}
@@ -186,10 +195,14 @@ then
 	echo "Installing VirtualBox additions/drivers"
 	linux32 chroot . emerge xf86-video-virtualbox xf86-input-virtualbox virtualbox-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
 
+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=/usr/lib/extlinux/mbr.bin of=../${IMAGE_NAME} conv=notrunc
@@ -200,19 +213,19 @@ cleanup_mounts
 case "${OUTPUT_FORMAT}" in
 	"raw" )
 		echo "Already in raw format, not converting"
-		IMAGE_OUT="${IMAGE_NAME}.image"
+		IMAGE_OUT="${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="${IMAGE_NAME}.vdi"
+		IMAGE_OUT="${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="${IMAGE_NAME}.vmdk"
+		IMAGE_OUT="${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]="" # remove first element
     ini[${#ini[*]} + 1]='}'    # add the last brace
     eval "$(echo "${ini[*]}")" # eval the result
+    IFS=" "
 }
 
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gentoaster:master commit in: /, configs/
@ 2011-06-15 21:09 Liam McLoughlin
  0 siblings, 0 replies; 7+ messages in thread
From: Liam McLoughlin @ 2011-06-15 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1722e7157285dd4c8cf6c359912310f6154e2303
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Wed Jun 15 21:09:31 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Wed Jun 15 21:09:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=1722e715

Minimal configuration has to be larger, fixed a network setup error too

---
 configs/minimal.ini |    2 +-
 create_image.sh     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/minimal.ini b/configs/minimal.ini
index 48f197f..92c2924 100644
--- a/configs/minimal.ini
+++ b/configs/minimal.ini
@@ -1,7 +1,7 @@
 [vmconfig]
 
 BUILD_ID='minimal'
-IMAGE_MEGABYTES='3072'
+IMAGE_MEGABYTES='4096'
 BOOT_MEGABYTES='64'
 SWAP_MEGABYTES='128'
 TIMEZONE='Europe/London'

diff --git a/create_image.sh b/create_image.sh
index ad271a2..27d439b 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -155,7 +155,7 @@ cp ${TOOL_RES_PATH}/fstab etc/fstab &>> ${LOG_FILE}
 
 echo "Setting up networking"
 echo 'config_eth0=( "dhcp" )' > etc/conf.d/net
-ln -s etc/init.d/net.lo etc/init.d/net.eth0
+cp etc/init.d/net.lo etc/init.d/net.eth0
 linux32 chroot . rc-update add net.eth0 default
 
 echo "Downloading/installing kernel sources"



^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-08-12 23:20 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-16 15:58 [gentoo-commits] proj/gentoaster:master commit in: /, configs/ Liam McLoughlin
  -- strict thread matches above, loose matches on Subject: below --
2011-08-02 16:48 [gentoo-commits] proj/gentoaster:webui " Liam McLoughlin
2011-08-12 23:17 ` [gentoo-commits] proj/gentoaster:master " Liam McLoughlin
2011-07-28  4:51 [gentoo-commits] proj/gentoaster:webui " Liam McLoughlin
2011-08-12 23:17 ` [gentoo-commits] proj/gentoaster:master " Liam McLoughlin
2011-06-16  0:51 Liam McLoughlin
2011-06-16  0:44 Liam McLoughlin
2011-06-16  1:01 ` Liam McLoughlin
2011-06-15 21:09 Liam McLoughlin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox