From 8e93386b804f8029a1180755ce240fbc0f06b009 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 7 Apr 2019 17:20:01 -0700 Subject: [PATCH 1/3] vim: Add host build to install xxd Packages such as ttyd and device-observatory need this. Signed-off-by: Rosen Penev --- utils/vim/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/vim/Makefile b/utils/vim/Makefile index 8e9e3f3f0..e4ab2682f 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vim PKG_VERSION:=8.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 VIMVER:=81 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -21,7 +21,11 @@ PKG_CPE_ID:=cpe:/a:vim:vim PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER) PKG_BUILD_PARALLEL:=1 +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(VIMVER) +HOST_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/vim/Default SECTION:=utils @@ -242,3 +246,4 @@ $(eval $(call BuildPackage,vim-fuller)) $(eval $(call BuildPackage,vim-runtime)) $(eval $(call BuildPackage,vim-help)) $(eval $(call BuildPackage,xxd)) +$(eval $(call HostBuild)) From 773c19afad0723bc2ba49b36e8172776e2eaf207 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 10 Apr 2019 14:55:37 -0700 Subject: [PATCH 2/3] ttyd: Add dependency for vim Needed to avoid error in case xxd is not installed: [ 16%] Generating html.h from index.html /bin/sh: 1: CMAKE_XXD-NOTFOUND: not found CMakeFiles/ttyd.dir/build.make:61: recipe for target 'html.h' failed make[6]: *** [html.h] Error 127 Signed-off-by: Rosen Penev --- utils/ttyd/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/utils/ttyd/Makefile b/utils/ttyd/Makefile index 21efa6913..5ec444e4d 100644 --- a/utils/ttyd/Makefile +++ b/utils/ttyd/Makefile @@ -9,17 +9,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ttyd PKG_VERSION:=1.4.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/tsl0922/ttyd/tar.gz/$(PKG_VERSION)? -PKG_SOURCE_VERSION=$(PKG_VERSION) -PKG_HASH=ff1a66b418df6cd741868a8ea84f69cd63f15e52e3fa117641ec57d3c37a1315 +PKG_HASH:=ff1a66b418df6cd741868a8ea84f69cd63f15e52e3fa117641ec57d3c37a1315 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_DEPENDS:=vim/host CMAKE_INSTALL:=1 include $(INCLUDE_DIR)/package.mk From b2db7f89542a88dd847108368346dedf2e075e09 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 10 Apr 2019 14:58:07 -0700 Subject: [PATCH 3/3] device-observatory: Add depend on vim to avoid build failure /bin/sh: 2: xxd: not found /bin/sh: 2: xxd: not found Makefile:24: recipe for target 'src/files.h' failed make[4]: *** [src/files.h] Error 127 Signed-off-by: Rosen Penev --- utils/device-observatory/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/device-observatory/Makefile b/utils/device-observatory/Makefile index 8a88c3ddb..6970dad08 100644 --- a/utils/device-observatory/Makefile +++ b/utils/device-observatory/Makefile @@ -2,14 +2,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=device-observatory PKG_VERSION:=1.2.0 -PKG_RELEASE:=2 - -PKG_LICENSE:=GPL-3.0+ +PKG_RELEASE:=3 PKG_SOURCE_URL:=https://codeload.github.com/mwarning/device-observatory/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=83b3f362f154a427abbd3af31b3c2dda9983cdc15f6b833d804727ef0fbdc72e +PKG_LICENSE:=GPL-3.0+ +PKG_BUILD_DEPENDS:=vim/host + include $(INCLUDE_DIR)/package.mk define Package/device-observatory