Skip to content

Commit

Permalink
Build z2m 1.26
Browse files Browse the repository at this point in the history
  • Loading branch information
@devbis
devbis committed Aug 2, 2022
1 parent 9d6eb81 commit 696d59f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 20 deletions.
10 changes: 6 additions & 4 deletions user/19.07.8/patches/001_zigbee2mqtt_optimize.patch
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- package/feeds/node/node-zigbee2mqtt/Makefile
+++ package/feeds/node/node-zigbee2mqtt/Makefile
@@ -50,20 +50,26 @@
@@ -50,20 +50,28 @@
TARGET_CFLAGS+=$(FPIC)
TARGET_CPPFLAGS+=$(FPIC)

+NPM_FLAGS=$(MAKE_VARS) \
+ $(MAKE_FLAGS) \
+ npm_config_arch=$(NODEJS_CPU) \
Expand All @@ -22,20 +22,22 @@
- 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 --package-lock-only --prefix=$(PKG_BUILD_DIR)
+ $(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
rm -rf $(PKG_BUILD_DIR)/node_modules/ajv/lib
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/min
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/src
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale
+ rm -rf $(PKG_BUILD_DIR)/node_modules/{react-icons,@rjsf,react-dom,react-bootstrap}
clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.map.js" "**/*.png" \
"**/example/" "**/examples/" --include "**/npm-shrinkwrap.json" "**/.babelrc.js" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" "**/package-lock.json" \
"**/.prebuild-installrc" "**/obj.target/" "**/config.gypi" "**/binding.Makefile"
rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
@@ -74,13 +80,13 @@

define Package/node-zigbee2mqtt/install
$(INSTALL_DIR) $(1)/opt/$(PKG_NPM_NAME)
- $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \
Expand Down
10 changes: 6 additions & 4 deletions user/21.02.2/patches/001_zigbee2mqtt_optimize.patch
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- package/feeds/node/node-zigbee2mqtt/Makefile
+++ package/feeds/node/node-zigbee2mqtt/Makefile
@@ -50,20 +50,26 @@
@@ -50,20 +50,28 @@
TARGET_CFLAGS+=$(FPIC)
TARGET_CPPFLAGS+=$(FPIC)

+NPM_FLAGS=$(MAKE_VARS) \
+ $(MAKE_FLAGS) \
+ npm_config_arch=$(NODEJS_CPU) \
Expand All @@ -22,20 +22,22 @@
- 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 --package-lock-only --prefix=$(PKG_BUILD_DIR)
+ $(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
rm -rf $(PKG_BUILD_DIR)/node_modules/ajv/lib
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/min
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/src
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale
+ rm -rf $(PKG_BUILD_DIR)/node_modules/{react-icons,@rjsf,react-dom,react-bootstrap}
clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.map.js" "**/*.png" \
"**/example/" "**/examples/" --include "**/npm-shrinkwrap.json" "**/.babelrc.js" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" "**/package-lock.json" \
"**/.prebuild-installrc" "**/obj.target/" "**/config.gypi" "**/binding.Makefile"
rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
@@ -74,13 +80,13 @@

define Package/node-zigbee2mqtt/install
$(INSTALL_DIR) $(1)/opt/$(PKG_NPM_NAME)
- $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \
Expand Down
10 changes: 6 additions & 4 deletions user/21.02.3/patches/001_zigbee2mqtt_optimize.patch
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- package/feeds/node/node-zigbee2mqtt/Makefile
+++ package/feeds/node/node-zigbee2mqtt/Makefile
@@ -50,20 +50,26 @@
@@ -50,20 +50,28 @@
TARGET_CFLAGS+=$(FPIC)
TARGET_CPPFLAGS+=$(FPIC)

+NPM_FLAGS=$(MAKE_VARS) \
+ $(MAKE_FLAGS) \
+ npm_config_arch=$(NODEJS_CPU) \
Expand All @@ -22,20 +22,22 @@
- 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 --package-lock-only --prefix=$(PKG_BUILD_DIR)
+ $(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
rm -rf $(PKG_BUILD_DIR)/node_modules/ajv/lib
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/min
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/src
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale
+ rm -rf $(PKG_BUILD_DIR)/node_modules/{react-icons,@rjsf,react-dom,react-bootstrap}
clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.map.js" "**/*.png" \
"**/example/" "**/examples/" --include "**/npm-shrinkwrap.json" "**/.babelrc.js" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" "**/package-lock.json" \
"**/.prebuild-installrc" "**/obj.target/" "**/config.gypi" "**/binding.Makefile"
rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
@@ -74,13 +80,13 @@

define Package/node-zigbee2mqtt/install
$(INSTALL_DIR) $(1)/opt/$(PKG_NPM_NAME)
- $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \
Expand Down
10 changes: 6 additions & 4 deletions user/22.03.0/patches/001_zigbee2mqtt_optimize.patch
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- package/feeds/node/node-zigbee2mqtt/Makefile
+++ package/feeds/node/node-zigbee2mqtt/Makefile
@@ -50,20 +50,26 @@
@@ -50,20 +50,28 @@
TARGET_CFLAGS+=$(FPIC)
TARGET_CPPFLAGS+=$(FPIC)

+NPM_FLAGS=$(MAKE_VARS) \
+ $(MAKE_FLAGS) \
+ npm_config_arch=$(NODEJS_CPU) \
Expand All @@ -22,20 +22,22 @@
- 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 --package-lock-only --prefix=$(PKG_BUILD_DIR)
+ $(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
rm -rf $(PKG_BUILD_DIR)/node_modules/ajv/lib
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/min
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/src
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale
+ rm -rf $(PKG_BUILD_DIR)/node_modules/{react-icons,@rjsf,react-dom,react-bootstrap}
clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.map.js" "**/*.png" \
"**/example/" "**/examples/" --include "**/npm-shrinkwrap.json" "**/.babelrc.js" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" "**/package-lock.json" \
"**/.prebuild-installrc" "**/obj.target/" "**/config.gypi" "**/binding.Makefile"
rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
@@ -74,13 +80,13 @@

define Package/node-zigbee2mqtt/install
$(INSTALL_DIR) $(1)/opt/$(PKG_NPM_NAME)
- $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \
Expand Down
10 changes: 6 additions & 4 deletions user/snapshot/patches/001_zigbee2mqtt_optimize.patch
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--- package/feeds/node/node-zigbee2mqtt/Makefile
+++ package/feeds/node/node-zigbee2mqtt/Makefile
@@ -50,20 +50,26 @@
@@ -50,20 +50,28 @@
TARGET_CFLAGS+=$(FPIC)
TARGET_CPPFLAGS+=$(FPIC)

+NPM_FLAGS=$(MAKE_VARS) \
+ $(MAKE_FLAGS) \
+ npm_config_arch=$(NODEJS_CPU) \
Expand All @@ -22,20 +22,22 @@
- 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 --package-lock-only --prefix=$(PKG_BUILD_DIR)
+ $(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
rm -rf $(PKG_BUILD_DIR)/node_modules/ajv/lib
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/min
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/src
rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale
+ rm -rf $(PKG_BUILD_DIR)/node_modules/{react-icons,@rjsf,react-dom,react-bootstrap}
clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.map.js" "**/*.png" \
"**/example/" "**/examples/" --include "**/npm-shrinkwrap.json" "**/.babelrc.js" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" \
+ "**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" "**/package-lock.json" \
"**/.prebuild-installrc" "**/obj.target/" "**/config.gypi" "**/binding.Makefile"
rm -rf $(TMP_DIR)/npm-tmp-$(TMPNPM)
@@ -74,13 +80,13 @@

define Package/node-zigbee2mqtt/install
$(INSTALL_DIR) $(1)/opt/$(PKG_NPM_NAME)
- $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \
Expand Down

0 comments on commit 696d59f

Please sign in to comment.