main/alpine-conf: backport setup scripts for xorg

3 files changed, 156 insertions, 2 deletions

diff --git a/main/alpine-conf/0001-setup-xorg-base-initial-commit.patch b/main/alpine-conf/0001-setup-xorg-base-initial-commit.patch
new file mode 100644
index 0000000000..f0f1067ec3
--- /dev/null
+++ b/main/alpine-conf/0001-setup-xorg-base-initial-commit.patch
@@ -0,0 +1,74 @@
+From 049d3ce1efda40a59bd42834d3b8db5cdb0386fa Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 6 Jun 2011 11:39:45 +0000
+Subject: [PATCH 1/2] setup-xorg-base: initial commit
+
+This script is supposed to help users to quickly get a working xorg server
+running.
+---
+ .gitignore         |    1 +
+ Makefile           |    1 +
+ setup-xorg-base.in |   29 +++++++++++++++++++++++++++++
+ 3 files changed, 31 insertions(+), 0 deletions(-)
+ create mode 100644 setup-xorg-base.in
+
+diff --git a/.gitignore b/.gitignore
+index c1f3e8e..e0b22b1 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -16,4 +16,5 @@ setup-interfaces
+ setup-keymap
+ setup-mta
+ setup-timezone
++setup-xorg-base
+ update-conf
+diff --git a/Makefile b/Makefile
+index 96ec9cc..91f0835 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,6 +24,7 @@ SBIN_FILES	:= lbu\
+ 		setup-acf\
+ 		setup-bootable\
+ 		setup-timezone\
++		setup-xorg-base\
+ 		update-conf
+ 
+ BIN_FILES	:= uniso
+diff --git a/setup-xorg-base.in b/setup-xorg-base.in
+new file mode 100644
+index 0000000..bcdbe77
+--- /dev/null
++++ b/setup-xorg-base.in
+@@ -0,0 +1,29 @@
++#!/bin/sh
++
++# simple script to setup x basic org server
++# you will still need a window manager and login manager or xinit
++
++base_pkgs="xorg-server xf86-video-vesa xf86-input-evdev xf86-input-mouse
++	xf86-input-keyboard udev"
++
++# TODO: detect graphics card and pick proper xf86-video-* driver based on that
++
++# TODO: detect if we need xf86-input-synaptics
++
++# ps mouse
++modprobe psmouse
++grep -q -w psmouse /etc/modules || echo "psmouse" >> /etc/modules
++
++# install packages
++apk add $base_pkgs $@
++
++# setup and start udev
++rc-update -q del mdev sysinit
++rc-update -q add udev sysinit
++rc-update -q add udev-postmount default
++
++if ! rc-service -q udev status; then
++	rc-service udev start
++	rc-service udev-postmount start
++fi
++
+-- 
+1.7.5.4
+
diff --git a/main/alpine-conf/0002-setup-gparted-desktop-new-setup-script.patch b/main/alpine-conf/0002-setup-gparted-desktop-new-setup-script.patch
new file mode 100644
index 0000000000..9c15b337a6
--- /dev/null
+++ b/main/alpine-conf/0002-setup-gparted-desktop-new-setup-script.patch
@@ -0,0 +1,75 @@
+From d71205d14c74516925c0e837ba02135f36f084c6 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Mon, 6 Jun 2011 14:55:19 +0000
+Subject: [PATCH 2/2] setup-gparted-desktop: new setup script
+
+The idea is that you quick and dirty can get gparted up and running
+---
+ Makefile                 |    1 +
+ setup-gparted-desktop.in |   42 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+), 0 deletions(-)
+ create mode 100644 setup-gparted-desktop.in
+
+diff --git a/Makefile b/Makefile
+index 91f0835..0427b1b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,6 +25,7 @@ SBIN_FILES	:= lbu\
+ 		setup-bootable\
+ 		setup-timezone\
+ 		setup-xorg-base\
++		setup-gparted-desktop\
+ 		update-conf
+ 
+ BIN_FILES	:= uniso
+diff --git a/setup-gparted-desktop.in b/setup-gparted-desktop.in
+new file mode 100644
+index 0000000..8bd198e
+--- /dev/null
++++ b/setup-gparted-desktop.in
+@@ -0,0 +1,42 @@
++#!/bin/sh
++
++setup-xorg-base gparted xinit aterm openbox ttf-freefont $@
++
++# create openbox menu
++mkdir -p ~/.config/openbox
++cat >~/.config/openbox/menu.xml<<EOF
++<?xml version="1.0" encoding="UTF-8"?>
++
++<openbox_menu xmlns="http://openbox.org/3.4/menu">
++<menu id="root-menu" label="Openbox 3">
++  <separator label="Applications" />
++  <item label="GParted">
++    <action name="Execute">
++      <command>gparted</command>
++    </action>
++  </item>
++  <item label="aterm">
++    <action name="Execute">
++      <command>aterm</command>
++    </action>
++  </item>
++  <separator />
++  <item label="Log Out">
++    <action name="Exit">
++      <prompt>yes</prompt>
++    </action>
++  </item>
++</menu>
++</openbox_menu>
++EOF
++
++# create xinitrc
++cat >~/.xinitrc <<EOF
++gparted &
++exec openbox-session
++EOF
++
++echo ""
++echo " To start GParted run: startx"
++echo ""
++
+-- 
+1.7.5.4
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index e2028cc0d6..b08e6d35fc 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,12 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=2.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
+	0001-setup-xorg-base-initial-commit.patch
+	0002-setup-gparted-desktop-new-setup-script.patch
 	"
+
 arch="all"
 license="GPL-2"
 
@@ -35,4 +38,6 @@ package() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="a8068da6ae47c1bc567ba215b0da6187  alpine-conf-2.8.1.tar.bz2"
+md5sums="a8068da6ae47c1bc567ba215b0da6187  alpine-conf-2.8.1.tar.bz2
+0bae26b57051fa3058687401cccf90cf  0001-setup-xorg-base-initial-commit.patch
+d3e1ad87641e8420fa0272d544c068d1  0002-setup-gparted-desktop-new-setup-script.patch"