...
 
Commits (3)
......@@ -24,7 +24,7 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_BUILD_ARM64_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@bitbucket.org:croniccorey/amlogic-mm-common.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3605fa1fd0e17930490a1fcc425a27ebe1fc4500"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="df03f8adad178f3bbb9d765d76dcbff4c8d78e28"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/amlogic-mmc-emmc.patch $(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/disable-fbcon.patch"
BR2_LINUX_KERNEL_DEFCONFIG="meson64_le"
BR2_LINUX_KERNEL_IMAGE=y
......
......@@ -21,7 +21,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/overlay/MesonGX"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@bitbucket.org:croniccorey/amlogic-mm-common.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3605fa1fd0e17930490a1fcc425a27ebe1fc4500"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="df03f8adad178f3bbb9d765d76dcbff4c8d78e28"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/amlogic-mmc-emmc.patch $(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/disable-fbcon.patch"
BR2_LINUX_KERNEL_DEFCONFIG="meson64_le"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
......
......@@ -21,7 +21,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/overlay/MesonGX"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@bitbucket.org:croniccorey/amlogic-mm-common.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3605fa1fd0e17930490a1fcc425a27ebe1fc4500"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="df03f8adad178f3bbb9d765d76dcbff4c8d78e28"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/amlogic-mmc-emmc.patch $(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/disable-fbcon.patch"
BR2_LINUX_KERNEL_DEFCONFIG="meson64_le"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
......
......@@ -21,7 +21,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/overlay/MesonGX"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@bitbucket.org:croniccorey/amlogic-mm-common.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3605fa1fd0e17930490a1fcc425a27ebe1fc4500"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="df03f8adad178f3bbb9d765d76dcbff4c8d78e28"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/amlogic-mmc-emmc.patch $(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/disable-fbcon.patch"
BR2_LINUX_KERNEL_DEFCONFIG="meson64_le"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
......
......@@ -21,7 +21,7 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/overlay/MesonGX"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@bitbucket.org:croniccorey/amlogic-mm-common.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3605fa1fd0e17930490a1fcc425a27ebe1fc4500"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="df03f8adad178f3bbb9d765d76dcbff4c8d78e28"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/amlogic-mmc-emmc.patch $(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/linux/3.14.x/disable-fbcon.patch"
BR2_LINUX_KERNEL_DEFCONFIG="meson64_le"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
......
......@@ -108,11 +108,11 @@ config BR2_PACKAGE_KODI_GIT
config BR2_PACKAGE_KODI_REV
string "git revision"
default "ca0464535140d9b3d4a37f2c312658e4218f2945"
default "04d9428aa540e5c32e99c01effe6a20d314466b4"
help
This option will set the git revision.
Default: "ca0464535140d9b3d4a37f2c312658e4218f2945"
Default: "04d9428aa540e5c32e99c01effe6a20d314466b4"
source "$BR2_EXTERNAL_EmbER_PATH/package/mediacenter/kodi-platform/Config.in"
......
......@@ -5,7 +5,7 @@
################################################################################
AUTOMOUNT_SITE = $(BR2_EXTERNAL_EmbER_PATH)/package/utils/automount/src
AUTOMOUNT_VERSION = 1.0.0
AUTOMOUNT_VERSION = 1.0.1
AUTOMOUNT_SITE_METHOD = local
define AUTOMOUNT_INSTALL_TARGET_CMDS
......
......@@ -8,47 +8,46 @@
mount_media()
{
# Check if device is already mounted
if [ -n "$(/bin/mount | /bin/grep -w /dev/$1)" ]; then
exit 1
fi
[ -n "$(mount | grep -w /dev/$1)" ] && exit 1
# Get device info ($ID_FS_LABEL and $ID_FS_TYPE)
eval $(/sbin/blkid -o udev /dev/$1)
eval $(blkid -o udev /dev/$1)
# Create mount point
MP=/media/$1
if [ -n "$ID_FS_LABEL" ] && [ -z "$(/bin/mount | /bin/grep -w /media/$ID_FS_LABEL)" ]; then
MP=/media/$ID_FS_LABEL
fi
/bin/mkdir -p $MP
[ -n "$ID_FS_LABEL" ] && [ -z "$(mount | grep -w /media/$ID_FS_LABEL)" ] && MP=/media/$ID_FS_LABEL
mkdir -p $MP
# Mount device
if ! /bin/mount /dev/$1 $MP; then
/bin/rmdir $MP
exit 1
fi
mount /dev/$1 $MP || (rmdir $MP; exit 1)
# If device has emulators folder symlink to /root/emulators
find $MP/emulators -type d -mindepth 1 -exec sh -c 'dir="${0##*emulators/}"; mkdir -p /root/emulators/"$dir"' {} \; 2>/dev/null || true
find $MP/emulators -type f -exec sh -c 'emu="${0##*emulators/}"; [ ! -e "/root/emulators/$emu" ] && ln -sf "$0" /root/emulators/"$emu"' {} \; 2>/dev/null || true
# If device has roms folder symlink to /root/roms
find $MP/roms -type d -mindepth 1 -exec sh -c 'dir="${0##*roms/}"; mkdir -p /root/roms/"$dir"' {} \; 2>/dev/null || true
find $MP/roms -type f -exec sh -c 'rom="${0##*roms/}"; [ ! -e "/root/roms/$rom" ] && ln -sf "$0" /root/roms/"$rom"' {} \; 2>/dev/null || true
}
umount_media()
{
# Check if device is still mounted
if [ -z "$(/bin/mount | /bin/grep -w /dev/$1)" ]; then
exit 1
fi
[ -z "$(mount | grep -w /dev/$1)" ] && exit 1
# Unmount device
/bin/umount -l /dev/$1
umount -l /dev/$1
# Remove stale mount points
for dir in /media/*; do
if [ -z "$(/bin/mount | /bin/grep -w $dir)" ] && [ -z "$(/bin/ls -A $dir)" ]; then
/bin/rmdir $dir
fi
[ -z "$(mount | grep -w $dir)" ] && [ -z "$(ls -A $dir)" ] && rmdir $dir
done
# If /root/emulators exists remove broken symlinks
(find /root/emulators -type l ! -exec test -e {} \; -print0 2>/dev/null || true) | xargs -r0 rm
# If /root/roms exists remove broken symlinks
(find /root/roms -type l ! -exec test -e {} \; -print0 2>/dev/null || true) | xargs -r0 rm
}
if [ "$1" = "add" ]; then
mount_media $2
elif [ "$1" = "remove" ]; then
umount_media $2
fi
([ "$1" = "add" ] && mount_media $2) || ([ "$1" = "remove" ] && umount_media $2)