[gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/, tools-uclibc/desktop/portage/package.mask/

[gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/, tools-uclibc/desktop/portage/package.mask/

[Anthony G. Basile]

commit:     0ac3aa949e0a3a3996f21e654ebbf58849a9a659
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 13:53:22 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 13:57:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=0ac3aa94

tools-uclibc/desktop: fix python maskings, remove kernel evbug module

---
 tools-uclibc/desktop/config                      | 4 ++--
 tools-uclibc/desktop/portage/package.mask/python | 2 --
 tools-uclibc/desktop/run.sh                      | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools-uclibc/desktop/config b/tools-uclibc/desktop/config
index 0c9f586..c310cca 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 f1f8a9b..0000000
--- 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 d204618..c9369b1 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

[gentoo-commits] proj/releng:master commit in: tools-uclibc/desktop/, tools-uclibc/desktop/portage/package.mask/

[Anthony G. Basile]

commit:     b796c7b684cc6f617451bb480fdd8081d0f6a5f9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 17:17:30 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 17:19:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=b796c7b6

tools-uclibc/desktop: bump slim

---
 tools-uclibc/desktop/portage/package.mask/slim | 1 -
 tools-uclibc/desktop/run.sh                    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools-uclibc/desktop/portage/package.mask/slim b/tools-uclibc/desktop/portage/package.mask/slim
deleted file mode 100644
index afc75de..0000000
--- a/tools-uclibc/desktop/portage/package.mask/slim
+++ /dev/null
@@ -1 +0,0 @@
->x11-misc/slim-1.3.5-r4

diff --git a/tools-uclibc/desktop/run.sh b/tools-uclibc/desktop/run.sh
index 7fd2b4b..ba393d8 100755
--- a/tools-uclibc/desktop/run.sh
+++ b/tools-uclibc/desktop/run.sh
@@ -134,8 +134,8 @@ setup_confs() {
 	sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm
 	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
-	#sed -i 's/^\(sessiondir.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
-	#sed -i '/# sessiondir.*/ a\sessiondir /etc/X11/Sessions' "${ROOTFS}"/etc/slim.conf
+	sed -i 's/^\(sessiondir.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
+	sed -i '/# sessiondir.*/ a\sessiondir /etc/X11/Sessions' "${ROOTFS}"/etc/slim.conf
 
 	wget -O "${ROOTFS}"/usr/share/slim/themes/default/background.jpg "${IMAGE}"
 	wget -O "${ROOTFS}"/usr/share/pixmaps/backgrounds/gnome/background-default.jpg "${IMAGE}"