-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Node.js: Add compatibility with base OpenEmbedded npm.bbclass
This patch enables the --no-registry functionality to allow for offline builds with new nodejs versions. Signed-off-by: Michael Davis <michael.davis@essvote.com>
- Loading branch information
Michael Davis
committed
Apr 27, 2017
1 parent
8e345ab
commit d4fea38
Showing
5 changed files
with
117 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
Bugfix for --no-registry in nodejs-v0.12.2 | ||
|
||
diff -u -r node-v0.12.2_def/deps/npm/lib/cache/caching-client.js node-v0.12.2/deps/npm/lib/cache/caching-client.js | ||
--- node-v0.12.2_def/deps/npm/lib/cache/caching-client.js 2015-04-01 01:13:01.000000000 +0300 | ||
+++ node-v0.12.2/deps/npm/lib/cache/caching-client.js 2015-05-18 00:47:10.738599686 +0300 | ||
@@ -67,6 +67,22 @@ | ||
var cacheBase = cacheFile(npm.config.get("cache"))(uri) | ||
var cachePath = path.join(cacheBase, ".cache.json") | ||
|
||
+ if (parsed.host === "noregistry") (function() { | ||
+ var stat = null | ||
+ var file = npm.config.get("cache") + parsed.pathname + "/.cache.json" | ||
+ try { | ||
+ stat = fs.statSync(cachePath) | ||
+ } catch (ex) {} | ||
+ if (!stat) try { | ||
+ stat = fs.statSync(file) | ||
+ cachePath = file | ||
+ } catch (ex) { | ||
+ stat = "Registry not defined and registry files not found: \"" + | ||
+ cachePath + "\", \"" + file + "\"." | ||
+ throw new Error(stat) | ||
+ } | ||
+ })() | ||
+ | ||
// If the GET is part of a write operation (PUT or DELETE), then | ||
// skip past the cache entirely, but still save the results. | ||
if (uri.match(/\?write=true$/)) { | ||
@@ -83,12 +99,17 @@ | ||
} | ||
catch (ex) { | ||
data = null | ||
+ if (parsed.host === "noregistry") | ||
+ throw new Error("File \"" + cachePath+"\"" + " corrupted.") | ||
} | ||
|
||
params.stat = stat | ||
params.data = data | ||
|
||
- get_.call(client, uri, cachePath, params, cb) | ||
+ if (parsed.host === "noregistry") | ||
+ cb(null, data, JSON.stringify(data), { statusCode : 304 }) | ||
+ else | ||
+ get_.call(client, uri, cachePath, params, cb) | ||
}) | ||
} | ||
else { | ||
diff -u -r node-v0.12.2_def/deps/npm/lib/utils/map-to-registry.js node-v0.12.2/deps/npm/lib/utils/map-to-registry.js | ||
--- node-v0.12.2_def/deps/npm/lib/utils/map-to-registry.js 2015-04-01 01:13:01.000000000 +0300 | ||
+++ node-v0.12.2/deps/npm/lib/utils/map-to-registry.js 2015-05-18 01:15:10.030569613 +0300 | ||
@@ -45,6 +45,8 @@ | ||
|
||
log.silly("mapToRegistry", "registry", registry) | ||
|
||
+ if (!registry) return cb(null, "http://noregistry/" + name, {}) | ||
+ | ||
var auth = config.getCredentialsByURI(registry) | ||
|
||
// normalize registry URL so resolution doesn't drop a piece of registry URL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
diff -Naur node-v6.10.0/deps/npm/lib/cache/caching-client.js node-v6.10.0b/deps/npm/lib/cache/caching-client.js | ||
--- node-v6.10.0/deps/npm/lib/cache/caching-client.js 2017-02-21 18:40:14.000000000 -0600 | ||
+++ node-v6.10.0b/deps/npm/lib/cache/caching-client.js 2017-04-18 14:35:05.725921973 -0500 | ||
@@ -68,6 +68,22 @@ | ||
var cacheBase = cacheFile(npm.config.get('cache'))(uri) | ||
var cachePath = path.join(cacheBase, '.cache.json') | ||
|
||
+ if (parsed.host === "noregistry") (function() { | ||
+ var stat = null | ||
+ var file = npm.config.get("cache") + parsed.pathname + "/.cache.json" | ||
+ try { | ||
+ stat = fs.statSync(cachePath) | ||
+ } catch (ex) {} | ||
+ if (!stat) try { | ||
+ stat = fs.statSync(file) | ||
+ cachePath = file | ||
+ } catch (ex) { | ||
+ stat = "Registry not defined and registry files not found: \"" + | ||
+ cachePath + "\", \"" + file + "\"." | ||
+ throw new Error(stat) | ||
+ } | ||
+ })() | ||
+ | ||
// If the GET is part of a write operation (PUT or DELETE), then | ||
// skip past the cache entirely, but still save the results. | ||
if (uri.match(/\?write=true$/)) { | ||
@@ -88,7 +104,10 @@ | ||
params.stat = stat | ||
params.data = data | ||
|
||
- get_.call(client, uri, cachePath, params, cb) | ||
+ if (parsed.host === "noregistry") | ||
+ cb(null, data, JSON.stringify(data), { statusCode : 304 }) | ||
+ else | ||
+ get_.call(client, uri, cachePath, params, cb) | ||
}) | ||
} else { | ||
get_.call(client, uri, cachePath, params, cb) | ||
diff -Naur node-v6.10.0/deps/npm/lib/utils/map-to-registry.js node-v6.10.0b/deps/npm/lib/utils/map-to-registry.js | ||
--- node-v6.10.0/deps/npm/lib/utils/map-to-registry.js 2017-02-21 18:40:14.000000000 -0600 | ||
+++ node-v6.10.0b/deps/npm/lib/utils/map-to-registry.js 2017-04-18 14:38:29.640908067 -0500 | ||
@@ -45,6 +45,7 @@ | ||
|
||
log.silly('mapToRegistry', 'registry', registry) | ||
+ if (!registry) return cb(null, "http://noregistry/" + name, {}) | ||
|
||
var auth = config.getCredentialsByURI(registry) | ||
|
||
// normalize registry URL so resolution doesn't drop a piece of registry URL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters