diff options
Diffstat (limited to 'meta-ibm/recipes-phosphor')
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service (renamed from meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service | 12 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service | 12 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service | 12 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend | 31 |
9 files changed, 73 insertions, 7 deletions
diff --git a/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json new file mode 100644 index 0000000000..52280a4e67 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +} diff --git a/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service index 890551e7a4..890551e7a4 100644 --- a/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service diff --git a/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json new file mode 100644 index 0000000000..52280a4e67 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +} diff --git a/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service new file mode 100644 index 0000000000..890551e7a4 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json new file mode 100644 index 0000000000..08bb92aeda --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json @@ -0,0 +1,4 @@ +{ + "eth0":"ethernet0", + "eth1":"ethernet1" +} diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service new file mode 100644 index 0000000000..890551e7a4 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json new file mode 100644 index 0000000000..9f535ca8fb --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"eth0" +} diff --git a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service new file mode 100644 index 0000000000..890551e7a4 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend index bcb2d0136d..178a921a07 100644 --- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,15 +1,32 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/network:" -SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service" -SRC_URI_append_mihawk = " file://ncsi-netlink.service" -SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service" -SYSTEMD_SERVICE_${PN}_append_mihawk = " ncsi-netlink.service" +SRC_URI += " file://ncsi-netlink.service" +SYSTEMD_SERVICE_${PN} += " ncsi-netlink.service" +FILES_${PN} += "${datadir}/network/*.json" -do_install_append_ibm-ac-server() { +install_network_configuration(){ install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} + install -d ${D}${datadir}/network/ + install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json +} + +SRC_URI_append_rainier = " file://inventory-object-map.json" +do_install_append_rainier(){ + install_network_configuration +} + +SRC_URI_append_ibm-ac-server = " file://inventory-object-map.json" +do_install_append_ibm-ac-server() { + install_network_configuration } + +SRC_URI_append_mihawk = " file://inventory-object-map.json" do_install_append_mihawk() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} + install_network_configuration +} + +SRC_URI_append_witherspoon-tacoma = " file://inventory-object-map.json" +do_install_append_witherspoon-tacoma(){ + install_network_configuration } |