mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
merging trunk
This commit is contained in:
commit
6070cd1038
@ -255,10 +255,10 @@ add_user() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
add_group() {
|
add_group() {
|
||||||
# Usage: add_group "groupname" "groupid"
|
# Usage: add_group "groupname" "groupid" ("members")
|
||||||
mkdir -p ${INSTALL}/etc
|
mkdir -p ${INSTALL}/etc
|
||||||
touch ${INSTALL}/etc/group
|
touch ${INSTALL}/etc/group
|
||||||
if [ -z "`grep "$1:" ${INSTALL}/etc/group`" ]; then
|
if [ -z "`grep "$1:" ${INSTALL}/etc/group`" ]; then
|
||||||
echo "$1:x:$2:" >> ${INSTALL}/etc/group
|
echo "$1:x:$2:$3" >> ${INSTALL}/etc/group
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ mixer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
(
|
(
|
||||||
. /etc/sysconfig
|
. /etc/profile
|
||||||
|
|
||||||
progress "Setting up sound card"
|
progress "Setting up sound card"
|
||||||
|
|
||||||
|
@ -39,6 +39,7 @@ case "$2" in
|
|||||||
mkdir -p $INSTALL/var
|
mkdir -p $INSTALL/var
|
||||||
mkdir -p $INSTALL/flash
|
mkdir -p $INSTALL/flash
|
||||||
mkdir -p $INSTALL/storage
|
mkdir -p $INSTALL/storage
|
||||||
|
echo "chmod 1777 $INSTALL/storage" >> $FAKEROOT_SCRIPT
|
||||||
|
|
||||||
ln -sf /var $INSTALL/usr/var
|
ln -sf /var $INSTALL/usr/var
|
||||||
ln -sf /var/tmp $INSTALL/tmp
|
ln -sf /var/tmp $INSTALL/tmp
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
# Mediacenter environment variables.
|
|
||||||
#
|
|
||||||
# This file contains non-OpenELEC evironment variables as well as OpenELEC
|
|
||||||
# evironment variables that are not user defined.
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
XBMC_CACHING="no"
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
# do not change anything below
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
XBMC_HOME="/usr/share/xbmc"
|
|
||||||
|
|
||||||
export XBMC_HOME
|
|
||||||
|
|
||||||
cache_xbmc () {
|
|
||||||
progress "caching XBMC"
|
|
||||||
mkdir -p /var/cache/bin
|
|
||||||
$IONICE cp -PR /usr/share/xbmc/xbmc.bin /var/cache/bin
|
|
||||||
touch /var/cache/xbmc.cache
|
|
||||||
}
|
|
||||||
|
|
||||||
wait_for_xbmc_cache () {
|
|
||||||
while [ ! -f /var/cache/xbmc.cache ]; do
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
}
|
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# caching xbmc
|
# caching xbmc
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
if [ "$XBMC_CACHING" = "yes" ]; then
|
if [ "$XBMC_CACHING" = "yes" ]; then
|
||||||
|
|
||||||
|
10
packages/mediacenter/xbmc/profile.d/xbmc.conf
Normal file
10
packages/mediacenter/xbmc/profile.d/xbmc.conf
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
################################################################################
|
||||||
|
# Mediacenter environment variables.
|
||||||
|
#
|
||||||
|
# This file contains non-OpenELEC evironment variables as well as OpenELEC
|
||||||
|
# evironment variables that are not user defined.
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
XBMC_HOME="/usr/share/xbmc"
|
||||||
|
|
||||||
|
export XBMC_HOME
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
. /etc/sysconfig
|
. /etc/profile
|
||||||
|
|
||||||
XBMC_ARGS="--standalone -fs --lircdev $LIRC_OUTPUT"
|
XBMC_ARGS="--standalone -fs --lircdev $LIRC_OUTPUT"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# start Avahi Daemon
|
# start Avahi Daemon
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
progress "Starting Avahi Daemon"
|
progress "Starting Avahi Daemon"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# start connman network manager
|
# start connman network manager
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
progress "Starting Connection Manager"
|
progress "Starting Connection Manager"
|
||||||
|
|
||||||
|
@ -1,22 +1,22 @@
|
|||||||
# start ssh server
|
# start ssh server
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
# Check for the Dropbear RSA key
|
# Check for the Dropbear RSA key
|
||||||
if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
|
if [ ! -f /storage/.cache/dropbear/dropbear_rsa_host_key ] ; then
|
||||||
progress "SSH: generating rsa key"
|
progress "SSH: generating rsa key"
|
||||||
|
|
||||||
$IONICE mkdir -p /etc/dropbear
|
$IONICE mkdir -p /storage/.cache/dropbear
|
||||||
dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
|
dropbearkey -t rsa -f /storage/.cache/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for the Dropbear DSS key
|
# Check for the Dropbear DSS key
|
||||||
if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
|
if [ ! -f /storage/.cache/dropbear/dropbear_dss_host_key ] ; then
|
||||||
progress "SSH: generating dsa key"
|
progress "SSH: generating dsa key"
|
||||||
|
|
||||||
$IONICE mkdir -p /etc/dropbear
|
$IONICE mkdir -p /storage/.cache/dropbear
|
||||||
dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
|
dropbearkey -t dss -f /storage/.cache/dropbear/dropbear_dss_host_key > /dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
progress "Starting SSH Server"
|
progress "Starting SSH Server"
|
||||||
|
@ -13,5 +13,5 @@ mkdir -p $INSTALL/usr/bin
|
|||||||
cp -PR $PKG_BUILD/dropbearkey $INSTALL/usr/bin
|
cp -PR $PKG_BUILD/dropbearkey $INSTALL/usr/bin
|
||||||
cp -PR $PKG_BUILD/scp $INSTALL/usr/bin
|
cp -PR $PKG_BUILD/scp $INSTALL/usr/bin
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/config/dropbear
|
mkdir -p $INSTALL/etc
|
||||||
ln -s /storage/.config/dropbear $INSTALL/etc/dropbear
|
ln -s /storage/.cache/dropbear $INSTALL/etc/dropbear
|
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
$SCRIPTS/build toolchain
|
$SCRIPTS/build toolchain
|
||||||
$SCRIPTS/build libiconv
|
$SCRIPTS/build libiconv
|
||||||
|
$SCRIPTS/build avahi
|
||||||
|
|
||||||
export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
|
export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# start Samba Server
|
# start Samba Server
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
progress "Starting Samba server"
|
progress "Starting Samba server"
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
. config/options
|
. config/options
|
||||||
|
|
||||||
$SCRIPTS/install libiconv
|
$SCRIPTS/install libiconv
|
||||||
|
$SCRIPTS/install avahi
|
||||||
|
|
||||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||||
|
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
# Starting SABnzbd Newsgroup downloader daemon
|
# Starting SABnzbd Newsgroup downloader daemon
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text, debug
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
progress "Starting SABnzbd Newsgroup downloader daemon"
|
progress "Starting SABnzbd Newsgroup downloader daemon"
|
||||||
|
|
||||||
|
. /etc/sabnzbd.conf
|
||||||
|
|
||||||
python /usr/share/SABnzbd/SABnzbd.py -d $SABNZBD_ARGS > /dev/null 2>&1
|
python /usr/share/SABnzbd/SABnzbd.py -d $SABNZBD_ARGS > /dev/null 2>&1
|
||||||
)&
|
)&
|
||||||
|
@ -10,5 +10,10 @@ $SCRIPTS/install unrar
|
|||||||
$SCRIPTS/install unzip
|
$SCRIPTS/install unzip
|
||||||
$SCRIPTS/install par2cmdline
|
$SCRIPTS/install par2cmdline
|
||||||
|
|
||||||
|
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||||
|
|
||||||
mkdir -p $INSTALL/usr/share/$1
|
mkdir -p $INSTALL/usr/share/$1
|
||||||
cp -PR $BUILD/$1*/* $INSTALL/usr/share/$1
|
cp -P $BUILD/$1*/* $INSTALL/usr/share/$1
|
||||||
|
|
||||||
|
mkdir -p $INSTALL/etc
|
||||||
|
cp -P $PKG_DIR/config/*.conf $INSTALL/etc
|
||||||
|
@ -1 +1 @@
|
|||||||
http://prdownloads.sourceforge.net/freetype/freetype-2.3.11.tar.bz2
|
http://prdownloads.sourceforge.net/freetype/freetype-2.3.12.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# start D-BUS daemon
|
# start D-BUS daemon
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
progress "Setup ConsoleKit"
|
progress "Setup ConsoleKit"
|
||||||
|
@ -26,6 +26,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
# read config files
|
# read config files
|
||||||
for config in `ls /etc/conf.d/`; do
|
for config in `ls /etc/profile.d/`; do
|
||||||
. /etc/conf.d/$config
|
. /etc/profile.d/$config
|
||||||
done
|
done
|
@ -1,6 +1,6 @@
|
|||||||
# start debug shell
|
# start debug shell
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
TTY="3"
|
TTY="3"
|
||||||
|
|
||||||
@ -12,7 +12,6 @@ if [ "$DEBUG" = "yes" ]; then
|
|||||||
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
|
echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
|
||||||
echo "###########################################"
|
echo "###########################################"
|
||||||
|
|
||||||
# exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1 &
|
|
||||||
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY &
|
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY &
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# mounting needed filesystems
|
# mounting needed filesystems
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
progress "mounting needed filesystems"
|
progress "mounting needed filesystems"
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# make variable directory structure
|
# make variable directory structure
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
progress "make variable directory structure"
|
progress "make variable directory structure"
|
||||||
$IONICE mkdir -p /var/log \
|
$IONICE mkdir -p /var/log \
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# copying config into storage
|
|
||||||
#
|
|
||||||
# runlevels: openelec, text
|
|
||||||
|
|
||||||
progress "copying config into storage"
|
|
||||||
|
|
||||||
$IONICE mkdir -p $HOME/.config
|
|
||||||
|
|
||||||
for i in `ls /usr/config`; do
|
|
||||||
[ ! -f "$HOME/.config/$i" ] && cp -PR /usr/config/$i $HOME/.config
|
|
||||||
done
|
|
||||||
|
|
@ -1,11 +1,7 @@
|
|||||||
#
|
#
|
||||||
# start syslog daemon
|
# start syslog daemon
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
HOSTNAME=`cat /etc/hostname`
|
|
||||||
|
|
||||||
export $HOSTNAME
|
|
||||||
|
|
||||||
# bring lo up, whether we have network card or not
|
# bring lo up, whether we have network card or not
|
||||||
progress "starting Loopback Network interface"
|
progress "starting Loopback Network interface"
|
||||||
@ -14,6 +10,3 @@ export $HOSTNAME
|
|||||||
# setup hostname
|
# setup hostname
|
||||||
progress "Setup hostname"
|
progress "Setup hostname"
|
||||||
echo $HOSTNAME > /proc/sys/kernel/hostname
|
echo $HOSTNAME > /proc/sys/kernel/hostname
|
||||||
|
|
||||||
# create /etc/hosts file, useful for gethostbyname(localhost)
|
|
||||||
echo -e "127.0.0.1\tlocalhost $HOSTNAME" > /var/run/hosts
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# start syslog daemon
|
# start syslog daemon
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
progress "Starting Syslog daemon"
|
progress "Starting Syslog daemon"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# start the ACPI daemon subsystem
|
# start the ACPI daemon subsystem
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
progress "Starting ACPI daemon"
|
progress "Starting ACPI daemon"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# start text mode shell
|
# start text mode shell
|
||||||
#
|
#
|
||||||
# runlevels: text
|
# runlevels: textmode
|
||||||
|
|
||||||
TTY="1"
|
TTY="1"
|
||||||
|
|
||||||
@ -11,6 +11,5 @@ echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
|
|||||||
echo "###########################################"
|
echo "###########################################"
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
# exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1
|
|
||||||
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY
|
exec /sbin/getty -n -l /bin/sh 38400 tty$TTY
|
||||||
done
|
done
|
||||||
|
@ -14,7 +14,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
|
|||||||
add_group root 0
|
add_group root 0
|
||||||
|
|
||||||
add_user $USER_NAME "$USER_PWD" 1000 1000 "User" "/storage" "/bin/sh"
|
add_user $USER_NAME "$USER_PWD" 1000 1000 "User" "/storage" "/bin/sh"
|
||||||
add_group $USER_GROUP 1000
|
add_group $USER_GROUP 1000 "video"
|
||||||
|
|
||||||
cp -PR $BUILD/busybox*/_install-system/* $INSTALL
|
cp -PR $BUILD/busybox*/_install-system/* $INSTALL
|
||||||
echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT
|
echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT
|
||||||
@ -22,15 +22,21 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
|
|||||||
mkdir -p $INSTALL/bin
|
mkdir -p $INSTALL/bin
|
||||||
ln -sf /bin/sh $INSTALL/bin/bash
|
ln -sf /bin/sh $INSTALL/bin/bash
|
||||||
|
|
||||||
|
mkdir -p $INSTALL/sbin
|
||||||
|
cp $PKG_DIR/scripts/init $INSTALL/sbin/
|
||||||
|
|
||||||
mkdir -p $INSTALL/etc
|
mkdir -p $INSTALL/etc
|
||||||
cp $PKG_DIR/config/sysconfig $INSTALL/etc
|
cp $PKG_DIR/config/profile $INSTALL/etc
|
||||||
cp $PKG_DIR/config/sysconfig $INSTALL/etc/profile
|
|
||||||
touch $INSTALL/etc/fstab
|
touch $INSTALL/etc/fstab
|
||||||
ln -sf /var/run/resolv.conf $INSTALL/etc/resolv.conf
|
ln -sf /var/run/resolv.conf $INSTALL/etc/resolv.conf
|
||||||
ln -sf /var/run/hosts $INSTALL/etc/hosts
|
|
||||||
|
|
||||||
|
# create /etc/hostname
|
||||||
echo $HOSTNAME > $INSTALL/etc/hostname
|
echo $HOSTNAME > $INSTALL/etc/hostname
|
||||||
|
|
||||||
|
# create /etc/hosts file, useful for gethostbyname(localhost)
|
||||||
|
echo -e "127.0.0.1\tlocalhost $HOSTNAME" > $INSTALL/etc/hosts
|
||||||
|
|
||||||
|
# create /etc/issue
|
||||||
echo $GREATING0 > $INSTALL/etc/issue
|
echo $GREATING0 > $INSTALL/etc/issue
|
||||||
echo $GREATING1 >> $INSTALL/etc/issue
|
echo $GREATING1 >> $INSTALL/etc/issue
|
||||||
echo $GREATING2 >> $INSTALL/etc/issue
|
echo $GREATING2 >> $INSTALL/etc/issue
|
||||||
@ -40,9 +46,6 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
|
|||||||
mkdir -p $INSTALL/usr/share/udhcpc
|
mkdir -p $INSTALL/usr/share/udhcpc
|
||||||
cp $PKG_DIR/scripts/udhcp.script $INSTALL/usr/share/udhcpc/default.script
|
cp $PKG_DIR/scripts/udhcp.script $INSTALL/usr/share/udhcpc/default.script
|
||||||
|
|
||||||
mkdir -p $INSTALL/sbin
|
|
||||||
cp $PKG_DIR/scripts/init $INSTALL/sbin/
|
|
||||||
|
|
||||||
# acpid specific
|
# acpid specific
|
||||||
mkdir -p $INSTALL/etc/acpi/PWRF
|
mkdir -p $INSTALL/etc/acpi/PWRF
|
||||||
cp $PKG_DIR/scripts/acpi_powerbtn $INSTALL/etc/acpi/PWRF/00000080
|
cp $PKG_DIR/scripts/acpi_powerbtn $INSTALL/etc/acpi/PWRF/00000080
|
||||||
|
10
packages/sysutils/busybox/profile.d/configcache.conf
Normal file
10
packages/sysutils/busybox/profile.d/configcache.conf
Normal file
@ -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.
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
CONFIG_CACHE="/storage/.cache"
|
||||||
|
|
||||||
|
export CONFIG_CACHE
|
16
packages/sysutils/busybox/profile.d/fastboot.conf
Normal file
16
packages/sysutils/busybox/profile.d/fastboot.conf
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
################################################################################
|
||||||
|
# Core (Shell) environment variables.
|
||||||
|
#
|
||||||
|
# This file contains non-OpenELEC evironment variables as well as OpenELEC
|
||||||
|
# evironment variables that are not user defined.
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
# setting some Variables
|
||||||
|
if test "$FASTBOOT" = "yes"; then
|
||||||
|
IONICE="ionice -c 1 -n 0"
|
||||||
|
NICE_20="nice -n -20"
|
||||||
|
else
|
||||||
|
FASTBOOT=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
export FASTBOOT
|
10
packages/sysutils/busybox/profile.d/hostname.conf
Normal file
10
packages/sysutils/busybox/profile.d/hostname.conf
Normal file
@ -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.
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
HOSTNAME=`cat /etc/hostname`
|
||||||
|
|
||||||
|
export HOSTNAME
|
10
packages/sysutils/busybox/profile.d/path.conf
Normal file
10
packages/sysutils/busybox/profile.d/path.conf
Normal file
@ -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
|
14
packages/sysutils/busybox/profile.d/runlevel.conf
Normal file
14
packages/sysutils/busybox/profile.d/runlevel.conf
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
################################################################################
|
||||||
|
# Core (Shell) environment variables.
|
||||||
|
#
|
||||||
|
# This file contains non-OpenELEC evironment variables as well as OpenELEC
|
||||||
|
# evironment variables that are not user defined.
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
# getting runlevel
|
||||||
|
RUNLEVEL="openelec"
|
||||||
|
if test "$TEXTMODE" = yes; then
|
||||||
|
RUNLEVEL="textmode"
|
||||||
|
fi
|
||||||
|
|
||||||
|
export RUNLEVEL
|
@ -5,9 +5,6 @@
|
|||||||
# evironment variables that are not user defined.
|
# evironment variables that are not user defined.
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
# Prompt environment variables.
|
|
||||||
#-------------------------------------------------------------------------------
|
|
||||||
PS1='\u@\h:\w \$ '
|
PS1='\u@\h:\w \$ '
|
||||||
|
|
||||||
export PS1
|
export PS1
|
@ -1,13 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh -l
|
||||||
|
|
||||||
# read config
|
|
||||||
. /etc/sysconfig
|
|
||||||
|
|
||||||
# getting runlevel
|
|
||||||
RUNLEVEL="openelec"
|
|
||||||
if test "$TEXTMODE" = yes; then
|
|
||||||
RUNLEVEL="text"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# starting init scripts for wanted runlevel
|
# starting init scripts for wanted runlevel
|
||||||
progress "Starting Init Scripts"
|
progress "Starting Init Scripts"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# starting dbus
|
# starting dbus
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
progress "Starting D-BUS"
|
progress "Starting D-BUS"
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# starting HAL
|
# starting HAL
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
progress "Starting Hardware Abstraction Layer"
|
progress "Starting Hardware Abstraction Layer"
|
||||||
|
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
# start the LIRC daemon
|
# start the LIRC daemon
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
progress "Starting LIRC daemon"
|
progress "Starting LIRC daemon"
|
||||||
|
|
||||||
|
. /etc/lirc.conf
|
||||||
|
|
||||||
$IONICE mkdir -p /var/run/lirc
|
$IONICE mkdir -p /var/run/lirc
|
||||||
lircd --driver=$LIRC_DRIVER --device=$LIRC_DEVICE --output=$LIRC_OUTPUT
|
lircd --driver=$LIRC_DRIVER --device=$LIRC_DEVICE --output=$LIRC_OUTPUT
|
||||||
)&
|
)&
|
||||||
|
@ -16,9 +16,7 @@ mkdir -p $INSTALL/usr/bin
|
|||||||
|
|
||||||
mkdir -p $INSTALL/etc
|
mkdir -p $INSTALL/etc
|
||||||
cp $PKG_DIR/config/lircd_$REMOTE.conf $INSTALL/etc/lircd.conf
|
cp $PKG_DIR/config/lircd_$REMOTE.conf $INSTALL/etc/lircd.conf
|
||||||
|
cp $PKG_DIR/config/config_$RECEIVER $INSTALL/etc/lirc.conf
|
||||||
mkdir -p $INSTALL/etc/conf.d
|
|
||||||
cp $PKG_DIR/config/sysconfig_$RECEIVER $INSTALL/etc/conf.d/lirc
|
|
||||||
|
|
||||||
mkdir -p $INSTALL/lib/modules/$VER/lirc
|
mkdir -p $INSTALL/lib/modules/$VER/lirc
|
||||||
cp $PKG_BUILD/drivers/*/*.ko $INSTALL/lib/modules/$VER/lirc
|
cp $PKG_BUILD/drivers/*/*.ko $INSTALL/lib/modules/$VER/lirc
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# starting splash
|
# starting splash
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
(
|
(
|
||||||
[ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" \
|
[ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" \
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
#
|
#
|
||||||
# starting Udev daemon
|
# starting Udev daemon
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
progress "starting udev daemon"
|
progress "starting udev daemon"
|
||||||
|
|
||||||
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
|
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
|
||||||
|
|
||||||
|
$IONICE mkdir -p /dev/rules.d
|
||||||
|
|
||||||
$NICE_20 udevd --daemon
|
$NICE_20 udevd --daemon
|
||||||
$NICE_20 udevadm monitor 2>&1 >/dev/udev.log &
|
$NICE_20 udevadm monitor 2>&1 >/dev/udev.log &
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# monitoring udev events
|
# monitoring udev events
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
UDEV_LOGFILE="/dev/.udev.log"
|
UDEV_LOGFILE="/dev/.udev.log"
|
||||||
|
|
||||||
|
@ -1,13 +1,11 @@
|
|||||||
#
|
#
|
||||||
# request events from the kernel
|
# request events from the kernel
|
||||||
#
|
#
|
||||||
# runlevels: openelec, text
|
# runlevels: openelec, textmode
|
||||||
|
|
||||||
progress "request udev events from the kernel"
|
progress "request udev events from the kernel"
|
||||||
|
|
||||||
(
|
(
|
||||||
# $NICE_20 udevadm control --env STARTUP=1
|
|
||||||
$NICE_20 udevadm trigger
|
$NICE_20 udevadm trigger
|
||||||
$NICE_20 udevadm settle --timeout=5
|
$NICE_20 udevadm settle --timeout=5
|
||||||
# $NICE_20 udevadm control --env STARTUP=
|
|
||||||
)&
|
)&
|
||||||
|
@ -67,6 +67,4 @@ mkdir -p $INSTALL/lib/udev/rules.d
|
|||||||
|
|
||||||
mkdir -p $INSTALL/etc/udev
|
mkdir -p $INSTALL/etc/udev
|
||||||
cp $PKG_BUILD/udev.conf $INSTALL/etc/udev
|
cp $PKG_BUILD/udev.conf $INSTALL/etc/udev
|
||||||
|
ln -sf /dev/rules.d $INSTALL/etc/udev/rules.d
|
||||||
mkdir -p $INSTALL/usr/config/rules.d
|
|
||||||
ln -sf /storage/.config/rules.d $INSTALL/etc/udev/rules.d
|
|
||||||
|
@ -1 +1 @@
|
|||||||
http://xorg.freedesktop.org/archive/individual/driver/xf86-input-synaptics-1.2.1.tar.bz2
|
http://xorg.freedesktop.org/archive/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
. /etc/sysconfig
|
. /etc/profile
|
||||||
|
|
||||||
[ $START_WM="yes" ] && $WINDOWMANAGER &
|
[ $START_WM="yes" ] && $WINDOWMANAGER &
|
||||||
|
|
||||||
|
@ -6,3 +6,5 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
WINDOWMANAGER="ratpoison"
|
WINDOWMANAGER="ratpoison"
|
||||||
|
|
||||||
|
export WINDOWMANAGER
|
@ -28,11 +28,11 @@ progress "creating directories needed for Xorg"
|
|||||||
if lspci -n | grep 0300 | grep -q 10de; then
|
if lspci -n | grep 0300 | grep -q 10de; then
|
||||||
$IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
$IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
|
||||||
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
|
||||||
UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF"
|
# UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF"
|
||||||
else
|
else
|
||||||
$IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
|
$IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
|
||||||
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
|
$IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
|
||||||
UX_ARG="$UX_ARG -c $XORG_CONF"
|
# UX_ARG="$UX_ARG -c $XORG_CONF"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
progress "starting xsession"
|
progress "starting xsession"
|
||||||
|
@ -1,93 +0,0 @@
|
|||||||
diff -Naur uxlaunch-0.46/options.c uxlaunch-0.46.patch/options.c
|
|
||||||
--- uxlaunch-0.46/options.c 2010-03-04 19:51:44.000000000 +0100
|
|
||||||
+++ uxlaunch-0.46.patch/options.c 2010-03-23 09:47:14.394856281 +0100
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
int tty = 2;
|
|
||||||
char session[256] = "/usr/bin/mutter --sm-disable";
|
|
||||||
char username[256] = "moblin";
|
|
||||||
+char xconfig[256] = "/etc/X11/xorg.conf";
|
|
||||||
|
|
||||||
int verbose = 0;
|
|
||||||
|
|
||||||
@@ -34,6 +35,7 @@
|
|
||||||
{ "user", 1, NULL, 'u' },
|
|
||||||
{ "tty", 1, NULL, 't' },
|
|
||||||
{ "session", 1, NULL, 's' },
|
|
||||||
+ { "xconfig", 1, NULL, 'c' },
|
|
||||||
{ "help", 0, NULL, 'h' },
|
|
||||||
{ "verbose", 0, NULL, 'v' },
|
|
||||||
{ 0, 0, NULL, 0}
|
|
||||||
@@ -46,6 +48,7 @@
|
|
||||||
printf(" -u, --user Start session as specific username\n");
|
|
||||||
printf(" -t, --tty Start session on alternative tty number\n");
|
|
||||||
printf(" -s, --session Start a non-default session\n");
|
|
||||||
+ printf(" -c, --xconfig Xorg config file\n");
|
|
||||||
printf(" -v, --verbose Display lots of output to the console\n");
|
|
||||||
printf(" -h, --help Display this help message\n");
|
|
||||||
}
|
|
||||||
@@ -126,13 +129,15 @@
|
|
||||||
tty = atoi(val);
|
|
||||||
if (!strcmp(key, "session"))
|
|
||||||
strncpy(session, val, 256);
|
|
||||||
+ if (!strcmp(key, "xconfig"))
|
|
||||||
+ strncpy(xconfig, val, 256);
|
|
||||||
}
|
|
||||||
fclose(f);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* parse cmdline - overrides */
|
|
||||||
while (1) {
|
|
||||||
- c = getopt_long(argc, argv, "u:t:s:hv", opts, &i);
|
|
||||||
+ c = getopt_long(argc, argv, "u:t:s:c:hv", opts, &i);
|
|
||||||
if (c == -1)
|
|
||||||
break;
|
|
||||||
|
|
||||||
@@ -146,6 +151,9 @@
|
|
||||||
case 's':
|
|
||||||
strncpy(session, optarg, 256);
|
|
||||||
break;
|
|
||||||
+ case 'c':
|
|
||||||
+ strncpy(xconfig, optarg, 256);
|
|
||||||
+ break;
|
|
||||||
case 'h':
|
|
||||||
usage(argv[0]);
|
|
||||||
exit (EXIT_SUCCESS);
|
|
||||||
@@ -171,7 +179,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
lprintf("uxlaunch v%s started.", VERSION);
|
|
||||||
- lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session);
|
|
||||||
+ lprintf("user \"%s\", tty #%d, session \"%s\", xconfig \"%s\"", username, tty, session, xconfig);
|
|
||||||
|
|
||||||
pass = getpwnam(username);
|
|
||||||
if (!pass)
|
|
||||||
diff -Naur uxlaunch-0.46/uxlaunch.h uxlaunch-0.46.patch/uxlaunch.h
|
|
||||||
--- uxlaunch-0.46/uxlaunch.h 2010-03-04 19:51:44.000000000 +0100
|
|
||||||
+++ uxlaunch-0.46.patch/uxlaunch.h 2010-03-23 09:47:14.395856611 +0100
|
|
||||||
@@ -19,6 +19,7 @@
|
|
||||||
extern int tty;
|
|
||||||
extern char session[];
|
|
||||||
extern char username[];
|
|
||||||
+extern char xconfig[];
|
|
||||||
|
|
||||||
extern int session_pid;
|
|
||||||
extern int xpid;
|
|
||||||
diff -Naur uxlaunch-0.46/xserver.c uxlaunch-0.46.patch/xserver.c
|
|
||||||
--- uxlaunch-0.46/xserver.c 2010-03-04 19:51:44.000000000 +0100
|
|
||||||
+++ uxlaunch-0.46.patch/xserver.c 2010-03-23 09:47:14.401856143 +0100
|
|
||||||
@@ -231,13 +231,13 @@
|
|
||||||
execl(xserver, xserver, displayname,
|
|
||||||
"-nolisten", "tcp", "-dpi", "120", "-noreset",
|
|
||||||
"-auth", xauth_cookie_file,
|
|
||||||
- vt, NULL);
|
|
||||||
+ vt, "-config", xconfig, NULL);
|
|
||||||
} else {
|
|
||||||
execl(xserver, xserver, displayname,
|
|
||||||
"-nolisten", "tcp", "-dpi", "120", "-noreset",
|
|
||||||
"-auth", user_xauth_path,
|
|
||||||
"-logfile", xorg_log,
|
|
||||||
- vt, NULL);
|
|
||||||
+ vt, "-config", xconfig, NULL);
|
|
||||||
}
|
|
||||||
exit(0);
|
|
||||||
}
|
|
@ -1,21 +0,0 @@
|
|||||||
diff -Naur uxlaunch-0.46/xserver.c uxlaunch-0.46.patch/xserver.c
|
|
||||||
--- uxlaunch-0.46/xserver.c 2010-03-23 09:47:54.621981367 +0100
|
|
||||||
+++ uxlaunch-0.46.patch/xserver.c 2010-03-23 09:53:39.703855113 +0100
|
|
||||||
@@ -231,13 +231,15 @@
|
|
||||||
execl(xserver, xserver, displayname,
|
|
||||||
"-nolisten", "tcp", "-dpi", "120", "-noreset",
|
|
||||||
"-auth", xauth_cookie_file,
|
|
||||||
- vt, "-config", xconfig, NULL);
|
|
||||||
+ vt, "-config", xconfig, "-nocursor", "-nohwaccess",
|
|
||||||
+ NULL);
|
|
||||||
} else {
|
|
||||||
execl(xserver, xserver, displayname,
|
|
||||||
"-nolisten", "tcp", "-dpi", "120", "-noreset",
|
|
||||||
"-auth", user_xauth_path,
|
|
||||||
"-logfile", xorg_log,
|
|
||||||
- vt, "-config", xconfig, NULL);
|
|
||||||
+ vt, "-config", xconfig, "-nocursor", "-nohwaccess",
|
|
||||||
+ NULL);
|
|
||||||
}
|
|
||||||
exit(0);
|
|
||||||
}
|
|
@ -22,9 +22,9 @@ if [ -d $PKG_DIR/init.d ]; then
|
|||||||
cp $PKG_DIR/init.d/* $INSTALL/etc/init.d/
|
cp $PKG_DIR/init.d/* $INSTALL/etc/init.d/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d $PKG_DIR/conf.d ]; then
|
if [ -d $PKG_DIR/profile.d ]; then
|
||||||
mkdir -p $INSTALL/etc/conf.d
|
mkdir -p $INSTALL/etc/profile.d
|
||||||
cp $PKG_DIR/conf.d/* $INSTALL/etc/conf.d/
|
cp $PKG_DIR/profile.d/*.conf $INSTALL/etc/profile.d/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$SCRIPTS/build $@
|
$SCRIPTS/build $@
|
||||||
|
Loading…
x
Reference in New Issue
Block a user