From 25f254890f0f13c63e224a16304f9605a422797f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 30 Jun 2018 12:31:22 +0200 Subject: [PATCH] Revert "dash: add package, configure as CONFIG_SHELL" This reverts commit 3b5986704e002602cf72c9e34206d2938dcc0a0b. The config shell is set as an interpreter in libtool scripts and as Linux has a hard limit of 127 bytes on the first line in scripts (including the hashbang) this causes the build to fail with a "bad interpreter" error if the path to the config shell exceeds this limit. These errors were first noticed on jenkins builds but can be easily reproduced by building LibreELEC in a longer build dir. eg RPi2 clean build failing on libtool invocation in kmod build: ./doltlibtool: /home/hias/rpi/libreelec-testing-with-a-long-directory-path-as-on-jenkins/build.LibreELEC-RPi2.arm-9.0-devel/kmod-24/.x86_64-linux-gnu/libtool: /home/hias/rpi/libreelec-testing-with-a-long-directory-path-as-on-jenkins/build.LibreELEC-RPi2.arm-9.0-devel/toolchain/bin/d: bad interpreter: No such file or directory Signed-off-by: Matthias Reichl --- config/path | 2 -- config/show_config | 1 - packages/lang/dash/package.mk | 34 --------------------------- packages/virtual/toolchain/package.mk | 11 ++++----- 4 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 packages/lang/dash/package.mk diff --git a/config/path b/config/path index 67067aad9f..dc2f3e6e8b 100644 --- a/config/path +++ b/config/path @@ -37,8 +37,6 @@ SYSROOT_PREFIX=$TOOLCHAIN/$TARGET_NAME/sysroot LIB_PREFIX=$SYSROOT_PREFIX/usr TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME- -[ -z "$CONFIG_SHELL" -a -x $TOOLCHAIN/bin/dash ] && export CONFIG_SHELL=$TOOLCHAIN/bin/dash - # use linaro toolchain on 64/32 split builds if [ -z "$KERNEL_LINARO_TOOLCHAIN" -a "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then KERNEL_LINARO_TOOLCHAIN="aarch64-linux-gnu" diff --git a/config/show_config b/config/show_config index 9ed6c9ce42..597580fb96 100644 --- a/config/show_config +++ b/config/show_config @@ -104,7 +104,6 @@ show_config() { config_message="$config_message\n - OEM Support:\t\t\t\t $OEM_SUPPORT" config_message="$config_message\n - Default ROOT Password:\t\t $ROOT_PASSWORD" - config_message="$config_message\n - CONFIG_SHELL:\t\t\t $CONFIG_SHELL" config_message="$config_message\n - Bootloader:\t\t\t\t $BOOTLOADER" if [ "$BOOTLOADER" = "u-boot" ]; then config_message="$config_message\n - U-Boot configuration:\t\t $UBOOT_CONFIG" diff --git a/packages/lang/dash/package.mk b/packages/lang/dash/package.mk deleted file mode 100644 index 9e9f4cd73c..0000000000 --- a/packages/lang/dash/package.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# This file is part of LibreELEC - https://libreelec.tv -# Copyright (C) 2018-present Team LibreELEC -# -# LibreELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# LibreELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with LibreELEC. If not, see . -################################################################################ - -PKG_NAME="dash" -PKG_VERSION="0.5.10.2" -PKG_SHA256="c34e1259c4179a6551dc3ceb41c668cf3be0135c5ec430deb2edfc17fff44da9" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://gondor.apana.org.au/~herbert/dash/" -PKG_URL="https://git.kernel.org/pub/scm/utils/dash/dash.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_HOST="" -PKG_SECTION="lang" -PKG_SHORTDESC="dash: Debian Almquist shell" -PKG_LONGDESC="DASH is a POSIX-compliant implementation of /bin/sh that aims to be as small as possible. It does this without sacrificing speed where possible. In fact, it is significantly faster than bash (the GNU Bourne-Again SHell) for most tasks." -PKG_TOOLCHAIN="configure" - -pre_configure_host() { - $PKG_BUILD/autogen.sh -} diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk index 6f4c71ff48..354cb85058 100644 --- a/packages/virtual/toolchain/package.mk +++ b/packages/virtual/toolchain/package.mk @@ -1,20 +1,19 @@ ################################################################################ -# This file is part of LibreELEC - https://libreelec.tv -# Copyright (C) 2018-present Team LibreELEC +# This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) # -# LibreELEC is free software: you can redistribute it and/or modify +# OpenELEC is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# LibreELEC is distributed in the hope that it will be useful, +# OpenELEC is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with LibreELEC. If not, see . +# along with OpenELEC. If not, see . ################################################################################ PKG_NAME="toolchain" @@ -23,7 +22,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host dash:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host p7zip:host ninja:host meson:host" +PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host yasm:host p7zip:host ninja:host meson:host" PKG_SECTION="virtual" PKG_SHORTDESC="toolchain: LibreELEC.tv' toolchain" PKG_LONGDESC="a crosscompiling toolchain to compile all packages"