aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-10-15 09:53:22 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-10-15 09:57:23 -0400
commit0ac3aa949e0a3a3996f21e654ebbf58849a9a659 (patch)
tree79b1b7b5e8142ce62f3f8025111c730556e39701 /tools-uclibc
parenttools-uclibc/desktop: update build system for lilblue (diff)
downloadreleng-0ac3aa949e0a3a3996f21e654ebbf58849a9a659.tar.gz
releng-0ac3aa949e0a3a3996f21e654ebbf58849a9a659.tar.bz2
releng-0ac3aa949e0a3a3996f21e654ebbf58849a9a659.zip
tools-uclibc/desktop: fix python maskings, remove kernel evbug module
Diffstat (limited to 'tools-uclibc')
-rw-r--r--tools-uclibc/desktop/config4
-rw-r--r--tools-uclibc/desktop/portage/package.mask/python2
-rwxr-xr-xtools-uclibc/desktop/run.sh1
3 files changed, 3 insertions, 4 deletions
diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config
index 0c9f5867..c310cca6 100644
--- a/tools-uclibc/desktop/config
+++ b/tools-uclibc/desktop/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.1-hardened-r2 Kernel Configuration
+# Linux/x86 3.11.3-hardened Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2892,7 +2892,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=m
+# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
diff --git a/tools-uclibc/desktop/portage/package.mask/python b/tools-uclibc/desktop/portage/package.mask/python
deleted file mode 100644
index f1f8a9b7..00000000
--- a/tools-uclibc/desktop/portage/package.mask/python
+++ /dev/null
@@ -1,2 +0,0 @@
-=dev-lang/python-2.7.4*
-=dev-lang/python-2.7.5*
diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh
index d2046186..c9369b1f 100755
--- a/tools-uclibc/desktop/run.sh
+++ b/tools-uclibc/desktop/run.sh
@@ -126,6 +126,7 @@ setup_confs() {
sed -i 's/^\(login.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
sed -i '/# login_cmd.*Xsession/ a\login_cmd exec /bin/bash -login ~/.xinitrc' "${ROOTFS}"/etc/slim.conf
wget -O "${ROOTFS}"/usr/share/slim/themes/default/background.jpg http://www.gentoo.org/images/backgrounds/gentoo1600x1200.jpg
+ wget -O "${ROOTFS}"/usr/share/pixmaps/backgrounds/gnome/background-default.jpg http://www.gentoo.org/images/backgrounds/gentoo1600x1200.jpg
sed -i '/^SYNC/d' "${ROOTFS}"/etc/portage/make.conf
sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf