Merge pull request #9057 from CvH/13.0/shfmt

cleanup script formatting
This commit is contained in:
Rudi Heitbaum 2024-07-27 18:24:18 +10:00 committed by GitHub
commit ed8681ff03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
116 changed files with 1349 additions and 1305 deletions

View File

@ -8,4 +8,4 @@ name="$(basename $0)"
oe_setup_addon "$name" oe_setup_addon "$name"
docker rm "$name" 2>/dev/null docker rm "$name" 2>/dev/null
docker run --name="$name" \ docker run --name="$name"

View File

@ -6,7 +6,8 @@
MOUNTPOINT="/tmp/LibreELEC-System" MOUNTPOINT="/tmp/LibreELEC-System"
md5sumCheck() { md5sumCheck() {
( cd $MOUNTPOINT (
cd $MOUNTPOINT
echo "checking MD5: $1" echo "checking MD5: $1"
md5sum -c $1.md5 md5sum -c $1.md5
if [ "$?" = "1" ]; then if [ "$?" = "1" ]; then
@ -35,19 +36,19 @@ if [ -z $part1 -o -z $part2 -o -z $id1 -o -z $id2 ]; then
fi fi
# create mountpoint # create mountpoint
mkdir -p $MOUNTPOINT mkdir -p $MOUNTPOINT
# mount needed partition # mount needed partition
mount $part1 $MOUNTPOINT mount $part1 $MOUNTPOINT
# check md5sum # check md5sum
md5sumCheck kernel.img md5sumCheck kernel.img
md5sumCheck SYSTEM md5sumCheck SYSTEM
# create bootloader configuration # create bootloader configuration
echo "creating bootloader configuration..." echo "creating bootloader configuration..."
echo "boot=$id1 disk=$id2 quiet @EXTRA_CMDLINE@" > $MOUNTPOINT/cmdline.txt echo "boot=$id1 disk=$id2 quiet @EXTRA_CMDLINE@" >$MOUNTPOINT/cmdline.txt
# cleanup mountpoint # cleanup mountpoint
umount $MOUNTPOINT umount $MOUNTPOINT
rmdir $MOUNTPOINT rmdir $MOUNTPOINT

View File

@ -37,7 +37,7 @@ show_config() {
config_message+="\n - LLVM support:\t\t\t ${LLVM_SUPPORT}" config_message+="\n - LLVM support:\t\t\t ${LLVM_SUPPORT}"
config_message+="\n - DEBUG:\t\t\t\t ${DEBUG:-no}" config_message+="\n - DEBUG:\t\t\t\t ${DEBUG:-no}"
config_message+="\n - CFLAGS:\t\t\t\t ${TARGET_CFLAGS}" config_message+="\n - CFLAGS:\t\t\t\t ${TARGET_CFLAGS}"
config_message+="\n - LDFLAGS:\t\t\t\t $(sed 's/^ *//' <<< ${TARGET_LDFLAGS})" config_message+="\n - LDFLAGS:\t\t\t\t $(sed 's/^ *//' <<<${TARGET_LDFLAGS})"
config_message+="\n - Local Ccache:\t\t\t ${LOCAL_CCACHE:-no}" config_message+="\n - Local Ccache:\t\t\t ${LOCAL_CCACHE:-no}"
config_message+="\n - CONFIG_SHELL:\t\t\t ${CONFIG_SHELL:-auto}" config_message+="\n - CONFIG_SHELL:\t\t\t ${CONFIG_SHELL:-auto}"
@ -104,7 +104,7 @@ show_config() {
config_message+="\n ${dashes}${dashes}" config_message+="\n ${dashes}${dashes}"
config_message+="\n - Graphic Drivers:\t\t\t ${GRAPHIC_DRIVERS}" config_message+="\n - Graphic Drivers:\t\t\t ${GRAPHIC_DRIVERS}"
config_message+="\n - Display Server:\t\t\t ${DISPLAYSERVER}" config_message+="\n - Display Server:\t\t\t ${DISPLAYSERVER}"
if [ "${DISPLAYSERVER}" = "x11" ] ; then if [ "${DISPLAYSERVER}" = "x11" ]; then
for drv in ${XORG_DRIVERS}; do for drv in ${XORG_DRIVERS}; do
XORG_DRIVERS_CONFIG+="xf86-video-${drv} " XORG_DRIVERS_CONFIG+="xf86-video-${drv} "
done done
@ -113,11 +113,11 @@ show_config() {
fi fi
config_message+="\n - Window Manager / Compositor:\t\t ${WINDOWMANAGER}" config_message+="\n - Window Manager / Compositor:\t\t ${WINDOWMANAGER}"
config_message+="\n - OpenGL (GLX) support (provider):\t ${OPENGL_SUPPORT}" config_message+="\n - OpenGL (GLX) support (provider):\t ${OPENGL_SUPPORT}"
[ "${OPENGL}" != "no" ] && config_message+=" (${OPENGL})" [ "${OPENGL}" != "no" ] && config_message+=" (${OPENGL})"
config_message+="\n - OpenGL ES support (provider):\t ${OPENGLES_SUPPORT}" config_message+="\n - OpenGL ES support (provider):\t ${OPENGLES_SUPPORT}"
[ "${OPENGLES}" != "no" ] && config_message+=" (${OPENGLES})" [ "${OPENGLES}" != "no" ] && config_message+=" (${OPENGLES})"
config_message+="\n - Vulkan API support (provider):\t ${VULKAN_SUPPORT}" config_message+="\n - Vulkan API support (provider):\t ${VULKAN_SUPPORT}"
[ "${VULKAN}" != "no" ] && config_message+=" (${VULKAN})" [ "${VULKAN}" != "no" ] && config_message+=" (${VULKAN})"
if [ "${VULKAN_SUPPORT}" = "yes" ]; then if [ "${VULKAN_SUPPORT}" = "yes" ]; then
config_message+="\n - Vulkan Graphic Drivers:\t\t ${VULKAN_DRIVERS_CONFIG}" config_message+="\n - Vulkan Graphic Drivers:\t\t ${VULKAN_DRIVERS_CONFIG}"
fi fi

View File

@ -14,7 +14,7 @@ CHROME_FILE="google-chrome-stable_@CHROME_VERSION@-1_amd64.deb"
# check for enough free disk space # check for enough free disk space
if [ $(df -P . | awk 'END {print $4}') -lt 400000 ]; then if [ $(df -P . | awk 'END {print $4}') -lt 400000 ]; then
kodi-send --action="Notification(Not enough disk space, at least 400MB are required,30000,${ICON})" >/dev/null kodi-send --action="Notification(Not enough disk space, at least 400MB are required,30000,${ICON})" >/dev/null
exit 0; exit 0
fi fi
# remove install status and folders # remove install status and folders
@ -41,9 +41,9 @@ rm -f ${CONTROL_FILE} ${DATA_FILE}
( (
curl -# -O -C - https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_FILE} 2>${DATA_FILE} curl -# -O -C - https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_FILE} 2>${DATA_FILE}
touch ${CONTROL_FILE} touch ${CONTROL_FILE}
) | \ ) |
while [ : ]; do while [ : ]; do
[ -f ${DATA_FILE} ] && prog="$(tr '\r' '\n' < ${DATA_FILE} | tail -n 1 | sed -r 's/^[# ]+/#/;s/^[^0-9]*//g')" || prog= [ -f ${DATA_FILE} ] && prog="$(tr '\r' '\n' <${DATA_FILE} | tail -n 1 | sed -r 's/^[# ]+/#/;s/^[^0-9]*//g')" || prog=
kodi-send --action="Notification(Downloading Chrome,\"${prog:-0.0%}\",3000,${ICON})" >/dev/null kodi-send --action="Notification(Downloading Chrome,\"${prog:-0.0%}\",3000,${ICON})" >/dev/null
[ -f ${CONTROL_FILE} ] && break [ -f ${CONTROL_FILE} ] && break
sleep 4 sleep 4

View File

@ -12,8 +12,7 @@ if [ ! -f "$ADDON_DIR/extract.ok" ]; then
chrome-downloader chrome-downloader
fi fi
if [ -e $ADDON_HOME/env ] if [ -e $ADDON_HOME/env ]; then
then
. $ADDON_HOME/env . $ADDON_HOME/env
fi fi
@ -32,8 +31,7 @@ export GDK_PIXBUF_MODULE_FILE=$ADDON_DIR/config/pixbuf.loaders.cache
export XENVIRONMENT=$ADDON_DIR/config/Xdefaults export XENVIRONMENT=$ADDON_DIR/config/Xdefaults
# start unclutter # start unclutter
if [ "$HIDE_CURSOR" == "true" ] if [ "$HIDE_CURSOR" == "true" ]; then
then
unclutter & unclutter &
UNCLUTTER_PID=$! UNCLUTTER_PID=$!
fi fi
@ -43,33 +41,42 @@ LIBVA_DRIVERS_PATH="/usr/lib/dri:$ADDON_DIR/lib.private"
LIBVA_DRIVER_NAME='' LIBVA_DRIVER_NAME=''
case $VAAPI_MODE in case $VAAPI_MODE in
'intel') 'intel')
LIBVA_DRIVER_NAME='i965' LIBVA_DRIVER_NAME='i965'
chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder" chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder"
;; ;;
'amd') 'amd')
LIBVA_DRIVER_NAME='vdpau' LIBVA_DRIVER_NAME='vdpau'
chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder" chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder"
;; ;;
'nvidia') 'nvidia')
LIBVA_DRIVER_NAME='vdpau' LIBVA_DRIVER_NAME='vdpau'
chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder --allow-no-sandbox-job --disable-gpu-sandbox" chrome_OPTS="$chrome_OPTS --use-gl=desktop --enable-features=VaapiVideoDecoder --allow-no-sandbox-job --disable-gpu-sandbox"
;; ;;
*) *)
LIBGL_ALWAYS_SOFTWARE='1' LIBGL_ALWAYS_SOFTWARE='1'
export LIBGL_ALWAYS_SOFTWARE export LIBGL_ALWAYS_SOFTWARE
;;
esac esac
export LIBVA_DRIVER_NAME LIBVA_DRIVERS_PATH export LIBVA_DRIVER_NAME LIBVA_DRIVERS_PATH
# windowed # windowed
case $WINDOW_MODE in case $WINDOW_MODE in
'maximized') chrome_OPTS="$chrome_OPTS --start-maximized";; 'maximized')
'kiosk') chrome_OPTS="$chrome_OPTS --kiosk";; chrome_OPTS="$chrome_OPTS --start-maximized"
;;
'kiosk')
chrome_OPTS="$chrome_OPTS --kiosk"
;;
esac esac
# rasterization # rasterization
case $RASTER_MODE in case $RASTER_MODE in
'off') chrome_OPTS="$chrome_OPTS --disable-accelerated-2d-canvas --disable-gpu-compositing";; 'off')
'force') chrome_OPTS="$chrome_OPTS --enable-gpu-rasterization --enable-accelerated-2d-canvas --ignore-gpu-blacklist";; chrome_OPTS="$chrome_OPTS --disable-accelerated-2d-canvas --disable-gpu-compositing"
;;
'force')
chrome_OPTS="$chrome_OPTS --enable-gpu-rasterization --enable-accelerated-2d-canvas --ignore-gpu-blacklist"
;;
esac esac
# alsa # alsa
@ -82,8 +89,7 @@ if [ "$AUDIO_DEVICE_TYPE" == "ALSA" ]; then
fi fi
# dark mode # dark mode
if [ "$DARK_MODE" == "true" ] if [ "$DARK_MODE" == "true" ]; then
then
chrome_OPTS="$chrome_OPTS --force-dark-mode" chrome_OPTS="$chrome_OPTS --force-dark-mode"
fi fi
@ -102,8 +108,7 @@ LD_PRELOAD=/usr/lib/libGL.so $ADDON_DIR/chrome-bin/chrome \
2>&1 | tee $ADDON_LOG_FILE 2>&1 | tee $ADDON_LOG_FILE
# kill unclutter # kill unclutter
if [ "$HIDE_CURSOR" == "true" ] if [ "$HIDE_CURSOR" == "true" ]; then
then
kill $UNCLUTTER_PID kill $UNCLUTTER_PID
fi fi

View File

@ -9,9 +9,15 @@
HDHR_LOCKFILE="/var/lock/userspace-driver-hdhomerun.lck" HDHR_LOCKFILE="/var/lock/userspace-driver-hdhomerun.lck"
HDHR_LOCKFD=99 HDHR_LOCKFD=99
# obtain an exclusive lock # obtain an exclusive lock
exlock() { eval "exec $HDHR_LOCKFD>\"$HDHR_LOCKFILE\""; flock -x $HDHR_LOCKFD; } exlock() {
eval "exec $HDHR_LOCKFD>\"$HDHR_LOCKFILE\""
flock -x $HDHR_LOCKFD
}
# drop a lock # drop a lock
unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFILE"; } unlock() {
flock -u $HDHR_LOCKFD
flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFILE"
}
# end locking mechanism # end locking mechanism
# exclusive lock # exclusive lock
@ -40,9 +46,9 @@ mkdir -p /var/config
# check settings version # check settings version
XML_SETTINGS_VER="$(xmlstarlet sel -t -m settings -v @version $HDHR_ADDON_SETTINGS)" XML_SETTINGS_VER="$(xmlstarlet sel -t -m settings -v @version $HDHR_ADDON_SETTINGS)"
if [ "$XML_SETTINGS_VER" = "2" ]; then if [ "$XML_SETTINGS_VER" = "2" ]; then
xmlstarlet sel -t -m settings/setting -v @id -o "=\"" -v . -o "\"" -n "$HDHR_ADDON_SETTINGS" > /var/config/hdhomerun-addon.conf xmlstarlet sel -t -m settings/setting -v @id -o "=\"" -v . -o "\"" -n "$HDHR_ADDON_SETTINGS" >/var/config/hdhomerun-addon.conf
else else
xmlstarlet sel -t -m settings -m setting -v @id -o "=\"" -v @value -o "\"" -n "$HDHR_ADDON_SETTINGS" > /var/config/hdhomerun-addon.conf xmlstarlet sel -t -m settings -m setting -v @id -o "=\"" -v @value -o "\"" -n "$HDHR_ADDON_SETTINGS" >/var/config/hdhomerun-addon.conf
fi fi
. /var/config/hdhomerun-addon.conf . /var/config/hdhomerun-addon.conf
@ -63,8 +69,8 @@ if [ -z "$(pidof userhdhomerun)" ]; then
DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DISABLE) DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DISABLE)
NUMBERS=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_NUMBERS) NUMBERS=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_NUMBERS)
NUMBERS=$(( $NUMBERS -1 )) NUMBERS=$(($NUMBERS - 1))
NUMBERS=$(( $NUMBERS *1 )) NUMBERS=$(($NUMBERS * 1))
for i in $(seq 0 $NUMBERS); do for i in $(seq 0 $NUMBERS); do
SERIAL="$SERIAL_UNIQ-$i" SERIAL="$SERIAL_UNIQ-$i"
@ -104,7 +110,7 @@ if [ -z "$(pidof userhdhomerun)" ]; then
sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
if [ "$LIBHDHOMERUN_LOG" = "true" ]; then if [ "$LIBHDHOMERUN_LOG" = "true" ]; then
cat >>$DVBHDHOMERUN_CONF_TMP << EOF cat >>$DVBHDHOMERUN_CONF_TMP <<EOF
[libhdhomerun] [libhdhomerun]
enable=true enable=true
@ -127,9 +133,9 @@ EOF
fi fi
[ -z "$PRE_WAIT" ] && PRE_WAIT=0 [ -z "$PRE_WAIT" ] && PRE_WAIT=0
PRE_WAIT=$(( $PRE_WAIT *1 )) PRE_WAIT=$(($PRE_WAIT * 1))
[ -z "$POST_WAIT" ] && POST_WAIT=0 [ -z "$POST_WAIT" ] && POST_WAIT=0
POST_WAIT=$(( $POST_WAIT *1 )) POST_WAIT=$(($POST_WAIT * 1))
logger -t HDHomeRun "### Pre wait for $PRE_WAIT sec ###" logger -t HDHomeRun "### Pre wait for $PRE_WAIT sec ###"
sleep $PRE_WAIT sleep $PRE_WAIT
@ -146,15 +152,15 @@ EOF
logger -t HDHomeRun "### Post wait for $POST_WAIT sec ###" logger -t HDHomeRun "### Post wait for $POST_WAIT sec ###"
sleep $POST_WAIT sleep $POST_WAIT
# save adapter names in background # save adapter names in background
( (
sleep 4 sleep 4
sn_old=$(cat $HDHR_ADDON_HOME/adapters.txt 2>/dev/null) sn_old=$(cat $HDHR_ADDON_HOME/adapters.txt 2>/dev/null)
sn_new=$(grep "Name of device: " /var/log/dvbhdhomerun.log) sn_new=$(grep "Name of device: " /var/log/dvbhdhomerun.log)
if [ "$sn_old" != "$sn_new" ]; then if [ "$sn_old" != "$sn_new" ]; then
echo -n $sn_new >$HDHR_ADDON_HOME/adapters.txt echo -n $sn_new >$HDHR_ADDON_HOME/adapters.txt
fi fi
)& ) &
fi fi
logger -t HDHomeRun "### HDHomeRun ready ###" logger -t HDHomeRun "### HDHomeRun ready ###"

View File

@ -16,7 +16,7 @@ if [ ! -f "$ADDON_HOME_DIR/config/docker.conf" ]; then
else else
# previous deprecated options before v23.0.0 need to be updated # previous deprecated options before v23.0.0 need to be updated
sed -i -e 's/--storage-opt overlay2.override_kernel_check=1//' \ sed -i -e 's/--storage-opt overlay2.override_kernel_check=1//' \
-e 's/--graph=/--data-root=/' $ADDON_HOME_DIR/config/docker.conf -e 's/--graph=/--data-root=/' $ADDON_HOME_DIR/config/docker.conf
fi fi
if [ ! -d "$ADDON_HOME_DIR/docker" ]; then if [ ! -d "$ADDON_HOME_DIR/docker" ]; then

View File

@ -4,28 +4,28 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
f="/storage/.kodi/userdata/addon_data/service.system.inadyn/settings.xml" f="/storage/.kodi/userdata/addon_data/service.system.inadyn/settings.xml"
[ -f "$f" ] && sed -i 's/inadyn_s/inadyn_c/g' "$f" [ -f "$f" ] && sed -i 's/inadyn_s/inadyn_c/g' "$f"
. /etc/profile . /etc/profile
oe_setup_addon service.system.inadyn oe_setup_addon service.system.inadyn
if [ "$inadyn_S" == "inadyn.conf" ]; then if [ "$inadyn_S" == "inadyn.conf" ]; then
config="$ADDON_HOME/inadyn.conf" config="$ADDON_HOME/inadyn.conf"
else else
config="$ADDON_HOME/inadyn.temp" config="$ADDON_HOME/inadyn.temp"
if [ -z "$inadyn_a" -o -z "$inadyn_p" -o -z "$inadyn_u" ]; then if [ -z "$inadyn_a" -o -z "$inadyn_p" -o -z "$inadyn_u" ]; then
rm -fr "$config" rm -fr "$config"
else else
echo "\ echo "\
provider $inadyn_S { provider $inadyn_S {
ssl = $inadyn_c ssl = $inadyn_c
username = $inadyn_u username = $inadyn_u
password = $inadyn_p password = $inadyn_p
hostname = $inadyn_a hostname = $inadyn_a
}" > "$config" }" >"$config"
fi fi
fi fi
if [ -f "$config" ]; then if [ -f "$config" ]; then
inadyn -f "$config" -l info inadyn -f "$config" -l info
fi fi

View File

@ -14,7 +14,7 @@ JELLYFIN_FILE="jellyfin_@JELLYFIN_VERSION@.tar.xz"
# check for enough free disk space # check for enough free disk space
if [ $(df . | awk 'END {print $4}') -lt 200000 ]; then if [ $(df . | awk 'END {print $4}') -lt 200000 ]; then
kodi-send --action="Notification(Not enough disk space, at least 200MB are required,30000,${ICON})" >/dev/null kodi-send --action="Notification(Not enough disk space, at least 200MB are required,30000,${ICON})" >/dev/null
exit 0; exit 0
fi fi
# remove install status and folders # remove install status and folders
@ -27,7 +27,7 @@ if [ -d ${ADDON_DIR}/libs ]; then
fi fi
# create tmp download dir # create tmp download dir
TEMP_DIR=`mktemp -d` TEMP_DIR=$(mktemp -d)
mkdir -p ${TEMP_DIR}/tmp_download mkdir -p ${TEMP_DIR}/tmp_download
if [ -d ${TEMP_DIR}/tmp_download ]; then if [ -d ${TEMP_DIR}/tmp_download ]; then
@ -44,9 +44,9 @@ rm -f ${CONTROL_FILE} ${DATA_FILE}
( (
curl -L -# -O -C - https://repo.jellyfin.org/files/server/portable/stable/v@JELLYFIN_VERSION@/any/${JELLYFIN_FILE} 2>${DATA_FILE} curl -L -# -O -C - https://repo.jellyfin.org/files/server/portable/stable/v@JELLYFIN_VERSION@/any/${JELLYFIN_FILE} 2>${DATA_FILE}
touch ${CONTROL_FILE} touch ${CONTROL_FILE}
) | \ ) |
while [ : ]; do while [ : ]; do
[ -f ${DATA_FILE} ] && prog="$(tr '\r' '\n' < ${DATA_FILE} | tail -n 1 | sed -r 's/^[# ]+/#/;s/^[^0-9]*//g')" || prog= [ -f ${DATA_FILE} ] && prog="$(tr '\r' '\n' <${DATA_FILE} | tail -n 1 | sed -r 's/^[# ]+/#/;s/^[^0-9]*//g')" || prog=
kodi-send --action="Notification(Downloading Jellyfin,\"${prog:-0.0%}\",3000,${ICON})" >/dev/null kodi-send --action="Notification(Downloading Jellyfin,\"${prog:-0.0%}\",3000,${ICON})" >/dev/null
[ -f ${CONTROL_FILE} ] && break [ -f ${CONTROL_FILE} ] && break
sleep 4 sleep 4

View File

@ -15,7 +15,7 @@ libs="${ADDON_DIR}/libs"
ff="/storage/.kodi/addons/tools.ffmpeg-tools/bin" ff="/storage/.kodi/addons/tools.ffmpeg-tools/bin"
exec \ exec \
nice -n "$jellyfin_nice" \ nice -n "$jellyfin_nice" \
dotnet "${libs}/jellyfin.dll" \ dotnet "${libs}/jellyfin.dll" \
--datadir "${ADDON_HOME}" \ --datadir "${ADDON_HOME}" \
--ffmpeg "${ff}/ffmpeg" --ffmpeg "${ff}/ffmpeg"

View File

@ -40,7 +40,7 @@ echo "Downloading NextPVR"
# download NextPVR # download NextPVR
rm -f ${CONTROL_FILE} ${DATA_FILE} rm -f ${CONTROL_FILE} ${DATA_FILE}
( (
curl -L -# -O -C - https://github.com/sub3/releases/releases/download/${NEXTPVR_VERSION%~*}/${NEXTPVR_FILE} 2>${DATA_FILE} curl -L -# -O -C - https://github.com/sub3/releases/releases/download/${NEXTPVR_VERSION%~*}/${NEXTPVR_FILE} 2>${DATA_FILE}
touch ${CONTROL_FILE} touch ${CONTROL_FILE}
) | ) |
while [ : ]; do while [ : ]; do

View File

@ -6,10 +6,10 @@
. /etc/profile . /etc/profile
oe_setup_addon service.system.syncthing oe_setup_addon service.system.syncthing
STNODEFAULTFOLDER="1" syncthing -home=$ADDON_HOME \ STNODEFAULTFOLDER="1" syncthing \
-gui-address="$gui_address" \ -home=$ADDON_HOME \
-logflags=0 \ -gui-address="$gui_address" \
-no-browser \ -logflags=0 \
-no-restart \ -no-browser \
& -no-restart \
&

View File

@ -21,7 +21,7 @@ if [ -f $ADDON_HOME/ts_env.sh ]; then
if [ ! -x $ADDON_HOME/ts_env.sh ]; then if [ ! -x $ADDON_HOME/ts_env.sh ]; then
chmod +x $ADDON_HOME/ts_env.sh chmod +x $ADDON_HOME/ts_env.sh
fi fi
dos2unix $ADDON_HOME/ts_env.sh dos2unix $ADDON_HOME/ts_env.sh
dos2unix $ADDON_HOME/ts.conf dos2unix $ADDON_HOME/ts.conf
@ -48,7 +48,7 @@ else
TS_DEVICE_CONF_GENERIC="ts.conf-generic" TS_DEVICE_CONF_GENERIC="ts.conf-generic"
#TS_DEVICE="$TS_DEVICE_1" # use specified one, should exist ts.conf for it #TS_DEVICE="$TS_DEVICE_1" # use specified one, should exist ts.conf for it
TS_DEVICE="" # find one automatically TS_DEVICE="" # find one automatically
#echo "device: $TS_DEVICE" #echo "device: $TS_DEVICE"
TS_DEVICE_CONF="" TS_DEVICE_CONF=""
@ -59,7 +59,7 @@ else
TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_DEVICE="$TS_DEVICE_1" '$0 ~ TS_DEVICE {print $1}') TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_DEVICE="$TS_DEVICE_1" '$0 ~ TS_DEVICE {print $1}')
if [ -n "$TSLIB_TSDEVICE" ]; then if [ -n "$TSLIB_TSDEVICE" ]; then
TS_DEVICE_CONF="$TS_DEVICE_CONF_1" TS_DEVICE_CONF="$TS_DEVICE_CONF_1"
rmmod st1232 >/dev/null 2>&1 # it's not rmmod st1232 >/dev/null 2>&1 # it's not
else else
TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_DEVICE="$TS_DEVICE_2" '$0 ~ TS_DEVICE {print $1}') TSLIB_TSDEVICE=$(echo 999 | evtest 2>&1 >/dev/null | awk -F':' -v TS_DEVICE="$TS_DEVICE_2" '$0 ~ TS_DEVICE {print $1}')
if [ -n "$TSLIB_TSDEVICE" ]; then if [ -n "$TSLIB_TSDEVICE" ]; then

View File

@ -3,8 +3,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
if [ $# -lt 1 ] if [ $# -lt 1 ]; then
then
. /etc/profile . /etc/profile
ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.tvheadend42" ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.tvheadend42"
@ -24,24 +23,24 @@ then
if [ "$XMLTV_TYPE" = "FILE" ]; then if [ "$XMLTV_TYPE" = "FILE" ]; then
case "$XMLTV_LOCATION_FILE" in case "$XMLTV_LOCATION_FILE" in
*.gz | *.bz2 | *.xz) *.gz | *.bz2 | *.xz)
zcat "$XMLTV_LOCATION_FILE" zcat "$XMLTV_LOCATION_FILE"
;; ;;
*) *)
cat "$XMLTV_LOCATION_FILE" cat "$XMLTV_LOCATION_FILE"
;; ;;
esac esac
exit 0 exit 0
elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then if [ -e "$XMLTV_LOCATION_SCRIPT" ]; then
exec "$XMLTV_LOCATION_SCRIPT" exec "$XMLTV_LOCATION_SCRIPT"
fi fi
elif [ "$XMLTV_TYPE" = "WEB" ]; then elif [ "$XMLTV_TYPE" = "WEB" ]; then
case "$XMLTV_LOCATION_WEB" in case "$XMLTV_LOCATION_WEB" in
*.gz | *.bz2 | *.xz) *.gz | *.bz2 | *.xz)
wget -qO - "$XMLTV_LOCATION_WEB" | zcat wget -qO - "$XMLTV_LOCATION_WEB" | zcat
;; ;;
*) *)
wget -qO - "$XMLTV_LOCATION_WEB" wget -qO - "$XMLTV_LOCATION_WEB"
;; ;;
esac esac
@ -53,24 +52,20 @@ dflag=
vflag= vflag=
cflag= cflag=
for a in "$@" for a in "$@"; do
do
[ "$a" = "-d" -o "$a" = "--description" ] && dflag=1 [ "$a" = "-d" -o "$a" = "--description" ] && dflag=1
[ "$a" = "-v" -o "$a" = "--version" ] && vflag=1 [ "$a" = "-v" -o "$a" = "--version" ] && vflag=1
[ "$a" = "-c" -o "$a" = "--capabilities" ] && cflag=1 [ "$a" = "-c" -o "$a" = "--capabilities" ] && cflag=1
done done
if [ -n "$dflag" ] if [ -n "$dflag" ]; then
then
echo "tv_grab_file is a simple grabber that can be configured through the addon settings from Kodi" echo "tv_grab_file is a simple grabber that can be configured through the addon settings from Kodi"
fi fi
if [ -n "$vflag" ] if [ -n "$vflag" ]; then
then
echo "1.0" echo "1.0"
fi fi
if [ -n "$cflag" ] if [ -n "$cflag" ]; then
then
echo "baseline" echo "baseline"
fi fi

