* [gentoo-commits] proj/gentoaster:webui commit in: /, configs/
@ 2011-07-28 4:51 Liam McLoughlin
0 siblings, 0 replies; 4+ 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] 4+ 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; 4+ 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] 4+ messages in thread
* [gentoo-commits] proj/gentoaster:webui commit in: /, configs/
@ 2011-08-02 16:48 Liam McLoughlin
0 siblings, 0 replies; 4+ messages in thread
From: Liam McLoughlin @ 2011-08-02 16:48 UTC (permalink / raw
To: gentoo-commits
commit: c80e652a6becc61fa29e8ae5f2a8c8b5c9ee3771
Author: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Tue Aug 2 16:48:28 2011 +0000
Commit: Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Tue Aug 2 16:48:28 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=c80e652a
Keyboard layout support for build tool, Stage3/Portage/BINHOST override from config files
---
configs/fluxbox.ini | 1 +
configs/minimal.ini | 1 +
configs/xfce.ini | 1 +
create_image.sh | 38 +++++++++++++++++++++++++-------------
daemon.php | 2 +-
5 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/configs/fluxbox.ini b/configs/fluxbox.ini
index f199237..cf9c3cb 100644
--- a/configs/fluxbox.ini
+++ b/configs/fluxbox.ini
@@ -5,6 +5,7 @@ BOOT_MEGABYTES='64'
SWAP_MEGABYTES='128'
ROOT_MEGABYTES='7999'
TIMEZONE='Europe/London'
+KEYBOARD='uk'
HOSTNAME='gentoo'
ROOT_PASSWORD='g3nt00'
DEFAULT_USERNAME='gentoo'
diff --git a/configs/minimal.ini b/configs/minimal.ini
index 0d7eed6..13740a2 100644
--- a/configs/minimal.ini
+++ b/configs/minimal.ini
@@ -5,6 +5,7 @@ BOOT_MEGABYTES='64'
SWAP_MEGABYTES='128'
ROOT_MEGABYTES='3903'
TIMEZONE='Europe/London'
+KEYBOARD='uk'
HOSTNAME='gentoo'
ROOT_PASSWORD='g3nt00'
DEFAULT_USERNAME='gentoo'
diff --git a/configs/xfce.ini b/configs/xfce.ini
index 6c249ee..bb4c14f 100644
--- a/configs/xfce.ini
+++ b/configs/xfce.ini
@@ -5,6 +5,7 @@ BOOT_MEGABYTES='64'
SWAP_MEGABYTES='128'
ROOT_MEGABYTES='16190'
TIMEZONE='Europe/London'
+KEYBOARD='uk'
HOSTNAME='gentoo'
ROOT_PASSWORD='g3nt00'
DEFAULT_USERNAME='gentoo'
diff --git a/create_image.sh b/create_image.sh
index 2da2d6f..3858dac 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -52,11 +52,20 @@ LOG_FILE="${IMAGE_WORK_PATH}/log.txt"
TOOL_RES_PATH=${RUNNING_DIRECTORY}/res
NUM_JOBS=$(( `grep -c processor /proc/cpuinfo`+1 ))
-STAGE3_URL="http://distribution.hexxeh.net/gentoo/stage3-i686-latest.tar.bz2"
-PORTAGE_URL="http://distribution.hexxeh.net/gentoo/portage-latest.tar.bz2"
-BINHOST_URL="http://tinderbox.dev.gentoo.org/default-linux/x86"
EMERGE_PROXY="${FLAGS_proxy}"
+if [ -z ${STAGE3_URL} ]; then
+ STAGE3_URL="http://distribution.hexxeh.net/gentoo/stage3-i686-latest.tar.bz2"
+fi
+
+if [ -z ${PORTAGE_URL} ]; then
+ PORTAGE_URL="http://distribution.hexxeh.net/gentoo/portage-latest.tar.bz2"
+fi
+
+if [ -z ${BINHOST_URL} ]; then
+ BINHOST_URL="http://tinderbox.dev.gentoo.org/default-linux/x86"
+fi
+
# Clean up old mounts
cleanup_mounts() {
sleep 2
@@ -191,19 +200,22 @@ linux32 chroot . /bin/bash /etc/profile &>> ${LOG_FILE}
echo "Step 13: Setting timezone to ${TIMEZONE}"
linux32 chroot . cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime &>> ${LOG_FILE}
-echo "Step 14: Setting hostname to ${HOSTNAME}"
+echo "Step 14: Setting keyboard layout to ${KEYBOARD}"
+linux32 chroot . sed -i -e "s/keymap=.*/keymap=\"${KEYBOARD}\"/" /etc/conf.d/keymaps &>> ${LOG_FILE}
+
+echo "Step 15: Setting hostname to ${HOSTNAME}"
linux32 chroot . /bin/bash -c "echo hostname='${HOSTNAME}' > /etc/conf.d/hostname" &>> ${LOG_FILE}
linux32 chroot . /bin/bash -c "echo 127.0.0.1 ${HOSTNAME}.local ${HOSTNAME} localhost > /etc/hosts" &>> ${LOG_FILE}
-echo "Step 15: Copying new fstab"
+echo "Step 16: Copying new fstab"
cp ${TOOL_RES_PATH}/fstab etc/fstab &>> ${LOG_FILE}
-echo "Step 16: Setting up networking"
+echo "Step 17: 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 &>> ${LOG_FILE}
-echo "Step 17: Setting up kernel"
+echo "Step 18: 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}
@@ -227,16 +239,16 @@ else
cp usr/src/linux/arch/i386/boot/bzImage boot/kernel &>> ${LOG_FILE} || handle_error "Error copying kernel"
fi
-echo "Step 18: Setting root password"
+echo "Step 19: Setting root password"
linux32 chroot . /bin/bash -c "echo 'root:${ROOT_PASSWORD}' | chpasswd" &>> ${LOG_FILE} || handle_error "Error setting root password"
-echo "Step 19: Processing packages list"
+echo "Step 20: Processing packages list"
for PACKAGE in ${PACKAGES_LIST}; do
echo "Installing ${PACKAGE}" &>> ${LOG_FILE}
linux32 chroot . emerge --jobs=${NUM_JOBS} ${PACKAGE} &>> ${LOG_FILE} || handle_error "Error emerging ${PACKAGE}"
done
-echo "Step 20: Adding default user"
+echo "Step 21: Adding default user"
linux32 chroot . useradd -g users -G lp,wheel,audio,cdrom,portage -m ${DEFAULT_USERNAME} || handle_error "Error adding default user"
linux32 chroot . /bin/bash -c "echo '${DEFAULT_USERNAME}:${DEFAULT_PASSWORD}' | chpasswd" &>> ${LOG_FILE} || handle_error "Error setting default user password"
@@ -249,13 +261,13 @@ then
linux32 chroot . usermod -a vboxguest ${DEFAULT_USERNAME}
fi
-echo "Step 21: Cleaning up make.conf"
+echo "Step 22: Cleaning up make.conf"
if [ -n ${EMERGE_PROXY} ]; then
sed -i '/http_proxy/ d' etc/make.conf
fi
sed -i '/MAKEOPTS/ d' etc/make.conf
-echo "Step 22: Installing extlinux"
+echo "Step 23: Installing extlinux"
extlinux --heads 255 --sectors 63 --install boot &>> ${LOG_FILE} || handle_error "Error installing extlinux"
dd if=/usr/lib/extlinux/mbr.bin of=../${IMAGE_NAME} conv=notrunc &>> ${LOG_FILE} || handle_error "Error copying extlinux MBR"
cp ${TOOL_RES_PATH}/extlinux.conf boot/ || handle_error "Error copying extlinux configuration"
@@ -291,6 +303,6 @@ if [[ ${FLAGS_compress} -eq ${FLAGS_TRUE} ]]; then
IMAGE_OUT="${BUILD_ID}.tar.gz"
fi
-echo "Step 23: Image build completed!"
+echo "Step 24: Image build completed!"
echo "Your image is here: ${IMAGES_OUTPUT_PATH}/${IMAGE_OUT}"
echo "Your log file is here: ${IMAGES_OUTPUT_PATH}/${BUILD_ID}.log"
diff --git a/daemon.php b/daemon.php
index 6704053..65d7d2b 100644
--- a/daemon.php
+++ b/daemon.php
@@ -53,7 +53,7 @@
function image_build($job)
{
- $progressMagic = 23;
+ $progressMagic = 24;
$handle = $job->handle();
$handlehash = md5($handle);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoaster:master commit in: /, configs/
2011-08-02 16:48 [gentoo-commits] proj/gentoaster:webui commit in: /, configs/ Liam McLoughlin
@ 2011-08-12 23:17 ` Liam McLoughlin
0 siblings, 0 replies; 4+ messages in thread
From: Liam McLoughlin @ 2011-08-12 23:17 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] 4+ messages in thread
end of thread, other threads:[~2011-08-12 23:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-02 16:48 [gentoo-commits] proj/gentoaster:webui commit in: /, configs/ Liam McLoughlin
2011-08-12 23:17 ` [gentoo-commits] proj/gentoaster:master " Liam McLoughlin
-- strict thread matches above, loose matches on Subject: below --
2011-08-02 16:48 [gentoo-commits] proj/gentoaster:webui " Liam McLoughlin
2011-07-28 4:51 Liam McLoughlin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox