Skip to content

Commit 6e54295

Browse files
committed
fixed build breaks
Signed-off-by: Joseph Liu <kwliu@nuvoton.com> Change-Id: If4047934ec4ce6b2f62dcce5d13c72164a46fb21
1 parent 2f6c75b commit 6e54295

File tree

5 files changed

+14
-37
lines changed

5 files changed

+14
-37
lines changed

meta-evb/meta-evb-nuvoton/meta-buv-runbmc/conf/machine/buv-runbmc.conf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,5 @@ IGPS_MACHINE = "RunBMC"
1616

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

19-
OBMC_MACHINE_FEATURES += "\
20-
obmc-phosphor-fan-mgmt \
21-
obmc-phosphor-chassis-mgmt \
22-
obmc-phosphor-flash-mgmt \
23-
obmc-host-ipmi \
24-
obmc-host-state-mgmt \
25-
obmc-chassis-state-mgmt \
26-
obmc-bmc-state-mgmt \
27-
"
2819
KCS_DEVICE = "ipmi-kcs1"
2920
PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"

meta-evb/meta-evb-nuvoton/meta-buv-runbmc/recipes-buv-entity/packagegroups/packagegroup-buv-runbmc-apps.bb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ inherit packagegroup
55

66
PROVIDES = "${PACKAGES}"
77
PACKAGES = " \
8-
${PN}-fans \
98
${PN}-flash \
109
${PN}-system \
1110
"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OBMC_IMAGE_EXTRA_INSTALL_append_buv-runbmc = " phosphor-webui phosphor-pid-control ipmitool"
1+
OBMC_IMAGE_EXTRA_INSTALL_append_buv-runbmc = " phosphor-webui phosphor-pid-control ipmitool iperf3"
Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,21 @@
1-
SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git"
2-
SRCREV = "${AUTOREV}"
3-
41
LICENSE = "Apache-2.0"
5-
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
2+
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
63

74
inherit autotools pkgconfig
85
inherit systemd
96

10-
DEPENDS += "systemd"
11-
DEPENDS += "autoconf-archive-native"
12-
13-
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
14-
SRC_URI_append = " file://mac-address.service"
15-
SRC_URI_append = " file://config.txt"
16-
17-
FILES_${PN}_append = " ${datadir}/mac-address/config.txt"
18-
19-
HASHSTYLE = "gnu"
207
S = "${WORKDIR}/git"
21-
CXXFLAGS += "-std=c++17"
8+
SRC_URI = "git://github.com/quanta-bmc/mac-address.git;protocol=git"
9+
SRCREV = "08b87370c56ff69df852eca87391ae46c05d437a"
10+
11+
DEPENDS += "autoconf-archive-native"
12+
DEPENDS += "systemd"
2213

23-
do_install_append() {
24-
install -d ${D}${systemd_unitdir}/system/
25-
install -m 0644 ${WORKDIR}/mac-address.service \
26-
${D}${systemd_unitdir}/system
27-
28-
install -d ${D}${datadir}/mac-address
29-
install -m 0644 -D ${WORKDIR}/config.txt \
30-
${D}${datadir}/mac-address/config.txt
31-
}
14+
FILES_${PN} += "${bindir}/mac-address"
3215

3316
SYSTEMD_PACKAGES = "${PN}"
34-
SYSTEMD_SERVICE_${PN} += "mac-address.service"
17+
SYSTEMD_SERVICE_${PN} = "mac-address.service"
18+
19+
EXTRA_OECONF = " \
20+
SYSTEMD_TARGET="multi-user.target" \
21+
"

setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ machine() {
3131
local target=$1
3232
local build_dir=$2
3333
local cfg name tmpl
34-
for cfg in meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf; do
34+
for cfg in meta-*/meta-*/meta-*/conf/machine/*.conf meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf; do
3535
name=${cfg##*/}
3636
name=${name%.conf}
3737
tmpl=${cfg%/machine/*.conf}

0 commit comments

Comments
 (0)