View File

@ -3,8 +3,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
if [ $# -lt 1 ] if [ $# -lt 1 ]; then
then
. /etc/profile . /etc/profile
ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.tvheadend43" ADDON_HOME="$HOME/.kodi/userdata/addon_data/service.tvheadend43"
@ -24,24 +23,24 @@ then
if [ "$XMLTV_TYPE" = "FILE" ]; then if [ "$XMLTV_TYPE" = "FILE" ]; then
case "$XMLTV_LOCATION_FILE" in case "$XMLTV_LOCATION_FILE" in
*.gz | *.bz2 | *.xz) *.gz | *.bz2 | *.xz)
zcat "$XMLTV_LOCATION_FILE" zcat "$XMLTV_LOCATION_FILE"
;; ;;
*) *)
cat "$XMLTV_LOCATION_FILE" cat "$XMLTV_LOCATION_FILE"
;; ;;
esac esac
exit 0 exit 0
elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then if [ -e "$XMLTV_LOCATION_SCRIPT" ]; then
exec "$XMLTV_LOCATION_SCRIPT" exec "$XMLTV_LOCATION_SCRIPT"
fi fi
elif [ "$XMLTV_TYPE" = "WEB" ]; then elif [ "$XMLTV_TYPE" = "WEB" ]; then
case "$XMLTV_LOCATION_WEB" in case "$XMLTV_LOCATION_WEB" in
*.gz | *.bz2 | *.xz) *.gz | *.bz2 | *.xz)
wget -qO - "$XMLTV_LOCATION_WEB" | zcat wget -qO - "$XMLTV_LOCATION_WEB" | zcat
;; ;;
*) *)
wget -qO - "$XMLTV_LOCATION_WEB" wget -qO - "$XMLTV_LOCATION_WEB"
;; ;;
esac esac
@ -53,24 +52,20 @@ dflag=
vflag= vflag=
cflag= cflag=
for a in "$@" for a in "$@"; do
do
[ "$a" = "-d" -o "$a" = "--description" ] && dflag=1 [ "$a" = "-d" -o "$a" = "--description" ] && dflag=1
[ "$a" = "-v" -o "$a" = "--version" ] && vflag=1 [ "$a" = "-v" -o "$a" = "--version" ] && vflag=1
[ "$a" = "-c" -o "$a" = "--capabilities" ] && cflag=1 [ "$a" = "-c" -o "$a" = "--capabilities" ] && cflag=1
done done
if [ -n "$dflag" ] if [ -n "$dflag" ]; then
then
echo "tv_grab_file is a simple grabber that can be configured through the addon settings from Kodi" echo "tv_grab_file is a simple grabber that can be configured through the addon settings from Kodi"
fi fi
if [ -n "$vflag" ] if [ -n "$vflag" ]; then
then
echo "1.0" echo "1.0"
fi fi
if [ -n "$cflag" ] if [ -n "$cflag" ]; then
then
echo "baseline" echo "baseline"
fi fi

View File

@ -13,171 +13,171 @@ mixer() {
} }
( (
. /etc/profile . /etc/profile
progress "Setting up sound card" progress "Setting up sound card"
if [ -f $HOME/.config/sound.conf ]; then if [ -f $HOME/.config/sound.conf ]; then
alsactl restore -f $HOME/.config/sound.conf alsactl restore -f $HOME/.config/sound.conf
else else
# get card num # get card num
card=`echo $1 | sed 's/[^0-9]*//g'` card=$(echo $1 | sed 's/[^0-9]*//g')
# set common mixer params # set common mixer params
mixer "$card" Master 0db mixer "$card" Master 0db
mixer "$card" Front 100% mixer "$card" Front 100%
mixer "$card" PCM 0db mixer "$card" PCM 0db
mixer "$card" Synth 100% mixer "$card" Synth 100%
# mute CD, since using digital audio instead # mute CD, since using digital audio instead
mixer "$card" CD 0% mute mixer "$card" CD 0% mute
# Only unmute Line and Aux if they are possibly used. # Only unmute Line and Aux if they are possibly used.
# mixer "$card" Line 100% # mixer "$card" Line 100%
# mixer "$card" Aux 100% # mixer "$card" Aux 100%
# mute mic # mute mic
mixer "$card" Mic 0% mute mixer "$card" Mic 0% mute
# ESS 1969 chipset has 2 PCM channels # ESS 1969 chipset has 2 PCM channels
mixer "$card" PCM,1 100% mixer "$card" PCM,1 100%
# Trident/YMFPCI/emu10k1 # Trident/YMFPCI/emu10k1
mixer "$card" Wave 100% mixer "$card" Wave 100%
mixer "$card" Music 100% mixer "$card" Music 100%
mixer "$card" AC97 100% mixer "$card" AC97 100%
mixer "$card" Surround 90% mixer "$card" Surround 90%
mixer "$card" 'Surround Digital' 90% mixer "$card" 'Surround Digital' 90%
mixer "$card" 'Wave Surround' 90% mixer "$card" 'Wave Surround' 90%
mixer "$card" 'Duplicate Front' 90% mixer "$card" 'Duplicate Front' 90%
mixer "$card" 'Sigmatel 4-Speaker Stereo' 90% mixer "$card" 'Sigmatel 4-Speaker Stereo' 90%
# CS4237B chipset: # CS4237B chipset:
mixer "$card" 'Master Digital' 100% mixer "$card" 'Master Digital' 100%
# DRC # DRC
mixer "$card" 'Dynamic Range Compression' 90% mixer "$card" 'Dynamic Range Compression' 90%
# Envy24 chips with analog outs # Envy24 chips with analog outs
mixer "$card" DAC 100% mixer "$card" DAC 100%
mixer "$card" DAC,0 100% mixer "$card" DAC,0 100%
mixer "$card" DAC,1 100% mixer "$card" DAC,1 100%
# some notebooks use headphone instead of master # some notebooks use headphone instead of master
mixer "$card" Headphone 100% mixer "$card" Headphone 100%
mixer "$card" Speaker 100% mixer "$card" Speaker 100%
mixer "$card" 'Internal Speaker' 0% mute mixer "$card" 'Internal Speaker' 0% mute
mixer "$card" Playback 100% mixer "$card" Playback 100%
mixer "$card" Headphone 100% mixer "$card" Headphone 100%
mixer "$card" Speaker 100% mixer "$card" Speaker 100%
mixer "$card" Center 100% mixer "$card" Center 100%
mixer "$card" LFE 100% mixer "$card" LFE 100%
mixer "$card" Center/LFE 100% mixer "$card" Center/LFE 100%
# Intel P4P800-MX (Ubuntu bug #5813) # Intel P4P800-MX (Ubuntu bug #5813)
mixer "$card" 'Master Playback Switch' on mixer "$card" 'Master Playback Switch' on
# set digital output mixer params # set digital output mixer params
mixer "$card" 'IEC958' 100% on mixer "$card" 'IEC958' 100% on
mixer "$card" 'IEC958 Output' 100% mixer "$card" 'IEC958 Output' 100%
mixer "$card" 'IEC958 Coaxial' 100% mixer "$card" 'IEC958 Coaxial' 100%
mixer "$card" 'IEC958 LiveDrive' 100% mixer "$card" 'IEC958 LiveDrive' 100%
mixer "$card" 'IEC958 Optical Raw' 100% mixer "$card" 'IEC958 Optical Raw' 100%
mixer "$card" 'SPDIF Out' 100% mixer "$card" 'SPDIF Out' 100%
mixer "$card" 'SPDIF Front' 100% mixer "$card" 'SPDIF Front' 100%
mixer "$card" 'SPDIF Rear' 100% mixer "$card" 'SPDIF Rear' 100%
mixer "$card" 'SPDIF Center/LFE' 100% mixer "$card" 'SPDIF Center/LFE' 100%
mixer "$card" 'Master Digital' 100% mixer "$card" 'Master Digital' 100%
mixer "$card" 'Analog Front' 100% mixer "$card" 'Analog Front' 100%
mixer "$card" 'Analog Rear' 100% mixer "$card" 'Analog Rear' 100%
mixer "$card" 'Analog Center/LFE' 100% mixer "$card" 'Analog Center/LFE' 100%
# ASRock ION 330 (and perhaps others) has 2 IEC958 channels # ASRock ION 330 (and perhaps others) has 2 IEC958 channels
mixer "$card" IEC958,0 on mixer "$card" IEC958,0 on
mixer "$card" IEC958,1 on mixer "$card" IEC958,1 on
# some ION2 has much more IEC958 channels ... # some ION2 has much more IEC958 channels ...
mixer "$card" IEC958,2 on mixer "$card" IEC958,2 on
mixer "$card" IEC958,3 on mixer "$card" IEC958,3 on
# ASRock ION 330 has Master Front set to 0 # ASRock ION 330 has Master Front set to 0
mixer "$card" 'Master Front' 100% mixer "$card" 'Master Front' 100%
# Shuttle XS35GT needs this too # Shuttle XS35GT needs this too
mixer "$card" 'Master',0 100% on mixer "$card" 'Master',0 100% on
# and this for various Fusion devices like Zotac ZBOX # and this for various Fusion devices like Zotac ZBOX
mixer "$card" 'Front',0 100% on mixer "$card" 'Front',0 100% on
# NVidia CK804 sound devices # NVidia CK804 sound devices
mixer "$card" 'IEC958 Playback AC97-SPSA' 100% mixer "$card" 'IEC958 Playback AC97-SPSA' 100%
# Allwinner H3 Analog # Allwinner H3 Analog
mixer "$card" 'Line Out' 0db on mixer "$card" 'Line Out' 0db on
# Allwinner A20 Analog # Allwinner A20 Analog
mixer "$card" 'Power Amplifier' 0db mixer "$card" 'Power Amplifier' 0db
mixer "$card" 'Power Amplifier DAC' on mixer "$card" 'Power Amplifier DAC' on
mixer "$card" 'Power Amplifier Mute' on mixer "$card" 'Power Amplifier Mute' on
# Allwinner A64 Analog # Allwinner A64 Analog
mixer "$card" Headphone 0db on mixer "$card" Headphone 0db on
mixer "$card" 'AIF1 Slot 0 Digital DAC' on mixer "$card" 'AIF1 Slot 0 Digital DAC' on
# Amlogic audio devices # Amlogic audio devices
case $(dtsoc) in case $(dtsoc) in
amlogic,g12*|amlogic,sm1) amlogic,g12* | amlogic,sm1)
# AXG HDMI // Logic assumes TDMOUT_A is not present in device-tree when TDMOUT_B is used # AXG HDMI // Logic assumes TDMOUT_A is not present in device-tree when TDMOUT_B is used
TDMOUT=$(awk '/TDMOUT/ && $2=="OUT" {print substr($1,length($1),1)}' /sys/firmware/devicetree/base/sound/audio-routing | sort | head -n 1) TDMOUT=$(awk '/TDMOUT/ && $2=="OUT" {print substr($1,length($1),1)}' /sys/firmware/devicetree/base/sound/audio-routing | sort | head -n 1)
if [ "${TDMOUT}" = "A" ]; then if [ "${TDMOUT}" = "A" ]; then
mixer "$card" 'FRDDR_A SINK 1 SEL' 'OUT 0' mixer "$card" 'FRDDR_A SINK 1 SEL' 'OUT 0'
mixer "$card" 'FRDDR_A SRC 1 EN' on mixer "$card" 'FRDDR_A SRC 1 EN' on
mixer "$card" 'TDMOUT_A SRC SEL' 'IN 0' mixer "$card" 'TDMOUT_A SRC SEL' 'IN 0'
mixer "$card" 'TOHDMITX' on mixer "$card" 'TOHDMITX' on
mixer "$card" 'TOHDMITX I2S SRC' 'I2S A' mixer "$card" 'TOHDMITX I2S SRC' 'I2S A'
elif [ "${TDMOUT}" = "B" ]; then elif [ "${TDMOUT}" = "B" ]; then
mixer "$card" 'FRDDR_A SINK 1 SEL' 'OUT 1' mixer "$card" 'FRDDR_A SINK 1 SEL' 'OUT 1'
mixer "$card" 'FRDDR_A SRC 1 EN' on mixer "$card" 'FRDDR_A SRC 1 EN' on
mixer "$card" 'TDMOUT_B SRC SEL' 'IN 0' mixer "$card" 'TDMOUT_B SRC SEL' 'IN 0'
mixer "$card" 'TOHDMITX' on mixer "$card" 'TOHDMITX' on
mixer "$card" 'TOHDMITX I2S SRC' 'I2S B' mixer "$card" 'TOHDMITX I2S SRC' 'I2S B'
fi fi
# AXG S/PDIF # AXG S/PDIF
SPDIFOUT=$(awk '/SPDIF/' /sys/firmware/devicetree/base/sound/audio-routing | sort | head -n 1) SPDIFOUT=$(awk '/SPDIF/' /sys/firmware/devicetree/base/sound/audio-routing | sort | head -n 1)
if [ -n "${SPDIFOUT}" ]; then if [ -n "${SPDIFOUT}" ]; then
mixer "$card" 'FRDDR_B SINK 1 SEL' 'OUT 3' mixer "$card" 'FRDDR_B SINK 1 SEL' 'OUT 3'
mixer "$card" 'FRDDR_B SRC 1 EN' on mixer "$card" 'FRDDR_B SRC 1 EN' on
mixer "$card" 'SPDIFOUT SRC SEL' 'IN 1' mixer "$card" 'SPDIFOUT SRC SEL' 'IN 1'
mixer "$card" 'SPDIFOUT Playback' on mixer "$card" 'SPDIFOUT Playback' on
fi fi
# AXG Headphone Jack # AXG Headphone Jack
ACODEC=$(awk '/ACODEC/' /sys/firmware/devicetree/base/sound/audio-routing | sort | head -n 1) ACODEC=$(awk '/ACODEC/' /sys/firmware/devicetree/base/sound/audio-routing | sort | head -n 1)
if [ -n "${ACODEC}" ]; then if [ -n "${ACODEC}" ]; then
mixer "$card" 'TOACODEC OUT EN' on mixer "$card" 'TOACODEC OUT EN' on
mixer "$card" 'TOACODEC SRC' 'I2S ${TDMOUT}' mixer "$card" 'TOACODEC SRC' 'I2S ${TDMOUT}'
mixer "$card" 'ACODEC Playback Switch' on mixer "$card" 'ACODEC Playback Switch' on
mixer "$card" 'ACODEC Playback Channel Mode' Stereo mixer "$card" 'ACODEC Playback Channel Mode' Stereo
fi fi
;; ;;
amlogic,meson-gx*) amlogic,meson-gx*)
# AIU HDMI and S/PDIF # AIU HDMI and S/PDIF
mixer "$card" 'AIU HDMI CTRL SRC' 'I2S' mixer "$card" 'AIU HDMI CTRL SRC' 'I2S'
mixer "$card" 'AIU SPDIF SRC SEL' 'SPDIF' mixer "$card" 'AIU SPDIF SRC SEL' 'SPDIF'
# AIU ACODEC headphone jack # AIU ACODEC headphone jack
mixer "$card" 'ACODEC' 80% on mixer "$card" 'ACODEC' 80% on
mixer "$card" 'AIU ACODEC SRC' 'I2S' mixer "$card" 'AIU ACODEC SRC' 'I2S'
mixer "$card" 'AIU ACODEC OUT EN' on mixer "$card" 'AIU ACODEC OUT EN' on
;; ;;
esac esac
# ES8316 headphone jack # ES8316 headphone jack
mixer "$card" 'Right Headphone Mixer Right DAC' on mixer "$card" 'Right Headphone Mixer Right DAC' on
mixer "$card" 'Left Headphone Mixer Left DAC' on mixer "$card" 'Left Headphone Mixer Left DAC' on
fi fi
exit 0 exit 0
)& ) &

View File

@ -4,21 +4,21 @@
. /etc/profile . /etc/profile
if [ -f $HOME/.config/sound.conf ] ; then if [ -f $HOME/.config/sound.conf ]; then
alsactl restore -f $HOME/.config/sound.conf alsactl restore -f $HOME/.config/sound.conf
else else
if [ -r $HOME/.config/rpi-cirrus-config.sh ] ; then if [ -r $HOME/.config/rpi-cirrus-config.sh ]; then
progress "Setting up Cirrus Logic Audio Card with user config" progress "Setting up Cirrus Logic Audio Card with user config"
sh $HOME/.config/rpi-cirrus-config.sh sh $HOME/.config/rpi-cirrus-config.sh
else else
progress "Setting up Cirrus Logic Audio Card" progress "Setting up Cirrus Logic Audio Card"
# load helper functions and definitions # load helper functions and definitions
. /usr/lib/alsa/rpi-cirrus-functions.sh . /usr/lib/alsa/rpi-cirrus-functions.sh
playback_to_spdif playback_to_spdif
playback_to_lineout playback_to_lineout
playback_to_headset playback_to_headset
mixer 'Noise Gate Switch' off mixer 'Noise Gate Switch' off
fi fi
fi fi

View File

@ -23,26 +23,26 @@ if [ ! -f $KODI_ROOT/userdata/sources.xml ]; then
fi fi
# common setup guisettings # common setup guisettings
if [ ! -f $KODI_ROOT/userdata/guisettings.xml ] ; then if [ ! -f $KODI_ROOT/userdata/guisettings.xml ]; then
if [ -f /usr/share/kodi/config/guisettings.xml ]; then if [ -f /usr/share/kodi/config/guisettings.xml ]; then
cp /usr/share/kodi/config/guisettings.xml $KODI_ROOT/userdata cp /usr/share/kodi/config/guisettings.xml $KODI_ROOT/userdata
fi fi
if [ "$BOOT_STATE" = "SAFE" ]; then if [ "$BOOT_STATE" = "SAFE" ]; then
[ ! -f $KODI_ROOT/userdata/guisettings.xml ] && echo '<settings version="2"></settings>' > $KODI_ROOT/userdata/guisettings.xml [ ! -f $KODI_ROOT/userdata/guisettings.xml ] && echo '<settings version="2"></settings>' >$KODI_ROOT/userdata/guisettings.xml
xmlstarlet ed --omit-decl --inplace -s settings -t elem -n setting -v "maroon" -i settings/setting -t attr -n id -v lookandfeel.skincolors $KODI_ROOT/userdata/guisettings.xml xmlstarlet ed --omit-decl --inplace -s settings -t elem -n setting -v "maroon" -i settings/setting -t attr -n id -v lookandfeel.skincolors $KODI_ROOT/userdata/guisettings.xml
fi fi
fi fi
KODI_ARGS="" KODI_ARGS=""
echo "KODI_ARGS=\"$KODI_ARGS\"" > /run/libreelec/kodi.conf echo "KODI_ARGS=\"$KODI_ARGS\"" >/run/libreelec/kodi.conf
if [ "$(uname -m)" = "x86_64" ]; then if [ "$(uname -m)" = "x86_64" ]; then
echo "MALLOC_MMAP_THRESHOLD_=524288" >> /run/libreelec/kodi.conf echo "MALLOC_MMAP_THRESHOLD_=524288" >>/run/libreelec/kodi.conf
else #arm else #arm
echo "MALLOC_MMAP_THRESHOLD_=8192" >> /run/libreelec/kodi.conf echo "MALLOC_MMAP_THRESHOLD_=8192" >>/run/libreelec/kodi.conf
fi fi
if [ -f /storage/.config/kodi.conf ] ; then if [ -f /storage/.config/kodi.conf ]; then
cat /storage/.config/kodi.conf >>/run/libreelec/kodi.conf cat /storage/.config/kodi.conf >>/run/libreelec/kodi.conf
fi fi

View File

@ -22,31 +22,31 @@ Quit Remote q or ctrl+c
" "
com() { com() {
kodi-send --action="$1" > /dev/null 2>&1 kodi-send --action="$1" >/dev/null 2>&1
echo -ne "\r$1\e[K"; echo -ne "\r$1\e[K"
} }
while true; do while true; do
read -r -sn1 k read -r -sn1 k
case "$k" in case "$k" in
A) com "Up";; A) com "Up" ;;
B) com "Down";; B) com "Down" ;;
C) com "Right";; C) com "Right" ;;
D) com "Left";; D) com "Left" ;;
c) com "ContextMenu";; c) com "ContextMenu" ;;
d) com "PlayerDebug";; d) com "PlayerDebug" ;;
f) com "FullScreen";; f) com "FullScreen" ;;
i) com "Info";; i) com "Info" ;;
m) com "Mute";; m) com "Mute" ;;
o) com "CodecInfo";; o) com "CodecInfo" ;;
p) com "Pause";; p) com "Pause" ;;
s) com "TakeScreenshot";; s) com "TakeScreenshot" ;;
t) com "Skin.ToggleDebug";; t) com "Skin.ToggleDebug" ;;
x) com "Stop";; x) com "Stop" ;;
-) com "VolumeDown";; -) com "VolumeDown" ;;
+) com "VolumeUp";; +) com "VolumeUp" ;;
$'\177') com "Back";; $'\177') com "Back" ;;
"") com "Select";; "") com "Select" ;;
q) exit q) exit ;;
esac esac
done done

View File

@ -8,8 +8,7 @@ KODI_ROOT=$HOME/.kodi
KODI_ROOT_FAILED=$KODI_ROOT.FAILED KODI_ROOT_FAILED=$KODI_ROOT.FAILED
BOOT_STATUS=$HOME/.config/boot.status BOOT_STATUS=$HOME/.config/boot.status
process_boot_status() process_boot_status() {
{
BOOT_STATE="$(cat $BOOT_STATUS 2>/dev/null)" BOOT_STATE="$(cat $BOOT_STATUS 2>/dev/null)"
if [ "${BOOT_STATE}" = "SAFE" ]; then if [ "${BOOT_STATE}" = "SAFE" ]; then
@ -21,10 +20,10 @@ process_boot_status()
# exiting safe mode - restore failed .kodi # exiting safe mode - restore failed .kodi
rm -fr $KODI_ROOT rm -fr $KODI_ROOT
mv $KODI_ROOT_FAILED $KODI_ROOT mv $KODI_ROOT_FAILED $KODI_ROOT
echo "OK" > $BOOT_STATUS echo "OK" >$BOOT_STATUS
fi fi
else else
echo "OK" > $BOOT_STATUS echo "OK" >$BOOT_STATUS
fi fi
return 0 return 0

View File

@ -41,9 +41,15 @@ OUTPUT="/usr/bin/pastebinit"
while getopts ":hc" opt; do while getopts ":hc" opt; do
case ${opt} in case ${opt} in
c) OUTPUT="cat";; c)
?) usage "${OPTARG}";; OUTPUT="cat"
h) usage;; ;;
?)
usage "${OPTARG}"
;;
h)
usage
;;
esac esac
done done
@ -90,13 +96,13 @@ fi
vcgencmd bootloader_version | cat_data "Bootloader version" vcgencmd bootloader_version | cat_data "Bootloader version"
fi fi
cat_file "/flash/config.txt" # RPi cat_file "/flash/config.txt" # RPi
cat_file "/flash/distroconfig.txt" # RPi cat_file "/flash/distroconfig.txt" # RPi
cat_file "/flash/cmdline.txt" # RPi cat_file "/flash/cmdline.txt" # RPi
cat_file "/flash/syslinux.cfg" # x86 BIOS cat_file "/flash/syslinux.cfg" # x86 BIOS
cat_file "/flash/EFI/BOOT/syslinux.cfg" # x86 EFI cat_file "/flash/EFI/BOOT/syslinux.cfg" # x86 EFI
cat_file "/flash/extlinux.conf" # x86 legacy cat_file "/flash/extlinux.conf" # x86 legacy
cat_file "/flash/extlinux/extlinux.conf" # u-boot cat_file "/flash/extlinux/extlinux.conf" # u-boot

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
if [ $# -ne 3 ] ; then if [ $# -ne 3 ]; then
echo "$0 usage: context addon-id addon-path" echo "$0 usage: context addon-id addon-path"
exit 1 exit 1
fi fi
@ -12,13 +12,13 @@ CONTEXT="$1"
ADDON_ID="$2" ADDON_ID="$2"
ADDON_PATH="$3" ADDON_PATH="$3"
if [ ! -d /storage/.config/system.d ] ; then if [ ! -d /storage/.config/system.d ]; then
mkdir -p /storage/.config/system.d mkdir -p /storage/.config/system.d
fi fi
SERVICE_FILE="${ADDON_PATH}/system.d/${ADDON_ID}.service" SERVICE_FILE="${ADDON_PATH}/system.d/${ADDON_ID}.service"
if [ -f "${SERVICE_FILE}" ] ; then if [ -f "${SERVICE_FILE}" ]; then
case "${CONTEXT}" in case "${CONTEXT}" in
enable) enable)
systemctl enable "${SERVICE_FILE}" systemctl enable "${SERVICE_FILE}"
@ -51,7 +51,7 @@ if [ -f "${SERVICE_FILE}" ] ; then
esac esac
fi fi
if [ ! -d /storage/.cache/kernel-overlays ] ; then if [ ! -d /storage/.cache/kernel-overlays ]; then
mkdir -p /storage/.cache/kernel-overlays mkdir -p /storage/.cache/kernel-overlays
fi fi
@ -70,21 +70,21 @@ esac
create_overlay_conf() { create_overlay_conf() {
rm -f "${OVERLAY_CONF}" rm -f "${OVERLAY_CONF}"
echo "${OVERLAY_PATH}" > "${OVERLAY_CONF}" echo "${OVERLAY_PATH}" >"${OVERLAY_CONF}"
} }
if [ -d "${OVERLAY_PATH}" ] ; then if [ -d "${OVERLAY_PATH}" ]; then
OVERLAY_CONF="/storage/.cache/kernel-overlays/50-${ADDON_ID}.conf" OVERLAY_CONF="/storage/.cache/kernel-overlays/50-${ADDON_ID}.conf"
case "${CONTEXT}" in case "${CONTEXT}" in
enable | post-install ) enable | post-install)
create_overlay_conf create_overlay_conf
;; ;;
disable | pre-uninstall ) disable | pre-uninstall)
rm -f "${OVERLAY_CONF}" rm -f "${OVERLAY_CONF}"
;; ;;
update ) update)
if [ -e "${OVERLAY_CONF}" ] ; then if [ -e "${OVERLAY_CONF}" ]; then
create_overlay_conf create_overlay_conf
fi fi
;; ;;

View File

@ -5,7 +5,7 @@
if [ -f /sys/class/rtc/rtc0/wakealarm ]; then if [ -f /sys/class/rtc/rtc0/wakealarm ]; then
logger -t setwakeup.sh "### Setting system wakeup time ###" logger -t setwakeup.sh "### Setting system wakeup time ###"
echo 0 > /sys/class/rtc/rtc0/wakealarm echo 0 >/sys/class/rtc/rtc0/wakealarm
echo $1 > /sys/class/rtc/rtc0/wakealarm echo $1 >/sys/class/rtc/rtc0/wakealarm
logger -t setwakeup.sh "### $(cat /proc/driver/rtc) ###" logger -t setwakeup.sh "### $(cat /proc/driver/rtc) ###"
fi fi

View File

