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 1QoI9L-0007cj-Lg for garchives@archives.gentoo.org; Tue, 02 Aug 2011 16:48:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63BEF21C246; Tue, 2 Aug 2011 16:48:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3457921C24C for ; Tue, 2 Aug 2011 16:48:52 +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 845B61B4027 for ; Tue, 2 Aug 2011 16:48:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A0AEF3C004 for ; Tue, 2 Aug 2011 16:48:50 +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: <6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f.hexxeh@gentoo> Subject: [gentoo-commits] proj/gentoaster:webui commit in: /, configs/ X-VCS-Repository: proj/gentoaster X-VCS-Files: configs/xfce.ini create_image.sh X-VCS-Directories: / configs/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: 6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f Date: Tue, 2 Aug 2011 16:48:50 +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: edb469d1545bb8909490c24335cd7d14 commit: 6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f Author: Liam McLoughlin hexxeh net> AuthorDate: Tue Aug 2 00:27:47 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Tue Aug 2 00:27:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3D6a2a5827 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=3D'-gnome -kde -minimal -qt4 dbus jpeg lock s= ession startup-notification PACKAGE_USE=3D'' FEATURES=3D'parallel-fetch userfetch userpriv' PACKAGE_ACCEPT_KEYWORDS=3D'' -PACKAGES_LIST=3D'dhcpcd =3Ddev-lang/python-2.6.6-r2 xorg-server xfce4-me= ta x11-terms/terminal firefox' +PACKAGES_LIST=3D'dhcpcd =3Ddev-lang/python-2.6.6-r2 xorg-server xfce4-me= ta x11-terms/terminal firefox xf86-video-cirrus xf86-input-evdev' OUTPUT_FORMAT=3D'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 tes= ting if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then - echo "Using cached kernel" &>> ${LOG_FILE} - cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying c= ached kernel" - cp -R ${TOOL_RES_PATH}/modules.tar.gz lib/modules/ || handle_error "Err= or copying cached kernel modules" - tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_error "Err= or extracting cached kernel modules" - ROOTDIR=3D`pwd` - KERNEL=3D`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 co= pying cached kernel" + mkdir lib/modules && cp ${TOOL_RES_PATH}/modules.tar.gz lib/mod= ules/ || handle_error "Error copying cached kernel modules" + tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_err= or "Error extracting cached kernel modules" + KERNEL=3D`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" 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 1Qs117-0004Jc-1f for garchives@archives.gentoo.org; Fri, 12 Aug 2011 23:19:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F4FC21C3F0; Fri, 12 Aug 2011 23:18:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 61D4021C3F0 for ; Fri, 12 Aug 2011 23:18:00 +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 CBFE91B4023 for ; Fri, 12 Aug 2011 23:17:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 257F080051 for ; Fri, 12 Aug 2011 23:17:59 +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: <6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f.hexxeh@gentoo> Subject: [gentoo-commits] proj/gentoaster:master commit in: /, configs/ X-VCS-Repository: proj/gentoaster X-VCS-Files: configs/xfce.ini create_image.sh X-VCS-Directories: / configs/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: 6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f Date: Fri, 12 Aug 2011 23:17:59 +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: e7a0a0d74d0e533046ec4766dc72c311 Message-ID: <20110812231759.WuyPCYNEdnbTxfDKoLYyzcPX54QAvwuai_KIUhM1UkM@z> commit: 6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f Author: Liam McLoughlin hexxeh net> AuthorDate: Tue Aug 2 00:27:47 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Tue Aug 2 00:27:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3D6a2a5827 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=3D'-gnome -kde -minimal -qt4 dbus jpeg lock s= ession startup-notification PACKAGE_USE=3D'' FEATURES=3D'parallel-fetch userfetch userpriv' PACKAGE_ACCEPT_KEYWORDS=3D'' -PACKAGES_LIST=3D'dhcpcd =3Ddev-lang/python-2.6.6-r2 xorg-server xfce4-me= ta x11-terms/terminal firefox' +PACKAGES_LIST=3D'dhcpcd =3Ddev-lang/python-2.6.6-r2 xorg-server xfce4-me= ta x11-terms/terminal firefox xf86-video-cirrus xf86-input-evdev' OUTPUT_FORMAT=3D'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 tes= ting if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then - echo "Using cached kernel" &>> ${LOG_FILE} - cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying c= ached kernel" - cp -R ${TOOL_RES_PATH}/modules.tar.gz lib/modules/ || handle_error "Err= or copying cached kernel modules" - tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_error "Err= or extracting cached kernel modules" - ROOTDIR=3D`pwd` - KERNEL=3D`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 co= pying cached kernel" + mkdir lib/modules && cp ${TOOL_RES_PATH}/modules.tar.gz lib/mod= ules/ || handle_error "Error copying cached kernel modules" + tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_err= or "Error extracting cached kernel modules" + KERNEL=3D`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"