From c69817eeb2b22f3d46d913f00c87554a6f5fbe00 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 May 2010 01:35:50 +0200 Subject: [PATCH 1/7] bash: - moving init scripts to start shell from busybox --- packages/sysutils/{busybox => bash}/init.d/00_debugshell | 4 +++- packages/sysutils/{busybox => bash}/init.d/99_shell | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) rename packages/sysutils/{busybox => bash}/init.d/00_debugshell (84%) rename packages/sysutils/{busybox => bash}/init.d/99_shell (83%) diff --git a/packages/sysutils/busybox/init.d/00_debugshell b/packages/sysutils/bash/init.d/00_debugshell similarity index 84% rename from packages/sysutils/busybox/init.d/00_debugshell rename to packages/sysutils/bash/init.d/00_debugshell index 556c21174c..1cf835f95e 100755 --- a/packages/sysutils/busybox/init.d/00_debugshell +++ b/packages/sysutils/bash/init.d/00_debugshell @@ -2,6 +2,8 @@ # # runlevels: openelec, textmode +. /etc/profile + TTY="3" if [ "$DEBUG" = "yes" ]; then @@ -12,6 +14,6 @@ if [ "$DEBUG" = "yes" ]; then echo "## ...... switch with ctrl-alt-f$TTY ...... ##" echo "###########################################" - exec /sbin/getty -n -l /bin/sh 38400 tty$TTY & + exec /sbin/getty -n -l /bin/bash 38400 tty$TTY & fi diff --git a/packages/sysutils/busybox/init.d/99_shell b/packages/sysutils/bash/init.d/99_shell similarity index 83% rename from packages/sysutils/busybox/init.d/99_shell rename to packages/sysutils/bash/init.d/99_shell index 96305a951c..a61ccd115b 100755 --- a/packages/sysutils/busybox/init.d/99_shell +++ b/packages/sysutils/bash/init.d/99_shell @@ -2,6 +2,8 @@ # # runlevels: textmode +. /etc/profile + TTY="1" echo "###########################################" @@ -11,5 +13,5 @@ echo "## ...... switch with ctrl-alt-f$TTY ...... ##" echo "###########################################" while true; do - exec /sbin/getty -n -l /bin/sh 38400 tty$TTY + exec /sbin/getty -n -l /bin/bash 38400 tty$TTY done From 9d7bc3cf95451827003268e6ba9d424b66fd418d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 May 2010 01:36:09 +0200 Subject: [PATCH 2/7] xbmc: - update to xbmc-29931 --- packages/mediacenter/xbmc/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index e4d83fad7a..cb96527626 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-29914.tar.bz2 +http://sources.openelec.tv/svn/xbmc-29931.tar.bz2 From 4e839710d6a5fc546b97017c932cef0585eeaaf6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 May 2010 01:36:29 +0200 Subject: [PATCH 3/7] xbmc-theme-Confluence: - update to xbmc-theme-Confluence-29931 --- packages/mediacenter/xbmc-theme-Confluence/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index bb8258f751..adc07bef62 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-29914.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-29931.tar.bz2 From b6d9cc7a267fce1754972c5aa76bce403e358b87 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 May 2010 01:36:47 +0200 Subject: [PATCH 4/7] xbmc-theme-PM3-HD: - update to xbmc-theme-PM3-HD-29931 --- packages/mediacenter/xbmc-theme-PM3-HD/url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/url b/packages/mediacenter/xbmc-theme-PM3-HD/url index 75ccaeea51..aec71e30fb 100644 --- a/packages/mediacenter/xbmc-theme-PM3-HD/url +++ b/packages/mediacenter/xbmc-theme-PM3-HD/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29914.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29931.tar.bz2 From 2c42b9ace9239c25396e7dfb74ad8890dc7afd21 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 May 2010 01:39:42 +0200 Subject: [PATCH 5/7] bash: - add some profile configfiles from busybox - nicer bootprompt --- packages/sysutils/bash/profile.d/home.conf | 10 ++++++++++ packages/sysutils/bash/profile.d/path.conf | 10 ++++++++++ packages/sysutils/bash/profile.d/shell.conf | 10 ++++++++++ 3 files changed, 30 insertions(+) create mode 100644 packages/sysutils/bash/profile.d/home.conf create mode 100644 packages/sysutils/bash/profile.d/path.conf create mode 100644 packages/sysutils/bash/profile.d/shell.conf diff --git a/packages/sysutils/bash/profile.d/home.conf b/packages/sysutils/bash/profile.d/home.conf new file mode 100644 index 0000000000..f0192e8cf2 --- /dev/null +++ b/packages/sysutils/bash/profile.d/home.conf @@ -0,0 +1,10 @@ +################################################################################ +# Core (PATH) environment variables. +# +# This file contains non-OpenELEC evironment variables as well as OpenELEC +# evironment variables that are not user defined. +################################################################################ + +HOME="/storage" + +export HOME diff --git a/packages/sysutils/bash/profile.d/path.conf b/packages/sysutils/bash/profile.d/path.conf new file mode 100644 index 0000000000..18c81147bd --- /dev/null +++ b/packages/sysutils/bash/profile.d/path.conf @@ -0,0 +1,10 @@ +################################################################################ +# Core (PATH) environment variables. +# +# This file contains non-OpenELEC evironment variables as well as OpenELEC +# evironment variables that are not user defined. +################################################################################ + +PATH="/bin:/sbin:/usr/bin:/usr/sbin" + +export PATH diff --git a/packages/sysutils/bash/profile.d/shell.conf b/packages/sysutils/bash/profile.d/shell.conf new file mode 100644 index 0000000000..a47e9231c1 --- /dev/null +++ b/packages/sysutils/bash/profile.d/shell.conf @@ -0,0 +1,10 @@ +################################################################################ +# Core (Shell) environment variables. +# +# This file contains non-OpenELEC evironment variables as well as OpenELEC +# evironment variables that are not user defined. +################################################################################ + +PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] \[\e[1;37m\]' + +export PS1 \ No newline at end of file From 31855dd999a6069829b60c7636227606ee074603 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 May 2010 01:42:04 +0200 Subject: [PATCH 6/7] busybox: - remove some profile configfiles (moved to bash) --- packages/sysutils/busybox/profile.d/home.conf | 10 ---------- packages/sysutils/busybox/profile.d/path.conf | 10 ---------- packages/sysutils/busybox/profile.d/shell.conf | 10 ---------- 3 files changed, 30 deletions(-) delete mode 100644 packages/sysutils/busybox/profile.d/home.conf delete mode 100644 packages/sysutils/busybox/profile.d/path.conf delete mode 100644 packages/sysutils/busybox/profile.d/shell.conf diff --git a/packages/sysutils/busybox/profile.d/home.conf b/packages/sysutils/busybox/profile.d/home.conf deleted file mode 100644 index f0192e8cf2..0000000000 --- a/packages/sysutils/busybox/profile.d/home.conf +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# Core (PATH) environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -HOME="/storage" - -export HOME diff --git a/packages/sysutils/busybox/profile.d/path.conf b/packages/sysutils/busybox/profile.d/path.conf deleted file mode 100644 index 18c81147bd..0000000000 --- a/packages/sysutils/busybox/profile.d/path.conf +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# Core (PATH) environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -PATH="/bin:/sbin:/usr/bin:/usr/sbin" - -export PATH diff --git a/packages/sysutils/busybox/profile.d/shell.conf b/packages/sysutils/busybox/profile.d/shell.conf deleted file mode 100644 index 6fca97cfc5..0000000000 --- a/packages/sysutils/busybox/profile.d/shell.conf +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# Core (Shell) environment variables. -# -# This file contains non-OpenELEC evironment variables as well as OpenELEC -# evironment variables that are not user defined. -################################################################################ - -PS1='\u@\h:\w \$ ' - -export PS1 \ No newline at end of file From ae2e2dc1a3164fd12468503a85e2b58670388db2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 May 2010 01:42:21 +0200 Subject: [PATCH 7/7] upower: - update to upower-20100507 --- packages/sysutils/upower/install | 4 ++-- packages/sysutils/upower/url | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/upower/install b/packages/sysutils/upower/install index fede24d7b1..9706752f1f 100755 --- a/packages/sysutils/upower/install +++ b/packages/sysutils/upower/install @@ -9,8 +9,8 @@ $SCRIPTS/install dbus-glib $SCRIPTS/install polkit $SCRIPTS/install pm-utils -#mkdir -p $INSTALL/etc -# cp -P $PKG_BUILD/etc/UPower.conf $INSTALL/etc +mkdir -p $INSTALL/etc + cp -P $PKG_BUILD/etc/UPower.conf $INSTALL/etc mkdir -p $INSTALL/etc/dbus-1/system.d cp -P $PKG_BUILD/src/org.freedesktop.UPower.conf $INSTALL/etc/dbus-1/system.d diff --git a/packages/sysutils/upower/url b/packages/sysutils/upower/url index fe8dcb77e1..4b6d2ef36a 100644 --- a/packages/sysutils/upower/url +++ b/packages/sysutils/upower/url @@ -1 +1 @@ -http://upower.freedesktop.org/releases/upower-0.9.2.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/upower-20100507.tar.bz2