Skip to content

Commit

Permalink
fixed build breaks
Browse files Browse the repository at this point in the history
Signed-off-by: Joseph Liu <kwliu@nuvoton.com>
Change-Id: If4047934ec4ce6b2f62dcce5d13c72164a46fb21
  • Loading branch information
maxdog988 committed Jun 22, 2021
1 parent 2f6c75b commit 6e54295
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,5 @@ IGPS_MACHINE = "RunBMC"

IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot"

OBMC_MACHINE_FEATURES += "\
obmc-phosphor-fan-mgmt \
obmc-phosphor-chassis-mgmt \
obmc-phosphor-flash-mgmt \
obmc-host-ipmi \
obmc-host-state-mgmt \
obmc-chassis-state-mgmt \
obmc-bmc-state-mgmt \
"
KCS_DEVICE = "ipmi-kcs1"
PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ inherit packagegroup

PROVIDES = "${PACKAGES}"
PACKAGES = " \
${PN}-fans \
${PN}-flash \
${PN}-system \
"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OBMC_IMAGE_EXTRA_INSTALL_append_buv-runbmc = " phosphor-webui phosphor-pid-control ipmitool"
OBMC_IMAGE_EXTRA_INSTALL_append_buv-runbmc = " phosphor-webui phosphor-pid-control ipmitool iperf3"
Original file line number Diff line number Diff line change
@@ -1,34 +1,21 @@
SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git"
SRCREV = "${AUTOREV}"

LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"

inherit autotools pkgconfig
inherit systemd

DEPENDS += "systemd"
DEPENDS += "autoconf-archive-native"

FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI_append = " file://mac-address.service"
SRC_URI_append = " file://config.txt"

FILES_${PN}_append = " ${datadir}/mac-address/config.txt"

HASHSTYLE = "gnu"
S = "${WORKDIR}/git"
CXXFLAGS += "-std=c++17"
SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git"
SRCREV = "08b87370c56ff69df852eca87391ae46c05d437a"

DEPENDS += "autoconf-archive-native"
DEPENDS += "systemd"

do_install_append() {
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/mac-address.service \
${D}${systemd_unitdir}/system

install -d ${D}${datadir}/mac-address
install -m 0644 -D ${WORKDIR}/config.txt \
${D}${datadir}/mac-address/config.txt
}
FILES_${PN} += "${bindir}/mac-address"

SYSTEMD_PACKAGES = "${PN}"
SYSTEMD_SERVICE_${PN} += "mac-address.service"
SYSTEMD_SERVICE_${PN} = "mac-address.service"

EXTRA_OECONF = " \
SYSTEMD_TARGET="multi-user.target" \
"
2 changes: 1 addition & 1 deletion setup
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ machine() {
local target=$1
local build_dir=$2
local cfg name tmpl
for cfg in meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf; do
for cfg in meta-*/meta-*/meta-*/conf/machine/*.conf meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf; do
name=${cfg##*/}
name=${name%.conf}
tmpl=${cfg%/machine/*.conf}
Expand Down

0 comments on commit 6e54295

Please sign in to comment.