archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

merging trunk

Browse Source
This commit is contained in:
Stephan Raue
2010-04-28 14:37:47 +02:00
parent d708c30ee1 8c7d320c03
commit a0063f77d4
27 changed files with 146 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/image/install
View File

@@ -54,7 +54,6 @@ case "$2" in
$SCRIPTS/install gcc-final
$SCRIPTS/install linux $2
$SCRIPTS/install busybox
$SCRIPTS/install plymouth-lite
$SCRIPTS/install util-linux-ng
echo "OpenELEC" > $INSTALL/etc/distribution

1
packages/mediacenter/xbmc/install
View File

@@ -83,6 +83,7 @@ mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
mkdir -p $INSTALL/usr/share/xbmc/media
cp -P $PKG_BUILD/media/weather.zip $INSTALL/usr/share/xbmc/media/
cp -P $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/
cp -P $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/
mkdir -p $INSTALL/usr/share/xbmc/skin

12
packages/mediacenter/xbmc/patches/452-xbmc-change_lcd_content-0.1.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur xbmc-29490/userdata/LCD.xml xbmc-29490.patch/userdata/LCD.xml
--- xbmc-29490/userdata/LCD.xml 2010-04-24 22:42:45.000000000 +0200
+++ xbmc-29490.patch/userdata/LCD.xml 2010-04-27 17:26:02.946045110 +0200
@@ -21,7 +21,7 @@
<line>Freemem: $INFO[System.FreeMemory]</line>
</video>
<general>
- <line>XBMC running...</line>
+ <line>*** OpenELEC.tv ***</line>
<line>$INFO[System.Time] $INFO[System.Date]</line>
<line>Freemem: $INFO[System.FreeMemory]</line>
<line>$INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode]</line>

0
packages/sysutils/plymouth-lite/splash/Splash.png → packages/mediacenter/xbmc/splash/Splash.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 292 KiB

12
packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf
View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.16.0
# Sat Jan 30 22:58:05 2010
# Busybox version: 1.16.1
# Tue Apr 27 18:57:48 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -172,8 +172,8 @@ CONFIG_CHROOT=y
# CONFIG_UNIX2DOS is not set
# CONFIG_DU is not set
# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
# CONFIG_ECHO is not set
# CONFIG_FEATURE_FANCY_ECHO is not set
CONFIG_ECHO=y
CONFIG_FEATURE_FANCY_ECHO=y
# CONFIG_ENV is not set
# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
# CONFIG_EXPAND is not set
@@ -203,7 +203,7 @@ CONFIG_CHROOT=y
# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
# CONFIG_MD5SUM is not set
CONFIG_MKDIR=y
CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
# CONFIG_MKFIFO is not set
# CONFIG_MKNOD is not set
CONFIG_MV=y
@@ -863,7 +863,7 @@ CONFIG_ASH_BASH_COMPAT=y
# CONFIG_ASH_JOB_CONTROL is not set
# CONFIG_ASH_ALIAS is not set
# CONFIG_ASH_GETOPTS is not set
CONFIG_ASH_BUILTIN_ECHO=y
# CONFIG_ASH_BUILTIN_ECHO is not set
# CONFIG_ASH_BUILTIN_PRINTF is not set
CONFIG_ASH_BUILTIN_TEST=y
# CONFIG_ASH_CMDCMD is not set

2
packages/sysutils/busybox/config/busybox.conf
View File

@@ -282,7 +282,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y
# Console Utilities
#
CONFIG_CHVT=y
# CONFIG_CLEAR is not set
CONFIG_CLEAR=y
# CONFIG_DEALLOCVT is not set
# CONFIG_DUMPKMAP is not set
# CONFIG_KBD_MODE is not set

2
packages/sysutils/busybox/config/profile
View File

@@ -22,6 +22,8 @@
progress() {
if test "$DEBUG" = yes; then
echo "### $1 ###"
else
echo -n "***"
fi
}

2
packages/sysutils/busybox/scripts/init
View File

@@ -1,5 +1,7 @@
#!/bin/sh -l
clear
# starting init scripts for wanted runlevel
progress "Starting Init Scripts"
RET=0

1
packages/sysutils/irserver/config/81-irtrans.rules Normal file
View File

@@ -0,0 +1 @@
BUS=="usb", ATTRS{interface}=="IRTrans USB", NAME="irtrans%n"

13
packages/sysutils/irserver/init.d/30_irserver
View File

@@ -2,9 +2,18 @@
#
# runlevels: openelec, textmode
IRTRANS_DEV="/dev/irtrans0"
IRSERVER_LOG="/var/log/irserver.log"
IRSERVER_PID="/var/run/irserver.pid"
[ "$DEBUG" = "yes" ] && \
IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
(
progress "Starting IRtrans daemon"
irtrans > /dev/null 2>&1
irserver -logfile $IRSERVER_LOG \
-pidfile $IRSERVER_PID \
-daemon $IRTRANS_DEV \
$IRSERVER_ARG > /dev/null 2>&1
)&

