diff options
| author |   Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-02-12 14:13:48 +0100 |
|---|---|---|
| committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2010-02-13 02:03:19 +0100 |
| commit | 8d9d0507c0a71c624db02d02d93739cda5c19309 (patch) | |
| tree | f163768839b3b9ae7c5a32689f88046d107c777f /recipes/e17 | |
| parent | e0580dd1080bc27cbde7d5f0257a233193559d2d (diff) | |
| download | openembedded-8d9d0507c0a71c624db02d02d93739cda5c19309.tar.gz | |
entrance: rebased config.db
The config.db seem to be some openembedded settings/configuration,
for launching entrance/e17 better
Diffstat (limited to 'recipes/e17')
| -rw-r--r-- | recipes/e17/entrance/rebased_config-db.patch | 116 | ||||
| -rw-r--r-- | recipes/e17/entrance_0.9.0.010.bb | 2 |
2 files changed, 117 insertions, 1 deletions
diff --git a/recipes/e17/entrance/rebased_config-db.patch b/recipes/e17/entrance/rebased_config-db.patch new file mode 100644 index 0000000000..94f98ed123 --- /dev/null +++ b/recipes/e17/entrance/rebased_config-db.patch @@ -0,0 +1,116 @@ +Index: entrance/data/config/build_config.sh.in +=================================================================== +--- entrance.orig/data/config/build_config.sh.in ++++ entrance/data/config/build_config.sh.in +@@ -1,45 +1,45 @@ + #!/bin/sh -e + +-usage() { +- cat <<-EOF +- Usage: $0 [options] +- +- Options: +- -d, --dir Session directory to scan +- -c, --file Config file (default: $DB) +- -h, --help This help output :p +- EOF +- +- if [ "$1" = "1" ] ; then +- echo "" +- echo "ERROR: $2" +- fi +- +- exit $1 +-} +- +-SESSION_DIR="" ++#usage() { ++# cat <<-EOF ++# Usage: $0 [options] ++# ++# Options: ++# -d, --dir Session directory to scan ++# -c, --file Config file (default: $DB) ++# -h, --help This help output :p ++# EOF ++# ++# if [ "$1" = "1" ] ; then ++# echo "" ++# echo "ERROR: $2" ++# fi ++# ++# exit $1 ++#} ++# ++#SESSION_DIR="" + DB="./entrance_config.cfg" + +-while [ -n "$1" ] ; do +- case $1 in +- -d) shift; SESSION_DIR=$1;; +- -c) shift; DB=$1;; +- -h) usage 0;; +- *) usage 1 "Unknown option: $1";; +- esac +- shift +-done +- +-if [ -z "$DB" ] || [ -d "$DB" ] ; then +- usage 1 "Invalid DB argument" +-fi +- +-FROM=$SESSION_DIR +-if [ -z "$FROM" ] ; then +- FROM="defaults" +-fi +-echo "Generating config file '$DB' from '$FROM' ..." ++#while [ -n "$1" ] ; do ++# case $1 in ++# -d) shift; SESSION_DIR=$1;; ++# -c) shift; DB=$1;; ++# -h) usage 0;; ++# *) usage 1 "Unknown option: $1";; ++# esac ++# shift ++#done ++# ++#if [ -z "$DB" ] || [ -d "$DB" ] ; then ++# usage 1 "Invalid DB argument" ++#fi ++# ++#FROM=$SESSION_DIR ++#if [ -z "$FROM" ] ; then ++# FROM="defaults" ++#fi ++#echo "Generating config file '$DB' from '$FROM' ..." + + rm -f $DB || exit 1 + +@@ -60,9 +60,9 @@ ecore_config -c $DB -k /entrance/time_fo + #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/" + ecore_config -c $DB -k /entrance/greeting/use_default -i 1 + ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to" +-ecore_config -c $DB -k /entrance/greeting/after -s "" ++ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE" + +-ecore_config -c $DB -k /entrance/session/session -s "default" ++ecore_config -c $DB -k /entrance/session/session -s "/etc/X11/Sessions/Enlightenment" + ecore_config -c $DB -k /entrance/session/title -s "Default" + ecore_config -c $DB -k /entrance/session/icon -s "default.png" + #if [ -z "$SESSION_DIR" ] ; then +@@ -92,7 +92,7 @@ ecore_config -c $DB -k /entrance/session + # done + #fi + count=0 +-ecore_config -c $DB -k /entrance/session/$count/session -s "failsafe" ++ecore_config -c $DB -k /entrance/session/$count/session -s "/etc/X11/Sessions/Enlightenment" + ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe" + ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png" + count=`(expr $count + 1)` +@@ -107,5 +107,5 @@ ecore_config -c $DB -k /entrance/autolog + ecore_config -c $DB -k /entrance/presel/mode -i 0 + + # for Entranced +-ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -br -nolisten tcp@ENTRANCE_VT_ARG@" ++ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver" + ecore_config -c $DB -k /entranced/attempts -i 5 diff --git a/recipes/e17/entrance_0.9.0.010.bb b/recipes/e17/entrance_0.9.0.010.bb index f9dd5e49ce..cecfcd7650 100644 --- a/recipes/e17/entrance_0.9.0.010.bb +++ b/recipes/e17/entrance_0.9.0.010.bb @@ -8,7 +8,7 @@ PR = "r2" inherit e SRC_URI += "\ - file://config-db.patch;patch=1 \ + file://rebased_config-db.patch;patch=1 \ file://allow-missing-xsession.patch;patch=1 \ file://run-Xinit.patch;patch=1 \ file://fix-auth-mode.patch;patch=1 \ |