diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 23:42:12 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-16 23:42:12 +0300 |
commit | 8a4275672b3463ef77bf9090d61a9aba45be9d3a (patch) | |
tree | 06dead3d17836e41388eee1c996a1138c0830e22 | |
parent | e34bf49e742be2f94a54795b794b88b4452e89a5 (diff) | |
parent | bd7c9e235facf05eff4493ebaf2c43f90ed34f92 (diff) | |
download | openbmc-8a4275672b3463ef77bf9090d61a9aba45be9d3a.tar.xz |
Merge commit 'bd7c9e235facf05eff4493ebaf2c43f90ed34f92' into HEAD
9 files changed, 102 insertions, 2 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 59be3454e..c50c84a42 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -30,9 +30,10 @@ IMAGE_FEATURES += " \ obmc-phosphor-event-mgmt \ obmc-phosphor-policy-mgmt \ obmc-phosphor-system-mgmt \ - ssh-server-openssh \ + ssh-server-dropbear \ " IMAGE_INSTALL += " \ bash \ + packagegroup-obmc-phosphor-apps-extras \ " diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb index 634f5d813..8aa6ba8ca 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb @@ -12,6 +12,7 @@ VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl ?= "virtual/obmc-phosphor-flash-ctl" PROVIDES = "${PACKAGES}" PACKAGES = " \ + packagegroup-obmc-phosphor-apps-extras \ ${@mf_enabled("obmc-phosphor-fan-mgmt", "packagegroup-obmc-phosphor-apps-fan-mgmt", d)} \ ${@mf_enabled("obmc-phosphor-chassis-mgmt", "packagegroup-obmc-phosphor-apps-chassis-mgmt", d)} \ ${@mf_enabled("obmc-phosphor-sensor-mgmt", "packagegroup-obmc-phosphor-apps-sensor-mgmt", d)} \ @@ -21,6 +22,11 @@ PACKAGES = " \ ${@df_enabled("obmc-phosphor-system-mgmt", "packagegroup-obmc-phosphor-apps-system-mgmt", d)} \ " +SUMMARY_packagegroup-obmc-phosphor-apps-extras = "Extra features" +RDEPENDS_packagegroup-obmc-phosphor-apps-extras = " \ + rest-dbus \ + " + SUMMARY_packagegroup-obmc-phosphor-apps-fan-mgmt = "Fan management support" RDEPENDS_packagegroup-obmc-phosphor-apps-fan-mgmt = \ "${@cf_enabled("obmc-phosphor-fan-mgmt", " \ diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/makefile.patch b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/makefile.patch new file mode 100644 index 000000000..96a82c112 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/makefile.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..3d79547 +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,18 @@ ++PACKAGE=rest-dbus ++ ++prefix?=/usr/local ++bin=$(prefix)/usr/bin ++share=$(prefix)/usr/share/$(PACKAGE) ++ ++build clean all: ++ ++install: ++ @install -d $(bin) $(share)/resources $(srv) ++ @install -m 755 $(PACKAGE) $(bin) ++ @for f in resources/*; do \ ++ install -m644 $$f $(share)/resources; \ ++ done ++ ++uninstall: ++ @rm -f $(bin)/$(PACKAGE) ++ @rm -rf $(share) diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch new file mode 100644 index 000000000..d68a037ba --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/no-session-bus.patch @@ -0,0 +1,12 @@ +Index: git/rest-dbus +=================================================================== +--- git.orig/rest-dbus ++++ git/rest-dbus +@@ -8,7 +8,6 @@ import os + from xml.etree import ElementTree + + busses = { +- 'session': dbus.SessionBus, + 'system': dbus.SystemBus, + } + diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/resources-path.patch b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/resources-path.patch new file mode 100644 index 000000000..dee44046f --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/resources-path.patch @@ -0,0 +1,13 @@ +diff --git a/rest-dbus b/rest-dbus +index 56ec1f9..078b1cf 100755 +--- a/rest-dbus ++++ b/rest-dbus +@@ -40,7 +40,7 @@ class DBusRestResourceResponse(DBusRestResponse): + 'png': 'image/png', + 'gif': 'image/gif', + } +- resource_base = 'resources' ++ resource_base = '/usr/share/rest-dbus/resources' + + def __init__(self, name): + (_, ext) = os.path.splitext(name) diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service new file mode 100644 index 000000000..686cf6952 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/files/rest-dbus.service @@ -0,0 +1,8 @@ +[Unit] +Description=DBUS introspecting REST server. + +[Service] +ExecStart=/usr/bin/rest-dbus + +[Install] +WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb new file mode 100644 index 000000000..e2b471965 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/rest-dbus/rest-dbus.bb @@ -0,0 +1,31 @@ +SUMMARY = "Phosphor OpenBMC REST framework" +DESCRIPTION = "Phosphor OpenBMC REST to DBUS daemon." +HOMEPAGE = "http://github.com/openbmc/rest-dbus" +PR = "r1" + +inherit allarch +inherit obmc-phosphor-license +inherit obmc-phosphor-systemd + +SYSTEMD_SERVICE_${PN} = "${PN}.service" + +RDEPENDS_${PN} += " \ + python-netserver \ + python-json \ + python-dbus \ + python-xml \ + " +SRC_URI += " \ + git://github.com/openbmc/rest-dbus.git \ + file://makefile.patch \ + file://resources-path.patch \ + file://no-session-bus.patch \ + " + +SRCREV = "9b0e0bab5150ccc4333ce442932f8969f365155e" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake prefix=${D} install +} diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 94f17526b..f1e50dcc6 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -3,8 +3,10 @@ require conf/distro/poky.conf DISTRO = "openbmc-phosphor" DISTRO_NAME = "Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" DISTRO_VERSION = "0.1.0" +TARGET_VENDOR="-openbmc" IMAGE_FSTYPES += "cpio.gz" +IMAGE_LINGUAS = "en-us" VIRTUAL-RUNTIME_keymaps = "" @@ -29,3 +31,5 @@ DISTRO_FEATURES = "\ MACHINE_FEATURES += " \ ${OBMC_MACHINE_FEATURES} \ " + +DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel" diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample index 6a919278d..4f18ca17c 100644 --- a/meta-phosphor/conf/local.conf.sample +++ b/meta-phosphor/conf/local.conf.sample @@ -115,7 +115,8 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.6" +SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +" # # Extra image configuration defaults # |