scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 09:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into K4.14

Browse Source
This commit is contained in:
Lewis Kang
2018-06-06 08:30:38 +08:00
committed by GitHub
parent 84c727986b 6697ea1a52
commit 4b02b4187d
9 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/base/all/vendor-config-onl/src/python/onl/install/InstallUtils.py
View File

@@ -1065,7 +1065,7 @@ class InitrdContext(SubprocessMixin):
if "efivarfs" not in buf:
cmd = ('modprobe', 'efivarfs',)
try:
self.check_call(cmd, vmode=self.V1)
self.check_output(cmd, vmode=self.V1, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError:
pass

5
packages/base/all/vendor-config-onl/src/python/onl/platform/base.py
View File

@@ -11,7 +11,7 @@
import pprint
import json
import os
import os, sys
import re
import yaml
import onl.YamlUtils
@@ -386,6 +386,9 @@ class OnlPlatformBase(object):
rv[field['name']] = v['data'][field['key']]
except:
pass
finally:
if 'dmidecodemod' in sys.modules:
sys.modules['dmidecodemod'].clear_warnings()
return rv
def upgrade_manifest(self, type_, override_dir=None):

7
packages/base/all/vendor-config-onl/src/python/onl/platform/baseconfig.py
View File

@@ -67,6 +67,13 @@ def baseconfig():
f.write(dmidecode.QuerySection('system')['0x0001']['data']['Version'])
except:
pass
finally:
if 'dmidecodemod' in sys.modules:
mod = sys.modules['dmidecodemod']
buf = mod.get_warnings()
if buf:
[msg("*** %s\n" % x) for x in buf.splitlines(False)]
mod.clear_warnings()
if not platform.baseconfig():
msg("*** platform class baseconfig failed.\n", fatal=True)

2
packages/base/any/kernels/4.9-lts/configs/x86_64-all/x86_64-all.config
View File

@@ -4000,7 +4000,7 @@ CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
# CONFIG_CONFIGFS_FS is not set
CONFIG_EFIVAR_FS=m
CONFIG_EFIVAR_FS=y
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ORANGEFS_FS is not set
# CONFIG_ADFS_FS is not set

2
packages/base/any/onlp/src/onlp/module/src/psu.c
View File

@@ -196,7 +196,7 @@ onlp_psu_show(onlp_oid_t id, aim_pvs_t* pvs, uint32_t flags)
}
else {
iof_iprintf(&iof, "Status: Running");
iof_iprintf(&iof, "Model: %s", pi.model[0] ? pi.model : "Unknown");
if(pi.model[0]) iof_iprintf(&iof, "Model: %s", pi.model);
if(pi.serial[0]) iof_iprintf(&iof, "SN: %s", pi.serial);
if(pi.caps & ONLP_PSU_CAPS_AC) {
iof_iprintf(&iof, "Type: AC");

2
packages/platforms-closed

Submodule packages/platforms-closed updated: 93a3eee233...19e7296d30

4
packages/platforms/accton/x86-64/x86-64-accton-wedge100bf-32x/onlp/builds/src/module/src/sfpi.c
View File

@@ -177,8 +177,8 @@ sfpi_eeprom_read(int port, uint8_t devaddr, uint8_t data[256])
return ONLP_STATUS_E_INTERNAL;
}
data[i] = val & 0xff;
data[i+1] = (val >> 8) & 0xff;
data[i*2] = val & 0xff;
data[(i*2)+1] = (val >> 8) & 0xff;
}
return ONLP_STATUS_OK;

2
packages/platforms/quanta/x86-64/x86-64-quanta-ix8-rglbmc/modules/builds/qci_platform_ix8.c
View File

@@ -213,7 +213,7 @@ static struct pca953x_platform_data pca9698_2_data = {
};
//CPU Board pca9555
static struct pca953x_platform_data pca9555_CPU_data = {
.gpio_base = 0x40,
.gpio_base = 0x48,
};
static struct i2c_board_info ix8_i2c_devices[] = {
{

2
packages/platforms/quanta/x86-64/x86-64-quanta-ix8-rglbmc/onlp/builds/src/x86_64_quanta_ix8_rglbmc/module/inc/x86_64_quanta_ix8_rglbmc/x86_64_quanta_ix8_rglbmc_gpio_table.h
View File

@@ -11,7 +11,7 @@
#define QUANTA_IX8_I2C_GPIO_BASE 0x10
#define QUANTA_IX8_I2C_GPIO_CPU_BASE 0x40
#define QUANTA_IX8_I2C_GPIO_CPU_BASE 0x48
#define QUANTA_IX8_CPU_BOARD_GPIO_BASE (QUANTA_IX8_I2C_GPIO_CPU_BASE)
#define QUANTA_IX8_CPU_BOARD_SYS_P1 (QUANTA_IX8_CPU_BOARD_GPIO_BASE + QUANTA_IX8_PCA953x_GPIO(1,2))