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

Merge pull request #1394 from JustEnoughLinuxOS/dev

Browse source 
PR for release
This commit is contained in:
fewtarius 2023-05-04 20:31:56 -04:00 committed by GitHub
commit e0dcefc4fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 58 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
config/functions
View file

@ -692,37 +692,50 @@ init_package_cache() {
local temp_global temp_local
# If the package caches are unset, then populate them
if [ -z "${_CACHE_PACKAGE_LOCAL}" -o -z "${_CACHE_PACKAGE_GLOBAL}" ]; then
if [ -z "${_CACHE_PACKAGE_GLOBAL}" -o -z "${_CACHE_PACKAGE_LOCAL}" -o -z "${_CACHE_PACKAGE_DEVICE}" ]; then
temp_global="$(mktemp)"
temp_local="$(mktemp)"
# cache project/device folder for packages
if [ -n "${DEVICE}" ]; then
find "${ROOT}/projects/${PROJECT}/devices/${DEVICE}/packages" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_local}"
fi
# cache project folder for packages
find "${ROOT}/projects/${PROJECT}/packages" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_local}"
temp_device="$(mktemp)"
# cache packages folder
find "${ROOT}/${PACKAGES}" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_global}"
_CACHE_PACKAGE_LOCAL="${BUILD}/.cache_package_local"
# cache project folder for packages
find "${ROOT}/projects/${PROJECT}/packages" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_local}"
# cache project/device folder for packages
if [ -n "${DEVICE}" ]; then
find "${ROOT}/projects/${PROJECT}/devices/${DEVICE}/packages" -type f -name package.mk 2>/dev/null | sed "s#/package\.mk\$#${_ANCHOR}#" >> "${temp_device}"
fi
_CACHE_PACKAGE_GLOBAL="${BUILD}/.cache_package_global"
export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
_CACHE_PACKAGE_LOCAL="${BUILD}/.cache_package_local"
_CACHE_PACKAGE_DEVICE="${BUILD}/.cache_package_device"
export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _CACHE_PACKAGE_DEVICE
# overwrite existing cache files only when they are invalid, or not yet created
# Order should be largest to smallest...
mkdir -p "$(dirname "${_CACHE_PACKAGE_GLOBAL}")"
if [ -f "${_CACHE_PACKAGE_LOCAL}" ] && cmp -s "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"; then
rm "${temp_local}"
else
mv "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"
fi
if [ -f "${_CACHE_PACKAGE_GLOBAL}" ] && cmp -s "${temp_global}" "${_CACHE_PACKAGE_GLOBAL}"; then
rm "${temp_global}"
else
mv "${temp_global}" "${_CACHE_PACKAGE_GLOBAL}"
fi
if [ -f "${_CACHE_PACKAGE_LOCAL}" ] && cmp -s "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"; then
rm "${temp_local}"
else
mv "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"
fi
if [ -f "${_CACHE_PACKAGE_DEVICE}" ] && cmp -s "${temp_device}" "${_CACHE_PACKAGE_DEVICE}"; then
rm "${temp_device}"
else
mv "${temp_device}" "${_CACHE_PACKAGE_DEVICE}"
fi
fi
if [ -z "${_DEBUG_DEPENDS_LIST+x}" ]; then
@ -940,8 +953,8 @@ get_pkg_version_maj_min() {
get_pkg_directory() {
local _PKG_ROOT_NAME=${1%:*} _ALL_DIRS _FOUND=0 _ANCHOR="@?+?@" _PKG_DIR _DIR
# Check for any available local package in preference to a global package
for _DIR in $(grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}" "${_CACHE_PACKAGE_LOCAL}"); do
# Check for any available device package in preference to a local package
for _DIR in $(grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}" "${_CACHE_PACKAGE_DEVICE}"); do
_DIR="${_DIR%${_ANCHOR}}"
# found first, set ${_PKG_DIR}
_PKG_DIR="$_DIR"
@ -950,6 +963,18 @@ get_pkg_directory() {
_FOUND=$((_FOUND+1))
done
# Check for any available local package in preference to a global package
if [ ${_FOUND} -eq 0 ]; then
for _DIR in $(grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}" "${_CACHE_PACKAGE_LOCAL}"); do
_DIR="${_DIR%${_ANCHOR}}"
# found first, set ${_PKG_DIR}
_PKG_DIR="$_DIR"
# keep track of dirs with package.mk for detecting multiple folders
_ALL_DIRS+="${_DIR}\n"
_FOUND=$((_FOUND+1))
done
fi
# If there's no local package available, use the global package
if [ ${_FOUND} -eq 0 ]; then
for _DIR in $(grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}" "${_CACHE_PACKAGE_GLOBAL}"); do

7
packages/hardware/quirks/devices/AYANEO AIR Plus/002-fancontrol
View file

@ -10,8 +10,9 @@ then
fi
cat <<EOF >/storage/.config/profile.d/002-fancontrol
DEVICE_HAS_FAN=true
DEVICE_PWM_FAN="/sys/devices/platform/oxp-platform/hwmon/hwmon5/pwm1"
DEVICE_TEMP_SENSOR="/sys/class/hwmon/hwmon2/temp1_input /sys/class/hwmon/hwmon3/temp1_input /sys/class/hwmon/hwmon4/temp1_input /sys/class/hwmon/hwmon5/temp1_input"
### Fan control is not working yet.
DEVICE_HAS_FAN=false
DEVICE_PWM_FAN="$(find /sys/devices/platform/oxp-platform/hwmon -name pwm1)"
DEVICE_TEMP_SENSOR="$(find /sys/devices/pci0000:00/ -name temp1_input | tr "\n" " ")"
EOF

2
packages/hardware/quirks/devices/Powkiddy x55/004-display
View file

@ -10,7 +10,7 @@ do
MYVAL=$(get_setting display.${PROPERTY})
if [ -z "${MYVAL}" ]
then
MYVAL=$(drm_tool list | sed -n '/Connector: 133/,$p' | awk '/'${PROPERTY}'/ {print $5}')
MYVAL=$(drm_tool list | sed -n '/Connector: 206/,$p' | awk '/'${PROPERTY}'/ {print $5}')
fi
display ${PROPERTY} ${MYVAL}
done

3
packages/network/netbase/package.mk
View file

@ -2,8 +2,7 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="netbase"
PKG_VERSION="5.4"
PKG_SHA256="66ff73d2d162e2d49db43988d8b8cd328cf7fffca042db73397f14c71825e80d"
PKG_VERSION="5.6"
PKG_LICENSE="GPL"
PKG_SITE="https://anonscm.debian.org/cgit/users/md/netbase.git/"
PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_${PKG_VERSION}.tar.xz"

6
packages/sysutils/system-utils/sources/devices/AMD64/overclock
View file

@ -51,6 +51,12 @@ case ${PROFILE} in
24w)
WATTS="24000"
;;
26w)
WATTS="26000"
;;
28w)
WATTS="28000"
;;
esac
ryzenadj --tctl-temp=97 --stapm-limit=${WATTS} --fast-limit=${WATTS} --stapm-time=500 --slow-limit=${WATTS} --slow-time=30 --vrmmax-current=70000

2
packages/ui/emulationstation/config/common/es_input.cfg
View file

@ -85,7 +85,7 @@
<input name="x" type="button" id="4" value="1" code="292" />
<input name="y" type="button" id="3" value="1" code="291" />
</inputConfig>
<inputConfig type="joystick" deviceName="Broadcom Bluetooth Wireless Joystick " deviceGUID="0500000042726f6164636f6d20426c00">
<inputConfig type="joystick" deviceName="Broadcom Bluetooth Wireless Joystick" deviceGUID="0500000042726f6164636f6d20426c00">
<input name="a" type="button" id="2" value="1" code="290" />
<input name="b" type="button" id="1" value="1" code="289" />
<input name="down" type="hat" id="0" value="4" code="16" />

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

@ -26,13 +26,13 @@ case ${DEVICE} in
;;
RK3566)
PKG_URL="${PKG_SITE}/rk356x-kernel.git"
PKG_VERSION="5aef2e6"
PKG_VERSION="cc3d1b418"
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="main"
;;
*X55)
PKG_URL="${PKG_SITE}/rk3566-x55-kernel.git"
PKG_VERSION="f1f05a235"
PKG_VERSION="c898e6a1f"
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="main"
;;