From d5fa4c2426f41671fd7f984a899100a1616c0aec Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 13 Sep 2018 23:04:27 +0000 Subject: [PATCH 1/7] projects; remove references to ratpoison Signed-off-by: Ian Leonard --- projects/Amlogic/options | 2 +- projects/RPi/options | 2 +- projects/Rockchip/options | 2 +- projects/WeTek_Core/options | 2 +- projects/WeTek_Play/options | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/Amlogic/options b/projects/Amlogic/options index 8c125aaf7e..a7762ea86b 100644 --- a/projects/Amlogic/options +++ b/projects/Amlogic/options @@ -96,7 +96,7 @@ # Displayserver to use (x11 / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) + # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau) diff --git a/projects/RPi/options b/projects/RPi/options index d77c6a0258..6d2804cabb 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -111,7 +111,7 @@ fi # Displayserver to use (x11 / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) + # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) diff --git a/projects/Rockchip/options b/projects/Rockchip/options index 21628264ca..f98719b2a8 100644 --- a/projects/Rockchip/options +++ b/projects/Rockchip/options @@ -41,7 +41,7 @@ # Displayserver to use (weston / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) + # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) diff --git a/projects/WeTek_Core/options b/projects/WeTek_Core/options index 37c479c903..c7e43c455b 100644 --- a/projects/WeTek_Core/options +++ b/projects/WeTek_Core/options @@ -103,7 +103,7 @@ # Displayserver to use (x11 / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) + # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau) diff --git a/projects/WeTek_Play/options b/projects/WeTek_Play/options index 58cfeedf4f..680f41382f 100644 --- a/projects/WeTek_Play/options +++ b/projects/WeTek_Play/options @@ -100,7 +100,7 @@ # Displayserver to use (x11 / no) DISPLAYSERVER="no" - # Windowmanager to use (ratpoison / fluxbox / none) + # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) From df1cffa51ea0b45084456f0ca9c095b79985b645 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 4 Oct 2018 08:01:33 +0000 Subject: [PATCH 2/7] config/options: cleanup Signed-off-by: Ian Leonard --- config/options | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/options b/config/options index 7013860093..46ea9826a3 100644 --- a/config/options +++ b/config/options @@ -70,7 +70,7 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux $PROJECT_DIR/$PROJECT/patches/linux $ # Need to point to your actual cc # If you have ccache installed, take care that LOCAL_CC don't point to it - [ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(which gcc)" + [ -z "${LOCAL_CC}" ] && export LOCAL_CC="$(command -v gcc)" if [ -z "$LOCAL_CC" ] ; then echo "***** Please install gcc *****" @@ -79,15 +79,15 @@ fi # Need to point to your actual g++ # If you have ccache installed, take care that LOCAL_CXX don't point to it - [ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(which g++)" + [ -z "${LOCAL_CXX}" ] && export LOCAL_CXX="$(command -v g++)" # verbose compilation mode (yes/no) VERBOSE="${VERBOSE:-yes}" # Concurrency make level (-j option) -# Try value 1 (default) to 4 on single CPU computer, or more on -# multi-processor computer (like hyperthreading SMP CPU) - [ -z "${CONCURRENCY_MAKE_LEVEL}" ] && export CONCURRENCY_MAKE_LEVEL=$(grep -c '^processor[[:cntrl:]]*:' /proc/cpuinfo) +# Try values between 1 and number of processor cores present. +# default: use all cores + [ -z "${CONCURRENCY_MAKE_LEVEL}" ] && export CONCURRENCY_MAKE_LEVEL=$(nproc) # cache size for ccache # Set the maximum size of the files stored in the cache. You can specify a From ef93ecf54b199828e59fe92f181cc84aa46fe79a Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 4 Oct 2018 07:24:55 +0000 Subject: [PATCH 3/7] scripts/checkdeps: cleanup Replace "which" with "command -v", which is part of POSIX. Make offering to install packages contingent on having the sudo command. Not every distro uses sudo. It is optional in Gentoo, for example. Signed-off-by: Ian Leonard --- scripts/checkdeps | 62 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index 82268c3b8d..fcff945cca 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -41,7 +41,7 @@ get_deps() { get_yes_no() { local ans - read -p "Would you like to install the needed tools ? (y/n) " ans + read -p "Would you like to install the needed tools? (y/n) " ans [ "${ans,,}" = "y" ] && return 0 [ "${ans,,}" = "yes" ] && return 0 return 1 @@ -132,34 +132,38 @@ if [ "${#need[@]}" -gt 0 ]; then done echo "**** You seem to use a $DISTRO system ****" - case "$DISTRO" in - ubuntu|debian|linuxmint|\"elementary\") - get_yes_no && sudo apt-get install "${need_pkg[@]}" - ;; - fedora|centos|rhel) - if [ $(which dnf) ]; then YUM=dnf; else YUM=yum; fi - get_yes_no && sudo $YUM install "${need_pkg[@]}" - ;; - gentoo) - get_yes_no && sudo emerge --ask --deep "${need_pkg[@]}" - ;; - sabayon) - get_yes_no && sudo equo install --ask "${need_pkg[@]}" - ;; - mageia) - get_yes_no && sudo urpmi "${need_pkg[@]}" - ;; - arch) - get_yes_no && sudo pacman -Sy "${need_pkg[@]}" - ;; - opensuse) - get_yes_no && sudo zypper install -y --no-recommends "${need_pkg[@]}" - ;; - *) - echo "**** unsupported distro $DISTRO ****" - exit 1 - ;; - esac + if command -v sudo >/dev/null; then + case "$DISTRO" in + ubuntu|debian|linuxmint|\"elementary\") + get_yes_no && sudo apt-get install "${need_pkg[@]}" + ;; + fedora|centos|rhel) + command -v dnf >/dev/null && YUM=dnf || YUM=yum + get_yes_no && sudo $YUM install "${need_pkg[@]}" + ;; + gentoo) + get_yes_no && sudo emerge --ask --deep "${need_pkg[@]}" + ;; + sabayon) + get_yes_no && sudo equo install --ask "${need_pkg[@]}" + ;; + mageia) + get_yes_no && sudo urpmi "${need_pkg[@]}" + ;; + arch) + get_yes_no && sudo pacman -Sy "${need_pkg[@]}" + ;; + opensuse) + get_yes_no && sudo zypper install -y --no-recommends "${need_pkg[@]}" + ;; + *) + echo "**** unsupported distro $DISTRO ****" + exit 1 + ;; + esac + else + echo "The command 'sudo' was not found. Please install necessary packages manually." + fi fi get_deps From 9f29687692f6194cf341c53f3da0a1389ef2d46c Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 29 Aug 2018 01:03:11 +0000 Subject: [PATCH 4/7] rpi: project housekeeping Signed-off-by: Ian Leonard --- projects/RPi/options | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/projects/RPi/options b/projects/RPi/options index 6d2804cabb..d77c883390 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -8,7 +8,6 @@ arm) # Valid TARGET_CPU for Raspberry Pi based devices are: # arm1176jzf-s cortex-a7 cortex-a53 - if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Slice" ]; then TARGET_CPU="arm1176jzf-s" elif [ "$DEVICE" = "RPi2" -o "$DEVICE" = "Slice3" ]; then @@ -24,18 +23,16 @@ # This specifies what floating point hardware (or hardware emulation) is # available on the target. Permissible names are: # vfp neon-vfpv4 neon-fp-armv8 - if [ "$DEVICE" = "RPi" -o "$DEVICE" = "Slice" ]; then TARGET_FPU="vfp" elif [ "$DEVICE" = "RPi2" -o "$DEVICE" = "Slice3" ]; then TARGET_FPU="neon-vfpv4" fi TARGET_FEATURES="32bit" - ;; esac - # Bootloader to use (syslinux / u-boot / bcm2835-bootloader) + # Bootloader to use (bcm2835-bootloader) BOOTLOADER="bcm2835-bootloader" # u-boot version to use (default) @@ -91,7 +88,6 @@ fi # SquashFS compression method (gzip / lzo / xz / zstd) SQUASHFS_COMPRESSION="lzo" - ################################################################################ # setup project defaults ################################################################################ @@ -102,7 +98,7 @@ fi # OpenGL(X) implementation to use (no / mesa) OPENGL="no" - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) + # OpenGL-ES implementation to use (no / bcm2835-driver / mesa) OPENGLES="bcm2835-driver" # include uvesafb support (yes / no) @@ -114,15 +110,15 @@ fi # Windowmanager to use (fluxbox / none) WINDOWMANAGER="none" - # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) + # Xorg Graphic drivers to use (all / vc4 / none) # Space separated list is supported, - # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia" + # e.g. GRAPHIC_DRIVERS="vc4" GRAPHIC_DRIVERS="" # Use a vendor specific KODI repo KODI_VENDOR="raspberrypi" - # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) + # KODI Player implementation to use (default / bcm2835-driver / mesa) KODIPLAYER_DRIVER="bcm2835-driver" # Modules to install in initramfs for early boot From 520391bb466583fb04300088d3bbe593d116e471 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 5 Oct 2018 06:49:13 +0000 Subject: [PATCH 5/7] config/functions: retire unused functions eglibc ceased active development years ago and is no longer in tree, so no need to check for it. tolower() has been around since 2010 and is unused anywhere. Wish it well! Should it return, tr '[:upper:]' '[:lower:]' is likely better. Signed-off-by: Ian Leonard --- config/functions | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/config/functions b/config/functions index c9691c9c95..b6cf71aeaa 100644 --- a/config/functions +++ b/config/functions @@ -671,17 +671,6 @@ install_addon_files() { create_addon_xml "$1" } -tolower() { - echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz -} - -require_eglibc() { - if [ "$TARGET_LIBC" != eglibc ]; then - echo "$1 requires eglibc, aborting." - exit 1 - fi -} - add_user() { # Usage: add_user "username" "password" "userid" "groupid" "description" "home" "shell" mkdir -p ${INSTALL}/etc From a36c818ae4ec160b59d3e8cf22f35df1535e0b0a Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Fri, 5 Oct 2018 20:15:10 +0000 Subject: [PATCH 6/7] tools/mkpkg_lockdev: drop; lockdev is no more Signed-off-by: Ian Leonard --- tools/mkpkg/mkpkg_lockdev | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100755 tools/mkpkg/mkpkg_lockdev diff --git a/tools/mkpkg/mkpkg_lockdev b/tools/mkpkg/mkpkg_lockdev deleted file mode 100755 index 0123a01b25..0000000000 --- a/tools/mkpkg/mkpkg_lockdev +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -echo "getting sources..." - if [ ! -d lockdev.git ]; then - git clone git://anonscm.debian.org/lockdev/lockdev.git -b master lockdev.git - fi - - cd lockdev.git - git pull - GIT_REV=`git log -n1 --format=%H` - cd .. - -echo "copying sources..." - rm -rf lockdev-$GIT_REV - cp -R lockdev.git lockdev-$GIT_REV - -echo "creating VERSION and other needed files" - ( - cd lockdev-$GIT_REV - LC_ALL=C ./scripts/git-version > VERSION - touch ChangeLog - ) - -echo "cleaning sources..." - rm -rf lockdev-$GIT_REV/.git - - -echo "packing sources..." - tar cvJf lockdev-$GIT_REV.tar.xz lockdev-$GIT_REV - -echo "remove temporary sourcedir..." - From 8d4aff2243d181422afead3a0d67c39294908551 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 13 Oct 2018 01:56:16 +0000 Subject: [PATCH 7/7] gitignore: ignore lost+found Signed-off-by: Ian Leonard --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7168344f04..ac9936c872 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ mkpkg-temp # private working directory /.work/ +# dedicated filesystem +/lost+found/ + # symlinks... /sources /.work