Try to build z2m

openlumi · Jul 22, 2022 · cfc4c36 · cfc4c36
1 parent 9d6eb81
commit cfc4c36
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/user/19.07.8/patches/001_zigbee2mqtt_optimize.patch b/user/19.07.8/patches/001_zigbee2mqtt_optimize.patch
@@ -1,9 +1,9 @@
 --- package/feeds/node/node-zigbee2mqtt/Makefile
 +++ package/feeds/node/node-zigbee2mqtt/Makefile
-@@ -50,20 +50,26 @@
+@@ -50,20 +50,33 @@
  TARGET_CFLAGS+=$(FPIC)
  TARGET_CPPFLAGS+=$(FPIC)
- 
+
 +NPM_FLAGS=$(MAKE_VARS) \
 +    $(MAKE_FLAGS) \
 +    npm_config_arch=$(NODEJS_CPU) \
@@ -15,13 +15,13 @@
 +    npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM)
 +
  define Build/Compile
--	cd $(PKG_BUILD_DIR); \
--	$(MAKE_VARS) \
--	$(MAKE_FLAGS) \
--	npm_config_nodedir=$(STAGING_DIR)/usr/ \
--	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
--	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
--	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
+ 	cd $(PKG_BUILD_DIR); \
+ 	$(MAKE_VARS) \
+ 	$(MAKE_FLAGS) \
+ 	npm_config_nodedir=$(STAGING_DIR)/usr/ \
+ 	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
+ 	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
+ 	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
 +	$(NPM_FLAGS) npm i -g --production $(PKG_BUILD_DIR)
 +	$(NPM_FLAGS) npm ci --production --prefix=$(PKG_BUILD_DIR) --target_arch=$(NODEJS_CPU) --prefer-dedupe
  	rm -rf $(PKG_BUILD_DIR)/node_modules/zigbee-herdsman-converters/node_modules/zigbee-herdsman

diff --git a/user/21.02.2/patches/001_zigbee2mqtt_optimize.patch b/user/21.02.2/patches/001_zigbee2mqtt_optimize.patch
@@ -1,9 +1,9 @@
 --- package/feeds/node/node-zigbee2mqtt/Makefile
 +++ package/feeds/node/node-zigbee2mqtt/Makefile
-@@ -50,20 +50,26 @@
+@@ -50,20 +50,33 @@
  TARGET_CFLAGS+=$(FPIC)
  TARGET_CPPFLAGS+=$(FPIC)
- 
+
 +NPM_FLAGS=$(MAKE_VARS) \
 +    $(MAKE_FLAGS) \
 +    npm_config_arch=$(NODEJS_CPU) \
@@ -15,13 +15,13 @@
 +    npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM)
 +
  define Build/Compile
--	cd $(PKG_BUILD_DIR); \
--	$(MAKE_VARS) \
--	$(MAKE_FLAGS) \
--	npm_config_nodedir=$(STAGING_DIR)/usr/ \
--	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
--	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
--	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
+ 	cd $(PKG_BUILD_DIR); \
+ 	$(MAKE_VARS) \
+ 	$(MAKE_FLAGS) \
+ 	npm_config_nodedir=$(STAGING_DIR)/usr/ \
+ 	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
+ 	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
+ 	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
 +	$(NPM_FLAGS) npm i -g --production $(PKG_BUILD_DIR)
 +	$(NPM_FLAGS) npm ci --production --prefix=$(PKG_BUILD_DIR) --target_arch=$(NODEJS_CPU) --prefer-dedupe
  	rm -rf $(PKG_BUILD_DIR)/node_modules/zigbee-herdsman-converters/node_modules/zigbee-herdsman

diff --git a/user/21.02.3/patches/001_zigbee2mqtt_optimize.patch b/user/21.02.3/patches/001_zigbee2mqtt_optimize.patch
@@ -1,6 +1,6 @@
 --- package/feeds/node/node-zigbee2mqtt/Makefile
 +++ package/feeds/node/node-zigbee2mqtt/Makefile
-@@ -50,20 +50,26 @@
+@@ -50,20 +50,33 @@
  TARGET_CFLAGS+=$(FPIC)
  TARGET_CPPFLAGS+=$(FPIC)
 
@@ -15,13 +15,13 @@
 +    npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM)
 +
  define Build/Compile
--	cd $(PKG_BUILD_DIR); \
--	$(MAKE_VARS) \
--	$(MAKE_FLAGS) \
--	npm_config_nodedir=$(STAGING_DIR)/usr/ \
--	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
--	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
--	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
+ 	cd $(PKG_BUILD_DIR); \
+ 	$(MAKE_VARS) \
+ 	$(MAKE_FLAGS) \
+ 	npm_config_nodedir=$(STAGING_DIR)/usr/ \
+ 	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
+ 	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
+ 	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
 +	$(NPM_FLAGS) npm i -g --production $(PKG_BUILD_DIR)
 +	$(NPM_FLAGS) npm ci --production --prefix=$(PKG_BUILD_DIR) --target_arch=$(NODEJS_CPU) --prefer-dedupe
  	rm -rf $(PKG_BUILD_DIR)/node_modules/zigbee-herdsman-converters/node_modules/zigbee-herdsman

diff --git a/user/22.03.0/patches/001_zigbee2mqtt_optimize.patch b/user/22.03.0/patches/001_zigbee2mqtt_optimize.patch
@@ -1,9 +1,9 @@
 --- package/feeds/node/node-zigbee2mqtt/Makefile
 +++ package/feeds/node/node-zigbee2mqtt/Makefile
-@@ -50,20 +50,26 @@
+@@ -50,20 +50,33 @@
  TARGET_CFLAGS+=$(FPIC)
  TARGET_CPPFLAGS+=$(FPIC)
- 
+
 +NPM_FLAGS=$(MAKE_VARS) \
 +    $(MAKE_FLAGS) \
 +    npm_config_arch=$(NODEJS_CPU) \
@@ -15,13 +15,13 @@
 +    npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM)
 +
  define Build/Compile
--	cd $(PKG_BUILD_DIR); \
--	$(MAKE_VARS) \
--	$(MAKE_FLAGS) \
--	npm_config_nodedir=$(STAGING_DIR)/usr/ \
--	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
--	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
--	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
+ 	cd $(PKG_BUILD_DIR); \
+ 	$(MAKE_VARS) \
+ 	$(MAKE_FLAGS) \
+ 	npm_config_nodedir=$(STAGING_DIR)/usr/ \
+ 	npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
+ 	npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM) \
+ 	npm install --production --global-style --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
 +	$(NPM_FLAGS) npm i -g --production $(PKG_BUILD_DIR)
 +	$(NPM_FLAGS) npm ci --production --prefix=$(PKG_BUILD_DIR) --target_arch=$(NODEJS_CPU) --prefer-dedupe
  	rm -rf $(PKG_BUILD_DIR)/node_modules/zigbee-herdsman-converters/node_modules/zigbee-herdsman