@ -14,4 +14,4 @@ for script in $HOME/.kodi/addons/*/sleep.d/*.power; do
fi fi
done done
exit 0 exit 0

View File

@ -14,4 +14,4 @@ for script in $HOME/.config/sleep.d/*.power; do
fi fi
done done
exit 0 exit 0

View File

@ -5,25 +5,23 @@
. /etc/profile . /etc/profile
run_scripts() run_scripts() {
{ list_scripts $1
list_scripts $1 for script in $SCRIPTS; do
for script in $SCRIPTS ; do progress "running sleep script $script ($1)..."
progress "running sleep script $script ($1)..." sh /usr/lib/systemd/system-sleep.serial/$script $1
sh /usr/lib/systemd/system-sleep.serial/$script $1 done
done
} }
list_scripts() list_scripts() {
{ case $1 in
case $1 in pre)
pre) SCRIPTS=$(ls /usr/lib/systemd/system-sleep.serial/ | sort)
SCRIPTS=$(ls /usr/lib/systemd/system-sleep.serial/ | sort) ;;
;; post)
post) SCRIPTS=$(ls /usr/lib/systemd/system-sleep.serial/ | sort -r)
SCRIPTS=$(ls /usr/lib/systemd/system-sleep.serial/ | sort -r) ;;
;; esac
esac
} }
run_scripts $1 run_scripts $1

View File

@ -4,22 +4,22 @@
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
# creating initial settings file # creating initial settings file
if [ ! -f /storage/.cache/connman/settings ]; then if [ ! -f /storage/.cache/connman/settings ]; then
mkdir -p /storage/.cache/connman mkdir -p /storage/.cache/connman
cp /usr/share/connman/settings /storage/.cache/connman cp /usr/share/connman/settings /storage/.cache/connman
fi fi
# set variable for connman main.conf location # set variable for connman main.conf location
if [ -f /storage/.config/connman_main.conf ]; then if [ -f /storage/.config/connman_main.conf ]; then
export CONNMAN_MAIN="--config=/storage/.config/connman_main.conf" export CONNMAN_MAIN="--config=/storage/.config/connman_main.conf"
else else
export CONNMAN_MAIN="--config=/etc/connman/main.conf" export CONNMAN_MAIN="--config=/etc/connman/main.conf"
fi fi
# switch resolv.conf management to connman and use current contents # switch resolv.conf management to connman and use current contents
# as a fallback # as a fallback
if [ -f /run/libreelec/resolv.conf ]; then if [ -f /run/libreelec/resolv.conf ]; then
cat /run/libreelec/resolv.conf > /run/connman/resolv.conf cat /run/libreelec/resolv.conf >/run/connman/resolv.conf
fi fi
rm -f /run/libreelec/resolv.conf rm -f /run/libreelec/resolv.conf
ln -s /run/connman/resolv.conf /run/libreelec/resolv.conf ln -s /run/connman/resolv.conf /run/libreelec/resolv.conf

View File

@ -51,17 +51,17 @@ flush() {
enable() { enable() {
for cmd in $IPTABLES_CMDS; do for cmd in $IPTABLES_CMDS; do
case "$cmd" in case "$cmd" in
*6*) *6*)
rules="$RULES6" rules="$RULES6"
ipv="6" ipv="6"
;; ;;
*) *)
rules="$RULES4" rules="$RULES4"
ipv="4" ipv="4"
;; ;;
esac esac
if [ -e "$rules" ]; then if [ -e "$rules" ]; then
"$cmd-restore" "$rules" "$cmd-restore" "$rules"
fi fi
done done
check_docker check_docker
@ -70,24 +70,24 @@ enable() {
if [ "$1" = "enable" ]; then if [ "$1" = "enable" ]; then
case "${RULES}" in case "${RULES}" in
"none") "none")
flush flush
;; ;;
"public") "public")
RULES4="${PUBLIC_RULES}4" RULES4="${PUBLIC_RULES}4"
RULES6="${PUBLIC_RULES}6" RULES6="${PUBLIC_RULES}6"
;; ;;
"home") "home")
RULES4="${HOME_RULES}4" RULES4="${HOME_RULES}4"
RULES6="${HOME_RULES}6" RULES6="${HOME_RULES}6"
;; ;;
"custom") "custom")
RULES4="${CUSTOM_RULES}4" RULES4="${CUSTOM_RULES}4"
RULES6="${CUSTOM_RULES}6" RULES6="${CUSTOM_RULES}6"
;; ;;
*) *)
exit 1 exit 1
;; ;;
esac esac
enable enable
elif [ "$1" = "disable" ]; then elif [ "$1" = "disable" ]; then

View File

@ -6,7 +6,7 @@
if [ -f /storage/.cache/services/samba.conf ]; then if [ -f /storage/.cache/services/samba.conf ]; then
. /storage/.cache/services/samba.conf . /storage/.cache/services/samba.conf
if [ "$SAMBA_AUTOSHARE" == "true" ] ; then if [ "$SAMBA_AUTOSHARE" == "true" ]; then
/usr/lib/samba/samba-config /usr/lib/samba/samba-config
[ -f /run/samba/smbd.pid ] && pkill -HUP smbd [ -f /run/samba/smbd.pid ] && pkill -HUP smbd
fi fi

View File

@ -9,21 +9,21 @@ if [ -x /usr/bin/wg ]; then
mkdir -p /storage/.cache/wireguard mkdir -p /storage/.cache/wireguard
if [ ! -f /storage/.cache/wireguard/privatekey ]; then if [ ! -f /storage/.cache/wireguard/privatekey ]; then
wg genkey > /storage/.cache/wireguard/privatekey wg genkey >/storage/.cache/wireguard/privatekey
echo "created /storage/.cache/wireguard/privatekey" echo "created /storage/.cache/wireguard/privatekey"
else else
echo "error, /storage/.cache/wireguard/privatekey already exists" echo "error, /storage/.cache/wireguard/privatekey already exists"
fi fi
if [ ! -f /storage/.cache/wireguard/publickey ]; then if [ ! -f /storage/.cache/wireguard/publickey ]; then
wg pubkey < /storage/.cache/wireguard/privatekey > /storage/.cache/wireguard/publickey wg pubkey </storage/.cache/wireguard/privatekey >/storage/.cache/wireguard/publickey
echo "created /storage/.cache/wireguard/publickey" echo "created /storage/.cache/wireguard/publickey"
else else
echo "error, /storage/.cache/wireguard/publickey already exists" echo "error, /storage/.cache/wireguard/publickey already exists"
fi fi
if [ ! -f /storage/.cache/wireguard/preshared ]; then if [ ! -f /storage/.cache/wireguard/preshared ]; then
wg genpsk > /storage/.cache/wireguard/preshared wg genpsk >/storage/.cache/wireguard/preshared
echo "created /storage/.cache/wireguard/preshared" echo "created /storage/.cache/wireguard/preshared"
else else
echo "error, /storage/.cache/wireguard/preshared already exists" echo "error, /storage/.cache/wireguard/preshared already exists"

View File

@ -25,7 +25,7 @@ mkdir -p "${TMPDIR}/usr/lib/firmware"
cp -r "${EDID_DIR}" "${TMPDIR}/usr/lib/firmware" cp -r "${EDID_DIR}" "${TMPDIR}/usr/lib/firmware"
cd "${TMPDIR}" cd "${TMPDIR}"
mount -o remount,rw /flash mount -o remount,rw /flash
find usr -print | cpio -ov -H newc > "${EDID_CPIO}" find usr -print | cpio -ov -H newc >"${EDID_CPIO}"
sync sync
mount -o remount,ro /flash mount -o remount,ro /flash
cd /storage cd /storage

View File

@ -5,7 +5,7 @@
COMPATIBLE=$(cat /proc/device-tree/compatible 2>/dev/null | tr -d '\000' | sed -n -e 's/.*\(allwinner\|amlogic\|fsl\|nxp\|qcom\|raspberrypi\|rockchip\|samsung\).*/\1/p') COMPATIBLE=$(cat /proc/device-tree/compatible 2>/dev/null | tr -d '\000' | sed -n -e 's/.*\(allwinner\|amlogic\|fsl\|nxp\|qcom\|raspberrypi\|rockchip\|samsung\).*/\1/p')
do_dtfile(){ do_dtfile() {
if [[ -n $(find /flash -name extlinux.conf) ]]; then if [[ -n $(find /flash -name extlinux.conf) ]]; then
EXTLINUX=$(find /flash -name extlinux.conf) EXTLINUX=$(find /flash -name extlinux.conf)
DTFILE=$(grep FDT "${EXTLINUX}" | sed 's,^ *FDT /,,g') DTFILE=$(grep FDT "${EXTLINUX}" | sed 's,^ *FDT /,,g')
@ -19,7 +19,7 @@ do_dtfile(){
echo "${DTFILE}" echo "${DTFILE}"
} }
do_dtflag(){ do_dtflag() {
if [ "${COMPATIBLE}" = "raspberrypi" ]; then if [ "${COMPATIBLE}" = "raspberrypi" ]; then
DTFLAG=$(cat /proc/device-tree/compatible | cut -f1,2 -d',' | head -n 1) DTFLAG=$(cat /proc/device-tree/compatible | cut -f1,2 -d',' | head -n 1)
PIREV=$(awk '/^Revision/ {sub($3,-6, "", $3); print $3}' /proc/cpuinfo) # truncate to 6-chars PIREV=$(awk '/^Revision/ {sub($3,-6, "", $3); print $3}' /proc/cpuinfo) # truncate to 6-chars
@ -36,10 +36,10 @@ do_dtflag(){
a*) a*)
MEMSIZE="-1g" MEMSIZE="-1g"
;; ;;
*0002|*0003|*0004|*0005|*0006|*0007|*0008|*0009|*0012) *0002 | *0003 | *0004 | *0005 | *0006 | *0007 | *0008 | *0009 | *0012)
MEMSIZE="-256" MEMSIZE="-256"
;; ;;
0*|9*) 0* | 9*)
MEMSIZE="-512" MEMSIZE="-512"
;; ;;
*) *)
@ -58,17 +58,17 @@ do_dtflag(){
echo "${DTFLAG}${MEMSIZE}" echo "${DTFLAG}${MEMSIZE}"
} }
do_dtname(){ do_dtname() {
DTNAME=$(cat /proc/device-tree/compatible | cut -f1,2 -d',' | head -n 1) DTNAME=$(cat /proc/device-tree/compatible | cut -f1,2 -d',' | head -n 1)
echo "${DTNAME}" echo "${DTNAME}"
} }
do_dtsoc(){ do_dtsoc() {
DTSOC=$(cat /proc/device-tree/compatible | cut -f1,2 -d',' | tail -n 1) DTSOC=$(cat /proc/device-tree/compatible | cut -f1,2 -d',' | tail -n 1)
echo "${DTSOC}" echo "${DTSOC}"
} }
do_unknown(){ do_unknown() {
echo "unknown" echo "unknown"
exit 1 exit 1
} }

View File

