wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/rishooty/distribution into RG552-M64-FIX

Browse source
This commit is contained in:
Nicholas Ricciuti 2022-11-12 19:03:21 -05:00
commit 517b822245
No known key found for this signature in database
GPG key ID: CBB28CCF1964C6D1
15 changed files with 90 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/jelos/sources/autostart/common/004-upgrade
View file

@ -12,4 +12,6 @@ then
fi
rm /storage/.config/boot.hint
touch /storage/.configured
else
echo "No update hint found." >/var/log/upgrade.log 2>&1
fi

16
packages/jelos/sources/autostart/common/005-alsa
View file

@ -16,14 +16,14 @@ then
mkdir -p /storage/.config/modprobe.d
fi
touch /storage/.config/modprobe.d/alsa-base.conf
set-audio "DEFAULT HDMI"
set-audio set "DEFAULT HDMI"
reboot
fi
fi
if [ ! -e "/storage/.config/asound.conf" ]
then
set-audio "DEFAULT (SYSTEM PROVIDED)"
set-audio set "DEFAULT (SYSTEM PROVIDED)"
fi
if [ ! -e "/storage/.config/asound.state" ] && [ -e /usr/config/asound.state ]
@ -31,18 +31,6 @@ then
cp /usr/config/asound.state /storage/.config
fi
AUDIODEVICE=$(get_setting system.audiodevice)
AUDIOTEST=$(grep "${AUDIODEVICE}" /storage/.config/emulationstation/es_settings.cfg 2>/dev/null)
if [ ! "$?" = 0 ]
then
sed -i '/^.*AudioCard.*$/a \\t<string name="AudioDevice" value="${AUDIODEVICE}" \/>' /storage/.config/emulationstation/es_settings.cfg
else
if [ -z "${AUDIODEVICE}" ]
then
sed -i '/<string name="AudioDevice".*$/d' /storage/.emulationstation/es_settings.cfg
fi
fi
# Initialize sound using the state if available.
if [ -e "/storage/.config/asound.state" ]
then

2
packages/jelos/sources/autostart/common/008-network
View file

@ -6,7 +6,7 @@
HOSTNAME=$(get_setting system.hostname)
hostname ${HOSTNAME}
avahi-set-hostname ${HOSTNAME}
avahi-set-host-name ${HOSTNAME}
if [ "$(get_setting internal.wifi)" == 0 ] && [ "${DEVICE_INTERNAL_WIFI}" = true ]
then

1
packages/jelos/sources/post-update
View file

