fix nodejs modules makefile

yodaos-project · Dec 3, 2019 · 8d9b670 · 8d9b670
1 parent 6c21e51
commit 8d9b670
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/openwrt/package/nodejs/node-caps/Makefile b/openwrt/package/nodejs/node-caps/Makefile
@@ -2,11 +2,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node-caps
+PKG_VERSION:=master
 PKG_RELEASE:=1
-PKG_SOURCE_DIR:=$(ROKID_DIR)/frameworks/node_modules/@yoda/caps
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/yodaos-project/node-caps.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_LICENSE:=
+PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -22,11 +29,6 @@ define Package/node-caps
 	DEPENDS:=+libstdcpp +shadow-node +mutils
 endef
 
-define Build/Prepare
-	$(CP) $(PKG_SOURCE_DIR)/* $(PKG_BUILD_DIR)
-	$(call Build/Prepare/Default,)
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)$(NODE_MODULE_DIR)
 	$(CP) $(PKG_INSTALL_DIR)$(NODE_MODULE_DIR)/* $(1)$(NODE_MODULE_DIR)

diff --git a/openwrt/package/nodejs/node-flock/Makefile b/openwrt/package/nodejs/node-flock/Makefile
@@ -2,11 +2,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node-flock
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
-PKG_SOURCE_DIR:=$(ROKID_DIR)/frameworks/node_modules/flock
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/yodaos-project/node-flock.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_LICENSE:=
+PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -22,11 +29,6 @@ define Package/node-flock
 	DEPENDS:=+libstdcpp +shadow-node
 endef
 
-define Build/Prepare
-	$(CP) $(PKG_SOURCE_DIR)/* $(PKG_BUILD_DIR)
-	$(call Build/Prepare/Default,)
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)$(NODE_MODULE_DIR)
 	$(CP) $(PKG_INSTALL_DIR)$(NODE_MODULE_DIR)/* $(1)$(NODE_MODULE_DIR)

diff --git a/openwrt/package/nodejs/node-flora/Makefile b/openwrt/package/nodejs/node-flora/Makefile
@@ -2,11 +2,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node-flora
+PKG_VERSION:=master
 PKG_RELEASE:=1
-PKG_SOURCE_DIR:=$(ROKID_DIR)/frameworks/node_modules/@yoda/flora
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/yodaos-project/node-flora.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_LICENSE:=
+PKG_LICENSE:=MIT
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -24,11 +31,6 @@ define Package/node-flora
 	DEPENDS:=+libstdcpp +shadow-node +flora
 endef
 
-define Build/Prepare
-	$(CP) $(PKG_SOURCE_DIR)/* $(PKG_BUILD_DIR)
-	$(call Build/Prepare/Default,)
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)$(NODE_MODULE_DIR)
 	$(CP) $(PKG_INSTALL_DIR)$(NODE_MODULE_DIR)/* $(1)$(NODE_MODULE_DIR)