openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-01 14:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

node: bump to v16.15.0

Browse Source 
Description:
Update from  v16.15.0
Changed handling of host's npm problems due to npm updates.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
This commit is contained in:
Hirokazu MORIKAWA 2022-06-02 18:03:14 +00:00 committed by Beginner-Go
parent adef3769f9
commit ec00e06068
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/node/Makefile
View File

@ -13,9 +13,9 @@ PKG_HASH:=d72fc2c244603b4668da94081dc4d6067d467fdfa026e06a274012f16600480c
PATCH_DIR:=./patches/v10.x PATCH_DIR:=./patches/v10.x
else else
ifeq ($(CONFIG_NODEJS_16),y) ifeq ($(CONFIG_NODEJS_16),y)
PKG_VERSION:=v16.14.2 PKG_VERSION:=v16.15.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_HASH:=e922e215cc68eb5f94d33e8a0b61e2c863b7731cc8600ab955d3822da90ff8d1 PKG_HASH:=a0f812efc43f78321eca08957960a48f5e6bf97004d5058c8dd3b03c646ea4f7
PATCH_DIR:=./patches/v16.x PATCH_DIR:=./patches/v16.x
else else
ifeq ($(CONFIG_NODEJS_14),y) ifeq ($(CONFIG_NODEJS_14),y)
@ -191,7 +191,6 @@ define Package/node/install
endef endef
define Package/node-npm/install define Package/node-npm/install
$(RM) $(1)/usr/lib/node_modules/npm
$(INSTALL_DIR) $(1)/usr/lib/node_modules/npm $(INSTALL_DIR) $(1)/usr/lib/node_modules/npm
$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{package.json,LICENSE} \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{package.json,LICENSE} \
$(1)/usr/lib/node_modules/npm/ $(1)/usr/lib/node_modules/npm/
@ -204,6 +203,11 @@ define Package/node-npm/install
$(LN) ../lib/node_modules/npm/bin/npx-cli.js $(1)/usr/bin/npx $(LN) ../lib/node_modules/npm/bin/npx-cli.js $(1)/usr/bin/npx
endef endef
define Host/Install
$(RM) -rf $(1)/lib/node_modules/npm
$(call Host/Install/Default)
endef
define Package/node-npm/postrm define Package/node-npm/postrm
#!/bin/sh #!/bin/sh
rm -rf /usr/lib/node_modules/npm || true rm -rf /usr/lib/node_modules/npm || true

2
lang/node/patches/v16.x/003-path.patch
View File

@ -1,6 +1,6 @@
--- a/lib/internal/modules/cjs/loader.js --- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js
@@ -1238,7 +1238,8 @@ Module._initPaths = function() { @@ -1240,7 +1240,8 @@ Module._initPaths = function() {
path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..'); path.resolve(process.execPath, '..', '..');

2
lang/node/patches/v16.x/999-localhost-no-addrconfig.patch
View File

@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the // copy of this software and associated documentation files (the
@@ -1037,13 +1038,6 @@ function lookupAndConnect(self, options) @@ -1059,13 +1060,6 @@ function lookupAndConnect(self, options)
hints: options.hints || 0 hints: options.hints || 0
}; };