6
packages/sysutils/irserver/install
View File

@@ -10,6 +10,10 @@ mkdir -p $INSTALL/usr/sbin
[ $TARGET_ARCH = arm ] && cp -P $PKG_BUILD/irserver_arm $INSTALL/usr/sbin/irserver
mkdir -p $INSTALL/usr/share/irtrans/remotes
cp $PKG_BUILD/remotes/ccf.rem $INSTALL/usr/share/irtrans/remotes
cp $PKG_BUILD/remotes/irtrans.rem $INSTALL/usr/share/irtrans/remotes
cp $PKG_BUILD/remotes/mediacenter.rem $INSTALL/usr/share/irtrans/remotes
cp $PKG_DIR/remotes/*.rem $INSTALL/usr/share/irtrans/remotes
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d

30
packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff Normal file
View File

@@ -0,0 +1,30 @@
diff -Naur irserver-05.02.10/lowlevel.c irserver-05.02.10.patch/lowlevel.c
--- irserver-05.02.10/lowlevel.c 2010-02-05 01:14:44.000000000 +0100
+++ irserver-05.02.10.patch/lowlevel.c 2010-04-26 13:22:40.171936190 +0200
@@ -2638,10 +2638,17 @@
#endif
#ifdef LINUX
//LINUX Autofind USB devices
- if ((!strncmp (st + q,"usb",3) || !strncmp (st + q,"USB",3)) && !autoflag) {
+ if( !strncmp( st, "/dev/irtrans", 12 ) && !autoflag ) {
+ autoflag = 1;
+ res = 0;
+ get_detail_deviceinfo ("",st,IF_USB);
+ }
+ else if ((!strncmp (st + q,"usb",3) || !strncmp (st + q,"USB",3)) && !autoflag) {
autoflag = 1;
res = 0;
for (i=0;i < 16;i++) {
+ sprintf (dst,"/dev/irtrans%d",i);
+ if (get_detail_deviceinfo ("",dst,IF_USB)) {
sprintf (dst,"/dev/ttyUSB%d",i);
if (get_detail_deviceinfo ("",dst,IF_USB)) {
sprintf (dst,"/dev/usb/ttyUSB%d",i);
@@ -2655,6 +2662,7 @@
}
}
}
+ }
else if ((!strncmp (st + q,"/dev/usb/tty",12) || !strncmp (st + q,"/dev/ttyUSB",11) || !strncmp (st + q,"/dev/usb/tts",12) ||
!strncmp (st + q,"/dev/ttyusb",11) || !strncmp (st + q,"/dev/tts/USB",12)) && !autoflag) {
if (st[q + strlen (st+q) - 1] == ']') {

53
packages/sysutils/irserver/remotes/philips-rc197.rem Normal file
View File

@@ -0,0 +1,53 @@
[REMOTE]
[NAME]philips-rc197
[TIMING]
[0][N]0[RC]2[RP]87[FREQ]36[SB][RS][RC6]
[COMMANDS]
[1][T]0[D]S11101010000000000011110000010000000001
[2][T]0[D]S11101010000000000011110000010000000010
[3][T]0[D]S11101010000000000011110000010000000011
[4][T]0[D]S11101010000000000011110000010000000100
[5][T]0[D]S11101010000000000011110000010000000101
[6][T]0[D]S11101010000000000011110000010000000110
[7][T]0[D]S11101010000000000011110000010000000111
[8][T]0[D]S11101010000000000011110000010000001000
[9][T]0[D]S11101010000000000011110000010000001001
[0][T]0[D]S11101010000000000011110000010000000000
[Star][T]0[D]S11101010000000000011110000010000011101
[Hash][T]0[D]S11101010000000000011110000010000011100
[ok][T]0[D]S11101010000000000011110000010000100010
[left][T]0[D]S11101010000000000011110000010000100000
[right][T]0[D]S11101010000000000011110000010000100001
[down][T]0[D]S11101010000000000011110000010000011111
[up][T]0[D]S11101010000000000011110000010000011110
[play][T]0[D]S11101010000000000011110000010000010110
[power][T]0[D]S11101010000000000011110000010000001100
[Stop][T]0[D]S11101010000000000011110000010000011001
[Rec][T]0[D]S11101010000000000011110000010000010111
[Rew][T]0[D]S11101010000000000011110000010000010101
[Fwd][T]0[D]S11101010000000000011110000010000010100
[Pause][T]0[D]S11101010000000000011110000010000011000
[Next][T]0[D]S11101010000000000011110000010000011010
[Prev][T]0[D]S11101010000000000011110000010000011011
[eHome][T]0[D]S11101010000000000011110000010000001101
[Back][T]0[D]S11101010000000000011110000010000100011
[EPG][T]0[D]S11101010000000000011110000010000100110
[Info][T]0[D]S11101010000000000011110000010000001111
[LiveTV][T]0[D]S11101010000000000011110000010000100101
[TV][T]0[D]S11101010000000000011110000010001000110
[Vol+][T]0[D]S11101010000000000011110000010000010000
[Vol-][T]0[D]S11101010000000000011110000010000010001
[Mute][T]0[D]S11101010000000000011110000010000001110
[Ch+][T]0[D]S11101010000000000011110000010000010010
[Ch-][T]0[D]S11101010000000000011110000010000010011
[Enter][T]0[D]S11101010000000000011110000010000001011
[Clear][T]0[D]S11101010000000000011110000010000001010
[DVDMenu][T]0[D]S11101010000000000011110000010000100100
[Rectv][T]0[D]S11101010000000000011110000010001001000
[Teletext][T][0][D]S11101010000000000011110000010001011010
[Red][T][0][D]S11101010000000000011110000010001011011
[Green][T][0][D]S11101010000000000011110000010001011100
[Yellow][T][0][D]S11101010000000000011110000010001011101
[Blue][T][0][D]S11101010000000000011110000010001011110

6
packages/sysutils/lcdproc/build
View File

@@ -17,4 +17,8 @@ make
sed -i -e "s|^DriverPath=.*$|DriverPath=/usr/lib/lcdproc/|" LCDd.conf
sed -i -e "s|^Driver=.*$|Driver=irtrans|" LCDd.conf
sed -i -e "s|^#Foreground=.*$|Foreground=no|" LCDd.conf
sed -i -e "s|^#Foreground=.*$|Foreground=no|" LCDd.conf
sed -i -e "s|^#ServerScreen=.*$|ServerScreen=blank|" LCDd.conf
sed -i -e "s|^#Backlight=.*$|Backlight=open|" LCDd.conf
sed -i -e "s|^#Heartbeat=.*$|Heartbeat=open|" LCDd.conf
sed -i -e "s|^#TitleSpeed=.*$|TitleSpeed=10|" LCDd.conf

12
packages/sysutils/lcdproc/init.d/33_lcdproc
View File

@@ -5,16 +5,6 @@
(
progress "Starting LCD daemon"
LCD_USERCONF="/storage/.config/LCDd.conf"
LCD_DEFCONF="/etc/LCDd.conf"
LCD_ARG=""
if [ -f $LCD_USERCONF ]; then
LCD_ARG="$LCD_ARG -c $LCD_USERCONF"
else
LCD_ARG="$LCD_ARG -c $LCD_DEFCONF"
fi
LCDd $LCD_ARG > /dev/null 2>&1
LCDd -c /etc/LCDd.conf > /dev/null 2>&1
)&

11
packages/sysutils/lcdproc/install
View File

@@ -7,19 +7,14 @@ $SCRIPTS/install irserver
PKG_DIR=`find $PACKAGES -type d -name $1`
add_user nobody x 999 999 "Nobody" "/" "/bin/sh"
add_group nobody 999
mkdir -p $INSTALL/usr/sbin
cp $PKG_BUILD/server/LCDd $INSTALL/usr/sbin
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/clients/lcdproc/lcdproc $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib/lcdproc
cp $PKG_BUILD/server/drivers/*.so $INSTALL/usr/lib/lcdproc
mkdir -p $INSTALL/etc
cp $PKG_BUILD/LCDd.conf $INSTALL/etc
cp $PKG_BUILD/clients/lcdproc/lcdproc.conf $INSTALL/etc
mkdir -p $INSTALL/usr/config
cp $PKG_BUILD/LCDd.conf $INSTALL/usr/config/LCDd.conf.sample
cp $PKG_BUILD/clients/lcdproc/lcdproc.conf $INSTALL/usr/config/lcdproc.conf.sample

10
packages/sysutils/plymouth-lite/build
View File

@@ -1,10 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
$SCRIPTS/build libpng
cd $PKG_BUILD
make

11
packages/sysutils/plymouth-lite/init.d/00_plymouth
View File

@@ -1,11 +0,0 @@
#
# starting splash
#
# runlevels: openelec, textmode
(
[ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" \
-a -f /usr/bin/ply-image -a -f /usr/share/splash/Splash.png \
] && ply-image /usr/share/splash/Splash.png
)&

13
packages/sysutils/plymouth-lite/install
View File

@@ -1,13 +0,0 @@
#!/bin/sh
. config/options
$SCRIPTS/install libpng
PKG_DIR=`find $PACKAGES -type d -name $1`
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/ply-image $INSTALL/usr/bin
mkdir -p $INSTALL/usr/share/splash
cp -PR $PKG_DIR/splash/Splash.png $INSTALL/usr/share/splash

11
packages/sysutils/plymouth-lite/patches/cursor.diff
View File

@@ -1,11 +0,0 @@
--- plymouth-lite-0.6.0/ply-image.c~ 2009-03-06 16:20:52.000000000 -0800
+++ plymouth-lite-0.6.0/ply-image.c 2009-03-06 16:20:52.000000000 -0800
@@ -439,7 +439,7 @@
exit_code = 0;
-// hide_cursor ();
+ hide_cursor ();
if (argc == 1)
image = ply_image_new ("/usr/share/plymouth/splash.png");

Some files were not shown because too many files have changed in this diff Show More