@ -18,14 +18,14 @@ info() {
mkdir -p "${EDID_DIR}" mkdir -p "${EDID_DIR}"
for c in /sys/class/drm/card?-* ; do for c in /sys/class/drm/card?-*; do
[ ! -d "$c" ] && continue [ ! -d "$c" ] && continue
[ ! -e "$c/status" ] && continue [ ! -e "$c/status" ] && continue
if [ $(cat $c/status 2>/dev/null) = "connected" ]; then if [ $(cat $c/status 2>/dev/null) = "connected" ]; then
CONNECTOR=$(basename $c | cut -c 7-) CONNECTOR=$(basename $c | cut -c 7-)
EDID_NAME="edid-${CONNECTOR}.bin" EDID_NAME="edid-${CONNECTOR}.bin"
cat $c/edid > "${EDID_DIR}/${EDID_NAME}" 2>/dev/null cat $c/edid >"${EDID_DIR}/${EDID_NAME}" 2>/dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
[ -n "${CONNECTORS}" ] && CONNECTORS="${CONNECTORS} " [ -n "${CONNECTORS}" ] && CONNECTORS="${CONNECTORS} "
CONNECTORS="${CONNECTORS}${CONNECTOR}" CONNECTORS="${CONNECTORS}${CONNECTOR}"

View File

@ -26,10 +26,9 @@ help() {
echo "And then use: getedid create" echo "And then use: getedid create"
} }
# check for GPU and store string # check for GPU and store string
check_gpu() { check_gpu() {
if lspci | grep -i vga | grep -i -q -E 'intel|amd' ; then if lspci | grep -i vga | grep -i -q -E 'intel|amd'; then
gpu="intel/amd" gpu="intel/amd"
elif lspci | grep -i vga | grep -i -q nvidia; then elif lspci | grep -i vga | grep -i -q nvidia; then
gpu="nvidia" gpu="nvidia"
@ -39,12 +38,11 @@ check_gpu() {
fi fi
} }
# run this first if the user already has a custom EDID but want to create a new one (TV or AVR change) # run this first if the user already has a custom EDID but want to create a new one (TV or AVR change)
del_edid() { del_edid() {
if [ "$gpu" = "intel/amd" ]; then if [ "$gpu" = "intel/amd" ]; then
check_file check_file
if [ -f "$file".old ]; then if [ -f "$file".old ]; then
mount_rw mount_rw
rm "$file" rm "$file"
mv "$file".old "$file" mv "$file".old "$file"
@ -60,10 +58,9 @@ del_edid() {
rm -f /storage/.config/xorg.conf rm -f /storage/.config/xorg.conf
rm -f /storage/.config/xorg.le.backup rm -f /storage/.config/xorg.le.backup
systemctl restart xorg.service systemctl restart xorg.service
fi fi
} }
# run main script depending on the GPU # run main script depending on the GPU
run() { run() {
if [ "$gpu" = "intel/amd" ]; then if [ "$gpu" = "intel/amd" ]; then
@ -73,19 +70,16 @@ run() {
fi fi
} }
# mounting /flash to rw # mounting /flash to rw
mount_rw() { mount_rw() {
mount -o remount,rw /flash mount -o remount,rw /flash
} }
# mounting /flash to ro # mounting /flash to ro
mount_ro() { mount_ro() {
mount -o remount,ro /flash mount -o remount,ro /flash
} }
# remount /flash to ro and reboot # remount /flash to ro and reboot
sys_reboot() { sys_reboot() {
mount_ro mount_ro
@ -94,11 +88,10 @@ sys_reboot() {
reboot reboot
} }
# check syslinux.cfg and/or extlinux.conf # check syslinux.cfg and/or extlinux.conf
check_file() { check_file() {
# check boot system # check boot system
if [ -d /sys/firmware/efi -a -f /flash/EFI/BOOT/syslinux.cfg ] ; then if [ -d /sys/firmware/efi -a -f /flash/EFI/BOOT/syslinux.cfg ]; then
sys_boot="UEFI" sys_boot="UEFI"
sys_path="/flash/EFI/BOOT" sys_path="/flash/EFI/BOOT"
else else
@ -122,30 +115,26 @@ check_file() {
fi fi
} }
check_content() { check_content() {
# check if changes are already made to $file and exit if yes # check if changes are already made to $file and exit if yes
if grep -q "initrd=/edid.cpio" $file ; then if grep -q "initrd=/edid.cpio" $file; then
echo "$file has been modified. Please run 'getedid delete' first if you want to modify it again. Exiting." echo "$file has been modified. Please run 'getedid delete' first if you want to modify it again. Exiting."
exit 5 exit 5
fi fi
} }
create_edid() { create_edid() {
# create edid # create edid
mkdir -p /tmp/cpio/lib/firmware/edid mkdir -p /tmp/cpio/lib/firmware/edid
cat "/sys/class/drm/$card/edid" > /tmp/cpio/lib/firmware/edid/edid.bin cat "/sys/class/drm/$card/edid" >/tmp/cpio/lib/firmware/edid/edid.bin
mkdir -p /storage/.config/firmware/edid mkdir -p /storage/.config/firmware/edid
cp /tmp/cpio/lib/firmware/edid/edid.bin /storage/.config/firmware/edid cp /tmp/cpio/lib/firmware/edid/edid.bin /storage/.config/firmware/edid
# create cpio archive # create cpio archive
cd /tmp/cpio/ cd /tmp/cpio/
find . -print | cpio -ov -H newc > /storage/edid.cpio find . -print | cpio -ov -H newc >/storage/edid.cpio
} }
intel_amd() { intel_amd() {
# check which output is connnected: # check which output is connnected:
counter=0 counter=0
@ -162,7 +151,7 @@ intel_amd() {
fi fi
done done
# create the edid # create the edid
create_edid create_edid
# check extlinux.conf and syslinux.cfg # check extlinux.conf and syslinux.cfg
@ -175,7 +164,7 @@ intel_amd() {
# make a backup of $file # make a backup of $file
cp "$file" "$file".old cp "$file" "$file".old
# add boot parameters to $file # add boot parameters to $file
sed -i "/ APPEND/s/$/ initrd=\/edid.cpio drm.edid_firmware=edid\/edid.bin video=$hdmi:D/" "$file" sed -i "/ APPEND/s/$/ initrd=\/edid.cpio drm.edid_firmware=edid\/edid.bin video=$hdmi:D/" "$file"
@ -183,7 +172,6 @@ intel_amd() {
sys_reboot sys_reboot
} }
nvidia() { nvidia() {
# check if xorg.conf already exists # check if xorg.conf already exists
if [ -f /storage/.config/xorg.conf -o -f /storage/.config/xorg-nvidia.conf ]; then if [ -f /storage/.config/xorg.conf -o -f /storage/.config/xorg-nvidia.conf ]; then
@ -191,7 +179,6 @@ nvidia() {
exit 6 exit 6
fi fi
# check for multi-montior setup # check for multi-montior setup
monitors="$(grep -i -w "connected" /var/log/Xorg.0.log | grep -i -o "dfp-[0-9]" | sort -u | wc -l)" monitors="$(grep -i -w "connected" /var/log/Xorg.0.log | grep -i -o "dfp-[0-9]" | sort -u | wc -l)"
if [ "$monitors" -gt "1" ]; then if [ "$monitors" -gt "1" ]; then
@ -199,12 +186,10 @@ nvidia() {
exit 7 exit 7
fi fi
# set debug and restart Xorg # set debug and restart Xorg
cp /etc/X11/xorg-nvidia.conf /storage/.config/xorg.conf cp /etc/X11/xorg-nvidia.conf /storage/.config/xorg.conf
sed -i 's/"ModeDebug" "false"/"ModeDebug" "true"/g' /storage/.config/xorg.conf sed -i 's/"ModeDebug" "false"/"ModeDebug" "true"/g' /storage/.config/xorg.conf
systemctl restart xorg.service systemctl restart xorg.service
# get port # get port
nv_port="$(grep -i -w connected /var/log/Xorg.0.log | grep -i -o "dfp-[0-9]" | sort -u)" nv_port="$(grep -i -w connected /var/log/Xorg.0.log | grep -i -o "dfp-[0-9]" | sort -u)"
@ -212,7 +197,7 @@ nvidia() {
# set mode debug back to false # set mode debug back to false
sed -i 's/"ModeDebug" "true"/"ModeDebug" "false"/g' /storage/.config/xorg.conf sed -i 's/"ModeDebug" "true"/"ModeDebug" "false"/g' /storage/.config/xorg.conf
# set port and uncomment lines # set port and uncomment lines
sed -i "s/# Option \"ConnectedMonitor\" \"DFP-0\"/ Option \"ConnectedMonitor\" \"$nv_port\"/g" /storage/.config/xorg.conf sed -i "s/# Option \"ConnectedMonitor\" \"DFP-0\"/ Option \"ConnectedMonitor\" \"$nv_port\"/g" /storage/.config/xorg.conf
sed -i "s/# Option \"CustomEDID\" \"DFP-0:\/storage\/.config\/edid.bin\"/ Option \"CustomEDID\" \"$nv_port:\/storage\/.config\/edid.bin\"/g" /storage/.config/xorg.conf sed -i "s/# Option \"CustomEDID\" \"DFP-0:\/storage\/.config\/edid.bin\"/ Option \"CustomEDID\" \"$nv_port:\/storage\/.config\/edid.bin\"/g" /storage/.config/xorg.conf
@ -223,7 +208,6 @@ nvidia() {
systemctl restart xorg.service systemctl restart xorg.service
} }
# start script from here # start script from here
case "$1" in case "$1" in
'create') 'create')

View File

@ -15,7 +15,7 @@ mkdir -p "${MODULES_DIR}"
mkdir -p "${FIRMWARE_DIR}" mkdir -p "${FIRMWARE_DIR}"
log() { log() {
echo "kernel-overlays-setup: $@" > /dev/kmsg echo "kernel-overlays-setup: $@" >/dev/kmsg
} }
apply_overlay() { apply_overlay() {
@ -30,18 +30,18 @@ apply_overlay() {
;; ;;
esac esac
if [ -d "${modules_overlay_dir}" ] ; then if [ -d "${modules_overlay_dir}" ]; then
GOT_MODULE_OVERLAY="yes" GOT_MODULE_OVERLAY="yes"
if cp -rfs "${modules_overlay_dir}"/* "${MODULES_DIR}" ; then if cp -rfs "${modules_overlay_dir}"/* "${MODULES_DIR}"; then
log "added modules from $modules_overlay_dir" log "added modules from $modules_overlay_dir"
else else
log "failed to add modules from $modules_overlay_dir" log "failed to add modules from $modules_overlay_dir"
fi fi
fi fi
if [ -d "${firmware_overlay_dir}" ] ; then if [ -d "${firmware_overlay_dir}" ]; then
if cp -rfs "${firmware_overlay_dir}"/* "${FIRMWARE_DIR}" ; then if cp -rfs "${firmware_overlay_dir}"/* "${FIRMWARE_DIR}"; then
log "added firmware from $firmware_overlay_dir" log "added firmware from $firmware_overlay_dir"
else else
log "failed to add firmware from $firmware_overlay_dir" log "failed to add firmware from $firmware_overlay_dir"
@ -56,26 +56,26 @@ apply_overlay base
# apply user-configured module overlays # apply user-configured module overlays
if [ -d "${OVERLAY_CONFIG_DIR}" ] ; then if [ -d "${OVERLAY_CONFIG_DIR}" ]; then
log "adding overlays from ${OVERLAY_CONFIG_DIR}" log "adding overlays from ${OVERLAY_CONFIG_DIR}"
GOT_MODULE_OVERLAY="no" GOT_MODULE_OVERLAY="no"
for conf in "${OVERLAY_CONFIG_DIR}/"*.conf ; do for conf in "${OVERLAY_CONFIG_DIR}/"*.conf; do
if [ -e "$conf" ] ; then if [ -e "$conf" ]; then
log "processing conf $conf" log "processing conf $conf"
overlay=$(cat "$conf") overlay=$(cat "$conf")
[ -n "$overlay" ] && apply_overlay "$overlay" [ -n "$overlay" ] && apply_overlay "$overlay"
fi fi
done done
if [ "yes" = "$GOT_MODULE_OVERLAY" ] ; then if [ "yes" = "$GOT_MODULE_OVERLAY" ]; then
log "running depmod" log "running depmod"
/usr/sbin/depmod -a >/dev/kmsg 2>&1 /usr/sbin/depmod -a >/dev/kmsg 2>&1
fi fi
fi fi
if [ -d "${USER_FIRMWARE_DIR}" ] && [ -n "$(ls ${USER_FIRMWARE_DIR})" ] ; then if [ -d "${USER_FIRMWARE_DIR}" ] && [ -n "$(ls ${USER_FIRMWARE_DIR})" ]; then
if cp -rfs "${USER_FIRMWARE_DIR}"/* "${FIRMWARE_DIR}" ; then if cp -rfs "${USER_FIRMWARE_DIR}"/* "${FIRMWARE_DIR}"; then
log "added firmware from ${USER_FIRMWARE_DIR}" log "added firmware from ${USER_FIRMWARE_DIR}"
else else
log "failed to add firmware from ${USER_FIRMWARE_DIR}" log "failed to add firmware from ${USER_FIRMWARE_DIR}"

View File

@ -9,8 +9,8 @@ case $(dtsoc) in
for triggerfile in $(find /sys/devices/platform/leds -name trigger); do for triggerfile in $(find /sys/devices/platform/leds -name trigger); do
trigger=$(awk -F'[][]' '{print $2}' "$triggerfile") trigger=$(awk -F'[][]' '{print $2}' "$triggerfile")
if [ "$trigger" = "heartbeat" ]; then if [ "$trigger" = "heartbeat" ]; then
echo "none" > "$triggerfile" echo "none" >"$triggerfile"
fi fi
done done
;; ;;
esac esac

View File

@ -7,7 +7,7 @@
EARLY_DIR="$2" EARLY_DIR="$2"
log() { log() {
echo "libreelec-target-generator: $@" > /dev/kmsg echo "libreelec-target-generator: $@" >/dev/kmsg
} }
if [ -z "$EARLY_DIR" ]; then if [ -z "$EARLY_DIR" ]; then

View File

@ -3,13 +3,13 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
do_install(){ do_install() {
# create the persistent firmware dir # create the persistent firmware dir
mkdir -p "/storage/.config/firmware/edid" mkdir -p "/storage/.config/firmware/edid"
# capture the raw edid file # capture the raw edid file
if [ ! -e /storage/.config/firmware/edid/edid.bin ]; then if [ ! -e /storage/.config/firmware/edid/edid.bin ]; then
cat "/sys/class/drm/card0-HDMI-A-1/edid" > "/storage/.config/firmware/edid/edid.bin" cat "/sys/class/drm/card0-HDMI-A-1/edid" >"/storage/.config/firmware/edid/edid.bin"
else else
echo "info: using existing edid.bin" echo "info: using existing edid.bin"
fi fi
@ -18,7 +18,7 @@ do_install(){
mkdir -p "/storage/cpio/lib/firmware/edid" mkdir -p "/storage/cpio/lib/firmware/edid"
cp "/storage/.config/firmware/edid/edid.bin" "/storage/cpio/lib/firmware/edid/" cp "/storage/.config/firmware/edid/edid.bin" "/storage/cpio/lib/firmware/edid/"
cd "/storage/cpio" cd "/storage/cpio"
find . -print | cpio -ov -H newc > "/storage/.config/firmware/edid/edid.cpio" find . -print | cpio -ov -H newc >"/storage/.config/firmware/edid/edid.cpio"
# mount /flash rw # mount /flash rw
mount -o remount,rw /flash mount -o remount,rw /flash
@ -32,7 +32,7 @@ do_install(){
# determine boot method and set params # determine boot method and set params
if [ -f "/flash/extlinux/extlinux.conf" ]; then if [ -f "/flash/extlinux/extlinux.conf" ]; then
FILE="/flash/extlinux/extlinux.conf" FILE="/flash/extlinux/extlinux.conf"
if grep -q "initrd=/edid.cpio" "${FILE}" ; then if grep -q "initrd=/edid.cpio" "${FILE}"; then
echo "error: ${FILE} already contains edid.cpio, aborting!" echo "error: ${FILE} already contains edid.cpio, aborting!"
exit 1 exit 1
else else
@ -43,7 +43,7 @@ do_install(){
fi fi
else else
FILE="/flash/uEnv.ini" FILE="/flash/uEnv.ini"
if grep -q "initrd=/edid.cpio" "${FILE}" ; then if grep -q "initrd=/edid.cpio" "${FILE}"; then
echo "error: ${FILE} already contains edid.cpio info .. aborting!" echo "error: ${FILE} already contains edid.cpio info .. aborting!"
exit 1 exit 1
else else
@ -55,7 +55,7 @@ do_install(){
fi fi
} }
do_cleanup(){ do_cleanup() {
rm "/storage/.config/firmware/edid/edid.bin" rm "/storage/.config/firmware/edid/edid.bin"
rm "/storage/.config/firmware/edid/edid.cpio" rm "/storage/.config/firmware/edid/edid.cpio"
mount -o remount,rw /flash mount -o remount,rw /flash
@ -69,7 +69,7 @@ do_cleanup(){
mount -o remount,ro /flash mount -o remount,ro /flash
} }
do_usage(){ do_usage() {
echo "usage: getedid {create|delete}" echo "usage: getedid {create|delete}"
exit 0 exit 0
} }

View File

@ -43,21 +43,21 @@ get_cleaned_cmdline_txt() {
add_initramfs() { add_initramfs() {
# make sure config.txt ends with a newline # make sure config.txt ends with a newline
if [ "$(tail -c 1 ${CONFIG_TXT} | tr -c -d '\n' | tr '\n' 'X')" != "X" ]; then if [ "$(tail -c 1 ${CONFIG_TXT} | tr -c -d '\n' | tr '\n' 'X')" != "X" ]; then
echo "" >> ${CONFIG_TXT} echo "" >>${CONFIG_TXT}
fi fi
echo "initramfs edid.cpio" >> ${CONFIG_TXT} echo "initramfs edid.cpio" >>${CONFIG_TXT}
} }
add_cmdline() { add_cmdline() {
CMDLINE=$(get_cleaned_cmdline_txt) CMDLINE=$(get_cleaned_cmdline_txt)
FIRMWARE="" FIRMWARE=""
VIDEO="" VIDEO=""
for conn in "$@"; do for conn in "$@"; do
VIDEO="${VIDEO} video=${conn}:D" VIDEO="${VIDEO} video=${conn}:D"
[ -n "${FIRMWARE}" ] && FIRMWARE="${FIRMWARE}," [ -n "${FIRMWARE}" ] && FIRMWARE="${FIRMWARE},"
FIRMWARE="${FIRMWARE}${conn}:edid/edid-${conn}.bin" FIRMWARE="${FIRMWARE}${conn}:edid/edid-${conn}.bin"
done done
echo "${CMDLINE} drm.edid_firmware=${FIRMWARE}${VIDEO}" > ${CMDLINE_TXT} echo "${CMDLINE} drm.edid_firmware=${FIRMWARE}${VIDEO}" >${CMDLINE_TXT}
} }
set_edids() { set_edids() {
@ -73,7 +73,7 @@ delete_edids() {
mount -o remount,rw /flash mount -o remount,rw /flash
cleanup_config_txt cleanup_config_txt
CMDLINE=$(get_cleaned_cmdline_txt) CMDLINE=$(get_cleaned_cmdline_txt)
echo "${CMDLINE}" > ${CMDLINE_TXT} echo "${CMDLINE}" >${CMDLINE_TXT}
mount -o remount,ro /flash mount -o remount,ro /flash
} }

View File

@ -3,31 +3,30 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
do_start(){ do_start() {
while sleep 1 while sleep 1; do
do printf "%4s" "$(date +'%l %M' | tr -d '[:space:]')" >"$LED_PATH_TEXT"
printf "%4s" "$(date +'%l %M' | tr -d '[:space:]')" > "$LED_PATH_TEXT"
if [ "$LED_COLON" = "off" ]; then if [ "$LED_COLON" = "off" ]; then
echo "1" > "$LED_PATH_COLON" echo "1" >"$LED_PATH_COLON"
LED_COLON="on" LED_COLON="on"
else else
echo "0" > "$LED_PATH_COLON" echo "0" >"$LED_PATH_COLON"
LED_COLON="off" LED_COLON="off"
fi fi
done done
} }
do_stop(){ do_stop() {
echo "0" > "$LED_PATH_COLON" echo "0" >"$LED_PATH_COLON"
echo " " > "$LED_PATH_TEXT" echo " " >"$LED_PATH_TEXT"
} }
case $(dtname) in case $(dtname) in
oranth,tx3-mini|oranth,tx9-pro|sunvell,t95z-plus) oranth,tx3-mini | oranth,tx9-pro | sunvell,t95z-plus)
LED_PATH_COLON="/sys/devices/platform/spi/spi_master/spi0/spi0.0/leds/:colon/brightness" LED_PATH_COLON="/sys/devices/platform/spi/spi_master/spi0/spi0.0/leds/:colon/brightness"
LED_PATH_TEXT="/sys/devices/platform/spi/spi_master/spi0/spi0.0/display_text" LED_PATH_TEXT="/sys/devices/platform/spi/spi_master/spi0/spi0.0/display_text"
;; ;;
default|*) default | *)
# noop # noop
;; ;;
esac esac

View File

@ -3,8 +3,8 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2017 Matthias Reichl (hias@horus.com) # Copyright (C) 2017 Matthias Reichl (hias@horus.com)
if [ -e "/storage/.config/lirc_options.conf" ] ; then if [ -e "/storage/.config/lirc_options.conf" ]; then
LIRCD_OPTIONS="-O /storage/.config/lirc_options.conf" LIRCD_OPTIONS="-O /storage/.config/lirc_options.conf"
fi fi
exec /usr/sbin/lircd $LIRCD_OPTIONS "$@" /storage/.config/lircd.conf exec /usr/sbin/lircd $LIRCD_OPTIONS "$@" /storage/.config/lircd.conf

View File

@ -3,8 +3,8 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2017 Matthias Reichl (hias@horus.com) # Copyright (C) 2017 Matthias Reichl (hias@horus.com)
if [ -e "/storage/.config/lirc_options.conf" ] ; then if [ -e "/storage/.config/lirc_options.conf" ]; then
LIRCD_OPTIONS="-O /storage/.config/lirc_options.conf" LIRCD_OPTIONS="-O /storage/.config/lirc_options.conf"
fi fi
exec /usr/sbin/lircd-uinput $LIRCD_OPTIONS "$@" exec /usr/sbin/lircd-uinput $LIRCD_OPTIONS "$@"

View File

@ -4,14 +4,14 @@
# Copyright (C) 2009-2015 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2015 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
SYS_CPUFREQ_GOV=$( cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ) SYS_CPUFREQ_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
SYS_CPUFREQ_DIR="/sys/devices/system/cpu/cpufreq" SYS_CPUFREQ_DIR="/sys/devices/system/cpu/cpufreq"
# Configure frequency scaling properties # Configure frequency scaling properties
if [ $SYS_CPUFREQ_GOV = "ondemand" ]; then if [ $SYS_CPUFREQ_GOV = "ondemand" ]; then
for policy in ${SYS_CPUFREQ_DIR}/ondemand ${SYS_CPUFREQ_DIR}/policy*/; do for policy in ${SYS_CPUFREQ_DIR}/ondemand ${SYS_CPUFREQ_DIR}/policy*/; do
if [ -e $policy/up_threshold ]; then if [ -e $policy/up_threshold ]; then
echo 50 > $policy/up_threshold echo 50 >$policy/up_threshold
fi fi
done done
fi fi

View File

@ -4,7 +4,7 @@
# read config files # read config files
for config in /etc/profile.d/*; do for config in /etc/profile.d/*; do
if [ -f "$config" ] ; then if [ -f "$config" ]; then
. $config . $config
fi fi
done done

View File

@ -6,42 +6,40 @@ check_hosts() {
grep -v "^#" /run/libreelec/hosts | grep "${1}" grep -v "^#" /run/libreelec/hosts | grep "${1}"
} }
# setup hostname # setup hostname
if [ -f /storage/.cache/hostname ]; then if [ -f /storage/.cache/hostname ]; then
cat /storage/.cache/hostname > /proc/sys/kernel/hostname cat /storage/.cache/hostname >/proc/sys/kernel/hostname
fi fi
# setup /etc/hosts # setup /etc/hosts
rm -f /run/libreelec/hosts rm -f /run/libreelec/hosts
if [ -f /storage/.config/hosts.conf ]; then if [ -f /storage/.config/hosts.conf ]; then
cat /storage/.config/hosts.conf > /run/libreelec/hosts cat /storage/.config/hosts.conf >/run/libreelec/hosts
# add localhost to hosts if not present # add localhost to hosts if not present
LOCALHOST_HOSTS=$(check_hosts "localhost") LOCALHOST_HOSTS=$(check_hosts "localhost")
if [ -z "${LOCALHOST_HOSTS}" ]; then if [ -z "${LOCALHOST_HOSTS}" ]; then
{ {
echo "127.0.0.1 localhost" echo "127.0.0.1 localhost"
echo "::1 localhost ip6-localhost ip6-loopback" echo "::1 localhost ip6-localhost ip6-loopback"
} >> /run/libreelec/hosts } >>/run/libreelec/hosts
fi fi
# add HOSTNAME to hosts if not present # add HOSTNAME to hosts if not present
HOSTNAME=$(cat /proc/sys/kernel/hostname) HOSTNAME=$(cat /proc/sys/kernel/hostname)
HOSTNAME_HOSTS=$(check_hosts "${HOSTNAME}") HOSTNAME_HOSTS=$(check_hosts "${HOSTNAME}")
if [ -z "${HOSTNAME_HOSTS}" ]; then if [ -z "${HOSTNAME_HOSTS}" ]; then
echo "127.0.1.1 ${HOSTNAME}" >> /run/libreelec/hosts echo "127.0.1.1 ${HOSTNAME}" >>/run/libreelec/hosts
fi fi
fi fi
# setup /etc/resolv.conf # setup /etc/resolv.conf
rm -f /run/libreelec/resolv.conf rm -f /run/libreelec/resolv.conf
if [ -f /storage/.config/resolv.conf ]; then if [ -f /storage/.config/resolv.conf ]; then
cat /storage/.config/resolv.conf > /run/libreelec/resolv.conf cat /storage/.config/resolv.conf >/run/libreelec/resolv.conf
elif [ -f /dev/.kernel_ipconfig ] && [ -f /proc/net/pnp ]; then elif [ -f /dev/.kernel_ipconfig ] && [ -f /proc/net/pnp ]; then
cat /proc/net/pnp > /run/libreelec/resolv.conf cat /proc/net/pnp >/run/libreelec/resolv.conf
else else
cat << EOF > /run/libreelec/resolv.conf cat <<EOF >/run/libreelec/resolv.conf
nameserver 8.8.8.8 nameserver 8.8.8.8
nameserver 8.8.4.4 nameserver 8.8.4.4
EOF EOF
fi fi

View File

@ -17,4 +17,4 @@ umount /storage/.cache/systemd-machine-id >/dev/null 2>&1
# persist uuid # persist uuid
mkdir -p /storage/.cache mkdir -p /storage/.cache
echo "$MACHINEID" > /storage/.cache/systemd-machine-id echo "$MACHINEID" >/storage/.cache/systemd-machine-id

View File

@ -13,10 +13,9 @@ if [ -f /proc/net/ipconfig/ntp_servers ]; then
done done
if [ -n "$NTP_SERVERS" ]; then if [ -n "$NTP_SERVERS" ]; then
mkdir -p /run/systemd/timesyncd.conf.d/ mkdir -p /run/systemd/timesyncd.conf.d/
cat << EOF > /run/systemd/timesyncd.conf.d/kernel-ntp-servers.conf cat <<EOF >/run/systemd/timesyncd.conf.d/kernel-ntp-servers.conf
[Time] [Time]
NTP=$NTP_SERVERS NTP=$NTP_SERVERS
EOF EOF
fi fi
fi fi

View File

@ -11,12 +11,12 @@ if [ -f /storage/.config/swap.conf ]; then
. /storage/.config/swap.conf . /storage/.config/swap.conf
fi fi
if [ -e /dev/.storage_netboot ] ; then if [ -e /dev/.storage_netboot ]; then
logger -t Boot "### netbooting... swap disabled ###" logger -t Boot "### netbooting... swap disabled ###"
exit 0 exit 0
fi fi
if [ ! "${SWAP_ENABLED}" = "yes" ] ; then if [ ! "${SWAP_ENABLED}" = "yes" ]; then
logger -t Boot "### swap disabled via configfile ###" logger -t Boot "### swap disabled via configfile ###"
exit 0 exit 0
fi fi

View File

@ -17,7 +17,7 @@ mount -o remount,rw $BOOT_ROOT
# update bootloader files # update bootloader files
cp -p $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT
for f in bootcode.bin fixup.dat start.elf ; do for f in bootcode.bin fixup.dat start.elf; do
if [ -f "${SYSTEM_ROOT}/usr/share/bootloader/$f" ]; then if [ -f "${SYSTEM_ROOT}/usr/share/bootloader/$f" ]; then
cp -p "${SYSTEM_ROOT}/usr/share/bootloader/$f" "${BOOT_ROOT}" cp -p "${SYSTEM_ROOT}/usr/share/bootloader/$f" "${BOOT_ROOT}"
fi fi
@ -36,10 +36,10 @@ rm -rf $BOOT_ROOT/start_x.elf
if [ ! -f $BOOT_ROOT/config.txt ]; then if [ ! -f $BOOT_ROOT/config.txt ]; then
cp -p $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT
else else
CONFIG_TXT_VERSION=$( \ CONFIG_TXT_VERSION=$(
grep "^# config.txt version v[0-9]\+" $BOOT_ROOT/config.txt | \ grep "^# config.txt version v[0-9]\+" $BOOT_ROOT/config.txt |
head -n 1 | \ head -n 1 |
sed 's/^# config.txt version v\([0-9]\+\) .*$/\1/' \ sed 's/^# config.txt version v\([0-9]\+\) .*$/\1/'
) )
if [ ${CONFIG_TXT_VERSION:-0} -lt $MIN_CONFIG_TXT_VERSION ]; then if [ ${CONFIG_TXT_VERSION:-0} -lt $MIN_CONFIG_TXT_VERSION ]; then
mv -f $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.old mv -f $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.old
@ -50,7 +50,7 @@ else
fi fi
# Add distro config files # Add distro config files
for distro in "$SYSTEM_ROOT/usr/share/bootloader/distroconfig"*.txt ; do for distro in "$SYSTEM_ROOT/usr/share/bootloader/distroconfig"*.txt; do
if [ -f "${distro}" ]; then if [ -f "${distro}" ]; then
cp -p "${distro}" $BOOT_ROOT cp -p "${distro}" $BOOT_ROOT
fi fi

View File

@ -5,20 +5,20 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
mkdir -p $RELEASE_DIR/3rdparty/bootloader mkdir -p $RELEASE_DIR/3rdparty/bootloader
cp -PR $INSTALL/usr/share/bootloader/LICENCE* $RELEASE_DIR/3rdparty/bootloader/ cp -PR $INSTALL/usr/share/bootloader/LICENCE* $RELEASE_DIR/3rdparty/bootloader/
for f in bootcode.bin fixup.dat start.elf ; do for f in bootcode.bin fixup.dat start.elf; do
if [ -f "${INSTALL}/usr/share/bootloader/$f" ]; then if [ -f "${INSTALL}/usr/share/bootloader/$f" ]; then
cp -PR "${INSTALL}/usr/share/bootloader/$f" "${RELEASE_DIR}/3rdparty/bootloader/" cp -PR "${INSTALL}/usr/share/bootloader/$f" "${RELEASE_DIR}/3rdparty/bootloader/"
fi
done
cp -PR $INSTALL/usr/share/bootloader/*.dtb $RELEASE_DIR/3rdparty/bootloader/
cp -PR $INSTALL/usr/share/bootloader/overlays $RELEASE_DIR/3rdparty/bootloader/
if [ -f $INSTALL/usr/share/bootloader/config.txt ]; then
cp -PR $INSTALL/usr/share/bootloader/config.txt $RELEASE_DIR/3rdparty/bootloader/
fi fi
for distro in "$INSTALL/usr/share/bootloader/distroconfig"*.txt ; do done
if [ -f "${distro}" ]; then cp -PR $INSTALL/usr/share/bootloader/*.dtb $RELEASE_DIR/3rdparty/bootloader/
cp -PR "${distro}" $RELEASE_DIR/3rdparty/bootloader/ cp -PR $INSTALL/usr/share/bootloader/overlays $RELEASE_DIR/3rdparty/bootloader/
fi
done if [ -f $INSTALL/usr/share/bootloader/config.txt ]; then
cp -PR $INSTALL/usr/share/bootloader/config.txt $RELEASE_DIR/3rdparty/bootloader/
fi
for distro in "$INSTALL/usr/share/bootloader/distroconfig"*.txt; do
if [ -f "${distro}" ]; then
cp -PR "${distro}" $RELEASE_DIR/3rdparty/bootloader/
fi
done

View File

@ -8,25 +8,25 @@
# modify it to run on other hardware and you brick your device you will # modify it to run on other hardware and you brick your device you will
# receive no support to restore your device. You have been warned! # receive no support to restore your device. You have been warned!
do_backup(){ do_backup() {
do_umount do_umount
echo "info: compressing ${EMMC} to ${2}, this will take time" echo "info: compressing ${EMMC} to ${2}, this will take time"
dd if="${EMMC}" | gzip > of="${2}" dd if="${EMMC}" | gzip >of="${2}"
echo "info: compressing completed" echo "info: compressing completed"
} }
do_detect(){ do_detect() {
# used on LibreComputer LePotato/LaFrite where pre-formatted modules # used on LibreComputer LePotato/LaFrite where pre-formatted modules
# must be attached after boot (LibreComputer supports this) else the # must be attached after boot (LibreComputer supports this) else the
# device always boots to the pre-installed OS on the module. # device always boots to the pre-installed OS on the module.
echo "info: rebinding d0074000.mmc" echo "info: rebinding d0074000.mmc"
echo -n d0074000.mmc > /sys/bus/platform/drivers/meson-gx-mmc/unbind echo -n d0074000.mmc >/sys/bus/platform/drivers/meson-gx-mmc/unbind
echo -n d0074000.mmc > /sys/bus/platform/drivers/meson-gx-mmc/bind echo -n d0074000.mmc >/sys/bus/platform/drivers/meson-gx-mmc/bind
sleep 1 sleep 1
parted -s "${EMMC}" print parted -s "${EMMC}" print
} }
do_info(){ do_info() {
BOOTINFO=$(dd if="${BOOT}" count=2048 2>/dev/null | strings | grep -e '^U-Boot ' | awk '{print $2}') BOOTINFO=$(dd if="${BOOT}" count=2048 2>/dev/null | strings | grep -e '^U-Boot ' | awk '{print $2}')
EMMCINFO=$(dd if="${EMMC}" count=2048 2>/dev/null | strings | grep -e '^U-Boot ' | awk '{print $2}') EMMCINFO=$(dd if="${EMMC}" count=2048 2>/dev/null | strings | grep -e '^U-Boot ' | awk '{print $2}')
echo "" echo ""
@ -45,7 +45,7 @@ do_info(){
echo "" echo ""
} }
do_labels(){ do_labels() {
if [ -n "${2}" ] && [ -n "${3}" ]; then if [ -n "${2}" ] && [ -n "${3}" ]; then
BOOTLABEL=$(echo "${2}" | awk 'BEGIN { getline; print toupper($0) }') BOOTLABEL=$(echo "${2}" | awk 'BEGIN { getline; print toupper($0) }')
DISKLABEL=$(echo "${3}" | awk 'BEGIN { getline; print toupper($0) }') DISKLABEL=$(echo "${3}" | awk 'BEGIN { getline; print toupper($0) }')
@ -77,7 +77,7 @@ do_labels(){
echo "" echo ""
} }
do_resize(){ do_resize() {
if [ -z "${DISKLABEL}" ]; then if [ -z "${DISKLABEL}" ]; then
DISKLABEL=$(blkid | grep "${EMMC}"p2 | awk -F'"' '{print $2}') DISKLABEL=$(blkid | grep "${EMMC}"p2 | awk -F'"' '{print $2}')
fi fi
@ -103,7 +103,7 @@ do_resize(){
parted -s "${EMMC}" print parted -s "${EMMC}" print
} }
do_storage(){ do_storage() {
if [ -n "${2}" ]; then if [ -n "${2}" ]; then
DISKLABEL=$(echo "${2}" | awk 'BEGIN { getline; print toupper($0) }') DISKLABEL=$(echo "${2}" | awk 'BEGIN { getline; print toupper($0) }')
else else
@ -130,7 +130,7 @@ do_storage(){
echo "" echo ""
} }
do_umount(){ do_umount() {
for mount in $(grep "${EMMC}" /proc/mounts | awk '{print $1}'); do for mount in $(grep "${EMMC}" /proc/mounts | awk '{print $1}'); do
echo "info: unmounting $mount" echo "info: unmounting $mount"
umount -f "$mount" umount -f "$mount"
@ -138,13 +138,13 @@ do_umount(){
done done
} }
do_writeprotect(){ do_writeprotect() {
echo "info: disabling emmc write protection" echo "info: disabling emmc write protection"
echo 0 > "/sys/block/${EMMC}boot0/force_ro" echo 0 >"/sys/block/${EMMC}boot0/force_ro"
echo 0 > "/sys/block/${EMMC}boot1/force_ro" echo 0 >"/sys/block/${EMMC}boot1/force_ro"
} }
do_write(){ do_write() {
do_umount do_umount
case $(dtname) in case $(dtname) in
@ -155,7 +155,7 @@ do_write(){
if [ -e "${2}" ]; then if [ -e "${2}" ]; then
case "${2}" in case "${2}" in
*box.img.gz|*box.img) *box.img.gz | *box.img)
echo "error: ${2} is not a bootable image, aborting!" echo "error: ${2} is not a bootable image, aborting!"
exit 1 exit 1
;; ;;
@ -170,6 +170,7 @@ do_write(){
*) *)
echo "error: ${2} is not a valid image file!" echo "error: ${2} is not a valid image file!"
exit 1 exit 1
;;
esac esac
else else
echo "error: ${2} not found!" echo "error: ${2} not found!"
@ -177,14 +178,14 @@ do_write(){
fi fi
} }
do_zero(){ do_zero() {
do_umount do_umount
echo "info: zeroing ${EMMC}, be patient, this will take time" echo "info: zeroing ${EMMC}, be patient, this will take time"
dd if="/dev/zero" of="${EMMC}" bs=1M dd if="/dev/zero" of="${EMMC}" bs=1M
echo "info: zeroing complete" echo "info: zeroing complete"
} }
do_help(){ do_help() {
echo "" echo ""
echo "usage: emmctool (w)rite <filename> : write <filename>.img/.img.gz to the eMMC module" echo "usage: emmctool (w)rite <filename> : write <filename>.img/.img.gz to the eMMC module"
echo " (b)backup <filename> : dump the emmc partition to <filename>.img.gz file" echo " (b)backup <filename> : dump the emmc partition to <filename>.img.gz file"
@ -207,7 +208,7 @@ if [ -z "${EMMC}" ]; then
fi fi
case $(dtname) in case $(dtname) in
azw*|bananapi*|friendlyarm*|hardkernel*|khadas*|libretech*|radxa*|wetek*) azw* | bananapi* | friendlyarm* | hardkernel* | khadas* | libretech* | radxa* | wetek*)
if [ "${BOOT}" = "${EMMC}" ]; then if [ "${BOOT}" = "${EMMC}" ]; then
do_info do_info
echo "Your device is booted from the eMMC module!" echo "Your device is booted from the eMMC module!"
@ -226,27 +227,27 @@ case "${1}" in
backup) backup)
do_backup "$@" do_backup "$@"
;; ;;
detect|d) detect | d)
do_detect do_detect
;; ;;
info|i) info | i)
do_info do_info
;; ;;
labels|l) labels | l)
do_labels "$@" do_labels "$@"
;; ;;
resize|r) resize | r)
do_resize do_resize
;; ;;
storage|s) storage | s)
do_storage "$@" do_storage "$@"
;; ;;
write|w) write | w)
do_write "$@" do_write "$@"
do_resize do_resize
do_labels do_labels
;; ;;
zero|z) zero | z)
do_zero do_zero
;; ;;
*) *)

View File

@ -29,7 +29,7 @@ fi
if [ ! -f ${SWAY_CONFIG_USER} ]; then if [ ! -f ${SWAY_CONFIG_USER} ]; then
mkdir -p ${SWAY_CONFIG_BASEDIR} mkdir -p ${SWAY_CONFIG_BASEDIR}
cp ${SWAY_CONFIG_USER_DEFAULT} ${SWAY_CONFIG_BASEDIR} cp ${SWAY_CONFIG_USER_DEFAULT} ${SWAY_CONFIG_BASEDIR}
fi fi
if [ ! -f ${SWAY_CONFIG_COLOR} ]; then if [ ! -f ${SWAY_CONFIG_COLOR} ]; then
@ -40,8 +40,8 @@ if [ ! -f ${SWAY_CONFIG_DAEMON} ]; then
cp ${SWAY_CONFIG_DAEMON_DEFAULT} ${SWAY_CONFIG_BASEDIR} cp ${SWAY_CONFIG_DAEMON_DEFAULT} ${SWAY_CONFIG_BASEDIR}
fi fi
if [ -f ${SWAY_CONFIG_DAEMON} ] ; then if [ -f ${SWAY_CONFIG_DAEMON} ]; then
SWAY_DAEMON_CONF=$(cat ${SWAY_CONFIG_DAEMON} | grep -E '^SWAY_DAEMON_CONF=' | cut -d "\"" -f2) SWAY_DAEMON_CONF=$(cat ${SWAY_CONFIG_DAEMON} | grep -E '^SWAY_DAEMON_CONF=' | cut -d "\"" -f2)
fi fi
echo SWAY_DAEMON_ARGS=\"${SWAY_DAEMON_CONF} ${SWAY_DAEMON_ARGS}\" > ${SWAY_CONFIG_RUN} echo SWAY_DAEMON_ARGS=\"${SWAY_DAEMON_CONF} ${SWAY_DAEMON_ARGS}\" >${SWAY_CONFIG_RUN}

View File

@ -14,4 +14,4 @@ fi
export WLR_LIBINPUT_NO_DEVICES=1 export WLR_LIBINPUT_NO_DEVICES=1
logger -t Sway "### Starting Sway with -V ${SWAY_GPU_ARGS} ${SWAY_DAEMON_ARGS}" logger -t Sway "### Starting Sway with -V ${SWAY_GPU_ARGS} ${SWAY_DAEMON_ARGS}"
/usr/bin/sway -V ${SWAY_GPU_ARGS} ${SWAY_DAEMON_ARGS} > ${SWAY_LOG_FILE} 2>&1 /usr/bin/sway -V ${SWAY_GPU_ARGS} ${SWAY_DAEMON_ARGS} >${SWAY_LOG_FILE} 2>&1

View File

@ -8,11 +8,11 @@ FOOT_LOG_FILE=/var/log/foot.log
if [ ! -f ${FOOT_CONFIG_DIR}/foot.ini ]; then if [ ! -f ${FOOT_CONFIG_DIR}/foot.ini ]; then
mkdir -p ${FOOT_CONFIG_DIR} mkdir -p ${FOOT_CONFIG_DIR}
cp ${FOOT_CONFIG_DEFAULT} ${FOOT_CONFIG_DIR} cp ${FOOT_CONFIG_DEFAULT} ${FOOT_CONFIG_DIR}
fi fi
if [ -z "${LOCPATH}" ]; then if [ -z "${LOCPATH}" ]; then
export LOCPATH="/storage/.cache/locpath" export LOCPATH="/storage/.cache/locpath"
fi fi
/usr/bin/foot > ${FOOT_LOG_FILE} 2>&1 /usr/bin/foot >${FOOT_LOG_FILE} 2>&1

View File

@ -6,22 +6,22 @@
# wait for xorg-configure@.service # wait for xorg-configure@.service
# max 10 seconds # max 10 seconds
ARGS_FILE="/run/libreelec/xorg-settings.conf" ARGS_FILE="/run/libreelec/xorg-settings.conf"
for i in $(seq 1 40) ; do for i in $(seq 1 40); do
if [ -e "$ARGS_FILE" ] ; then if [ -e "$ARGS_FILE" ]; then
break break
fi fi
usleep 250000 usleep 250000
done done
if [ -e "$ARGS_FILE" ] ; then if [ -e "$ARGS_FILE" ]; then
. /run/libreelec/xorg-settings.conf . /run/libreelec/xorg-settings.conf
exec xorg-launch-helper $@ $XORG_ARGS exec xorg-launch-helper $@ $XORG_ARGS
else else
echo "" > /dev/tty1 echo "" >/dev/tty1
echo "failed to start xorg." > /dev/tty1 echo "failed to start xorg." >/dev/tty1
echo "is your GPU supported?" > /dev/tty1 echo "is your GPU supported?" >/dev/tty1
echo "" > /dev/tty1 echo "" >/dev/tty1
lspci -nn > /dev/tty1 lspci -nn >/dev/tty1
echo "" > /dev/tty1 echo "" >/dev/tty1
sleep 30 sleep 30
fi fi

View File

@ -13,7 +13,7 @@ mkdir -p /var/run
# HACK. we have xorg-configure@%. so nice race # HACK. we have xorg-configure@%. so nice race
# can happen on multi-gpu setups # can happen on multi-gpu setups
if [ -e /var/run/xorg-configure.done ] ; then if [ -e /var/run/xorg-configure.done ]; then
exit 0 exit 0
fi fi
@ -26,10 +26,10 @@ logger -t Xorg "creating needed directories and symlinks for driver: "${1}""
logger -t Xorg "### setup xorg.conf paths ###" logger -t Xorg "### setup xorg.conf paths ###"
XORG_CONF_USER="/storage/.config/xorg.conf" XORG_CONF_USER="/storage/.config/xorg.conf"
XORG_CONF_USER_DRV="/storage/.config/xorg-${1}.conf" XORG_CONF_USER_DRV="/storage/.config/xorg-${1}.conf"
XORG_CONF_DEFAULT="/etc/X11/xorg.conf" XORG_CONF_DEFAULT="/etc/X11/xorg.conf"
XORG_CONF_DEFAULT_DRV="/etc/X11/xorg-${1}.conf" XORG_CONF_DEFAULT_DRV="/etc/X11/xorg-${1}.conf"
############################################################################## ##############################################################################
# creating start options # creating start options
@ -37,18 +37,18 @@ logger -t Xorg "### setup xorg.conf paths ###"
logger -t Xorg "### creating start options ###" logger -t Xorg "### creating start options ###"
XORG_ARGS="-s 0 -noreset -allowMouseOpenFail" XORG_ARGS="-s 0 -noreset -allowMouseOpenFail"
# load user defined xorg.conf, if exist # load user defined xorg.conf, if exist
if [ -f "${XORG_CONF_USER}" ]; then if [ -f "${XORG_CONF_USER}" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER}"
elif [ -f "${XORG_CONF_USER_DRV}" ]; then elif [ -f "${XORG_CONF_USER_DRV}" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER_DRV}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_USER_DRV}"
elif [ -f "${XORG_CONF_DEFAULT}" ]; then elif [ -f "${XORG_CONF_DEFAULT}" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT}"
elif [ -f "$XORG_CONF_DEFAULT_DRV" ]; then elif [ -f "$XORG_CONF_DEFAULT_DRV" ]; then
XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT_DRV}" XORG_ARGS="${XORG_ARGS} -config ${XORG_CONF_DEFAULT_DRV}"
fi fi
############################################################################## ##############################################################################
# creating needed directories and symlinks # creating needed directories and symlinks
@ -56,55 +56,54 @@ logger -t Xorg "### creating start options ###"
logger -t Xorg "### creating needed directories and symlinks ###" logger -t Xorg "### creating needed directories and symlinks ###"
# Used to support GeForce 600 Series & newer # Used to support GeForce 600 Series & newer
if [ "${1}" = "nvidia" ]; then if [ "${1}" = "nvidia" ]; then
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1 ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so ln -sf /usr/lib/xorg/modules/drivers/nvidia-main_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko ln -sf /usr/lib/nvidia/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1 ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so ln -sf /usr/lib/vdpau/libvdpau_nvidia-main.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi ln -sf /usr/bin/nvidia-main-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig ln -sf /usr/bin/nvidia-main-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko insmod /var/lib/nvidia.ko
# GL/GLX (GLVND) # GL/GLX (GLVND)
ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so
# indirect rendering # indirect rendering
ln -sf /usr/lib/libGLX_nvidia.so.0 /var/lib/libGLX_indirect.so.0 ln -sf /usr/lib/libGLX_nvidia.so.0 /var/lib/libGLX_indirect.so.0
XORG_ARGS="${XORG_ARGS} -ignoreABI" XORG_ARGS="${XORG_ARGS} -ignoreABI"
# Used to support GeForce 500 Series & older # Used to support GeForce 500 Series & older
elif [ "${1}" = "nvidia-legacy" ]; then elif [ "${1}" = "nvidia-legacy" ]; then
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGL.so
ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia-legacy.so /var/lib/libglx.so
ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1 ln -sf /usr/lib/libnvidia-ml.so.@NVIDIA_LEGACY_VERSION@ /var/lib/libnvidia-ml.so.1
ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so ln -sf /usr/lib/xorg/modules/drivers/nvidia-legacy_drv.so /var/lib/nvidia_drv.so
ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko ln -sf /usr/lib/nvidia-legacy/nvidia.ko /var/lib/nvidia.ko
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1 ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so.1
ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so ln -sf /usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 /var/lib/libvdpau_nvidia.so
ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi ln -sf /usr/bin/nvidia-legacy-smi /var/lib/nvidia-smi
ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig ln -sf /usr/bin/nvidia-legacy-xconfig /var/lib/nvidia-xconfig
insmod /var/lib/nvidia.ko insmod /var/lib/nvidia.ko
# GLX (NON-GLVND) # GLX (NON-GLVND)
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX.so ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX.so
# indirect rendering # indirect rendering
ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX_indirect.so.0 ln -sf /usr/lib/libGL_nvidia-legacy.so.1 /var/lib/libGLX_indirect.so.0
XORG_ARGS="${XORG_ARGS} -ignoreABI" XORG_ARGS="${XORG_ARGS} -ignoreABI"
# Used for AMD & Intel GPUs supported by MESA 3D # Used for AMD & Intel GPUs supported by MESA 3D
else else
ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
# GL/GLX (GLVND) # GL/GLX (GLVND)
ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so ln -sf /usr/lib/libGL_glvnd.so.1 /var/lib/libGL.so
ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so ln -sf /usr/lib/libGLX_glvnd.so.0 /var/lib/libGLX.so
# indirect rendering # indirect rendering
ln -sf /usr/lib/libGLX_mesa.so.0 /var/lib/libGLX_indirect.so.0 ln -sf /usr/lib/libGLX_mesa.so.0 /var/lib/libGLX_indirect.so.0
fi fi
################################################################################ ################################################################################
# setup xorg-settings.conf # setup xorg-settings.conf
################################################################################ ################################################################################
logger -t Xorg "### starting Xorg with '${DISPLAY} vt01 ${XORG_ARGS}' ###" logger -t Xorg "### starting Xorg with '${DISPLAY} vt01 ${XORG_ARGS}' ###"
mkdir -p /run/libreelec mkdir -p /run/libreelec
echo "XORG_ARGS=\"${XORG_ARGS}\"" > /run/libreelec/xorg-settings.conf echo "XORG_ARGS=\"${XORG_ARGS}\"" >/run/libreelec/xorg-settings.conf

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -5,8 +5,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
if [ -f /sys/class/thermal/thermal_zone1/temp ]; then if [ -f /sys/class/thermal/thermal_zone1/temp ]; then
TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)"
else else
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
fi fi
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -5,7 +5,7 @@
# detect legacy kernel installs and abort to prevent upgrades # detect legacy kernel installs and abort to prevent upgrades
case $(uname -r) in case $(uname -r) in
3.14*|4.9*) 3.14* | 4.9*)
echo "Updates from Amlogic vendor kernels are not supported!" echo "Updates from Amlogic vendor kernels are not supported!"
sleep 10 sleep 10
exit 1 exit 1

View File

@ -8,56 +8,56 @@
[ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '}) [ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '})
# identify the boot device # identify the boot device
if [ -z "$BOOT_DISK" ]; then if [ -z "$BOOT_DISK" ]; then
case $BOOT_PART in case $BOOT_PART in
/dev/sd[a-z][0-9]*) /dev/sd[a-z][0-9]*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g")
;; ;;
/dev/mmcblk*) /dev/mmcblk*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g")
;; ;;
esac esac
fi fi
# mount $BOOT_ROOT rw # mount $BOOT_ROOT rw
mount -o remount,rw $BOOT_ROOT mount -o remount,rw $BOOT_ROOT
# update /amlogic device trees # update /amlogic device trees
if [ -d $BOOT_ROOT/amlogic ]; then if [ -d $BOOT_ROOT/amlogic ]; then
for dtbfile in $BOOT_ROOT/amlogic/*.dtb ; do for dtbfile in $BOOT_ROOT/amlogic/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/amlogic/ 2>/dev/null || true
done done
fi fi
# update /extlinux device trees # update /extlinux device trees
if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then
for dtbfile in $BOOT_ROOT/*.dtb ; do for dtbfile in $BOOT_ROOT/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true
done done
fi fi
# update /dtb device trees # update /dtb device trees
if [ -d $BOOT_ROOT/dtb ]; then if [ -d $BOOT_ROOT/dtb ]; then
for dtbfile in $BOOT_ROOT/dtb/*.dtb ; do for dtbfile in $BOOT_ROOT/dtb/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/dtb/ 2>/dev/null || true
done done
fi fi
# update u-boot scripts # update u-boot scripts
if [ -f $BOOT_ROOT/uEnv.ini ]; then if [ -f $BOOT_ROOT/uEnv.ini ]; then
for scriptfile in $SYSTEM_ROOT/usr/share/bootloader/*_autoscript* $SYSTEM_ROOT/usr/share/bootloader/*.scr ; do for scriptfile in $SYSTEM_ROOT/usr/share/bootloader/*_autoscript* $SYSTEM_ROOT/usr/share/bootloader/*.scr; do
script=$(basename $scriptfile) script=$(basename $scriptfile)
echo "Updating $script" echo "Updating $script"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$script $BOOT_ROOT/ 2>/dev/null || true
done done
fi fi
# mount $BOOT_ROOT ro # mount $BOOT_ROOT ro
sync sync
mount -o remount,ro $BOOT_ROOT mount -o remount,ro $BOOT_ROOT

View File

@ -4,7 +4,7 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
case $(dtsoc) in case $(dtsoc) in
amlogic,g12*|amlogic,sm1) amlogic,g12* | amlogic,sm1)
TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone1/temp) TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone1/temp)
;; ;;
*) *)
@ -12,5 +12,5 @@ case $(dtsoc) in
;; ;;
esac esac
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
echo "${TEMP} C" echo "${TEMP} C"

View File

@ -8,16 +8,16 @@ SYS_CPUFREQ_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then
for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do
echo 1 > "${io_is_busy}" echo 1 >"${io_is_busy}"
done done
for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do
echo 50 > "${up_threshold}" echo 50 >"${up_threshold}"
done done
for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do
echo 100000 > "${sampling_rate}" echo 100000 >"${sampling_rate}"
done done
for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do
echo 50 > "${sampling_down_factor}" echo 50 >"${sampling_down_factor}"
done done
else else
echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info

View File

@ -2,14 +2,15 @@
FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')" FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')"
if [ "$FB_TYPE" == "inteldrmfb" ] || echo "$FB_TYPE" | grep -q "^i9[0-9]*drmfb$"; then if [ "$FB_TYPE" == "inteldrmfb" ] || echo "$FB_TYPE" | grep -q "^i9[0-9]*drmfb$"; then
OUTPUT=`/usr/bin/xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q'` OUTPUT=$(/usr/bin/xrandr -display :0 -q | sed '/ connected/!d;s/ .*//;q')
for out in $OUTPUT ; do for out in $OUTPUT; do
# Hack - something is not yet fully right # Hack - something is not yet fully right
/usr/bin/xrandr -display :0 --output $out --set "Broadcast RGB" "Full" /usr/bin/xrandr -display :0 --output $out --set "Broadcast RGB" "Full"
# Seems there is a little race somewhere on some outputs # Seems there is a little race somewhere on some outputs
# Turn the display shortly off and on again # Turn the display shortly off and on again
if [ -e "/storage/.config/forcedisplay" ]; then if [ -e "/storage/.config/forcedisplay" ]; then
/usr/bin/xrandr -display :0 --output $out --off ; /usr/bin/xrandr -display :0 --output $out --auto /usr/bin/xrandr -display :0 --output $out --off
/usr/bin/xrandr -display :0 --output $out --auto
fi fi
done done
fi fi

View File

@ -16,16 +16,16 @@ if [ $(basename "$0") = "gputemp" -o "$1" = "gpu" ]; then
for hwmon in /sys/class/hwmon/*; do for hwmon in /sys/class/hwmon/*; do
if [ -f "${hwmon}/name" ]; then if [ -f "${hwmon}/name" ]; then
case $(cat ${hwmon}/name) in case $(cat ${hwmon}/name) in
nouveau|radeon|amdgpu) nouveau | radeon | amdgpu)
[[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break [[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break
[[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break [[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break
;; ;;
# intel gpu is supported by cpu coretemp below # intel gpu is supported by cpu coretemp below
esac esac
fi fi
done done
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
fi fi
fi fi
@ -34,7 +34,7 @@ if [ "$1" = "cpu" -o "$TEMP" = "0" ]; then
for hwmon in /sys/class/hwmon/*; do for hwmon in /sys/class/hwmon/*; do
if [ -f "${hwmon}/name" ]; then if [ -f "${hwmon}/name" ]; then
case $(cat ${hwmon}/name) in case $(cat ${hwmon}/name) in
coretemp|k10temp|scpi_sensors) coretemp | k10temp | scpi_sensors)
[[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break [[ -f "${hwmon}/temp1_input" ]] && TEMP="$(cat ${hwmon}/temp1_input)" && break
[[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break [[ -f "${hwmon}/temp2_input" ]] && TEMP="$(cat ${hwmon}/temp2_input)" && break
;; ;;
@ -46,7 +46,7 @@ if [ "$1" = "cpu" -o "$TEMP" = "0" ]; then
TEMP="$(cat /sys/class/hwmon/hwmon0/device/temp1_input)" TEMP="$(cat /sys/class/hwmon/hwmon0/device/temp1_input)"
fi fi
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
fi fi
echo "${TEMP} C" echo "${TEMP} C"

View File

@ -13,105 +13,104 @@ USED_IFACES=""
function log function log
{ {
logger -t "${LOGGER_TAG}" "$@" logger -t "${LOGGER_TAG}" "$@"
} }
function logerr function logerr
{ {
logger -t "${LOGGER_TAG}" -p "err" "$@" logger -t "${LOGGER_TAG}" -p "err" "$@"
} }
# Select setup based on model # Select setup based on model
case "${MODEL}" in case "${MODEL}" in
"ZII RDU2+ Board" | "ZII RDU2 Board") "ZII RDU2+ Board" | "ZII RDU2 Board")
log "Loading RDU2 networking setup..." log "Loading RDU2 networking setup..."
IP_IFACE="eth1" IP_IFACE="eth1"
BR_NAME="br0" BR_NAME="br0"
BR_IFACES="netaux netleft netright gigabit_proc" BR_IFACES="netaux netleft netright gigabit_proc"
ALL_IFACES="eth0 ${IP_IFACE} ${BR_IFACES} ${BR_NAME}" ALL_IFACES="eth0 ${IP_IFACE} ${BR_IFACES} ${BR_NAME}"
;; ;;
"ZII RDU1 Board") "ZII RDU1 Board")
log "Loading RDU1 networking setup..." log "Loading RDU1 networking setup..."
IP_IFACE="br0" IP_IFACE="br0"
BR_NAME="br0" BR_NAME="br0"
BR_IFACES="netaux netleft netright" BR_IFACES="netaux netleft netright"
ALL_IFACES="eth0 ${BR_NAME} ${BR_IFACES}" ALL_IFACES="eth0 ${BR_NAME} ${BR_IFACES}"
;; ;;
*) *)
logerr "invalid hardware model detected: ${MODEL}" logerr "invalid hardware model detected: ${MODEL}"
exit 1 exit 1
;; ;;
esac esac
case "${ACTION}" in case "${ACTION}" in
"start") "start")
# Assume RDU network is already started if the bridge is available # Assume RDU network is already started if the bridge is available
if [ -d /sys/class/net/${BR_NAME} ]; then if [ -d /sys/class/net/${BR_NAME} ]; then
log "Networking setup is already started" log "Networking setup is already started"
exit 0 exit 0
fi fi
# Cleanup all addresses from all interfaces and bring them down # Cleanup all addresses from all interfaces and bring them down
log "Resetting interfaces..." log "Resetting interfaces..."
for IFACE in ${ALL_IFACES}; do for IFACE in ${ALL_IFACES}; do
log " Resetting ${IFACE}..." log " Resetting ${IFACE}..."
ip addr flush dev ${IFACE} >/dev/null 2>&1 ip addr flush dev ${IFACE} >/dev/null 2>&1
ip link set dev ${IFACE} down >/dev/null 2>&1 ip link set dev ${IFACE} down >/dev/null 2>&1
done done
# Create bridge with all interfaces # Create bridge with all interfaces
log "Creating bridge interface..." log "Creating bridge interface..."
brctl addbr ${BR_NAME} >/dev/null 2>&1 brctl addbr ${BR_NAME} >/dev/null 2>&1
for IFACE in ${BR_IFACES}; do for IFACE in ${BR_IFACES}; do
log " Adding ${IFACE} to bridge..." log " Adding ${IFACE} to bridge..."
brctl addif ${BR_NAME} ${IFACE} >/dev/null 2>&1 brctl addif ${BR_NAME} ${IFACE} >/dev/null 2>&1
done done
# Bring all bridge interfaces and the bridge itself up # Bring all bridge interfaces and the bridge itself up
log "Bringing up all interfaces..." log "Bringing up all interfaces..."
for IFACE in ${ALL_IFACES}; do for IFACE in ${ALL_IFACES}; do
log " Bringing up ${IFACE}..." log " Bringing up ${IFACE}..."
ip link set dev ${IFACE} up >/dev/null 2>&1 ip link set dev ${IFACE} up >/dev/null 2>&1
done done
# All done # All done
log "RDU networking started" log "RDU networking started"
exit 0 exit 0
;; ;;
"stop") "stop")
# Assume RDU network is already stopped if the bridge is available # Assume RDU network is already stopped if the bridge is available
if [ ! -d /sys/class/net/${BR_NAME} ]; then if [ ! -d /sys/class/net/${BR_NAME} ]; then
log "Networking setup is already stopped" log "Networking setup is already stopped"
exit 0 exit 0
fi fi
# Cleanup all addresses from all interfaces and bring them down # Cleanup all addresses from all interfaces and bring them down
log "Resetting interfaces..." log "Resetting interfaces..."
for IFACE in ${ALL_IFACES}; do for IFACE in ${ALL_IFACES}; do
ip addr flush dev ${IFACE} >/dev/null 2>&1 ip addr flush dev ${IFACE} >/dev/null 2>&1
ip link set dev ${IFACE} down >/dev/null 2>&1 ip link set dev ${IFACE} down >/dev/null 2>&1
done done
# Remove bridge interfaces and bridge itself # Remove bridge interfaces and bridge itself
log "Removing bridge interface..." log "Removing bridge interface..."
for IFACE in ${BR_IFACES}; do for IFACE in ${BR_IFACES}; do
brctl delif ${BR_NAME} ${IFACE} >/dev/null 2>&1 brctl delif ${BR_NAME} ${IFACE} >/dev/null 2>&1
done done
brctl delbr ${BR_NAME} >/dev/null 2>&1 brctl delbr ${BR_NAME} >/dev/null 2>&1
# All done # All done
log "RDU networking stopped" log "RDU networking stopped"
exit 0 exit 0
;; ;;
*) *)
logerr "invalid action requested: ${ACTION}" logerr "invalid action requested: ${ACTION}"
exit 2 exit 2
;; ;;
esac esac

View File

@ -4,4 +4,4 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -4,4 +4,4 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -16,17 +16,17 @@ if [ -z "$BOOT_DISK" ]; then
fi fi
# mount $BOOT_ROOT r/w # mount $BOOT_ROOT r/w
mount -o remount,rw $BOOT_ROOT mount -o remount,rw $BOOT_ROOT
# update Device Tree Blobs # update Device Tree Blobs
for all_dtb in /flash/*.dtb; do for all_dtb in /flash/*.dtb; do
dtb=$(basename $all_dtb) dtb=$(basename $all_dtb)
if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
echo "*** updating Device Tree Blob: $dtb ..." echo "*** updating Device Tree Blob: $dtb ..."
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT
fi fi
done done
# mount $BOOT_ROOT r/o # mount $BOOT_ROOT r/o
sync sync
mount -o remount,ro $BOOT_ROOT mount -o remount,ro $BOOT_ROOT

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -4,15 +4,15 @@
# Copyright (C) 2009-2015 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2015 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
SYS_CPUFREQ_GOV=$( cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ) SYS_CPUFREQ_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
SYS_ONDEMAND_DIR="/sys/devices/system/cpu/cpufreq/ondemand/" SYS_ONDEMAND_DIR="/sys/devices/system/cpu/cpufreq/ondemand/"
# Configure frequency scaling properties # Configure frequency scaling properties
if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then
echo 1 > "${SYS_ONDEMAND_DIR}/io_is_busy" echo 1 >"${SYS_ONDEMAND_DIR}/io_is_busy"
echo 50 > "${SYS_ONDEMAND_DIR}/up_threshold" echo 50 >"${SYS_ONDEMAND_DIR}/up_threshold"
echo 100000 > "${SYS_ONDEMAND_DIR}/sampling_rate" echo 100000 >"${SYS_ONDEMAND_DIR}/sampling_rate"
echo 50 > "${SYS_ONDEMAND_DIR}/sampling_down_factor" echo 50 >"${SYS_ONDEMAND_DIR}/sampling_down_factor"
else else
echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info
fi fi

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone1/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -5,4 +5,4 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)" TEMP="$(cat /sys/class/thermal/thermal_zone0/temp)"
echo "$(( $TEMP / 1000 )) C" echo "$(($TEMP / 1000)) C"

View File

@ -8,16 +8,16 @@ SYS_CPUFREQ_GOV=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then if [ "${SYS_CPUFREQ_GOV}" = "ondemand" ]; then
for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do for io_is_busy in $(find /sys/devices/system/cpu -name io_is_busy); do
echo 1 > "${io_is_busy}" echo 1 >"${io_is_busy}"
done done
for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do for up_threshold in $(find /sys/devices/system/cpu -name up_threshold); do
echo 50 > "${up_threshold}" echo 50 >"${up_threshold}"
done done
for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do for sampling_rate in $(find /sys/devices/system/cpu -name sampling_rate); do
echo 100000 > "${sampling_rate}" echo 100000 >"${sampling_rate}"
done done
for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do for sampling_down_factor in $(find /sys/devices/system/cpu -name sampling_down_factor); do
echo 50 > "${sampling_down_factor}" echo 50 >"${sampling_down_factor}"
done done
else else
echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info echo "cpufreq: settings not found for current cpu governor." | systemd-cat -p info

View File

@ -8,29 +8,29 @@
[ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '}) [ -z "$BOOT_PART" ] && BOOT_PART=$(df "$BOOT_ROOT" | tail -1 | awk {' print $1 '})
# identify the boot device # identify the boot device
if [ -z "$BOOT_DISK" ]; then if [ -z "$BOOT_DISK" ]; then
case $BOOT_PART in case $BOOT_PART in
/dev/sd[a-z][0-9]*) /dev/sd[a-z][0-9]*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,[0-9]*,,g")
;; ;;
/dev/mmcblk*) /dev/mmcblk*)
BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g") BOOT_DISK=$(echo $BOOT_PART | sed -e "s,p[0-9]*,,g")
;; ;;
esac esac
fi fi
# mount $BOOT_ROOT rw # mount $BOOT_ROOT rw
mount -o remount,rw $BOOT_ROOT mount -o remount,rw $BOOT_ROOT
# update extlinux device trees # update extlinux device trees
if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then if [ -f $BOOT_ROOT/extlinux/extlinux.conf ]; then
for dtbfile in $BOOT_ROOT/*.dtb ; do for dtbfile in $BOOT_ROOT/*.dtb; do
dtb=$(basename $dtbfile) dtb=$(basename $dtbfile)
echo "Updating $dtb" echo "Updating $dtb"
cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true
done done
fi fi
# mount $BOOT_ROOT ro # mount $BOOT_ROOT ro
sync sync
mount -o remount,ro $BOOT_ROOT mount -o remount,ro $BOOT_ROOT

View File

@ -5,5 +5,5 @@
# XU4 has 5x sensors so read them all and report the highest value # XU4 has 5x sensors so read them all and report the highest value
TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone*/temp | sort -n | tail -1) TEMP=$(cat /sys/devices/virtual/thermal/thermal_zone*/temp | sort -n | tail -1)
TEMP="$(( $TEMP / 1000 ))" TEMP="$(($TEMP / 1000))"
echo "${TEMP} C" echo "${TEMP} C"

View File

@ -9,7 +9,7 @@
RECONF_DIR="${3}" RECONF_DIR="${3}"
if [ ! -f "${RECONF_DIR}/configure.in" \ if [ ! -f "${RECONF_DIR}/configure.in" \
-a ! -f "${RECONF_DIR}/configure.ac" ]; then -a ! -f "${RECONF_DIR}/configure.ac" ]; then
die "configure.in or configure.ac not found" die "configure.in or configure.ac not found"
fi fi

View File

@ -60,10 +60,18 @@ ${SCRIPTS}/unpack "${PKG_NAME}" "${PARENT_PKG}"
# build dependencies, only when PKG_DEPENDS_? is filled # build dependencies, only when PKG_DEPENDS_? is filled
unset _pkg_depends unset _pkg_depends
case "${TARGET}" in case "${TARGET}" in
"target") _pkg_depends="${PKG_DEPENDS_TARGET}";; "target")
"host") _pkg_depends="${PKG_DEPENDS_HOST}";; _pkg_depends="${PKG_DEPENDS_TARGET}"
"init") _pkg_depends="${PKG_DEPENDS_INIT}";; ;;
"bootstrap") _pkg_depends="${PKG_DEPENDS_BOOTSTRAP}";; "host")
_pkg_depends="${PKG_DEPENDS_HOST}"
;;
"init")
_pkg_depends="${PKG_DEPENDS_INIT}"
;;
"bootstrap")
_pkg_depends="${PKG_DEPENDS_BOOTSTRAP}"
;;
esac esac
if is_sequential_build; then if is_sequential_build; then
@ -76,7 +84,7 @@ fi
if [ "${PKG_SECTION}" = "virtual" ]; then if [ "${PKG_SECTION}" = "virtual" ]; then
PKG_DEEPHASH=$(calculate_stamp) PKG_DEEPHASH=$(calculate_stamp)
for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
echo "STAMP_${i}=\"${!i}\"" >> ${STAMP} echo "STAMP_${i}=\"${!i}\"" >>${STAMP}
done done
pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "built" pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "built"
@ -171,7 +179,6 @@ if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then
TARGET_MESON_OPTS+=" -Dstrip=true" TARGET_MESON_OPTS+=" -Dstrip=true"
fi fi
# configure HOST build defaults # configure HOST build defaults
HOST_CONFIGURE_OPTS="--host=${HOST_NAME} \ HOST_CONFIGURE_OPTS="--host=${HOST_NAME} \
--build=${HOST_NAME} \ --build=${HOST_NAME} \
@ -227,9 +234,15 @@ cd "${PKG_BUILD}"
if [ -f "${PKG_CONFIGURE_SCRIPT}" -o -f "${PKG_CMAKE_SCRIPT}" -o -f "${PKG_MESON_SCRIPT}" ]; then if [ -f "${PKG_CONFIGURE_SCRIPT}" -o -f "${PKG_CMAKE_SCRIPT}" -o -f "${PKG_MESON_SCRIPT}" ]; then
case "${TARGET}" in case "${TARGET}" in
"target") PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}" ;; "target")
"host") PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}" ;; PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}"
"init") PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}-${TARGET}" ;; ;;
"host")
PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}"
;;
"init")
PKG_REAL_BUILD="${PKG_BUILD}/.${TARGET_NAME}-${TARGET}"
;;
"bootstrap") PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}-${TARGET}" ;; "bootstrap") PKG_REAL_BUILD="${PKG_BUILD}/.${HOST_NAME}-${TARGET}" ;;
esac esac
mkdir -p "${PKG_REAL_BUILD}" mkdir -p "${PKG_REAL_BUILD}"
@ -241,13 +254,13 @@ fi
# create wrapper scripts in build dir and use them for CC/CXX when # create wrapper scripts in build dir and use them for CC/CXX when
# building for host and local-cc build flag is set # building for host and local-cc build flag is set
if [ "${TARGET}" = "host" ] && flag_enabled "local-cc" "no"; then if [ "${TARGET}" = "host" ] && flag_enabled "local-cc" "no"; then
cat > libreelec-local-cc << EOF cat >libreelec-local-cc <<EOF
#!/bin/sh #!/bin/sh
exec ${CC} "\$@" exec ${CC} "\$@"
EOF EOF
chmod +x libreelec-local-cc chmod +x libreelec-local-cc
export CC=$(pwd)/libreelec-local-cc export CC=$(pwd)/libreelec-local-cc
cat > libreelec-local-cxx << EOF cat >libreelec-local-cxx <<EOF
#!/bin/sh #!/bin/sh
exec ${CXX} "\$@" exec ${CXX} "\$@"
EOF EOF
@ -338,19 +351,19 @@ else
;; ;;
# configure builds # configure builds
"configure:target"|"autotools:target") "configure:target" | "autotools:target")
echo "Executing (target): ${PKG_CONFIGURE_SCRIPT} ${TARGET_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_TARGET}" | tr -s " " echo "Executing (target): ${PKG_CONFIGURE_SCRIPT} ${TARGET_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_TARGET}" | tr -s " "
${PKG_CONFIGURE_SCRIPT} ${TARGET_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_TARGET} ${PKG_CONFIGURE_SCRIPT} ${TARGET_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_TARGET}
;; ;;
"configure:host"|"autotools:host") "configure:host" | "autotools:host")
echo "Executing (host): ${PKG_CONFIGURE_SCRIPT} ${HOST_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_HOST}" | tr -s " " echo "Executing (host): ${PKG_CONFIGURE_SCRIPT} ${HOST_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_HOST}" | tr -s " "
${PKG_CONFIGURE_SCRIPT} ${HOST_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_HOST} ${PKG_CONFIGURE_SCRIPT} ${HOST_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_HOST}
;; ;;
"configure:init"|"autotools:init") "configure:init" | "autotools:init")
echo "Executing (init): ${PKG_CONFIGURE_SCRIPT} ${INIT_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_INIT}" | tr -s " " echo "Executing (init): ${PKG_CONFIGURE_SCRIPT} ${INIT_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_INIT}" | tr -s " "
${PKG_CONFIGURE_SCRIPT} ${INIT_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_INIT} ${PKG_CONFIGURE_SCRIPT} ${INIT_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_INIT}
;; ;;
"configure:bootstrap"|"autotools:bootstrap") "configure:bootstrap" | "autotools:bootstrap")
echo "Executing (bootstrap): ${PKG_CONFIGURE_SCRIPT} ${BOOTSTRAP_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_BOOTSTRAP}" | tr -s " " echo "Executing (bootstrap): ${PKG_CONFIGURE_SCRIPT} ${BOOTSTRAP_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_BOOTSTRAP}" | tr -s " "
${PKG_CONFIGURE_SCRIPT} ${BOOTSTRAP_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_BOOTSTRAP} ${PKG_CONFIGURE_SCRIPT} ${BOOTSTRAP_CONFIGURE_OPTS} ${PKG_CONFIGURE_OPTS_BOOTSTRAP}
;; ;;
@ -369,37 +382,37 @@ if pkg_call_exists make_${TARGET}; then
else else
case "${PKG_TOOLCHAIN}:${TARGET}" in case "${PKG_TOOLCHAIN}:${TARGET}" in
# ninja based builds # ninja based builds
"meson:target"|"cmake:target"|"ninja:target") "meson:target" | "cmake:target" | "ninja:target")
echo "Executing (target): ninja ${PKG_MAKE_OPTS_TARGET}" | tr -s " " echo "Executing (target): ninja ${PKG_MAKE_OPTS_TARGET}" | tr -s " "
ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_TARGET} ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_TARGET}
;; ;;
"meson:host"|"cmake:host"|"ninja:host") "meson:host" | "cmake:host" | "ninja:host")
echo "Executing (host): ninja ${PKG_MAKE_OPTS_HOST}" | tr -s " " echo "Executing (host): ninja ${PKG_MAKE_OPTS_HOST}" | tr -s " "
ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_HOST} ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_HOST}
;; ;;
"meson:init"|"cmake:init"|"ninja:init") "meson:init" | "cmake:init" | "ninja:init")
echo "Executing (init): ninja ${PKG_MAKE_OPTS_INIT}" | tr -s " " echo "Executing (init): ninja ${PKG_MAKE_OPTS_INIT}" | tr -s " "
ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_INIT} ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_INIT}
;; ;;
"meson:bootstrap"|"cmake:bootstrap"|"ninja:bootstrap") "meson:bootstrap" | "cmake:bootstrap" | "ninja:bootstrap")
echo "Executing (bootstrap): ninja ${PKG_MAKE_OPTS_BOOTSTRAP}" | tr -s " " echo "Executing (bootstrap): ninja ${PKG_MAKE_OPTS_BOOTSTRAP}" | tr -s " "
ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_BOOTSTRAP} ninja ${NINJA_OPTS} ${PKG_MAKE_OPTS_BOOTSTRAP}
;; ;;
# make based builds # make based builds
"configure:target"|"cmake-make:target"|"autotools:target"|"make:target") "configure:target" | "cmake-make:target" | "autotools:target" | "make:target")
echo "Executing (target): make ${PKG_MAKE_OPTS_TARGET}" | tr -s " " echo "Executing (target): make ${PKG_MAKE_OPTS_TARGET}" | tr -s " "
make ${PKG_MAKE_OPTS_TARGET} make ${PKG_MAKE_OPTS_TARGET}
;; ;;
"configure:host"|"cmake-make:host"|"autotools:host"|"make:host") "configure:host" | "cmake-make:host" | "autotools:host" | "make:host")
echo "Executing (host): make ${PKG_MAKE_OPTS_HOST}" | tr -s " " echo "Executing (host): make ${PKG_MAKE_OPTS_HOST}" | tr -s " "
make ${PKG_MAKE_OPTS_HOST} make ${PKG_MAKE_OPTS_HOST}
;; ;;
"configure:init"|"cmake-make:init"|"autotools:init"|"make:init") "configure:init" | "cmake-make:init" | "autotools:init" | "make:init")
echo "Executing (init): make ${PKG_MAKE_OPTS_INIT}" | tr -s " " echo "Executing (init): make ${PKG_MAKE_OPTS_INIT}" | tr -s " "
make ${PKG_MAKE_OPTS_INIT} make ${PKG_MAKE_OPTS_INIT}
;; ;;
"configure:bootstrap"|"cmake-make:bootstrap"|"autotools:bootstrap"|"make:bootstrap") "configure:bootstrap" | "cmake-make:bootstrap" | "autotools:bootstrap" | "make:bootstrap")
echo "Executing (bootstrap): make ${PKG_MAKE_OPTS_BOOTSTRAP}" | tr -s " " echo "Executing (bootstrap): make ${PKG_MAKE_OPTS_BOOTSTRAP}" | tr -s " "
make ${PKG_MAKE_OPTS_BOOTSTRAP} make ${PKG_MAKE_OPTS_BOOTSTRAP}
;; ;;
@ -432,34 +445,34 @@ else
case "${PKG_TOOLCHAIN}:${TARGET}" in case "${PKG_TOOLCHAIN}:${TARGET}" in
# ninja based builds # ninja based builds
"meson:target"|"cmake:target") "meson:target" | "cmake:target")
[ "${INSTALL_TO_SYSROOT}" = "yes" ] && \ [ "${INSTALL_TO_SYSROOT}" = "yes" ] &&
DESTDIR=${SYSROOT_PREFIX} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET} DESTDIR=${SYSROOT_PREFIX} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET}
DESTDIR=${INSTALL} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET} DESTDIR=${INSTALL} ninja install ${PKG_MAKEINSTALL_OPTS_TARGET}
;; ;;
"meson:host"|"cmake:host") "meson:host" | "cmake:host")
ninja install ${PKG_MAKEINSTALL_OPTS_HOST} ninja install ${PKG_MAKEINSTALL_OPTS_HOST}
;; ;;
"meson:init"|"cmake:init") "meson:init" | "cmake:init")
DESTDIR=${INSTALL} ninja install ${PKG_MAKEINSTALL_OPTS_INIT} DESTDIR=${INSTALL} ninja install ${PKG_MAKEINSTALL_OPTS_INIT}
;; ;;
"meson:bootstrap"|"cmake:bootstrap") "meson:bootstrap" | "cmake:bootstrap")
ninja install ${PKG_MAKEINSTALL_OPTS_BOOTSTRAP} ninja install ${PKG_MAKEINSTALL_OPTS_BOOTSTRAP}
;; ;;
# make based builds # make based builds
"configure:target"|"cmake-make:target"|"autotools:target"|"make:target") "configure:target" | "cmake-make:target" | "autotools:target" | "make:target")
[ "${INSTALL_TO_SYSROOT}" = "yes" ] && \ [ "${INSTALL_TO_SYSROOT}" = "yes" ] &&
make install DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET} make install DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET}
make install DESTDIR=${INSTALL} ${PKG_MAKEINSTALL_OPTS_TARGET} make install DESTDIR=${INSTALL} ${PKG_MAKEINSTALL_OPTS_TARGET}
;; ;;
"configure:host"|"cmake-make:host"|"autotools:host"|"make:host") "configure:host" | "cmake-make:host" | "autotools:host" | "make:host")
make install ${PKG_MAKEINSTALL_OPTS_HOST} make install ${PKG_MAKEINSTALL_OPTS_HOST}
;; ;;
"configure:init"|"cmake-make:init"|"autotools:init"|"make:init") "configure:init" | "cmake-make:init" | "autotools:init" | "make:init")
make install DESTDIR=${INSTALL} ${PKG_MAKEINSTALL_OPTS_INIT} make install DESTDIR=${INSTALL} ${PKG_MAKEINSTALL_OPTS_INIT}
;; ;;
"configure:bootstrap"|"cmake-make:bootstrap"|"autotools:bootstrap"|"make:bootstrap") "configure:bootstrap" | "cmake-make:bootstrap" | "autotools:bootstrap" | "make:bootstrap")
make install ${PKG_MAKEINSTALL_OPTS_BOOTSTRAP} make install ${PKG_MAKEINSTALL_OPTS_BOOTSTRAP}
;; ;;
esac esac
@ -516,10 +529,10 @@ if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then
rm -rf ${INSTALL}/{usr/local/,usr/,}share/zsh rm -rf ${INSTALL}/{usr/local/,usr/,}share/zsh
rm -rf ${INSTALL}/{usr/local/,usr/,}var rm -rf ${INSTALL}/{usr/local/,usr/,}var
find ${INSTALL} \( -name "*.orig" \ find ${INSTALL} \( -name "*.orig" \
-o -name "*.rej" \ -o -name "*.rej" \
-o -name "*.in" \ -o -name "*.in" \
-o -name ".git*" \) \ -o -name ".git*" \) \
-exec rm -f {} \; 2>/dev/null || : -exec rm -f {} \; 2>/dev/null || :
find ${INSTALL} -type d -exec rmdir -p {} \; 2>/dev/null || : find ${INSTALL} -type d -exec rmdir -p {} \; 2>/dev/null || :
python_fix_abi "${INSTALL}" python_fix_abi "${INSTALL}"
@ -532,24 +545,24 @@ if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then
! -name "libpthread-*.so" \ ! -name "libpthread-*.so" \
! -name "libthread_db-*so" \ ! -name "libthread_db-*so" \
2>/dev/null) 2>/dev/null || : 2>/dev/null) 2>/dev/null || :
if [ "${TARGET}" = "init" ]; then if [ "${TARGET}" = "init" ]; then
${STRIP} $(find ${INSTALL} -type f -name "*.so*" 2>/dev/null) 2>/dev/null || : ${STRIP} $(find ${INSTALL} -type f -name "*.so*" 2>/dev/null) 2>/dev/null || :
fi fi
${STRIP} $(find ${INSTALL} ! -name "*.so*" ! -name "*.ko" \ ${STRIP} $(find ${INSTALL} ! -name "*.so*" ! -name "*.ko" \
-type f -executable 2>/dev/null) 2>/dev/null || : -type f -executable 2>/dev/null) 2>/dev/null || :
fi fi
fi fi
fi fi
if [ -n "${INSTALL}" -a -d "${INSTALL}" ]; then if [ -n "${INSTALL}" -a -d "${INSTALL}" ]; then
echo "INFO_PKG_NAME=\"${PKG_NAME}\"" > "${INSTALL}/.libreelec-package" echo "INFO_PKG_NAME=\"${PKG_NAME}\"" >"${INSTALL}/.libreelec-package"
fi fi
cd ${ROOT} cd ${ROOT}
PKG_DEEPHASH=$(calculate_stamp) PKG_DEEPHASH=$(calculate_stamp)
for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do for i in PKG_NAME PKG_DEEPHASH BUILD_WITH_DEBUG; do
echo "STAMP_${i}=\"${!i}\"" >> ${STAMP} echo "STAMP_${i}=\"${!i}\"" >>${STAMP}
done done
pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "built" pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "build" "built"
@ -559,7 +572,7 @@ record_timestamp BUILD_END
if [ -n "${TRACE_BUILD_TIMING}" ]; then if [ -n "${TRACE_BUILD_TIMING}" ]; then
( (
print_color "CLR_AUTOREMOVE" "\nBuild timing details:" print_color "CLR_AUTOREMOVE" "\nBuild timing details:"
print_color "CLR_TARGET" "\n================================\n" print_color "CLR_TARGET" "\n================================\n"
show_timestamp_diff "unpack" BUILD_BEGIN BUILD_START show_timestamp_diff "unpack" BUILD_BEGIN BUILD_START
show_timestamp_diff "pre-build setup" BUILD_START BUILD_CONFIGURE show_timestamp_diff "pre-build setup" BUILD_START BUILD_CONFIGURE
show_timestamp_diff "configure" BUILD_CONFIGURE BUILD_MAKE show_timestamp_diff "configure" BUILD_CONFIGURE BUILD_MAKE
@ -567,7 +580,7 @@ if [ -n "${TRACE_BUILD_TIMING}" ]; then
show_timestamp_diff "make install" BUILD_MAKEINSTALL BUILD_COPY_SYSROOT show_timestamp_diff "make install" BUILD_MAKEINSTALL BUILD_COPY_SYSROOT
show_timestamp_diff "copy sysroot" BUILD_COPY_SYSROOT BUILD_CLEANUP_INSTALL show_timestamp_diff "copy sysroot" BUILD_COPY_SYSROOT BUILD_CLEANUP_INSTALL
show_timestamp_diff "cleanup install" BUILD_CLEANUP_INSTALL BUILD_END show_timestamp_diff "cleanup install" BUILD_CLEANUP_INSTALL BUILD_END
print_color "CLR_TARGET" "--------------------------------\n" print_color "CLR_TARGET" "--------------------------------\n"
show_timestamp_diff "total time" BUILD_BEGIN BUILD_END show_timestamp_diff "total time" BUILD_BEGIN BUILD_END
echo -e echo -e
) >&${VERBOSE_OUT} ) >&${VERBOSE_OUT}

