diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2019-05-31 04:38:04 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-06-05 16:34:05 +0300 |
| commit | 31ea32d3953358fa63c97b5e5e0d22cf5dd23cfb (patch) | |
| tree | bf5e8bd534beb53d3e255b4082dc54e1b762a821 | |
| parent | 9bf83c80212c268d8d0c3b255cbaad9626bd2902 (diff) | |
| download | openbmc-31ea32d3953358fa63c97b5e5e0d22cf5dd23cfb.tar.xz | |
phosphor: use standard proxy settings for phosphor-webui recipe
The current phosphor-webui compile stage needs to connect to the npm
registry. In build environments that use a proxy (specified by the
`http_proxy`) setting, this fails.
Although the current recipe provides proxy arguments through the
HTTP_PROXY environment variable, not many other download tools use this
(wget and curl do not).
Since the lower-case version needs to be set anyway (for wget), use that
instead of requiring both http_proxy and HTTP_PROXY.
Tested: phosphor-webui's do_compile target works with only
http{,s}_proxy set
(From meta-phosphor rev: 0a4689a724565cf04db0844ba56771dc6b9469cc)
Fixes: https://github.com/openbmc/meta-phosphor/issues/14
Change-Id: I4091bfec0ce948e23a5648544900fd416c333965
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
| -rw-r--r-- | meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 89f4e24c9..5d36313c9 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -33,7 +33,7 @@ FILES_${PN} += "${datadir}/www/*" do_compile () { cd ${S} rm -rf node_modules - npm --loglevel info --proxy=${HTTP_PROXY} --https-proxy=${HTTPS_PROXY} install + npm --loglevel info --proxy=${http_proxy} --https-proxy=${https_proxy} install npm run-script build } |