From 56194d28fb80e83566cc4129ae6814f625b3c82f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 31 May 2019 15:42:42 +0000 Subject: phosphor-webui: srcrev bump 6a3b3b2cdd..5bd1dec7fd Yoshie Muranaka (1): Change button styles from rounded to straight corners (From meta-phosphor rev: c9d3a6d32f40a504dcd499c2dfc1769692d81ec0) Change-Id: I5ae89f2cdacac7fbd16d9855f63e3b7dbca51423 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb') diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 59b00a885..89f4e24c9 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "6a3b3b2cdd8e92265997fe66f6c8489caf1dd403" +SRCREV = "5bd1dec7fdc8f6a3a20e6c23dc491b3d31392bc5" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 31ea32d3953358fa63c97b5e5e0d22cf5dd23cfb Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 31 May 2019 09:38:04 +0800 Subject: 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 Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb') 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 } -- cgit v1.2.3