From f7da3c2cc30c6a2bda7cd8138b28618aee5ef3d8 Mon Sep 17 00:00:00 2001 From: cvh Date: Mon, 16 Oct 2017 00:19:42 +0200 Subject: [PATCH] remove double newlines --- packages/addons/addon-depends/cxxtools/package.mk | 1 - .../addons/addon-depends/system-tools-depends/mrxvt/package.mk | 1 - packages/addons/repository/repository.kodinerds/package.mk | 1 - .../addons/repository/repository.linuxserver.docker/package.mk | 1 - packages/audio/alsa-utils/package.mk | 1 - packages/devel/libcap/package.mk | 1 - packages/emulation/libretro-picodrive/package.mk | 2 -- packages/graphics/cairo/package.mk | 1 - packages/multimedia/SDL2/package.mk | 2 -- packages/multimedia/ffmpeg/package.mk | 1 - packages/network/connman/package.mk | 1 - 11 files changed, 13 deletions(-) diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk index 966e9fed995..e5c3e7a2b79 100644 --- a/packages/addons/addon-depends/cxxtools/package.mk +++ b/packages/addons/addon-depends/cxxtools/package.mk @@ -39,7 +39,6 @@ pre_configure_target() { LDFLAGS="$LDFLAGS -fPIC" } - post_makeinstall_host() { rm -rf $TOOLCHAIN/bin/cxxtools-config } diff --git a/packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk b/packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk index e242ae43bfc..6fa7b4207d0 100644 --- a/packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk @@ -29,7 +29,6 @@ PKG_SHORTDESC="mrxvt: Lightweight Xterm replacement" PKG_LONGDESC="Mrxvt (previously named as materm) is a lightweight and powerful multi-tabbed X terminal emulator based on the popular rxvt and aterm. It implements many useful features seen in some modern X terminal emulators, like gnome-terminal and konsole, but keep to be lightweight and independent from the GNOME and KDE desktop environment." PKG_AUTORECONF="yes" - PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_setpgrp_void=no \ --enable-minimal \ --disable-frills \ diff --git a/packages/addons/repository/repository.kodinerds/package.mk b/packages/addons/repository/repository.kodinerds/package.mk index 2eeb93aa816..125fa17ec81 100644 --- a/packages/addons/repository/repository.kodinerds/package.mk +++ b/packages/addons/repository/repository.kodinerds/package.mk @@ -33,7 +33,6 @@ PKG_IS_ADDON="yes" PKG_ADDON_NAME="Kodinerds Repository" PKG_ADDON_TYPE="xbmc.addon.repository" - make_target() { $SED -e "s|@PKG_VERSION@|$PKG_VERSION|g" \ -e "s|@PKG_REV@|$PKG_REV|g" \ diff --git a/packages/addons/repository/repository.linuxserver.docker/package.mk b/packages/addons/repository/repository.linuxserver.docker/package.mk index 3bf508ed199..5de8eaa2b93 100644 --- a/packages/addons/repository/repository.linuxserver.docker/package.mk +++ b/packages/addons/repository/repository.linuxserver.docker/package.mk @@ -34,7 +34,6 @@ PKG_IS_ADDON="yes" PKG_ADDON_NAME="LinuxServer.io Repository" PKG_ADDON_TYPE="xbmc.addon.repository" - make_target() { $SED -e "s|@PKG_VERSION@|$PKG_VERSION|g" \ -e "s|@PKG_REV@|$PKG_REV|g" \ diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk index c52a6e033f6..3c4ace823ce 100644 --- a/packages/audio/alsa-utils/package.mk +++ b/packages/audio/alsa-utils/package.mk @@ -39,7 +39,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ --disable-nls \ --disable-rst2man" - post_makeinstall_target() { rm -rf $INSTALL/lib $INSTALL/var rm -rf $INSTALL/usr/share/alsa/speaker-test diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk index 6a4b493f989..8eed1443ad1 100644 --- a/packages/devel/libcap/package.mk +++ b/packages/devel/libcap/package.mk @@ -38,7 +38,6 @@ post_unpack() { cp -r $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME } - make_host() { cd $PKG_BUILD/.$HOST_NAME make CC=$CC \ diff --git a/packages/emulation/libretro-picodrive/package.mk b/packages/emulation/libretro-picodrive/package.mk index 49bc2c0904e..93c9ddc9d43 100644 --- a/packages/emulation/libretro-picodrive/package.mk +++ b/packages/emulation/libretro-picodrive/package.mk @@ -16,7 +16,6 @@ # along with LibreELEC. If not, see . ################################################################################ - PKG_NAME="libretro-picodrive" PKG_VERSION="9ae88ef" PKG_SHA256="a54ddc7de8261c32e848c583dfb0fe4831d92684b9b67a25e2ccbff6a0f6978c" @@ -80,4 +79,3 @@ makeinstall_target() { cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake } - diff --git a/packages/graphics/cairo/package.mk b/packages/graphics/cairo/package.mk index ac9e67f4172..861153df3b2 100644 --- a/packages/graphics/cairo/package.mk +++ b/packages/graphics/cairo/package.mk @@ -41,7 +41,6 @@ if [ "$DISPLAYSERVER" = "x11" ]; then --disable-egl \ --with-x" - elif [ "$DISPLAYSERVER" = "weston" ]; then PKG_CAIRO_CONFIG="--disable-xlib \ --disable-xlib-xrender \ diff --git a/packages/multimedia/SDL2/package.mk b/packages/multimedia/SDL2/package.mk index 82149b12e15..ed8a28b808d 100644 --- a/packages/multimedia/SDL2/package.mk +++ b/packages/multimedia/SDL2/package.mk @@ -74,8 +74,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static \ --disable-rpath \ --disable-render-d3d" - - if [ "$DISPLAYSERVER" = "x11" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXrandr" diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 4ff79362003..cc9d44383f6 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -87,7 +87,6 @@ pre_configure_target() { # ffmpeg fails running with GOLD support strip_gold - if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then CFLAGS="-I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux -DRPI=1 $CFLAGS" FFMPEG_LIBS="-lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm" diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index a7d86df397d..9e7482122a7 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -63,7 +63,6 @@ PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \ --with-systemdunitdir=/usr/lib/systemd/system \ --disable-silent-rules" - PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \ statedir=/run/connman"