From 1c8460cd2311db9a6470e4b055905a030f59a5a1 Mon Sep 17 00:00:00 2001 From: Alexander Filippov Date: Mon, 21 Sep 2020 15:56:19 +0300 Subject: nicole: Remove obsolete vlan-4004 package. The functionality of this package was added as a part of `systemd-conf` package. This package is no longer required. (From meta-yadro rev: e5fb11c84f7455acff17efb79373e954afef1780) Change-Id: Iee5368e0bcc60ccdb745323937ec5506ce3c1c4d Signed-off-by: Alexander Filippov Signed-off-by: Andrew Geissler --- .../network/vlan-4004/00-bmc-eth0.4004.0.network | 8 ----- .../network/vlan-4004/00-bmc-eth0.4004.1.network | 8 ----- .../network/vlan-4004/00-bmc-eth0.network | 9 ----- .../network/vlan-4004/eth0.4004.netdev | 5 --- .../network/vlan-4004/setup-vlan4004.service | 15 -------- .../network/vlan-4004/setup-vlan4004.sh | 8 ----- .../recipes-phosphor/network/vlan-4004_1.0.bb | 40 ---------------------- 7 files changed, 93 deletions(-) delete mode 100644 meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.0.network delete mode 100644 meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.1.network delete mode 100644 meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.network delete mode 100644 meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/eth0.4004.netdev delete mode 100644 meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.service delete mode 100755 meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.sh delete mode 100644 meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004_1.0.bb (limited to 'meta-yadro/meta-nicole/recipes-phosphor') diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.0.network b/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.0.network deleted file mode 100644 index 534cbe9b1..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.0.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=eth0.4004 -KernelCommandLine=bmcposition=0 -[Network] -LinkLocalAddressing=yes -IPv6AcceptRA=true -DHCP=no -Address=fd59:4144:524f:5441:544c:494e:3:1/122 diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.1.network b/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.1.network deleted file mode 100644 index 83a48eee7..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.4004.1.network +++ /dev/null @@ -1,8 +0,0 @@ -[Match] -Name=eth0.4004 -KernelCommandLine=bmcposition=1 -[Network] -LinkLocalAddressing=yes -IPv6AcceptRA=true -DHCP=no -Address=fd59:4144:524f:5441:544c:494e:3:2/122 diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.network b/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.network deleted file mode 100644 index f7c670743..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/00-bmc-eth0.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name=eth0 -[Network] -VLAN=eth0.4004 -DHCP=true -LinkLocalAddressing=yes -IPv6AcceptRA=false -[DHCP] -ClientIdentifier=mac diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/eth0.4004.netdev b/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/eth0.4004.netdev deleted file mode 100644 index e315f5e8a..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/eth0.4004.netdev +++ /dev/null @@ -1,5 +0,0 @@ -[NetDev] -Name=eth0.4004 -Kind=vlan -[VLAN] -Id=4004 diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.service b/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.service deleted file mode 100644 index 871462480..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Setup VLAN 4004 -DefaultDependencies=no -Conflicts=shutdown.target -After=systemd-remount-fs.service -Before=sysinit.target shutdown.target systemd-update-done.service -ConditionNeedsUpdate=/etc - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/setup-vlan4004.sh - -[Install] -WantedBy=sysinit.target diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.sh b/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.sh deleted file mode 100755 index 1278769d1..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004/setup-vlan4004.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -eu - -VLAN='VLAN=eth0.4004' -ETH0_CFG='/etc/systemd/network/00-bmc-eth0.network' - -if ( ! grep -q "${VLAN}" ${ETH0_CFG} ); then - sed -i "/^\[Network\]$/a ${VLAN}" ${ETH0_CFG} -fi diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004_1.0.bb b/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004_1.0.bb deleted file mode 100644 index c7dcb3beb..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/vlan-4004_1.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Tatlin network configuration" -DESCRIPTION = "This is default network configuration for the Tatlin's node." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -PR = "r1" - -inherit allarch -inherit systemd - -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils}" -SYSTEMD_SERVICE_${PN} = "setup-vlan4004.service" - -S = "${WORKDIR}" -SRC_URI = " \ - file://00-bmc-eth0.4004.0.network \ - file://00-bmc-eth0.4004.1.network \ - file://00-bmc-eth0.network \ - file://eth0.4004.netdev \ - file://setup-vlan4004.service \ - file://setup-vlan4004.sh \ -" - -do_install() { - mkdir -p ${D}${sysconfdir}/systemd/network - install -m 0644 eth0.4004.netdev 00-bmc-eth0.network \ - 00-bmc-eth0.4004.0.network 00-bmc-eth0.4004.1.network \ - ${D}${sysconfdir}/systemd/network/ - mkdir -p ${D}${bindir} ${D}${systemd_system_unitdir} - install setup-vlan4004.sh ${D}${bindir}/ - install -m 0644 setup-vlan4004.service ${D}${systemd_system_unitdir}/ -} - -FILES_${PN} = " \ - ${sysconfdir}/systemd/network/00-bmc-eth0.4004.0.network \ - ${sysconfdir}/systemd/network/00-bmc-eth0.4004.1.network \ - ${sysconfdir}/systemd/network/00-bmc-eth0.network \ - ${sysconfdir}/systemd/network/eth0.4004.netdev \ - ${bindir}/setup-vlan4004.sh \ -" -- cgit v1.2.3