Merge pull request #48 from bradbishop/btbridge
enable btbridge
diff --git a/common/recipes-core/systemd/systemd/default.network b/common/recipes-core/systemd/systemd/default.network
new file mode 100644
index 0000000..c75c3d6
--- /dev/null
+++ b/common/recipes-core/systemd/systemd/default.network
@@ -0,0 +1,4 @@
+[Match]
+Name=eth*
+[Network]
+DHCP=ipv4
diff --git a/common/recipes-core/systemd/systemd_%.bbappend b/common/recipes-core/systemd/systemd_%.bbappend
index b0cf906..680595c 100644
--- a/common/recipes-core/systemd/systemd_%.bbappend
+++ b/common/recipes-core/systemd/systemd_%.bbappend
@@ -1 +1,9 @@
PACKAGECONFIG += "networkd"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += "file://default.network"
+
+FILES_${PN} += "${libdir}/systemd/network/default.network"
+
+do_install_append() {
+ install -m 644 ${WORKDIR}/default.network ${D}${libdir}/systemd/network/
+}
diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-config.cfg b/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-config.cfg
deleted file mode 100644
index 17c8b50..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-config.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Used by yocto-kernel to manage config options.
-#
-# yocto-kernel may change the contents of this file in any
-# way it sees fit, including removing comments like this,
-# so don't manually make any modifications you don't want
-# to lose.
-#
diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-patches.scc b/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-patches.scc
deleted file mode 100644
index 7a598d9..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-patches.scc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Used by yocto-kernel to manage patches.
-#
-# yocto-kernel may change the contents of this file in any
-# way it sees fit, including removing comments like this,
-# so don't manually make any modifications you don't want
-# to lose.
-#
diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.cfg b/common/recipes-kernel/linux/linux-obmc/obmc-bsp.cfg
deleted file mode 100644
index 95170b1..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# A convenient place to add config options, nothing more.
-#
diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.scc b/common/recipes-kernel/linux/linux-obmc/obmc-bsp.scc
deleted file mode 100644
index 88e76e6..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.scc
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# The top-level 'feature' for the meta-obmc-bsp custom kernel.
-#
-# Essentially this is a convenient top-level container or starting
-# point for adding lower-level config fragements and features.
-#
-
-# meta-obmc-bsp.cfg in the linux-yocto-custom subdir is just a
-# convenient place for adding random config fragments.
-
-kconf hardware obmc-bsp.cfg
-
-# These are used by yocto-kernel to add config fragments and features.
-# Don't remove if you plan on using yocto-kernel with this BSP.
-
-kconf hardware obmc-bsp-user-config.cfg
-include obmc-bsp-user-patches.scc
diff --git a/common/recipes-kernel/linux/linux-obmc_4.2.bb b/common/recipes-kernel/linux/linux-obmc_4.2.bb
index 81edb70..f49b3fc 100644
--- a/common/recipes-kernel/linux/linux-obmc_4.2.bb
+++ b/common/recipes-kernel/linux/linux-obmc_4.2.bb
@@ -3,16 +3,12 @@
LICENSE = "GPLv2"
KBRANCH ?= "dev"
+KCONFIG_MODE="--alldefconfig"
SRC_URI = "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
-SRC_URI += "file://obmc-bsp.scc \
- file://obmc-bsp.cfg \
- file://obmc-bsp-user-config.cfg \
- file://obmc-bsp-user-patches.scc \
- "
LINUX_VERSION ?= "4.2"
-LINUX_VERSION_EXTENSION ?= "-openbmc-${SRCPV}"
+LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
SRCREV="openbmc-20151028-1"
@@ -22,7 +18,3 @@
inherit kernel
require recipes-kernel/linux/linux-yocto.inc
-
-do_configure_prepend() {
- sed -i 's/CONFIG_LOCALVERSION=.\+/CONFIG_LOCALVERSION=${LINUX_VERSION_EXTENSION}/' ${S}/arch/${ARCH}/configs/${KMACHINE}_defconfig
-}
diff --git a/common/recipes-phosphor/dbus/obmc-mapper.bb b/common/recipes-phosphor/dbus/obmc-mapper.bb
new file mode 100644
index 0000000..67219b0
--- /dev/null
+++ b/common/recipes-phosphor/dbus/obmc-mapper.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Phosphor DBUS Object Manager"
+DESCRIPTION = "Phosphor DBUS object manager."
+HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+inherit allarch
+inherit obmc-phosphor-dbus-service
+inherit obmc-phosphor-systemd
+inherit setuptools
+
+DBUS_SERVICES += "org.openbmc.ObjectMapper"
+RDEPENDS_${PN} += " \
+ python-xml \
+ python-dbus \
+ python-pygobject \
+ "
+SRC_URI += " \
+ git://github.com/openbmc/phosphor-objmgr \
+ "
+
+SRCREV = "e290f5cdccf14e50e838366367c91e0464f792f6"
+
+S = "${WORKDIR}/git"
diff --git a/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service b/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service
new file mode 100644
index 0000000..773eaa5
--- /dev/null
+++ b/common/recipes-phosphor/dbus/obmc-mapper/obmc-mapper.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Phosphor OpenBMC DBus service management daemon
+
+[Service]
+Type=dbus
+ExecStart=/usr/sbin/phosphor-mapper
+BusName=org.openbmc.objectmapper
+
+[Install]
+WantedBy=multi-user.target
diff --git a/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf b/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf
new file mode 100644
index 0000000..9a26ab9
--- /dev/null
+++ b/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <policy user="root">
+ <allow own="org.openbmc.ObjectMapper"/>
+ <allow send_destination="org.openbmc.ObjectMapper"/>
+ </policy>
+</busconfig>
diff --git a/common/recipes-phosphor/dbus/obmc-rest.bb b/common/recipes-phosphor/dbus/obmc-rest.bb
new file mode 100644
index 0000000..0162ec5
--- /dev/null
+++ b/common/recipes-phosphor/dbus/obmc-rest.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Phosphor DBUS REST Server"
+DESCRIPTION = "Phosphor DBUS REST manager."
+HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+inherit allarch
+inherit obmc-phosphor-systemd
+inherit setuptools
+
+RDEPENDS_${PN} += " \
+ python-xml \
+ python-dbus \
+ python-pygobject \
+ obmc-mapper \
+ "
+SRC_URI += " \
+ git://github.com/openbmc/phosphor-rest-server \
+ "
+
+SRCREV = "2f7aef50b005c16a51065984f090e787c04c0c14"
+
+S = "${WORKDIR}/git"
diff --git a/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service b/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
new file mode 100644
index 0000000..eb1c47e
--- /dev/null
+++ b/common/recipes-phosphor/dbus/obmc-rest/obmc-rest.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Phosphor OpenBMC DBus REST daemon
+Requires=obmc-mapper.service
+After=obmc-mapper.service
+
+[Service]
+ExecStart=/usr/sbin/phosphor-rest
+
+[Install]
+WantedBy=multi-user.target
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
index 4dbcdd3..cac7b1b 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
@@ -25,6 +25,7 @@
SUMMARY_packagegroup-obmc-phosphor-apps-extras = "Extra features"
RDEPENDS_packagegroup-obmc-phosphor-apps-extras = " \
rest-dbus \
+ obmc-rest \
host-ipmid \
"