View File

@ -10,7 +10,7 @@ ${SCRIPTS}/checkdeps
# Setup both toolchain cmake configs to avoid potentially racy behaviour later. # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
# Use a fork for host to isolate any variable modifications. # Use a fork for host to isolate any variable modifications.
( setup_toolchain host ) (setup_toolchain host)
setup_toolchain target setup_toolchain target
MTADDONBUILD=no start_multithread_build ${@} MTADDONBUILD=no start_multithread_build ${@}

View File

@ -16,8 +16,8 @@ clean_package() {
# Use a wildcard here to remove all versions of the package # Use a wildcard here to remove all versions of the package
for i in "${BUILD}/build/${1}-"* \ for i in "${BUILD}/build/${1}-"* \
"${BUILD}/install_pkg/${1}-"* \ "${BUILD}/install_pkg/${1}-"* \
"${BUILD}/install_init/${1}-"*; do "${BUILD}/install_init/${1}-"*; do
if [ -d "${i}" -a -f "${i}/.libreelec-unpack" ]; then if [ -d "${i}" -a -f "${i}/.libreelec-unpack" ]; then
. "${i}/.libreelec-unpack" . "${i}/.libreelec-unpack"
if [ "${STAMP_PKG_NAME}" = "${1}" ]; then if [ "${STAMP_PKG_NAME}" = "${1}" ]; then
@ -49,4 +49,3 @@ if [ "${1}" = "--all" -a -n "${2}" ]; then
elif [ -n "${1}" ]; then elif [ -n "${1}" ]; then
clean_package "${1}" clean_package "${1}"
fi fi

View File

@ -51,10 +51,19 @@ get_addons() {
local count=0 validpkg local count=0 validpkg
case ${1} in case ${1} in
binary) paths="^${ROOT}/packages/mediacenter/kodi-binary-addons/";; binary)
official) paths="^${ROOT}/packages/addons/";; paths="^${ROOT}/packages/mediacenter/kodi-binary-addons/"
all) paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/";; ;;
*) paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"; filter="${1}";; official)
paths="^${ROOT}/packages/addons/"
;;
all)
paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"
;;
*)
paths="^${ROOT}/packages/|^${ROOT}/projects/.*/packages/"
filter="${1}"
;;
esac esac
exit() { exited=1; } exit() { exited=1; }
@ -90,8 +99,8 @@ get_addons() {
unset -f exit unset -f exit
if [ ${count} -eq 0 -a -n "${filter}" ]; then if [ ${count} -eq 0 -a -n "${filter}" ]; then
echo "$(print_color CLR_ERROR "ERROR: no addons matched for filter ${filter}")" >&2 echo "$(print_color CLR_ERROR "ERROR: no addons matched for filter ${filter}")" >&2
echo "For more information type: ./scripts/create_addon --help" >&2 echo "For more information type: ./scripts/create_addon --help" >&2
die die
fi fi
} }
@ -110,13 +119,13 @@ verify_addon() {
VERIFY_FAIL="Incompatible project or device: \"${_DEVICE:-${PROJECT}}\" not in [ ${PKG_ADDON_PROJECTS} ]" VERIFY_FAIL="Incompatible project or device: \"${_DEVICE:-${PROJECT}}\" not in [ ${PKG_ADDON_PROJECTS} ]"
if listcontains "${PKG_ADDON_PROJECTS}" "!${_DEVICE:-${PROJECT}}" || if listcontains "${PKG_ADDON_PROJECTS}" "!${_DEVICE:-${PROJECT}}" ||
listcontains "${PKG_ADDON_PROJECTS}" "!${PROJECT}"; then listcontains "${PKG_ADDON_PROJECTS}" "!${PROJECT}"; then
return 1 return 1
fi fi
if ! listcontains "${PKG_ADDON_PROJECTS}" "${_DEVICE:-${PROJECT}}" && if ! listcontains "${PKG_ADDON_PROJECTS}" "${_DEVICE:-${PROJECT}}" &&
! listcontains "${PKG_ADDON_PROJECTS}" "${PROJECT}" && ! listcontains "${PKG_ADDON_PROJECTS}" "${PROJECT}" &&
! listcontains "${PKG_ADDON_PROJECTS}" "any"; then ! listcontains "${PKG_ADDON_PROJECTS}" "any"; then
return 1 return 1
fi fi
fi fi
@ -132,7 +141,7 @@ fi
# check environment and configure toolchains # check environment and configure toolchains
${SCRIPTS}/checkdeps ${SCRIPTS}/checkdeps
( setup_toolchain host ) (setup_toolchain host)
setup_toolchain target setup_toolchain target
# collect list of addons for building # collect list of addons for building
@ -143,11 +152,21 @@ show_only="no"
# read addons from parameter list # read addons from parameter list
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case ${1} in case ${1} in
--help) usage 0;; --help)
--show-only) show_only="yes";; usage 0
--*) usage 1;; ;;
-*) addons_drop+=" $(get_addons ${1:1})";; --show-only)
*) addons+=" $(get_addons ${1})";; show_only="yes"
;;
--*)
usage 1
;;
-*)
addons_drop+=" $(get_addons ${1:1})"
;;
*)
addons+=" $(get_addons ${1})"
;;
esac esac
shift shift
done done
@ -181,7 +200,7 @@ elif [ -f "${THREAD_CONTROL}/addons.failed" ]; then
echo " $(print_color CLR_ERROR "${addon}")" >&2 echo " $(print_color CLR_ERROR "${addon}")" >&2
fi fi
fi fi
done < "${THREAD_CONTROL}/addons.failed" done <"${THREAD_CONTROL}/addons.failed"
die die
else else
die "$(print_color CLR_ERROR "UNKNOWN BUILD FAILURE OR INABILITY TO GENERATE PLAN")" die "$(print_color CLR_ERROR "UNKNOWN BUILD FAILURE OR INABILITY TO GENERATE PLAN")"

