]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
fix build for Coolstream
authorMarkham <markham001@gmx.de>
Fri, 23 Mar 2018 11:56:19 +0000 (12:56 +0100)
committerMarkham <markham001@gmx.de>
Fri, 23 Mar 2018 11:56:19 +0000 (12:56 +0100)
make/applications.mk
make/bootstrap.mk
make/neutrino.mk

index 3b7c1b136bc70cc9c041690cc18b084ef1c19eda..2832df1f84a19f2d1acb73070f55d52a44dbb99d 100755 (executable)
@@ -280,11 +280,6 @@ $(D)/gdb-remote: $(ARCHIVE)/gdb-$(GDB_VER).tar.xz | $(TARGETPREFIX)
 # MTD-UTILS
 ifeq ($(PLATFORM), nevis)
 MTD_BUILDDIR = `pwd`/build
-MTD_BUILDS_HOST = \
-       $(MTD_BUILDDIR)/mkfs.jffs2 \
-       $(MTD_BUILDDIR)/sumtool \
-       $(MTD_BUILDDIR)/jffs2reader \
-       $(MTD_BUILDDIR)/jffs2dump
 MTD_BUILDS = \
        $(MTD_BUILDDIR)/flash_erase
 else
index c5481e5a8dc8d1b6c44d031f8606dcb3933c7801..d5094584c5073a797fa0bf2e52a6f1d3187dd518 100755 (executable)
@@ -90,7 +90,9 @@ $(D)/host_mtd-utils: $(ARCHIVE)/mtd-utils-$(HOST_MTD_UTILS_VER).tar.bz2
        $(UNTAR)/mtd-utils-$(HOST_MTD_UTILS_VER).tar.bz2
        set -e; cd $(BUILD_TMP)/mtd-utils-$(HOST_MTD_UTILS_VER); \
                $(PATCH)/host-mtd-utils-$(HOST_MTD_UTILS_VER).patch; \
-               $(MAKE) `pwd`/mkfs.jffs2 `pwd`/sumtool BUILDDIR=`pwd` WITHOUT_XATTR=1 DESTDIR=$(HOSTPREFIX); \
+               $(MAKE) `pwd`/mkfs.jffs2 `pwd`/sumtool BUILDDIR=`pwd` WITHOUT_XATTR=1
+       install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(HOST_MTD_UTILS_VER)/sumtool $(HOSTPREFIX)/bin
+       install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(HOST_MTD_UTILS_VER)/mkfs.jffs2 $(HOSTPREFIX)/bin
        $(REMOVE)/mtd-utils-$(HOST_MTD_UTILS_VER)
        $(TOUCH)
 
index e659ca6b7760abae368b273b1c623a8d3daf8b91..3d793b90097336d13ef69bf2153c576bdda69207 100755 (executable)
@@ -188,7 +188,7 @@ $(D)/neutrino-hd-libs:
        $(START_BUILD)
        $(MAKE) $(D)/libsigc $(D)/giflib $(D)/openssl \
                        $(D)/libcurl $(D)/freetype $(D)/libjpeg \
-                       $(D)/libdvbsi++ $(D)/pugixml $(D)/alsa-lib $(D)/ffmpeg \
+                       $(D)/libdvbsi++ $(D)/pugixml $(D)/ffmpeg \
                        $(D)/libbluray $(D)/libopenthreads $(D)/libusb $(D)/libfribidi \
                        $(D)/luaposix $(D)/luacurl $(D)/luasocket $(D)/lua-expat $(D)/lua-feedparser
        $(TOUCH)