jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2013-07-20 20:53:02 +02:00
commit 3461043061
24 changed files with 94 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/functions
View File

@ -328,7 +328,7 @@ show_config() {
config_message="$config_message\n - XBMC Airtunes support:\t\t $AIRTUNES_SUPPORT"
config_message="$config_message\n - XBMC AFP support:\t\t\t $AFP_SUPPORT"
config_message="$config_message\n - XBMC NFS support:\t\t\t $NFS_SUPPORT"
config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_CLIENT"
config_message="$config_message\n - XBMC SAMBA client support:\t\t $SAMBA_SUPPORT"
config_message="$config_message\n - XBMC Webserver support:\t\t $WEBSERVER"
# OS configuration

19
packages/linux/unpack
View File

@ -50,6 +50,25 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD
sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $LINUX/.config
fi
# disable nfs support if not enabled
if [ ! "$NFS_SUPPORT" = yes ]; then
sed -i -e "s|^CONFIG_NFS_FS=.*$|# CONFIG_NFS_FS is not set|" $LINUX/.config
fi
# disable cifs support if not enabled
if [ ! "$SAMBA_SUPPORT" = yes ]; then
sed -i -e "s|^CONFIG_CIFS=.*$|# CONFIG_CIFS is not set|" $LINUX/.config
fi
# disable iscsi support if not enabled
if [ ! "$ISCSI_SUPPORT" = yes ]; then
sed -i -e "s|^CONFIG_SCSI_ISCSI_ATTRS=.*$|# CONFIG_SCSI_ISCSI_ATTRS is not set|" $LINUX/.config
sed -i -e "s|^CONFIG_ISCSI_TCP=.*$|# CONFIG_ISCSI_TCP is not set|" $LINUX/.config
sed -i -e "s|^CONFIG_ISCSI_BOOT_SYSFS=.*$|# CONFIG_ISCSI_BOOT_SYSFS is not set|" $LINUX/.config
sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $LINUX/.config
sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $LINUX/.config
fi
# copy some extra firmware to linux tree
cp -R $PKG_DIR/firmware/* $LINUX/firmware

4
packages/mediacenter/service.openelec.settings/build
View File

@ -23,6 +23,10 @@
. config/options $1
cd $PKG_BUILD
# bluetooth is optional
if [ ! "$BLUETOOTH_SUPPORT" = yes ]; then
rm -f resources/lib/modules/bluetooth.py
fi
python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py ./resources/lib/ -f
rm -rf `find ./resources/lib/ -name "*.py"`

2
packages/mediacenter/service.openelec.settings/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="service.openelec.settings"
PKG_VERSION="0.1.28"
PKG_VERSION="0.1.29"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="prop."

2
packages/mediacenter/xbmc/build
View File

@ -174,7 +174,7 @@ else
XBMC_AFP="--disable-afpclient"
fi
if [ "$SAMBA_CLIENT" = yes ]; then
if [ "$SAMBA_SUPPORT" = yes ]; then
XBMC_SAMBA="--enable-samba"
export LIBS="$LIBS -ltalloc -ltdb -lwbclient"
else

4
packages/mediacenter/xbmc/init.d/93_xbmc
View File

@ -62,6 +62,10 @@ LIRCDEV="/var/run/lirc/lircd"
[ -e /var/run/lirc/lircd.irtrans ] && LIRCDEV="/var/run/lirc/lircd.irtrans"
XBMC_ARGS="--standalone -fs --lircdev $LIRCDEV"
if [ "$DEBUG" = yes ]; then
XBMC_ARGS="$XBMC_ARGS --debug"
fi
progress "starting XBMC"
# hack for Boxee Remote

2
packages/mediacenter/xbmc/meta
View File

@ -160,7 +160,7 @@ if [ "$AFP_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
fi
if [ "$SAMBA_CLIENT" = yes ]; then
if [ "$SAMBA_SUPPORT" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba"
PKG_DEPENDS="$PKG_DEPENDS samba"
fi

3
packages/network/openssh/config/sshd_config
View File

@ -106,9 +106,6 @@ SyslogFacility AUTHPRIV
#PermitTunnel no
#ChrootDirectory none
# no default banner path
Banner /etc/issue
# override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server

7
packages/sysutils/busybox/build
View File

@ -44,6 +44,13 @@ cd $BUILD/busybox*
sed -i -e "s|^CONFIG_FEATURE_CROND_D=.*$|# CONFIG_FEATURE_CROND_D is not set|" .config
sed -i -e "s|^CONFIG_CRONTAB=.*$|# CONFIG_CRONTAB is not set|" .config
fi
if [ ! "$NFS_SUPPORT" = yes ]; then
sed -i -e "s|^CONFIG_FEATURE_MOUNT_NFS=.*$|# CONFIG_FEATURE_MOUNT_NFS is not set|" .config
fi
if [ ! "$SAMBA_SUPPORT" = yes ]; then
sed -i -e "s|^CONFIG_FEATURE_MOUNT_CIFS=.*$|# CONFIG_FEATURE_MOUNT_CIFS is not set|" .config
fi
make oldconfig
make ARCH=$TARGET_ARCH \

1
packages/sysutils/busybox/install
View File

@ -39,6 +39,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
cp $PKG_DIR/scripts/createlog $INSTALL/usr/bin/
cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/
cp $PKG_DIR/scripts/apt-get $INSTALL/usr/bin/
cp $PKG_DIR/scripts/passwd $INSTALL/usr/bin/
ln -sf /bin/busybox $INSTALL/usr/bin/env #/usr/bin/env is needed for most python scripts
cp $PKG_DIR/scripts/pastebinit $INSTALL/usr/bin/
ln -sf pastebinit $INSTALL/usr/bin/paste

7
packages/sysutils/busybox/meta
View File

@ -25,7 +25,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.busybox.net"
PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils less procps-ng rpcbind"
PKG_DEPENDS="kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils less procps-ng"
PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
PKG_PRIORITY="required"
PKG_SECTION="system"
@ -39,3 +39,8 @@ PKG_AUTORECONF="no"
if [ "$NANO_EDITOR" = "yes" ]; then
PKG_DEPENDS="$PKG_DEPENDS nano"
fi
# nfs support
if [ "$NFS_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS rpcbind"
fi

36
packages/sysutils/busybox/scripts/passwd Executable file
View File

@ -0,0 +1,36 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
message="$message\n There is no working 'passwd'."
message="$message\n"
message="$message\n The 'passwd' command changes passwords for user accounts."
message="$message\n"
message="$message\n With OpenELEC it is not possible to change the system password"
message="$message\n"
message="$message\n SSH is included only as a last support resort. SSH is off by default."
message="$message\n Most users never need SSH and need help using it so we need a default"
message="$message\n password. If you need to keep SSH always on then this is unsupported"
message="$message\n but can be secured with certificates."
message="$message\n"
message="$message\n TIP: disable password authentication in ssh and use public key authentication."
echo -e $message

2
packages/unofficial

@ -1 +1 @@
Subproject commit 1e49ac1aa413096c65aaa3631b8bec265c49753f
Subproject commit 726e8ef3d6addd5ff2cf4525be574d6e5abd5a57

2
projects/ARCTIC_MC/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/ATV/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/Fusion/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/Generic/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/Generic_OSS/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/ION/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/Intel/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/RPi/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/Ultra/options
View File

@ -206,7 +206,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
projects/Virtual/options
View File

@ -201,7 +201,7 @@
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_CLIENT="yes"
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"

2
scripts/image
View File

@ -101,6 +101,8 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
echo "$DISTRONAME git: $GIT_HASH" >> $INSTALL/etc/issue
fi
ln -sf /etc/issue $INSTALL/etc/motd
# Basissystem...
$SCRIPTS/install eglibc
$SCRIPTS/install gcc-final