View File

@ -63,7 +63,7 @@ case "${PKG_SOURCE_NAME}" in
unzip -o -q "${FULL_SOURCE_PATH}" -d "${2}" unzip -o -q "${FULL_SOURCE_PATH}" -d "${2}"
;; ;;
*.diff | *.patch) *.diff | *.patch)
patch -d "${2}" -p1 < "${FULL_SOURCE_PATH}" patch -d "${2}" -p1 <"${FULL_SOURCE_PATH}"
;; ;;
*.diff.bz2 | *.patch.bz2 | patch-*.bz2) *.diff.bz2 | *.patch.bz2 | patch-*.bz2)
bzcat "${FULL_SOURCE_PATH}" | patch -d "${2}" -p1 bzcat "${FULL_SOURCE_PATH}" | patch -d "${2}" -p1

View File

@ -31,12 +31,15 @@ if [ -n "${PKG_URL}" -a -n "${PKG_SOURCE_NAME}" ]; then
# determine get handler based on protocol and/or filename # determine get handler based on protocol and/or filename
case "${PKG_URL}" in case "${PKG_URL}" in
git://*|*.git) git://* | *.git)
get_handler="git";; get_handler="git"
;;
file://*) file://*)
get_handler="file";; get_handler="file"
;;
*) *)
get_handler="archive";; get_handler="archive"
;;
esac esac
if ! listcontains "${GET_HANDLER_SUPPORT}" "${get_handler}"; then if ! listcontains "${GET_HANDLER_SUPPORT}" "${get_handler}"; then

View File

