From 05ac5d768cc6eaacc251f09753e051fbe906fb4a Mon Sep 17 00:00:00 2001 From: SpencerKu Date: Thu, 28 May 2020 16:46:28 +0800 Subject: meta-quanta: meta-common: Change File Path Move network folder under recipes-quanta. (From meta-quanta rev: 6350637b4b657b13629968a27d78cc98bfdf1f82) Signed-off-by: SpencerKu Change-Id: I470a1ff7543935d5e9a4f64c9f6cf15e759b4230 Signed-off-by: Andrew Geissler --- meta-quanta/meta-common/network/mac-address_git.bb | 21 -------------- meta-quanta/meta-common/network/usb-network.bb | 25 ---------------- .../network/usb-network/usb-network.service | 10 ------- .../meta-common/network/usb-network/usb-network.sh | 33 ---------------------- .../recipes-quanta/network/mac-address_git.bb | 21 ++++++++++++++ .../recipes-quanta/network/usb-network.bb | 25 ++++++++++++++++ .../network/usb-network/usb-network.service | 10 +++++++ .../network/usb-network/usb-network.sh | 33 ++++++++++++++++++++++ 8 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 meta-quanta/meta-common/network/mac-address_git.bb delete mode 100644 meta-quanta/meta-common/network/usb-network.bb delete mode 100644 meta-quanta/meta-common/network/usb-network/usb-network.service delete mode 100644 meta-quanta/meta-common/network/usb-network/usb-network.sh create mode 100644 meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb create mode 100644 meta-quanta/meta-common/recipes-quanta/network/usb-network.bb create mode 100644 meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.service create mode 100644 meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh diff --git a/meta-quanta/meta-common/network/mac-address_git.bb b/meta-quanta/meta-common/network/mac-address_git.bb deleted file mode 100644 index 5b63e49cb..000000000 --- a/meta-quanta/meta-common/network/mac-address_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit autotools pkgconfig -inherit systemd - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git" -SRCREV = "08b87370c56ff69df852eca87391ae46c05d437a" - -DEPENDS += "autoconf-archive-native" -DEPENDS += "systemd" - -FILES_${PN} += "${bindir}/mac-address" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "mac-address.service" - -EXTRA_OECONF = " \ - SYSTEMD_TARGET="multi-user.target" \ -" diff --git a/meta-quanta/meta-common/network/usb-network.bb b/meta-quanta/meta-common/network/usb-network.bb deleted file mode 100644 index 85146aa1f..000000000 --- a/meta-quanta/meta-common/network/usb-network.bb +++ /dev/null @@ -1,25 +0,0 @@ -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI_append = " file://usb-network.sh" -SRC_URI_append = " file://usb-network.service" - -inherit systemd - -DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" - -FILES_${PN}_append = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network" - -do_install() { - install -d ${D}/${sbindir} - install -m 0755 ${WORKDIR}/usb-network.sh ${D}/${sbindir} - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/usb-network.service \ - ${D}${systemd_unitdir}/system -} - -SYSTEMD_SERVICE_${PN}_append = "usb-network.service" diff --git a/meta-quanta/meta-common/network/usb-network/usb-network.service b/meta-quanta/meta-common/network/usb-network/usb-network.service deleted file mode 100644 index 917b552c1..000000000 --- a/meta-quanta/meta-common/network/usb-network/usb-network.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Enable USB Network - -[Service] -Type=oneshot -ExecStart=/usr/sbin/usb-network.sh -EnvironmentFile=/usr/share/usb-network/usb-network.conf - -[Install] -WantedBy=multi-user.target diff --git a/meta-quanta/meta-common/network/usb-network/usb-network.sh b/meta-quanta/meta-common/network/usb-network/usb-network.sh deleted file mode 100644 index 444d4aee7..000000000 --- a/meta-quanta/meta-common/network/usb-network/usb-network.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -cd /sys/kernel/config/usb_gadget - -if [ ! -f "g1" ]; then - mkdir g1 - cd g1 - - echo 0x1d6b > idVendor # Linux foundation - echo 0x0104 > idProduct # Multifunction composite gadget - mkdir -p strings/0x409 - echo "Linux" > strings/0x409/manufacturer - echo "Etherned/ECM gadget" > strings/0x409/product - - mkdir -p configs/c.1 - echo 100 > configs/c.1/MaxPower - mkdir -p configs/c.1/strings/0x409 - echo "ECM" > configs/c.1/strings/0x409/configuration - - mkdir -p functions/ecm.usb0 - cat /tmp/usb0_dev > functions/ecm.usb0/dev_addr # write device mac address - cat /tmp/usb0_host > functions/ecm.usb0/host_addr # write usb mac address - - ln -s functions/ecm.usb0 configs/c.1 - - echo "$UDC" > UDC - - rm /tmp/usb0_dev - rm /tmp/usb0_host - -fi - -exit 0 diff --git a/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb b/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb new file mode 100644 index 000000000..5b63e49cb --- /dev/null +++ b/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb @@ -0,0 +1,21 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit autotools pkgconfig +inherit systemd + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git" +SRCREV = "08b87370c56ff69df852eca87391ae46c05d437a" + +DEPENDS += "autoconf-archive-native" +DEPENDS += "systemd" + +FILES_${PN} += "${bindir}/mac-address" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "mac-address.service" + +EXTRA_OECONF = " \ + SYSTEMD_TARGET="multi-user.target" \ +" diff --git a/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb b/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb new file mode 100644 index 000000000..85146aa1f --- /dev/null +++ b/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb @@ -0,0 +1,25 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI_append = " file://usb-network.sh" +SRC_URI_append = " file://usb-network.service" + +inherit systemd + +DEPENDS += "systemd" +RDEPENDS_${PN} += "libsystemd" +RDEPENDS_${PN} += "bash" + +FILES_${PN}_append = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network" + +do_install() { + install -d ${D}/${sbindir} + install -m 0755 ${WORKDIR}/usb-network.sh ${D}/${sbindir} + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/usb-network.service \ + ${D}${systemd_unitdir}/system +} + +SYSTEMD_SERVICE_${PN}_append = "usb-network.service" diff --git a/meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.service b/meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.service new file mode 100644 index 000000000..917b552c1 --- /dev/null +++ b/meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.service @@ -0,0 +1,10 @@ +[Unit] +Description=Enable USB Network + +[Service] +Type=oneshot +ExecStart=/usr/sbin/usb-network.sh +EnvironmentFile=/usr/share/usb-network/usb-network.conf + +[Install] +WantedBy=multi-user.target diff --git a/meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh b/meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh new file mode 100644 index 000000000..444d4aee7 --- /dev/null +++ b/meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +cd /sys/kernel/config/usb_gadget + +if [ ! -f "g1" ]; then + mkdir g1 + cd g1 + + echo 0x1d6b > idVendor # Linux foundation + echo 0x0104 > idProduct # Multifunction composite gadget + mkdir -p strings/0x409 + echo "Linux" > strings/0x409/manufacturer + echo "Etherned/ECM gadget" > strings/0x409/product + + mkdir -p configs/c.1 + echo 100 > configs/c.1/MaxPower + mkdir -p configs/c.1/strings/0x409 + echo "ECM" > configs/c.1/strings/0x409/configuration + + mkdir -p functions/ecm.usb0 + cat /tmp/usb0_dev > functions/ecm.usb0/dev_addr # write device mac address + cat /tmp/usb0_host > functions/ecm.usb0/host_addr # write usb mac address + + ln -s functions/ecm.usb0 configs/c.1 + + echo "$UDC" > UDC + + rm /tmp/usb0_dev + rm /tmp/usb0_host + +fi + +exit 0 -- cgit v1.2.3