diff options
author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:18:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-25 19:18:16 +0300 |
commit | 0dbb60593ebb5a62190c0e6cff7f1770493303a2 (patch) | |
tree | 0df2ce67404dbca3ddc4ee063dbfd9ae455be682 /meta-quanta/meta-gsj/recipes-gsj | |
parent | 34a3942845ac3264ce27c648ae5486d302c3e6d8 (diff) | |
parent | cc9cea46d74d280de03c713c8b555153fd811f09 (diff) | |
download | openbmc-0dbb60593ebb5a62190c0e6cff7f1770493303a2.tar.xz |
Merge branch 'intel' into intel2
Diffstat (limited to 'meta-quanta/meta-gsj/recipes-gsj')
5 files changed, 5 insertions, 4 deletions
diff --git a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb index 86303c359..24ca38d8f 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb @@ -2,7 +2,7 @@ SUMMARY = "OpenBMC Quanta Detect Fan Fail Service" DESCRIPTION = "OpenBMC Quanta Detect Fan Fail Daemon." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit systemd diff --git a/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb b/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb index 8d3fbf376..37e4e44cf 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/mac-address/mac-address.bb @@ -2,7 +2,7 @@ SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git" SRCREV = "${AUTOREV}" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit autotools pkgconfig inherit systemd diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb index ada2a6a36..887b50305 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb @@ -2,7 +2,7 @@ SUMMARY = "Phosphor OpenBMC Quanta NVME Power Control Service" DESCRIPTION = "Phosphor OpenBMC Quanta NVME Power Control Daemon." PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" FILESEXTRAPATHS_append := "${THISDIR}/files:" diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service index 913f5fbee..81a4e4244 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/files/usb_network.service @@ -1,5 +1,6 @@ [Unit] Description=enable usb network +After=phosphor-ipmi-host.service [Service] Type=oneshot diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb index 591ca5afd..ad46c0b32 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb @@ -1,6 +1,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/files:" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += "systemd" RDEPENDS_${PN} += "libsystemd" |