@ -36,7 +36,6 @@ echo "Sync modules..." >>${LOG}
rsync -a /usr/config/modules/* /storage/.config/modules/
cp -f /usr/config/retroarch/retroarch-core-options.cfg /storage/.config/retroarch/retroarch-core-options.cfg
echo "Sync theme..." >>${LOG}
cd /usr/share/themes
for theme in *

45
packages/jelos/sources/scripts/essound
View file

@ -1,45 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: Apache-2.0
# Copyright (C) 2020 Fewtarius (https://github.com/fewtarius)
. /etc/profile
ES_SETTINGS="/storage/.config/emulationstation/es_settings.cfg"
get_controls() {
IFS=""
CONTROLS=$(amixer controls | sed -e 's#^.*name=##g' -e "s#'##g")
for CONTROL in "${CONTROLS[@]}"
do
echo ${CONTROL} | awk '{print $1}' | grep -v -E 'Mic|Extension|Capture|Differential|Left|Right' | uniq
done
echo "--------"
for CONTROL in "${CONTROLS[@]}"
do
echo ${CONTROL}
done
}
set_es() {
AUDIODEVICE=${1}
systemctl stop ${UI_SERVICE}
AUDIOTEST=$(grep "AudioDevice" ${ES_SETTINGS} 2>/dev/null)
if [ ! "$?" = 0 ]
then
sed -i '/^.*AudioCard.*$/a \\t<string name="AudioDevice" value="${AUDIODEVICE}" \/>' ${ES_SETTINGS}
else
sed -i '/<string name="AudioDevice".*$/d'
sed -i '/^.*AudioCard.*$/a \\t<string name="AudioDevice" value="${AUDIODEVICE}" \/>' ${ES_SETTINGS}
fi
set_setting system.audiodevice "${AUDIODEVICE}"
systemctl start ${UI_SERVICE}
}
case ${1} in
controls)
get_controls 2>/dev/null
;;
set_es)
set_es $2
;;
esac

7
packages/jelos/sources/scripts/factoryreset
View file

@ -9,11 +9,4 @@ case "${1}" in
rm -f /storage/.config/retroarch/retroarch.cfg
cp -rf /usr/config/retroarch/retroarch.cfg /storage/.config/retroarch/retroarch.cfg
;;
"ALL")
cd /
find /storage -mindepth 1 \( ! -regex '^/storage/.update.*' -a ! -regex '^/storage/roms.*' \) -delete
mkdir /storage/.config/
sync
systemctl reboot
;;
esac

62
packages/jelos/sources/scripts/set-audio
View file

@ -4,10 +4,29 @@
. /etc/profile
ES_SETTINGS="/storage/.config/emulationstation/es_settings.cfg"
function list_audio_controls() {
IFS=""
CONTROLS=$(amixer controls | sed -e 's#^.*name=##g' -e "s#'##g")
echo "DEFAULT (SYSTEM PROVIDED)"
echo "CUSTOM (UNMANAGED)"
for CONTROL in "${CONTROLS[@]}"
do
echo ${CONTROL} | awk '{print $1}' | grep -v -E 'Mic|Extension|Capture|Differential|Left|Right' | uniq
done
echo "--------"
for CONTROL in "${CONTROLS[@]}"
do
echo ${CONTROL}
done
}
function list_audio_devices() {
echo "DEFAULT (SYSTEM PROVIDED)"
echo "DEFAULT HDMI"
echo "CUSTOM (UNMANAGED)"
echo "--------"
for SDEVICE in $(find /proc/asound/card*/pcm*/info)
do
TYPE=$(awk '/^stream:/ {print $2}' ${SDEVICE})
@ -48,6 +67,10 @@ function set_audio_device() {
then
exit 0
else
if [ "${SELECTION}" == "--------" ]
then
exit 0
fi
for SDEVICE in $(find /proc/asound/card*/pcm*/info)
do
TYPE=$(awk '/^stream:/ {print $2}' ${SDEVICE})
@ -77,6 +100,26 @@ ctl.!default {
EOF
}
function set_es_path() {
AUDIODEVICE=${1}
if [ "${AUDIODEVICE}" == "CUSTOM (UNMANAGED)" ] || \
[ "${AUDIODEVICE}" == "--------" ]
then
exit 0
fi
AUDIOTEST=$(grep "AudioDevice" ${ES_SETTINGS} 2>/dev/null)
sed -i '/<string name="AudioDevice".*$/d' ${ES_SETTINGS}
if [ -e "/storage/.config/profile.d/99-mixer" ]
then
rm "/storage/.config/profile.d/99-mixer"
fi
if [ ! "${AUDIODEVICE}" = "DEFAULT (SYSTEM PROVIDED)" ]
then
sed -i '/^.*AudioCard.*$/a \\t<string name="AudioDevice" value="'"${AUDIODEVICE}"'" \/>' ${ES_SETTINGS}
echo "DEVICE_AUDIO_MIXER=\"${AUDIODEVICE}\"" >/storage/.config/profile.d/99-mixer
fi
}
function get_audio_device() {
MYAUDIODEVICE=$(get_setting system.audiodevice)
if [ ! -z "${MYAUDIODEVICE}" ]
@ -87,14 +130,33 @@ function get_audio_device() {
fi
}
function get_es_path() {
AUDIODEVICE=$(grep AudioDevice ${ES_SETTINGS} | sed -e 's#^.*="##g' -e 's#"\ .*$##g')
if [ -z "${AUDIODEVICE}" ]
then
echo "DEFAULT (SYSTEM PROVIDED)"
else
echo "${AUDIODEVICE}"
fi
}
case $1 in
controls)
list_audio_controls
;;
list)
list_audio_devices
;;
set)
set_audio_device "$2"
;;
esset)
set_es_path "$2"
;;
get)
get_audio_device
;;
esget)
get_es_path
;;
esac

9
packages/network/iw/package.mk
View file

@ -2,8 +2,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="iw"
PKG_VERSION="5.4"
PKG_SHA256="a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc27a395f"
PKG_VERSION="5.19"
PKG_LICENSE="PUBLIC_DOMAIN"
PKG_SITE="https://wireless.wiki.kernel.org/en/users/documentation/iw"
PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
@ -12,10 +11,10 @@ PKG_LONGDESC="A new nl80211 based CLI configuration utility for wireless devices
# iw fails at runtime with lto enabled
pre_configure_target() {
export LDFLAGS="$LDFLAGS -pthread"
export LDFLAGS="${LDFLAGS} -pthread"
}
post_makeinstall_target() {
mkdir -p $INSTALL/usr/lib/iw
cp $PKG_DIR/scripts/setregdomain $INSTALL/usr/lib/iw
mkdir -p ${INSTALL}/usr/lib/iw
cp ${PKG_DIR}/scripts/setregdomain ${INSTALL}/usr/lib/iw
}

12
packages/sysutils/busybox/config/busybox-init.conf
View file

