diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-08-19 21:16:19 +0300 |
---|---|---|
committer | Ed Tanous <ed@tanous.net> | 2019-08-20 18:56:17 +0300 |
commit | 35e295e2a161fcf146ea031de53431b2888521fa (patch) | |
tree | a0c78943fef5c085f371aaa840d46edecc1f2e95 /meta-openbmc-mods/meta-common/recipes-phosphor/dbus | |
parent | 9856ac69064742544fafad307d3ee4544385ffa2 (diff) | |
download | openbmc-35e295e2a161fcf146ea031de53431b2888521fa.tar.xz |
Sync to internal 8-19-2019
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/dbus')
2 files changed, 1 insertions, 61 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0002-Modify-Dbus-for-IPv6.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0002-Modify-Dbus-for-IPv6.patch deleted file mode 100644 index fc09da3bd..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0002-Modify-Dbus-for-IPv6.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 62240a7ef12bb2ed3730a625ad7a809a9a6d0512 Mon Sep 17 00:00:00 2001 -From: David Cobbley <david.j.cobbley@linux.intel.com> -Date: Wed, 6 Jun 2018 10:11:58 -0700 -Subject: [PATCH 1/1] Modify Dbus for IPv6. - -Add additional interfaces for IPv6 use. - -Signed-off-by: James Feist <james.feist@linux.intel.com> ---- - .../Network/EthernetInterface.interface.yaml | 13 ++++++++++++- - xyz/openbmc_project/Network/IP.interface.yaml | 4 ++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml -index 6fa1d0b..6b7cd9a 100644 ---- a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml -+++ b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml -@@ -46,6 +46,10 @@ properties: - type: boolean - description: > - Boolean for accepting router advertisements in IPv6 -+ - name: IPAddressEnables -+ type: enum[self.IPAllowed] -+ description: > -+ The type of IP connection is allowed on this channel - - enumerations: - - name: LinkLocalConf -@@ -56,4 +60,11 @@ enumerations: - - name: v4 - - name: v6 - - name: none -- -+ - name: IPAllowed -+ description: > -+ Determines whether the system allows both IPv6 & IPv4, or disables on -+ or the other -+ values: -+ - name: IPv4AndIPv6 -+ - name: IPv4Only -+ - name: IPv6Only -diff --git a/xyz/openbmc_project/Network/IP.interface.yaml b/xyz/openbmc_project/Network/IP.interface.yaml -index 5091ac9..b2442a5 100644 ---- a/xyz/openbmc_project/Network/IP.interface.yaml -+++ b/xyz/openbmc_project/Network/IP.interface.yaml -@@ -34,6 +34,10 @@ properties: - errors: - - xyz::openbmc_project.Common.Error.NotAllowed - -+ - name: BackupGateway -+ type: string -+ description: > -+ This is the IP address of the backup gateway. - - name: Type - type: enum[self.Protocol] - description: > --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index 40b00e70f..79a67ee79 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -3,8 +3,7 @@ SRCREV = "ddc9e9f9d6ed0282ec6c1421a706b45f3c09ebcc" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0002-Modify-Dbus-for-IPv6.patch \ - file://0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch \ +SRC_URI += "file://0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch \ file://0007-ipmi-set-BIOS-id.patch \ file://0010-Increase-the-default-watchdog-timeout-value.patch \ file://0012-Add-RestoreDelay-interface-for-power-restore-delay.patch \ |