@ -23,7 +23,7 @@ ${SCRIPTS}/checkdeps
# Setup both toolchain cmake configs to avoid potentially racy behaviour later. # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
# Use a fork for host to isolate any variable modifications. # Use a fork for host to isolate any variable modifications.
( setup_toolchain host ) (setup_toolchain host)
setup_toolchain target setup_toolchain target
show_config show_config
@ -68,11 +68,21 @@ if [ "${LIBREELEC_VERSION}" = "devel" ]; then
GIT_ABBREV=${GIT_HASH:0:7} GIT_ABBREV=${GIT_HASH:0:7}
DEVEL_VERSION=${LIBREELEC_VERSION} DEVEL_VERSION=${LIBREELEC_VERSION}
case "${BUILD_PERIODIC}" in case "${BUILD_PERIODIC}" in
nightly) LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV};; nightly)
daily) LIBREELEC_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV};; LIBREELEC_VERSION=nightly-$(date +%Y%m%d)-${GIT_ABBREV}
weekly) LIBREELEC_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV};; ;;
monthly) LIBREELEC_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV};; daily)
*) LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV};; LIBREELEC_VERSION=daily-$(date +%Y%j)-${GIT_ABBREV}
;;
weekly)
LIBREELEC_VERSION=weekly-$(date +%G%V)-${GIT_ABBREV}
;;
monthly)
LIBREELEC_VERSION=monthly-$(date +%Y%m)-${GIT_ABBREV}
;;
*)
LIBREELEC_VERSION=devel-$(date +%Y%m%d%H%M%S)-${GIT_ABBREV}
;;
esac esac
fi fi
@ -115,13 +125,13 @@ if [ -n "${IMAGE_SUFFIX}" ]; then
IMAGE_NAME="${IMAGE_NAME}-${IMAGE_SUFFIX}" IMAGE_NAME="${IMAGE_NAME}-${IMAGE_SUFFIX}"
fi fi
echo "${IMAGE_NAME}" > ${BUILD}/BUILD_FILENAME echo "${IMAGE_NAME}" >${BUILD}/BUILD_FILENAME
# Setup fakeroot # Setup fakeroot
rm -rf ${FAKEROOT_SCRIPT} # remove ${FAKEROOT_SCRIPT} if it exist rm -rf ${FAKEROOT_SCRIPT} # remove ${FAKEROOT_SCRIPT} if it exist
touch ${FAKEROOT_SCRIPT} # create an empty ${FAKEROOT_SCRIPT} touch ${FAKEROOT_SCRIPT} # create an empty ${FAKEROOT_SCRIPT}
chmod +x ${FAKEROOT_SCRIPT} # make ${FAKEROOT_SCRIPT} executable chmod +x ${FAKEROOT_SCRIPT} # make ${FAKEROOT_SCRIPT} executable
echo "chown -R 0:0 ${INSTALL}" >> ${FAKEROOT_SCRIPT} echo "chown -R 0:0 ${INSTALL}" >>${FAKEROOT_SCRIPT}
# Clean old install dirs # Clean old install dirs
rm -rf ${BUILD}/qa_checks/general rm -rf ${BUILD}/qa_checks/general
@ -151,7 +161,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ]; then
ln -sfn /usr/lib ${INSTALL}/usr/lib64 ln -sfn /usr/lib ${INSTALL}/usr/lib64
fi fi
echo "${TARGET_VERSION}" > ${INSTALL}/etc/release echo "${TARGET_VERSION}" >${INSTALL}/etc/release
# Create /etc/os-release # Create /etc/os-release
cat <<EOF >${INSTALL}/etc/os-release cat <<EOF >${INSTALL}/etc/os-release
@ -167,9 +177,9 @@ LIBREELEC_ARCH="${LIBREELEC_ARCH}"
LIBREELEC_BUILD="${LIBREELEC_BUILD}" LIBREELEC_BUILD="${LIBREELEC_BUILD}"
LIBREELEC_PROJECT="${PROJECT}" LIBREELEC_PROJECT="${PROJECT}"
EOF EOF
[ -n "${DEVICE}" ] && echo "LIBREELEC_DEVICE=\"${DEVICE}\"" >> ${INSTALL}/etc/os-release [ -n "${DEVICE}" ] && echo "LIBREELEC_DEVICE=\"${DEVICE}\"" >>${INSTALL}/etc/os-release
[ -n "${BUILDER_NAME}" ] && echo "BUILDER_NAME=\"${BUILDER_NAME}\"" >> ${INSTALL}/etc/os-release [ -n "${BUILDER_NAME}" ] && echo "BUILDER_NAME=\"${BUILDER_NAME}\"" >>${INSTALL}/etc/os-release
[ -n "${BUILDER_VERSION}" ] && echo "BUILDER_VERSION=\"${BUILDER_VERSION}\"" >> ${INSTALL}/etc/os-release [ -n "${BUILDER_VERSION}" ] && echo "BUILDER_VERSION=\"${BUILDER_VERSION}\"" >>${INSTALL}/etc/os-release
# Create /etc/issue # Create /etc/issue
cat <<EOF >${INSTALL}/etc/issue cat <<EOF >${INSTALL}/etc/issue
@ -208,16 +218,16 @@ fi
# Replace placeholders with values in install script to eMMC # Replace placeholders with values in install script to eMMC
if [ -f ${INSTALL}/usr/bin/install2emmc ]; then if [ -f ${INSTALL}/usr/bin/install2emmc ]; then
sed -e "s%@SYSTEM_SIZE@%${SYSTEM_SIZE}%g" \ sed -e "s%@SYSTEM_SIZE@%${SYSTEM_SIZE}%g" \
-i ${INSTALL}/usr/bin/install2emmc -i ${INSTALL}/usr/bin/install2emmc
sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \ sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \
-i ${INSTALL}/usr/bin/install2emmc -i ${INSTALL}/usr/bin/install2emmc
fi fi
# Run depmod for base overlay modules # Run depmod for base overlay modules
MODVER=$(basename $(ls -d ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/*)) MODVER=$(basename $(ls -d ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/*))
find ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/ -name *.ko | \ find ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/ -name *.ko |
sed -e "s,${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/,," \ sed -e "s,${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/,," \
> ${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/modules.order >${INSTALL}/usr/lib/kernel-overlays/base/lib/modules/${MODVER}/modules.order
${TOOLCHAIN}/bin/depmod -b ${INSTALL}/usr/lib/kernel-overlays/base -a -e -F "$(get_install_dir linux)/.image/System.map" ${MODVER} 2>&1 ${TOOLCHAIN}/bin/depmod -b ${INSTALL}/usr/lib/kernel-overlays/base -a -e -F "$(get_install_dir linux)/.image/System.map" ${MODVER} 2>&1
# Strip kernel modules # Strip kernel modules
@ -251,8 +261,8 @@ if [ -z "${SQUASHFS_COMPRESSION_OPTION}" ]; then
fi fi
# Create squashfs file, default to gzip if no compression configured # Create squashfs file, default to gzip if no compression configured
echo "rm -rf \"${TARGET_IMG}/${IMAGE_NAME}.system\"" >> ${FAKEROOT_SCRIPT} echo "rm -rf \"${TARGET_IMG}/${IMAGE_NAME}.system\"" >>${FAKEROOT_SCRIPT}
echo "${TOOLCHAIN}/bin/mksquashfs \"${BUILD}/image/system\" \"${TARGET_IMG}/${IMAGE_NAME}.system\" -noappend -comp ${SQUASHFS_COMPRESSION:-gzip} ${SQUASHFS_COMPRESSION_OPTION}" >> ${FAKEROOT_SCRIPT} echo "${TOOLCHAIN}/bin/mksquashfs \"${BUILD}/image/system\" \"${TARGET_IMG}/${IMAGE_NAME}.system\" -noappend -comp ${SQUASHFS_COMPRESSION:-gzip} ${SQUASHFS_COMPRESSION_OPTION}" >>${FAKEROOT_SCRIPT}
# Run fakeroot # Run fakeroot
${TOOLCHAIN}/bin/fakeroot -- ${FAKEROOT_SCRIPT} ${TOOLCHAIN}/bin/fakeroot -- ${FAKEROOT_SCRIPT}
@ -290,10 +300,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
cp ${ROOT}/README* ${RELEASE_DIR} cp ${ROOT}/README* ${RELEASE_DIR}
cp ${ROOT}/CHANGELOG* ${RELEASE_DIR} cp ${ROOT}/CHANGELOG* ${RELEASE_DIR}
echo "${TARGET_VERSION}" > ${RELEASE_DIR}/RELEASE echo "${TARGET_VERSION}" >${RELEASE_DIR}/RELEASE
if [ ! "${MEDIACENTER}" = "no" ]; then if [ ! "${MEDIACENTER}" = "no" ]; then
echo "Kodi commit: $(get_pkg_version ${MEDIACENTER})" >> ${RELEASE_DIR}/RELEASE echo "Kodi commit: $(get_pkg_version ${MEDIACENTER})" >>${RELEASE_DIR}/RELEASE
fi fi
mkdir -p ${RELEASE_DIR}/licenses mkdir -p ${RELEASE_DIR}/licenses
@ -304,9 +314,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
cp ${TARGET_IMG}/${IMAGE_NAME}.kernel ${RELEASE_DIR}/target/KERNEL cp ${TARGET_IMG}/${IMAGE_NAME}.kernel ${RELEASE_DIR}/target/KERNEL
# Create md5sum's # Create md5sum's
( cd ${RELEASE_DIR}; (
md5sum -t target/SYSTEM > target/SYSTEM.md5; cd ${RELEASE_DIR}
md5sum -t target/KERNEL > target/KERNEL.md5; md5sum -t target/SYSTEM >target/SYSTEM.md5
md5sum -t target/KERNEL >target/KERNEL.md5
) )
# Create target directory # Create target directory
@ -319,12 +330,13 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
tar cf ${TARGET_IMG}/${IMAGE_NAME}.tar -C target ${IMAGE_NAME} tar cf ${TARGET_IMG}/${IMAGE_NAME}.tar -C target ${IMAGE_NAME}
# Create sha256 checksum of tarball # Create sha256 checksum of tarball
( cd ${TARGET_IMG} (
sha256sum ${IMAGE_NAME}.tar > ${IMAGE_NAME}.tar.sha256 cd ${TARGET_IMG}
sha256sum ${IMAGE_NAME}.tar >${IMAGE_NAME}.tar.sha256
) )
# Create image files if requested # Create image files if requested
if [[ ( "${1}" = "noobs" || "${1}" = "mkimage" ) && -n "${BOOTLOADER}" ]]; then if [[ ("${1}" = "noobs" || "${1}" = "mkimage") && -n "${BOOTLOADER}" ]]; then
UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')" UUID_SYSTEM="$(date '+%d%m')-$(date '+%M%S')"
UUID_STORAGE="$(uuidgen)" UUID_STORAGE="$(uuidgen)"
@ -386,42 +398,42 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
if [ -n "${NOOBS_HEX}" ]; then if [ -n "${NOOBS_HEX}" ]; then
sed -e "s%@NOOBS_HEX@%${NOOBS_HEX}%g" \ sed -e "s%@NOOBS_HEX@%${NOOBS_HEX}%g" \
-i ${RELEASE_DIR}/${NOOBS_DISTRO}/os.json -i ${RELEASE_DIR}/${NOOBS_DISTRO}/os.json
else else
sed -e "/@NOOBS_HEX@/d" \ sed -e "/@NOOBS_HEX@/d" \
-i ${RELEASE_DIR}/${NOOBS_DISTRO}/os.json -i ${RELEASE_DIR}/${NOOBS_DISTRO}/os.json
fi fi
sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \ sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \
-e "s%@PROJECT@%${DEVICE:-${PROJECT}}%g" \ -e "s%@PROJECT@%${DEVICE:-${PROJECT}}%g" \
-e "s%@LIBREELEC_VERSION@%${LIBREELEC_VERSION}%g" \ -e "s%@LIBREELEC_VERSION@%${LIBREELEC_VERSION}%g" \
-e "s%@RELEASE_DATE@%$(date +%F)%g" \ -e "s%@RELEASE_DATE@%$(date +%F)%g" \
-e "s%@KERNEL_VERSION@%$(kernel_version)%g" \ -e "s%@KERNEL_VERSION@%$(kernel_version)%g" \
-e "s%@DESCRIPTION@%${DESCRIPTION}%g" \ -e "s%@DESCRIPTION@%${DESCRIPTION}%g" \
-e "s%@ROOT_PASSWORD@%${ROOT_PASSWORD}%g" \ -e "s%@ROOT_PASSWORD@%${ROOT_PASSWORD}%g" \
-e "s%@NOOBS_SUPPORTED_MODELS@%${NOOBS_SUPPORTED_MODELS}%g" \ -e "s%@NOOBS_SUPPORTED_MODELS@%${NOOBS_SUPPORTED_MODELS}%g" \
-i ${RELEASE_DIR}/${NOOBS_DISTRO}/os.json -i ${RELEASE_DIR}/${NOOBS_DISTRO}/os.json
sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \ sed -e "s%@DISTRONAME@%${DISTRONAME}%g" \
-e "s%@PROJECT@%${DEVICE:-${PROJECT}}%g" \ -e "s%@PROJECT@%${DEVICE:-${PROJECT}}%g" \
-e "s%@SYSTEM_SIZE@%${SYSTEM_SIZE}%g" \ -e "s%@SYSTEM_SIZE@%${SYSTEM_SIZE}%g" \
-i ${RELEASE_DIR}/${NOOBS_DISTRO}/partitions.json -i ${RELEASE_DIR}/${NOOBS_DISTRO}/partitions.json
sed -e "s%@EXTRA_CMDLINE@%${EXTRA_CMDLINE}%g" \ sed -e "s%@EXTRA_CMDLINE@%${EXTRA_CMDLINE}%g" \
-i ${RELEASE_DIR}/${NOOBS_DISTRO}/partition_setup.sh -i ${RELEASE_DIR}/${NOOBS_DISTRO}/partition_setup.sh
# Create System dir # Create System dir
mkdir -p ${RELEASE_DIR}/${NOOBS_DISTRO}/System mkdir -p ${RELEASE_DIR}/${NOOBS_DISTRO}/System
# Copy Bootloader # Copy Bootloader
cp -PR ${INSTALL}/usr/share/bootloader/config.txt ${RELEASE_DIR}/${NOOBS_DISTRO}/System/ cp -PR ${INSTALL}/usr/share/bootloader/config.txt ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
for distro in "${INSTALL}/usr/share/bootloader/distroconfig"*.txt ; do for distro in "${INSTALL}/usr/share/bootloader/distroconfig"*.txt; do
if [ -f "${distro}" ]; then if [ -f "${distro}" ]; then
cp -PR "${distro}" ${RELEASE_DIR}/${NOOBS_DISTRO}/System/ cp -PR "${distro}" ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
fi fi
done done
cp -PR ${INSTALL}/usr/share/bootloader/LICENCE* ${RELEASE_DIR}/${NOOBS_DISTRO}/System/ cp -PR ${INSTALL}/usr/share/bootloader/LICENCE* ${RELEASE_DIR}/${NOOBS_DISTRO}/System/
for f in bootcode.bin fixup.dat start.elf ; do for f in bootcode.bin fixup.dat start.elf; do
if [ -f "${INSTALL}/usr/share/bootloader/$f" ]; then if [ -f "${INSTALL}/usr/share/bootloader/$f" ]; then
cp -PR "${INSTALL}/usr/share/bootloader/$f" "${RELEASE_DIR}/${NOOBS_DISTRO}/System/" cp -PR "${INSTALL}/usr/share/bootloader/$f" "${RELEASE_DIR}/${NOOBS_DISTRO}/System/"
fi fi
@ -445,9 +457,10 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
done done
# Create md5sum's # Create md5sum's
( cd ${RELEASE_DIR}/${NOOBS_DISTRO}/System; (
md5sum -t SYSTEM > SYSTEM.md5; cd ${RELEASE_DIR}/${NOOBS_DISTRO}/System
md5sum -t kernel.img > kernel.img.md5; md5sum -t SYSTEM >SYSTEM.md5
md5sum -t kernel.img >kernel.img.md5
) )
# Copy additional files # Copy additional files
@ -476,8 +489,9 @@ if [ "${1}" = "release" -o "${1}" = "mkimage" -o "${1}" = "noobs" ]; then
tar cf ${TARGET_IMG}/${IMAGE_NAME}-${1}.tar -C ${TARGET_IMG} ${IMAGE_NAME}-${1} tar cf ${TARGET_IMG}/${IMAGE_NAME}-${1}.tar -C ${TARGET_IMG} ${IMAGE_NAME}-${1}
# Create sha256 checksum of tarball # Create sha256 checksum of tarball
( cd ${TARGET_IMG} (
sha256sum ${IMAGE_NAME}-${1}.tar > ${IMAGE_NAME}-${1}.tar.sha256 cd ${TARGET_IMG}
sha256sum ${IMAGE_NAME}-${1}.tar >${IMAGE_NAME}-${1}.tar.sha256
) )
fi fi
@ -490,4 +504,3 @@ fi
if [ -n "$(ls -1 ${BUILD}/qa_checks/ 2>/dev/null)" ]; then if [ -n "$(ls -1 ${BUILD}/qa_checks/ 2>/dev/null)" ]; then
log_qa_check "qa_issues" "QA issues present, please fix!\n$(find ${BUILD}/qa_checks/* -type f ! -name qa_issues)\n" log_qa_check "qa_issues" "QA issues present, please fix!\n$(find ${BUILD}/qa_checks/* -type f ! -name qa_issues)\n"
fi fi

View File

@ -15,7 +15,7 @@ if [ -z "${PKG_NAME}" ]; then
die "$(print_color CLR_ERROR "${1}: no package.mk file found")" die "$(print_color CLR_ERROR "${1}: no package.mk file found")"
fi fi
if [ -z "${INSTALL}" ] ; then if [ -z "${INSTALL}" ]; then
die "error: '\${INSTALL}' not set! this script is not intended to be run manually" die "error: '\${INSTALL}' not set! this script is not intended to be run manually"
fi fi
@ -46,17 +46,17 @@ mkdir -p ${STAMPS_INSTALL}/${PKG_NAME}
${SCRIPTS}/build "${1}" "${PARENT_PKG}" ${SCRIPTS}/build "${1}" "${PARENT_PKG}"
if is_sequential_build || [ "${PARENT_PKG}" = "initramfs:target" ]; then if is_sequential_build || [ "${PARENT_PKG}" = "initramfs:target" ]; then
if [ "${TARGET}" = "target" ] ; then if [ "${TARGET}" = "target" ]; then
for p in ${PKG_DEPENDS_TARGET}; do for p in ${PKG_DEPENDS_TARGET}; do
${SCRIPTS}/install "${p}" "${PARENT_PKG}" ${SCRIPTS}/install "${p}" "${PARENT_PKG}"
done done
elif [ "${TARGET}" = "init" ] ; then elif [ "${TARGET}" = "init" ]; then
for p in ${PKG_DEPENDS_INIT}; do for p in ${PKG_DEPENDS_INIT}; do
${SCRIPTS}/install "${p}" "${PARENT_PKG}" ${SCRIPTS}/install "${p}" "${PARENT_PKG}"
done done
fi fi
fi fi
if [ "${TARGET}" = "init" ] ; then if [ "${TARGET}" = "init" ]; then
INSTALL=${BUILD}/initramfs INSTALL=${BUILD}/initramfs
fi fi
@ -70,11 +70,10 @@ acquire_update_lock image
mkdir -p ${INSTALL} mkdir -p ${INSTALL}
if [ "${TARGET}" = "target" ] ; then if [ "${TARGET}" = "target" ]; then
for PKG_TMP_DIR in ${PKG_DIR} \ for PKG_TMP_DIR in ${PKG_DIR} \
${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} \ ${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} \
${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME} \ ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME}; do
; do
[ -d ${PKG_TMP_DIR} ] || continue [ -d ${PKG_TMP_DIR} ] || continue
@ -141,7 +140,7 @@ if [ "${TARGET}" = "target" ] ; then
fi fi
# install # install
if [ "${TARGET}" = "target" ] ; then if [ "${TARGET}" = "target" ]; then
pkg_call_exists_opt pre_install && pkg_call pkg_call_exists_opt pre_install && pkg_call
fi fi
@ -169,7 +168,7 @@ if [ -n "${PKG_INSTALL}" -a -d "${PKG_INSTALL}" ]; then
-cf - . | tar -C "${INSTALL}" -xf - -cf - . | tar -C "${INSTALL}" -xf -
fi fi
if [ "${TARGET}" = "target" ] ; then if [ "${TARGET}" = "target" ]; then
pkg_call_exists_opt post_install && pkg_call pkg_call_exists_opt post_install && pkg_call
fi fi

View File

@ -80,8 +80,9 @@ if [ "${ADDON_JENKINS}" = "yes" ]; then
mkdir -p "${ADDON_JENKINS_DIR}" mkdir -p "${ADDON_JENKINS_DIR}"
cd ${ADDON_INSTALL_DIR} cd ${ADDON_INSTALL_DIR}
${TOOLCHAIN}/bin/7za a -mx0 -bsp0 -bso0 -tzip ${ADDON_JENKINS_DIR}/${ADDON_JENKINS_ADDON_NAME}.zip ${PKG_ADDON_ID}-${ADDONVER}.zip resources/ ${TOOLCHAIN}/bin/7za a -mx0 -bsp0 -bso0 -tzip ${ADDON_JENKINS_DIR}/${ADDON_JENKINS_ADDON_NAME}.zip ${PKG_ADDON_ID}-${ADDONVER}.zip resources/
( cd ${ADDON_JENKINS_DIR} (
sha256sum ${ADDON_JENKINS_ADDON_NAME}.zip > ${ADDON_JENKINS_ADDON_NAME}.zip.sha256 cd ${ADDON_JENKINS_DIR}
sha256sum ${ADDON_JENKINS_ADDON_NAME}.zip >${ADDON_JENKINS_ADDON_NAME}.zip.sha256
) )
build_msg "CLR_INFO" "*** creating ${ADDON_JENKINS_ADDON_NAME}.zip for Jenkins complete ***" build_msg "CLR_INFO" "*** creating ${ADDON_JENKINS_ADDON_NAME}.zip for Jenkins complete ***"
else else

View File

@ -20,12 +20,12 @@ fi
case $1 in case $1 in
--clean) --clean)
rm -rf "${BUILD_ROOT}/${BUILD_BASE}."*/* "${BUILD_ROOT}/${BUILD_BASE}."*/.stamps rm -rf "${BUILD_ROOT}/${BUILD_BASE}."*/* "${BUILD_ROOT}/${BUILD_BASE}."*/.stamps
;; ;;
--distclean) --distclean)
rm -rf "${BUILD_ROOT}/.ccache" "${BUILD_ROOT}/${BUILD_BASE}."* rm -rf "${BUILD_ROOT}/.ccache" "${BUILD_ROOT}/${BUILD_BASE}."*
;; ;;
*) *)
echo "error: ${0}: unsupported option on CLI; aborting" echo "error: ${0}: unsupported option on CLI; aborting"
exit 1 exit 1
;; ;;
esac esac

View File

@ -18,9 +18,9 @@ if [ -z "${SYSTEM_SIZE}" -o -z "${SYSTEM_PART_START}" ]; then
exit 1 exit 1
fi fi
DISK_START_PADDING=$(( (${SYSTEM_PART_START} + 2048 - 1) / 2048 )) DISK_START_PADDING=$(((${SYSTEM_PART_START} + 2048 - 1) / 2048))
DISK_GPT_PADDING=1 DISK_GPT_PADDING=1
DISK_SIZE=$(( ${DISK_START_PADDING} + ${SYSTEM_SIZE} + ${STORAGE_SIZE} + ${DISK_GPT_PADDING} )) DISK_SIZE=$((${DISK_START_PADDING} + ${SYSTEM_SIZE} + ${STORAGE_SIZE} + ${DISK_GPT_PADDING}))
DISK_BASENAME="${TARGET_IMG}/${IMAGE_NAME}" DISK_BASENAME="${TARGET_IMG}/${IMAGE_NAME}"
DISK="${DISK_BASENAME}.img" DISK="${DISK_BASENAME}.img"
@ -63,17 +63,17 @@ sync
# create partitions # create partitions
echo "image: creating partitions..." echo "image: creating partitions..."
SYSTEM_PART_END=$(( ${SYSTEM_PART_START} + (${SYSTEM_SIZE} * 1024 * 1024 / 512) - 1 )) SYSTEM_PART_END=$((${SYSTEM_PART_START} + (${SYSTEM_SIZE} * 1024 * 1024 / 512) - 1))
STORAGE_PART_START=$(( ${SYSTEM_PART_END} + 1 )) STORAGE_PART_START=$((${SYSTEM_PART_END} + 1))
STORAGE_PART_END=$(( ${STORAGE_PART_START} + (${STORAGE_SIZE} * 1024 * 1024 / 512) - 1 )) STORAGE_PART_END=$((${STORAGE_PART_START} + (${STORAGE_SIZE} * 1024 * 1024 / 512) - 1))
if [ "${DISK_LABEL}" = "gpt" ]; then if [ "${DISK_LABEL}" = "gpt" ]; then
parted -s "${DISK}" -a min unit s mkpart system fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END} parted -s "${DISK}" -a min unit s mkpart system fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END}
parted -s "${DISK}" -a min unit s mkpart storage ext4 ${STORAGE_PART_START} ${STORAGE_PART_END} parted -s "${DISK}" -a min unit s mkpart storage ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
parted -s "${DISK}" set 1 legacy_boot on parted -s "${DISK}" set 1 legacy_boot on
else else
parted -s "${DISK}" -a min unit s mkpart primary fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END} parted -s "${DISK}" -a min unit s mkpart primary fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END}
parted -s "${DISK}" -a min unit s mkpart primary ext4 ${STORAGE_PART_START} ${STORAGE_PART_END} parted -s "${DISK}" -a min unit s mkpart primary ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
parted -s "${DISK}" set 1 boot on parted -s "${DISK}" set 1 boot on
fi fi
sync sync
@ -86,7 +86,7 @@ fi
# create part2 to format and copy files # create part2 to format and copy files
echo "image: creating sparse file for part2..." echo "image: creating sparse file for part2..."
STORAGE_PART_COUNT=$(( ${STORAGE_PART_END} - ${STORAGE_PART_START} + 1 )) STORAGE_PART_COUNT=$((${STORAGE_PART_END} - ${STORAGE_PART_START} + 1))
sync sync
dd if="${DISK}" of="${LE_TMP}/part2.ext4" bs=512 count=0 seek="${STORAGE_PART_COUNT}" conv=fsync >"${SAVE_ERROR}" 2>&1 || show_error dd if="${DISK}" of="${LE_TMP}/part2.ext4" bs=512 count=0 seek="${STORAGE_PART_COUNT}" conv=fsync >"${SAVE_ERROR}" 2>&1 || show_error
@ -118,11 +118,11 @@ fi
# create part1 to format and copy files # create part1 to format and copy files
echo "image: creating sparse file for part1..." echo "image: creating sparse file for part1..."
SYSTEM_PART_COUNT=$(( ${SYSTEM_PART_END} - ${SYSTEM_PART_START} + 1 )) SYSTEM_PART_COUNT=$((${SYSTEM_PART_END} - ${SYSTEM_PART_START} + 1))
sync sync
dd if=/dev/zero of="${LE_TMP}/part1.fat" bs=512 count=0 seek="${SYSTEM_PART_COUNT}" conv=fsync >"${SAVE_ERROR}" 2>&1 || show_error dd if=/dev/zero of="${LE_TMP}/part1.fat" bs=512 count=0 seek="${SYSTEM_PART_COUNT}" conv=fsync >"${SAVE_ERROR}" 2>&1 || show_error
shopt -s expand_aliases # enables alias expansion in script shopt -s expand_aliases # enables alias expansion in script
alias mcopy='mcopy -i "${LE_TMP}/part1.fat" -o' alias mcopy='mcopy -i "${LE_TMP}/part1.fat" -o'
alias mmd='mmd -i "${LE_TMP}/part1.fat"' alias mmd='mmd -i "${LE_TMP}/part1.fat"'
@ -137,7 +137,7 @@ sync
if [ "${BOOTLOADER}" = "syslinux" ]; then if [ "${BOOTLOADER}" = "syslinux" ]; then
# create bootloader configuration # create bootloader configuration
echo "image: creating bootloader configuration..." echo "image: creating bootloader configuration..."
cat << EOF > "${LE_TMP}/syslinux.cfg" cat <<EOF >"${LE_TMP}/syslinux.cfg"
SAY Wait for installer mode to start automatically in 5 seconds... SAY Wait for installer mode to start automatically in 5 seconds...
SAY SAY
SAY Options SAY Options
@ -163,7 +163,7 @@ LABEL run
APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} portable quiet APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} portable quiet
EOF EOF
cat << EOF > "${LE_TMP}/grub.cfg" cat <<EOF >"${LE_TMP}/grub.cfg"
set timeout="25" set timeout="25"
set default="Installer" set default="Installer"
menuentry "Installer" { menuentry "Installer" {
@ -202,7 +202,7 @@ EOF
elif [ "${BOOTLOADER}" = "bcm2835-bootloader" ]; then elif [ "${BOOTLOADER}" = "bcm2835-bootloader" ]; then
# create bootloader configuration # create bootloader configuration
echo "image: creating bootloader configuration..." echo "image: creating bootloader configuration..."
cat << EOF > "${LE_TMP}/cmdline.txt" cat <<EOF >"${LE_TMP}/cmdline.txt"
boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} quiet ${EXTRA_CMDLINE} boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} quiet ${EXTRA_CMDLINE}
EOF EOF
@ -215,20 +215,20 @@ EOF
mcopy "${RELEASE_DIR}/target/KERNEL.md5" "::/${KERNEL_NAME}.md5" >"${SAVE_ERROR}" 2>&1 || show_error mcopy "${RELEASE_DIR}/target/KERNEL.md5" "::/${KERNEL_NAME}.md5" >"${SAVE_ERROR}" 2>&1 || show_error
mcopy "${RELEASE_DIR}/target/SYSTEM.md5" ::/SYSTEM.md5 >"${SAVE_ERROR}" 2>&1 || show_error mcopy "${RELEASE_DIR}/target/SYSTEM.md5" ::/SYSTEM.md5 >"${SAVE_ERROR}" 2>&1 || show_error
for f in bootcode.bin fixup.dat start.elf ; do for f in bootcode.bin fixup.dat start.elf; do
if [ -f "${RELEASE_DIR}/3rdparty/bootloader/$f" ]; then if [ -f "${RELEASE_DIR}/3rdparty/bootloader/$f" ]; then
mcopy "${RELEASE_DIR}/3rdparty/bootloader/$f" :: >"${SAVE_ERROR}" 2>&1 || show_error mcopy "${RELEASE_DIR}/3rdparty/bootloader/$f" :: >"${SAVE_ERROR}" 2>&1 || show_error
fi fi
done done
mcopy "${RELEASE_DIR}/3rdparty/bootloader/config.txt" :: >"${SAVE_ERROR}" 2>&1 || show_error mcopy "${RELEASE_DIR}/3rdparty/bootloader/config.txt" :: >"${SAVE_ERROR}" 2>&1 || show_error
for distro in "${RELEASE_DIR}/3rdparty/bootloader/distroconfig"*.txt ; do for distro in "${RELEASE_DIR}/3rdparty/bootloader/distroconfig"*.txt; do
if [ -f "${distro}" ]; then if [ -f "${distro}" ]; then
mcopy "${distro}" ::/"${distro##*/}" >"${SAVE_ERROR}" 2>&1 || show_error mcopy "${distro}" ::/"${distro##*/}" >"${SAVE_ERROR}" 2>&1 || show_error
fi fi
done done
for dtb in "${RELEASE_DIR}/3rdparty/bootloader/"*.dtb ; do for dtb in "${RELEASE_DIR}/3rdparty/bootloader/"*.dtb; do
if [ -f "${dtb}" ]; then if [ -f "${dtb}" ]; then
mcopy "${dtb}" ::/"${dtb##*/}" >"${SAVE_ERROR}" 2>&1 || show_error mcopy "${dtb}" ::/"${dtb##*/}" >"${SAVE_ERROR}" 2>&1 || show_error
fi fi
@ -255,7 +255,7 @@ elif [ "${BOOTLOADER}" = "u-boot" -a -n "${UBOOT_SYSTEM}" ]; then
mkdir -p "${LE_TMP}/extlinux" mkdir -p "${LE_TMP}/extlinux"
cat << EOF > "${LE_TMP}/extlinux/extlinux.conf" cat <<EOF >"${LE_TMP}/extlinux/extlinux.conf"
LABEL ${DISTRO} LABEL ${DISTRO}
LINUX /${KERNEL_NAME} LINUX /${KERNEL_NAME}
FDT /${DTB} FDT /${DTB}
@ -314,14 +314,14 @@ if [ "${PROJECT}" = "Generic" ]; then
qemu-img convert -O vmdk -o subformat=streamOptimized "${DISK_BASENAME}.tmp" "${DISK_BASENAME}.vmdk" qemu-img convert -O vmdk -o subformat=streamOptimized "${DISK_BASENAME}.tmp" "${DISK_BASENAME}.vmdk"
# generate ovf from template # generate ovf from template
sed -e "s,@DISTRO@,${DISTRO},g" -e "s,@DISK@,${IMAGE_NAME},g" \ sed -e "s,@DISTRO@,${DISTRO},g" -e "s,@DISK@,${IMAGE_NAME},g" \
-e "s,@OVA_SIZE@,$((${OVA_SIZE}*1024*1024)),g" \ -e "s,@OVA_SIZE@,$((${OVA_SIZE} * 1024 * 1024)),g" \
"${PROJECT_DIR}/${PROJECT}/config/ovf.template" > "${DISK_BASENAME}.ovf" "${PROJECT_DIR}/${PROJECT}/config/ovf.template" >"${DISK_BASENAME}.ovf"
# combine ovf and vmdk into official ova # combine ovf and vmdk into official ova
tar -C "${TARGET_IMG}" -cf "${DISK_BASENAME}.ova" "${IMAGE_NAME}.ovf" "${IMAGE_NAME}.vmdk" tar -C "${TARGET_IMG}" -cf "${DISK_BASENAME}.ova" "${IMAGE_NAME}.ovf" "${IMAGE_NAME}.vmdk"
# create sha256 checksum of ova image # create sha256 checksum of ova image
( (
cd "${TARGET_IMG}" cd "${TARGET_IMG}"
sha256sum "${IMAGE_NAME}.ova" > "${IMAGE_NAME}.ova.sha256" sha256sum "${IMAGE_NAME}.ova" >"${IMAGE_NAME}.ova.sha256"
) )
echo "image: cleaning up open virtual appliance..." echo "image: cleaning up open virtual appliance..."
# remove tmp ${DISK}, vmdk and ovf # remove tmp ${DISK}, vmdk and ovf
@ -335,7 +335,7 @@ pigz --best --force "${DISK}"
# create sha256 checksum of image # create sha256 checksum of image
( (
cd "${TARGET_IMG}" cd "${TARGET_IMG}"
sha256sum "${DISK##*/}.gz" > "${DISK##*/}.gz.sha256" sha256sum "${DISK##*/}.gz" >"${DISK##*/}.gz.sha256"
) )
# cleanup # cleanup