@ -346,10 +346,10 @@ CONFIG_UNAME_OSNAME="GNU/Linux"
# CONFIG_UNIQ is not set
# CONFIG_UNLINK is not set
CONFIG_USLEEP=y
# CONFIG_UUDECODE is not set
CONFIG_UUDECODE=y
CONFIG_BASE32=y
# CONFIG_BASE64 is not set
# CONFIG_UUENCODE is not set
CONFIG_BASE64=y
CONFIG_UUENCODE=y
CONFIG_WC=y
CONFIG_FEATURE_WC_LARGE=y
# CONFIG_WHO is not set
@ -556,7 +556,7 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
#
# Linux Ext2 FS Progs
#
# CONFIG_CHATTR is not set
CONFIG_CHATTR=y
# CONFIG_FSCK is not set
# CONFIG_LSATTR is not set
# CONFIG_TUNE2FS is not set
@ -1119,9 +1119,9 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
CONFIG_SH_IS_ASH=y
# CONFIG_SH_IS_HUSH is not set
# CONFIG_SH_IS_NONE is not set
# CONFIG_BASH_IS_ASH is not set
CONFIG_BASH_IS_ASH=y
# CONFIG_BASH_IS_HUSH is not set
CONFIG_BASH_IS_NONE=y
# CONFIG_BASH_IS_NONE is not set
CONFIG_SHELL_ASH=y
CONFIG_ASH=y
# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set

8
packages/sysutils/busybox/config/busybox-target.conf
View file

@ -346,10 +346,10 @@ CONFIG_BB_ARCH=y
CONFIG_UNIQ=y
# CONFIG_UNLINK is not set
CONFIG_USLEEP=y
# CONFIG_UUDECODE is not set
CONFIG_UUDECODE=y
CONFIG_BASE32=y
# CONFIG_BASE64 is not set
# CONFIG_UUENCODE is not set
CONFIG_BASE64=y
CONFIG_UUENCODE=y
CONFIG_WC=y
CONFIG_FEATURE_WC_LARGE=y
# CONFIG_WHO is not set
@ -556,7 +556,7 @@ CONFIG_FEATURE_SU_CHECKS_SHELLS=y
#
# Linux Ext2 FS Progs
#
# CONFIG_CHATTR is not set
CONFIG_CHATTR=y
# CONFIG_FSCK is not set
# CONFIG_LSATTR is not set
# CONFIG_TUNE2FS is not set

1
packages/sysutils/busybox/package.mk
View file

@ -208,6 +208,7 @@ post_install() {
makeinstall_init() {
mkdir -p ${INSTALL}/bin
ln -sf busybox ${INSTALL}/usr/bin/sh
ln -sf busybox ${INSTALL}/usr/bin/bash
ln -sf busybox ${INSTALL}/usr/bin/bc
chmod 4755 ${INSTALL}/usr/bin/busybox

3
packages/sysutils/busybox/scripts/init
View file

@ -402,7 +402,6 @@ update_bootloader() {
export BOOT_ROOT="/flash"
export SYSTEM_ROOT="/update"
echo "UPDATE" > $SYSTEM_ROOT/storage/.config/boot.hint
if [ -f $SYSTEM_ROOT/usr/share/bootloader/update.sh ]; then
echo ""
echo "Updating Boot Files... "
@ -883,6 +882,8 @@ check_update() {
mv "$UPDATE_IMG" $IMG_FILE
fi
echo "UPDATE" > $UPDATE_DIR/../.config/boot.hint
LOOP=$(losetup -f)
LOOP_NUM=$(echo $LOOP | sed 's|/dev/loop||')
mknod $LOOP b 7 $LOOP_NUM &>/dev/null

4
packages/ui/emulationstation/package.mk
View file

@ -3,14 +3,14 @@
# Copyright (C) 2020-present Fewtarius
PKG_NAME="emulationstation"
PKG_VERSION="d5663ee"
PKG_VERSION="50668de"
PKG_GIT_CLONE_BRANCH="main"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/JustEnoughLinuxOS/emulationstation"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="boost toolchain SDL2 freetype curl freeimage bash rapidjson SDL2_mixer fping p7zip alsa vlc"
PKG_DEPENDS_TARGET="boost toolchain SDL2 freetype curl freeimage bash rapidjson SDL2_mixer fping p7zip alsa vlc splash"
PKG_NEED_UNPACK="busybox"
PKG_SHORTDESC="Emulationstation emulator frontend"
PKG_BUILD_FLAGS="-gold"

2
projects/Rockchip/devices/RG353P/options
View file

@ -26,7 +26,7 @@
esac
# Kernel target
DEVICE_NAME="RG353P"
DEVICE_NAME="RG353P/M"
KERNEL_TARGET="Image"
BOOTLOADER="u-boot"
PARTITION_TABLE="gpt"

2
projects/Rockchip/packages/linux/package.mk
View file

@ -30,7 +30,7 @@ case ${DEVICE} in
;;
RG353P|RG503)
PKG_URL="${PKG_SITE}/rk356x-kernel.git"
PKG_VERSION="178e6ca92"
PKG_VERSION="0ab76df23"
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="main"
;;