diff options
| author |   Liam McLoughlin <hexxeh@hexxeh.net> | 2011-08-02 01:27:47 +0100 |
|---|---|---|
| committer | Liam McLoughlin <hexxeh@hexxeh.net> | 2011-08-02 01:27:47 +0100 |
| commit | 6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f (patch) | |
| tree | 3125d2dfd4951a3434aef55eaf2a128c84bb7639 | |
| parent | Changes to get X started under QEMU (diff) | |
| download | gentoaster-6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f.tar.gz gentoaster-6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f.tar.bz2 gentoaster-6a2a582715ac05a486a9c82b4d52f4ca5fc4a78f.zip | |
Add more drivers to XFCE config, fix some cachedkernel logic
| -rw-r--r-- | configs/xfce.ini | 2 | ||||
| -rwxr-xr-x | 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" |