View File

@ -23,7 +23,7 @@ package_worker() {
num=0 num=0
for failed_items in ${oseqinfo//;/ }; do for failed_items in ${oseqinfo//;/ }; do
num=$((num + 1)) num=$((num + 1))
read -r ftask fpkgname fseq <<< "${failed_items//,/ }" read -r ftask fpkgname fseq <<<"${failed_items//,/ }"
if [ -n "${fseq}" ]; then if [ -n "${fseq}" ]; then
[ ${num} -eq 1 ] && echo "The following log(s) for already failed dependencies are available:" [ ${num} -eq 1 ] && echo "The following log(s) for already failed dependencies are available:"
@ -39,7 +39,7 @@ package_worker() {
[[ ${pkgname} =~ :target$ || "${pkgname//:/}" = "${pkgname}" ]] && istarget="yes" || istarget="no" [[ ${pkgname} =~ :target$ || "${pkgname//:/}" = "${pkgname}" ]] && istarget="yes" || istarget="no"
[[ "${MTADDONBUILD}" = "yes" && ( "${PKG_IS_ADDON}" = "yes" || "${PKG_IS_ADDON}" = "embedded" ) ]] && isaddon="yes" || isaddon="no" [[ "${MTADDONBUILD}" = "yes" && ("${PKG_IS_ADDON}" = "yes" || "${PKG_IS_ADDON}" = "embedded") ]] && isaddon="yes" || isaddon="no"
if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then if [ "${isaddon}" = "yes" -a "${istarget}" = "yes" ]; then
if [ ${result} -eq 0 ]; then if [ ${result} -eq 0 ]; then
@ -58,7 +58,7 @@ package_worker() {
( (
flock --exclusive 95 flock --exclusive 95
[ ${result} -eq 0 ] && status="DONE" || status="FAIL" [ ${result} -eq 0 ] && status="DONE" || status="FAIL"
num=$(< "${THREAD_CONTROL}/progress") num=$(<"${THREAD_CONTROL}/progress")
mv "${THREAD_CONTROL}/progress" "${THREAD_CONTROL}/progress.prev" mv "${THREAD_CONTROL}/progress" "${THREAD_CONTROL}/progress.prev"
num=$((num + 1)) num=$((num + 1))
echo ${num} >"${THREAD_CONTROL}/progress" echo ${num} >"${THREAD_CONTROL}/progress"

View File

@ -51,6 +51,6 @@ fi
# pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status # pipefail: return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
set -o pipefail set -o pipefail
cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} | \ cat ${_CACHE_PACKAGE_GLOBAL} ${_CACHE_PACKAGE_LOCAL} |
xargs --max-args=64 --max-procs="$(nproc)" "$0" --worker xargs --max-args=64 --max-procs="$(nproc)" "$0" --worker
exit $? exit $?

View File

@ -20,7 +20,7 @@ pkg_lock "${PKG_NAME}" "unpack" "${PARENT_PKG}"
${SCRIPTS}/get "${PKG_NAME}" ${SCRIPTS}/get "${PKG_NAME}"
if [ -n "${PKG_DEPENDS_UNPACK}" ]; then if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
export _unpack_recursive_cnt=$((_unpack_recursive_cnt+1)) export _unpack_recursive_cnt=$((_unpack_recursive_cnt + 1))
if [ ${_unpack_recursive_cnt} -gt 2 ]; then if [ ${_unpack_recursive_cnt} -gt 2 ]; then
die "unpack recursive limit hit: ${PKG_DEPENDS_UNPACK}, ${PARENT_PKG}" die "unpack recursive limit hit: ${PKG_DEPENDS_UNPACK}, ${PARENT_PKG}"
fi fi
@ -28,7 +28,7 @@ if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
for p in ${PKG_DEPENDS_UNPACK}; do for p in ${PKG_DEPENDS_UNPACK}; do
${SCRIPTS}/unpack "${p}" "${PARENT_PKG}" ${SCRIPTS}/unpack "${p}" "${PARENT_PKG}"
done done
unset _unpack_recursive_cnt unset _unpack_recursive_cnt
fi fi
@ -39,11 +39,11 @@ mkdir -p ${BUILD}/build
# Perform a wildcard match on the package to ensure old versions are cleaned too # Perform a wildcard match on the package to ensure old versions are cleaned too
PKG_DEEPHASH= PKG_DEEPHASH=
for i in ${BUILD}/build/${PKG_NAME}-*; do for i in ${BUILD}/build/${PKG_NAME}-*; do
if [ -d ${i} -a -f "${i}/.libreelec-unpack" ] ; then if [ -d ${i} -a -f "${i}/.libreelec-unpack" ]; then
. "${i}/.libreelec-unpack" . "${i}/.libreelec-unpack"
if [ "${STAMP_PKG_NAME}" = "${PKG_NAME}" ]; then if [ "${STAMP_PKG_NAME}" = "${PKG_NAME}" ]; then
[ -z "${PKG_DEEPHASH}" ] && PKG_DEEPHASH=$(calculate_stamp) [ -z "${PKG_DEEPHASH}" ] && PKG_DEEPHASH=$(calculate_stamp)
if [ ! "${PKG_DEEPHASH}" = "${STAMP_PKG_DEEPHASH}" ] ; then if [ ! "${PKG_DEEPHASH}" = "${STAMP_PKG_DEEPHASH}" ]; then
${SCRIPTS}/clean "${PKG_NAME}" ${SCRIPTS}/clean "${PKG_NAME}"
fi fi
fi fi
@ -109,7 +109,7 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists
fi fi
# Add a tag to the unpacked folder before transferring into the shared build folder # Add a tag to the unpacked folder before transferring into the shared build folder
echo "INFO_PKG_NAME=\"${PKG_NAME}\"" > "${PKG_UNPACK_DIR}/.intermediate/.libreelec-package" echo "INFO_PKG_NAME=\"${PKG_NAME}\"" >"${PKG_UNPACK_DIR}/.intermediate/.libreelec-package"
# Restore original PKG_BUILD, and transfer the unpacked folder # Restore original PKG_BUILD, and transfer the unpacked folder
PKG_BUILD="${PKG_BUILD_ORIG}" PKG_BUILD="${PKG_BUILD_ORIG}"
@ -126,7 +126,7 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists
if [ "${TARGET_ARCH}" = "x86_64" ]; then if [ "${TARGET_ARCH}" = "x86_64" ]; then
PATCH_ARCH="x86" PATCH_ARCH="x86"
elif [ "${PKG_IS_KERNEL_PKG}" = "yes" ]; then elif [ "${PKG_IS_KERNEL_PKG}" = "yes" ]; then
PATCH_ARCH="${TARGET_KERNEL_PATCH_ARCH:-${TARGET_ARCH}}" PATCH_ARCH="${TARGET_KERNEL_PATCH_ARCH:-${TARGET_ARCH}}"
else else
PATCH_ARCH="${TARGET_PATCH_ARCH:-${TARGET_ARCH}}" PATCH_ARCH="${TARGET_PATCH_ARCH:-${TARGET_ARCH}}"
@ -148,15 +148,15 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists
fi fi
for i in ${PKG_DIR}/patches/*.patch \ for i in ${PKG_DIR}/patches/*.patch \
${PKG_DIR}/patches/${PATCH_ARCH}/*.patch \ ${PKG_DIR}/patches/${PATCH_ARCH}/*.patch \
${PATCH_DIRS_PKG} \ ${PATCH_DIRS_PKG} \
${PKG_DIR}/patches/${PKG_VERSION}/*.patch \ ${PKG_DIR}/patches/${PKG_VERSION}/*.patch \
${PKG_DIR}/patches/${PKG_VERSION}/${PATCH_ARCH}/*.patch \ ${PKG_DIR}/patches/${PKG_VERSION}/${PATCH_ARCH}/*.patch \
${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/*.patch \ ${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/*.patch \
${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${PATCH_ARCH}/*.patch \ ${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${PATCH_ARCH}/*.patch \
${PATCH_DIRS_PRJ} \ ${PATCH_DIRS_PRJ} \
${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${PKG_VERSION}/*.patch \ ${PROJECT_DIR}/${PROJECT}/patches/${PKG_NAME}/${PKG_VERSION}/*.patch \
${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/${PKG_NAME}/*.patch; do ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/${PKG_NAME}/*.patch; do
thisdir="${i%/*}" thisdir="${i%/*}"
@ -191,9 +191,9 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists
if [ -f "${i}" ]; then if [ -f "${i}" ]; then
build_msg "CLR_APPLY_PATCH" "APPLY PATCH $(print_color "CLR_PATCH_DESC" "${PATCH_DESC}")" "${i#${ROOT}/}" build_msg "CLR_APPLY_PATCH" "APPLY PATCH $(print_color "CLR_PATCH_DESC" "${PATCH_DESC}")" "${i#${ROOT}/}"
if grep -qE '^GIT binary patch$|^rename from|^rename to' ${i}; then if grep -qE '^GIT binary patch$|^rename from|^rename to' ${i}; then
git apply --directory="${PKG_BUILD}" -p1 --verbose --whitespace=nowarn --unsafe-paths < ${i} >&${VERBOSE_OUT} git apply --directory="${PKG_BUILD}" -p1 --verbose --whitespace=nowarn --unsafe-paths <${i} >&${VERBOSE_OUT}
else else
patch -d "${PKG_BUILD}" -p1 < ${i} >&${VERBOSE_OUT} patch -d "${PKG_BUILD}" -p1 <${i} >&${VERBOSE_OUT}
fi fi
fi fi
done done
@ -201,13 +201,13 @@ if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ] || pkg_call_exists
pkg_call_exists_opt post_patch && pkg_call pkg_call_exists_opt post_patch && pkg_call
fi fi
if [ "${PKG_NAME}" != "configtools" ] ; then if [ "${PKG_NAME}" != "configtools" ]; then
for config in $(find "${PKG_BUILD}" -name config.guess | sed 's/config.guess//'); do for config in $(find "${PKG_BUILD}" -name config.guess | sed 's/config.guess//'); do
build_msg "CLR_FIXCONFIG" "FIXCONFIG" "${config}" build_msg "CLR_FIXCONFIG" "FIXCONFIG" "${config}"
[ -f "${config}/config.guess" -a -f ${TOOLCHAIN}/configtools/config.guess ] && \ [ -f "${config}/config.guess" -a -f ${TOOLCHAIN}/configtools/config.guess ] &&
cp -f ${TOOLCHAIN}/configtools/config.guess ${config} cp -f ${TOOLCHAIN}/configtools/config.guess ${config}
[ -f "${config}/config.sub" -a -f ${TOOLCHAIN}/configtools/config.sub ] && \ [ -f "${config}/config.sub" -a -f ${TOOLCHAIN}/configtools/config.sub ] &&
cp -f ${TOOLCHAIN}/configtools/config.sub ${config} cp -f ${TOOLCHAIN}/configtools/config.sub ${config}
done done
fi fi
@ -216,11 +216,11 @@ pkg_call_finish
if [ "${PKG_SECTION}" != "virtual" ]; then if [ "${PKG_SECTION}" != "virtual" ]; then
mkdir -p "${PKG_BUILD}" mkdir -p "${PKG_BUILD}"
echo "INFO_PKG_NAME=\"${PKG_NAME}\"" > "${PKG_BUILD}/.libreelec-package" echo "INFO_PKG_NAME=\"${PKG_NAME}\"" >"${PKG_BUILD}/.libreelec-package"
PKG_DEEPHASH=$(calculate_stamp) PKG_DEEPHASH=$(calculate_stamp)
for i in PKG_NAME PKG_DEEPHASH; do for i in PKG_NAME PKG_DEEPHASH; do
echo "STAMP_${i}=\"${!i}\"" >> ${STAMP} echo "STAMP_${i}=\"${!i}\"" >>${STAMP}
done done
fi fi

View File

@ -10,8 +10,7 @@ fi
DEPTH=1000 DEPTH=1000
usage() usage() {
{
local me="$(basename $0)" local me="$(basename $0)"
echo "Usage: ${me} <popcornmix-branch> <sha>|<xbmc branch>" echo "Usage: ${me} <popcornmix-branch> <sha>|<xbmc branch>"

View File

@ -12,5 +12,5 @@ for COMMIT in $DROP_COMMITS; do
sed -i -E "s/^pick ([0-9a-f]+) (${COMMIT}.*)/drop \1 \2/g" $TODO sed -i -E "s/^pick ([0-9a-f]+) (${COMMIT}.*)/drop \1 \2/g" $TODO
done done
grep -E "^drop " $TODO > /tmp/dropped grep -E "^drop " $TODO >/tmp/dropped
sed -i -E "/^drop /d" $TODO sed -i -E "/^drop /d" $TODO

View File

@ -59,21 +59,21 @@ OPTION=$(whiptail --title "Update ADDON-VERSION" --menu "" 12 60 4 \
"3" "Exit" 3>&1 1>&2 2>&3) "3" "Exit" 3>&1 1>&2 2>&3)
case $OPTION in case $OPTION in
"1") "1")
update_addon_version
update_package
;;
"2")
BUMP_ADDON_VERSION=$(whiptail --inputbox "Enter ADDON-VERSION:" 10 25 ${DISTRO_ADDON_VERSION} 3>&1 1>&2 2>&3)
EXITSTATUS=$?
if [ $EXITSTATUS = 0 ]; then
update_addon_version update_addon_version
update_package update_package
else ;;
"2")
BUMP_ADDON_VERSION=$(whiptail --inputbox "Enter ADDON-VERSION:" 10 25 ${DISTRO_ADDON_VERSION} 3>&1 1>&2 2>&3)
EXITSTATUS=$?
if [ $EXITSTATUS = 0 ]; then
update_addon_version
update_package
else
exit
fi
;;
"3")
exit exit
fi ;;
;;
"3")
exit
;;
esac esac

View File

@ -32,7 +32,7 @@ if [ -f "${DISTRO_DIR}/${DISTRO}/kernel_options" ]; then
$PKG_BUILD/scripts/config --file $PKG_KERNEL_CFG_FILE --set-str ${OPTION%%=*} $(echo ${OPTION##*=} | tr -d '"') $PKG_BUILD/scripts/config --file $PKG_KERNEL_CFG_FILE --set-str ${OPTION%%=*} $(echo ${OPTION##*=} | tr -d '"')
fi fi
done < ${DISTRO_DIR}/${DISTRO}/kernel_options done <${DISTRO_DIR}/${DISTRO}/kernel_options
else else
echo "kernel options file doesn't exist: ${DISTRO_DIR}/${DISTRO}/kernel_options" echo "kernel options file doesn't exist: ${DISTRO_DIR}/${DISTRO}/kernel_options"
fi fi

View File

@ -37,12 +37,25 @@ USING_FILTER="no"
while getopts "f:cvSh" opt; do while getopts "f:cvSh" opt; do
case ${opt} in case ${opt} in
f) FILTER="${OPTARG}"; USING_FILTER="yes";; f)
c) RMPROGRESS="yes";; FILTER="${OPTARG}"
v) VERBOSE="yes";; USING_FILTER="yes"
S) SHOW_SKIPPED="yes";; ;;
h) usage;; c)
*) usage;; RMPROGRESS="yes"
;;
v)
VERBOSE="yes"
;;
S)
SHOW_SKIPPED="yes"
;;
h)
usage
;;
*)
usage
;;
esac esac
done done
@ -59,7 +72,10 @@ SKIPPED="$(cut -d' ' -f1 ${RESTART_FILE} 2>/dev/null | sort -u | wc -l || true)"
[ "${USING_FILTER}" = "no" -a "${SKIPPED:-0}" -ne 0 ] && echo -e "WARNING: skipping ${SKIPPED} packages.\n" >&2 [ "${USING_FILTER}" = "no" -a "${SKIPPED:-0}" -ne 0 ] && echo -e "WARNING: skipping ${SKIPPED} packages.\n" >&2
for pkg_name in $(get_all_package_names | grep -E "${FILTER}"); do for pkg_name in $(get_all_package_names | grep -E "${FILTER}"); do
stamp=$(source_package ${pkg_name}; calculate_stamp) stamp=$(
source_package ${pkg_name}
calculate_stamp
)
if [ -z "${stamp}" ]; then if [ -z "${stamp}" ]; then
[ "${SHOW_SKIPPED}" = "yes" ] && printf "Checking: %-40s IGNORED\n" "${pkg_name}" [ "${SHOW_SKIPPED}" = "yes" ] && printf "Checking: %-40s IGNORED\n" "${pkg_name}"
continue continue

View File

@ -696,7 +696,7 @@ if __name__ == "__main__":
' '
[ -z "${PROJECT}" ] && PROJECT=Generic [ -z "${PROJECT}" ] && PROJECT=Generic
[ -z "${ARCH}" ] && ARCH=x86_64 [ -z "${ARCH}" ] && ARCH=x86_64
help() { help() {
[ -n "$1" ] && echo -e "ERROR: Unknown argument [$1]\n" [ -n "$1" ] && echo -e "ERROR: Unknown argument [$1]\n"
@ -854,7 +854,7 @@ generate_work_worker() {
echo " \"${var}\": \"${!var}\"${comma}" >>${workfile_o} echo " \"${var}\": \"${!var}\"${comma}" >>${workfile_o}
done done
echo " }," >>${workfile_o} echo " }," >>${workfile_o}
done < ${workfile_i} done <${workfile_i}
) )
} }
@ -909,17 +909,17 @@ get_packages() {
} }
init_progress() { init_progress() {
echo 0 > ${LOCKFILE} echo 0 >${LOCKFILE}
} }
progress() { progress() {
local count local count
( (
flock -x 9 flock -x 9
count=$(($(< ${LOCKFILE}) + 1)) count=$(($(<${LOCKFILE}) + 1))
echo "${count}" >${LOCKFILE} echo "${count}" >${LOCKFILE}
printf "Generating workload... %3d%% (%d of %d)\r" $((count * 100 / $1)) ${count} $1 >&2 printf "Generating workload... %3d%% (%d of %d)\r" $((count * 100 / $1)) ${count} $1 >&2
) 9< "${LOCKFILE}" ) 9<"${LOCKFILE}"
} }
end_progress() { end_progress() {
@ -930,52 +930,52 @@ end_progress() {
exec_worker_prog() { exec_worker_prog() {
echo "${PYTHON_PROG}" >/tmp/distro-tool.py echo "${PYTHON_PROG}" >/tmp/distro-tool.py
python3 /tmp/distro-tool.py "${DOWNLOAD_DIR}" "${TARGET_DIR}" "${DISTRO_SOURCE}" "${DISTRO_MIRROR}" \ python3 /tmp/distro-tool.py "${DOWNLOAD_DIR}" "${TARGET_DIR}" "${DISTRO_SOURCE}" "${DISTRO_MIRROR}" \
"${IS_MIRROR}" "${IGNORE_ERRORS}" "${DRY_RUN}" "${CHECK_NEWER}" \ "${IS_MIRROR}" "${IGNORE_ERRORS}" "${DRY_RUN}" "${CHECK_NEWER}" \
"${PROGRESS}" "${WORKER_THREADS}" "${GIT_USERNAME}" "${GIT_PASSWORD}" \ "${PROGRESS}" "${WORKER_THREADS}" "${GIT_USERNAME}" "${GIT_PASSWORD}" \
"${CHECK_FILTER_CLASS}" "${CHECK_FILTER_TYPE}" ${VERIFY_CHECKSUM} "${VERBOSE}" "${CHECK_FILTER_CLASS}" "${CHECK_FILTER_TYPE}" ${VERIFY_CHECKSUM} "${VERBOSE}"
rm -f /tmp/distro-tool.py rm -f /tmp/distro-tool.py
} }
while [ : ]; do while [ : ]; do
[ -z "$1" ] && break [ -z "$1" ] && break
case $1 in case $1 in
-d|--download) -d | --download)
shift shift
DOWNLOAD_DIR=$1 DOWNLOAD_DIR=$1
;; ;;
-l|--libreelec) -l | --libreelec)
shift shift
LIBREELEC_DIR=$1 LIBREELEC_DIR=$1
;; ;;
-t|--target) -t | --target)
shift shift
TARGET_DIR=$1 TARGET_DIR=$1
;; ;;
-a|--all) -a | --all)
IGNORE_ERRORS=yes IGNORE_ERRORS=yes
;; ;;
-p|--package) -p | --package)
shift shift
PACKAGE=$1 PACKAGE=$1
;; ;;
-r|--revision) -r | --revision)
shift shift
REVISION=$1 REVISION=$1
;; ;;
-m|--mirror) -m | --mirror)
IS_MIRROR=yes IS_MIRROR=yes
;; ;;
-s|--source) -s | --source)
IS_MIRROR=no IS_MIRROR=no
;; ;;
--dry-run|--dryrun) --dry-run | --dryrun)
DRY_RUN=yes DRY_RUN=yes
LINE_PREFIX="**DRY-RUN** " LINE_PREFIX="**DRY-RUN** "
;; ;;
--git) --git)
DOGIT=yes DOGIT=yes
;; ;;
-n|--notnewer) -n | --notnewer)
CHECK_NEWER=no CHECK_NEWER=no
;; ;;
--check-ver) --check-ver)
@ -990,19 +990,19 @@ while [ : ]; do
--check-main) --check-main)
CHECK_FILTER_CLASS=Main CHECK_FILTER_CLASS=Main
;; ;;
-T|--threads) -T | --threads)
shift shift
[ $1 -gt 0 ] && WORKER_THREADS=$1 [ $1 -gt 0 ] && WORKER_THREADS=$1
;; ;;
-U|--gituser) -U | --gituser)
shift shift
GIT_USERNAME=$1 GIT_USERNAME=$1
;; ;;
-P|--gitpass) -P | --gitpass)
shift shift
GIT_PASSWORD=$1 GIT_PASSWORD=$1
;; ;;
-v|--verbose) -v | --verbose)
VERBOSE=$((VERBOSE + 1)) VERBOSE=$((VERBOSE + 1))
;; ;;
--no-progress) --no-progress)
@ -1015,7 +1015,7 @@ while [ : ]; do
--verify-checksum) --verify-checksum)
VERIFY_CHECKSUM=yes VERIFY_CHECKSUM=yes
;; ;;
-h|--help) -h | --help)
help help
exit 0 exit 0
;; ;;

View File

@ -25,19 +25,17 @@ BUILD_SOURCES="false"
REPLACE_OLD="false" REPLACE_OLD="false"
NEW_SOURCES="${NEW_SOURCES_DIR:-${SOURCES}.new}" NEW_SOURCES="${NEW_SOURCES_DIR:-${SOURCES}.new}"
# helper functions # helper functions
help(){ help() {
echo "Usage: ${0} [-hdfbr]" echo "Usage: ${0} [-hdfbr]"
echo "Set PROJECT, DEVICE and ARCH as required." echo "Set PROJECT, DEVICE and ARCH as required."
echo " -h this help" echo " -h this help"
echo " -d delete obsolete source packages (default no)" echo " -d delete obsolete source packages (default no)"
echo " -f fetch updated source packages (default: no)" echo " -f fetch updated source packages (default: no)"
echo " -b build new SOURCES content (default: no)" echo " -b build new SOURCES content (default: no)"
echo " -r replace old SOURCES when rebuilding (default: no)" echo " -r replace old SOURCES when rebuilding (default: no)"
} }
# command line opts # command line opts
while getopts hdfrb OPT; do while getopts hdfrb OPT; do
case "${OPT}" in case "${OPT}" in
@ -65,8 +63,7 @@ while getopts hdfrb OPT; do
esac esac
done done
shift $((${OPTIND}-1)) shift $((${OPTIND} - 1))
# sanity checking # sanity checking
if [ ! -d "${SOURCES}" ]; then if [ ! -d "${SOURCES}" ]; then
@ -75,7 +72,6 @@ elif [ "${DESTRUCTIVE_RUN}" = "true" -a "${BUILD_SOURCES}" = "true" ]; then
die "error: options '-d' and '-b' are mutually exclusive" die "error: options '-d' and '-b' are mutually exclusive"
fi fi
# main # main
# process files in SOURCES # process files in SOURCES
for SOURCE_PACKAGE in $(find "${SOURCES}/" -mindepth 1 -type d); do for SOURCE_PACKAGE in $(find "${SOURCES}/" -mindepth 1 -type d); do

View File

@ -15,17 +15,18 @@ help() {
} }
case $1 in case $1 in
-a|--all) -a | --all)
ALL_PACKAGES="true" ALL_PACKAGES="true"
;; ;;
-h|--help) -h | --help)
help help
exit 0 exit 0
;;
esac esac
for package in $(find packages/ -name package.mk); do for package in $(find packages/ -name package.mk); do
if [ -n "$(echo $package | grep addons)" -a -z "$ALL_PACKAGES" ]; then if [ -n "$(echo $package | grep addons)" -a -z "$ALL_PACKAGES" ]; then
continue continue
fi fi
./scripts/get $(basename `dirname $package`) ./scripts/get $(basename $(dirname $package))
done done

View File

@ -13,7 +13,10 @@ if [ $# -eq 0 ]; then
fi fi
FFMPEG_ROOT="$(pwd)" FFMPEG_ROOT="$(pwd)"
LE_ROOT="$(cd $(dirname $0)/../.. ; pwd)" LE_ROOT="$(
cd $(dirname $0)/../..
pwd
)"
create_patch() { create_patch() {
FEATURE_SET="$1" FEATURE_SET="$1"
@ -25,7 +28,7 @@ create_patch() {
PATCH_CREATE_DIFF="no" PATCH_CREATE_DIFF="no"
case "${FEATURE_SET}" in case "${FEATURE_SET}" in
v4l2-drmprime|v4l2-request|vf-deinterlace-v4l2m2m) v4l2-drmprime | v4l2-request | vf-deinterlace-v4l2m2m)
REPO="https://github.com/jernejsk/FFmpeg" REPO="https://github.com/jernejsk/FFmpeg"
REFSPEC="${FEATURE_SET}-${FFMPEG_VERSION}" REFSPEC="${FEATURE_SET}-${FFMPEG_VERSION}"
;; ;;
@ -67,14 +70,14 @@ create_patch() {
if [ "${PATCH_CREATE_DIFF}" = "yes" ]; then if [ "${PATCH_CREATE_DIFF}" = "yes" ]; then
# create diff in case format-patch doesn't work, eg when we have non-linear history # create diff in case format-patch doesn't work, eg when we have non-linear history
git diff "${BASE_REV}..${REV}" > "${LE_ROOT}/${PATCH_FILE}" git diff "${BASE_REV}..${REV}" >"${LE_ROOT}/${PATCH_FILE}"
else else
git format-patch --stdout --no-signature "${BASE_REV}..${REV}" > "${LE_ROOT}/${PATCH_FILE}" git format-patch --stdout --no-signature "${BASE_REV}..${REV}" >"${LE_ROOT}/${PATCH_FILE}"
fi fi
MSG=$(mktemp) MSG=$(mktemp)
cat << EOF > "${MSG}" cat <<EOF >"${MSG}"
ffmpeg: ${ACTION} ${FEATURE_SET} patch ffmpeg: ${ACTION} ${FEATURE_SET} patch
Patch created using revisions ${BASE_REV:0:7}..${REV:0:7} Patch created using revisions ${BASE_REV:0:7}..${REV:0:7}

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