Merge pull request #21 from bradbishop/master
Add IPMI to build
diff --git a/common/recipes-devtools/python/python-tftpy.bb b/common/recipes-devtools/python/python-tftpy.bb
new file mode 100644
index 0000000..32f788b
--- /dev/null
+++ b/common/recipes-devtools/python/python-tftpy.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Python is a TFTP library for the Python programming language."
+DESCRIPTION = "Tftpy is a TFTP library for the Python programming language. It includes \
+client and server classes, with sample implementations. Hooks are included for \
+easy inclusion in a UI for populating progress indicators. It supports RFCs \
+1350, 2347, 2348 and the tsize option from RFC 2349."
+HOMEPAGE = "https://github.com/msoulier/tftpy"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=22770e72ae03c61f5bcc4e333b61368d"
+
+SRC_URI = "git://github.com/msoulier/tftpy.git"
+SRCREV = "${AUTOREV}"
+
+S = "${WORKDIR}/git"
+
+inherit allarch
+inherit setuptools
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
index 4dbcdd3..02fb8d4 100644
--- a/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
+++ b/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb
@@ -26,6 +26,7 @@
RDEPENDS_packagegroup-obmc-phosphor-apps-extras = " \
rest-dbus \
host-ipmid \
+ skeleton \
"
SUMMARY_packagegroup-obmc-phosphor-apps-fan-mgmt = "Fan management support"
diff --git a/common/recipes-phosphor/skeleton/skeleton.bb b/common/recipes-phosphor/skeleton/skeleton.bb
new file mode 100644
index 0000000..f5375c4
--- /dev/null
+++ b/common/recipes-phosphor/skeleton/skeleton.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Temp placeholder for skeleton function"
+DESCRIPTION = "Temp placeholder for skeleton repository"
+HOMEPAGE = "http://github.com/openbmc/skeleton"
+PR = "r1"
+
+inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
+
+DEPENDS += "glib-2.0"
+RDEPENDS_${PN} += "python-subprocess python-tftpy"
+SRC_URI += "git://github.com/openbmc/skeleton"
+SRC_URI += "file://make.patch"
+
+SRCREV = "18d4591170779ceb81158c650d31c6c59115b2f2"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+ oe_runmake all
+}
+
+do_install() {
+ install -d ${D}/${sbindir} ${D}${libdir}
+ for i in ${S}/bin/*.py ${S}/bin/*.exe; do
+ install $i ${D}/${sbindir}
+ done
+ install ${S}/bin/libopenbmc_intf.so ${D}/${libdir}
+}
diff --git a/common/recipes-phosphor/skeleton/skeleton/make.patch b/common/recipes-phosphor/skeleton/skeleton/make.patch
new file mode 100644
index 0000000..17ec317
--- /dev/null
+++ b/common/recipes-phosphor/skeleton/skeleton/make.patch
@@ -0,0 +1,120 @@
+diff --git a/Makefile b/Makefile
+index b303513..b7f0053 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,77 +4,74 @@ OBJS += objects/pflash/libflash/libflash.o objects/pflash/libflash/libffs.o
+ OBJS += objects/pflash/arm_io.o
+ OBJS2 = progress.o ast-sf-ctrl.o libflash.o libffs.o arm_io.o
+ OBJS3 = obj/progress.o obj/ast-sf-ctrl.o obj/libflash.o obj/libffs.o obj/arm_io.o
+-LIBS = ./bin
+-OFLAGS =-L$(LIBS) -lopenbmc_intf
+-HOME = .
+-CFLAGS=$(shell pkg-config --libs --cflags gio-unix-2.0 glib-2.0)
+-#CFLAGS = -pthread -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -lgio-2.0 -lgobject-2.0 -lglib-2.0
++INCLUDES=$(shell pkg-config --cflags gio-unix-2.0 glib-2.0) -Iincludes -Iobjects/pflash -I.
++LIBS=$(shell pkg-config --libs gio-unix-2.0 glib-2.0) -Lbin -lopenbmc_intf
+
+ %.o: interfaces/%.c
+- $(CC) -c -fPIC -o obj/$@ $< -I$(HOME) -I$(HOME)/includes $(CFLAGS)
++ $(CC) -c -fPIC -o obj/$@ $< $(CFLAGS) $(INCLUDES)
+
+ %.o: objects/%.c
+- $(CC) -c -o obj/$@ $< -L$(LIBS) -I$(HOME) -I$(HOME)/includes -I$(HOME)/objects/pflash $(CFLAGS)
++ $(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
+
+ %.o: includes/%.c
+- $(CC) -c -o obj/$@ $< -L$(LIBS) -I$(HOME) -I$(HOME)/includes -I$(HOME)/objects/pflash $(CFLAGS)
++ $(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
+
+ %.o: objects/pflash/%.c
+- $(CC) -c -o obj/$@ $< -I$(HOME) -I$(HOME)/objects/pflash $(CFLAGS)
++ $(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
+
+ %.o: objects/pflash/libflash/%.c
+- $(CC) -c -o obj/$@ $< -I$(HOME) -I$(HOME)/objects/pflash $(CFLAGS)
++ $(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
+
+ setup:
+- mkdir obj
++ mkdir -p obj
+
+ clean:
+ rm -rf obj
+
+ libopenbmc_intf: openbmc_intf.o
+- $(CC) -shared -o bin/$@.so obj/openbmc_intf.o $(CFLAGS)
++ $(CC) -shared -o bin/$@.so obj/openbmc_intf.o $(LDFLAGS)
+
+-power_control: power_control_obj.o gpio.o
+- $(CC) -o bin/$@.exe obj/gpio.o obj/power_control_obj.o $(OFLAGS) $(CFLAGS)
++power_control: power_control_obj.o gpio.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/gpio.o obj/power_control_obj.o $(LDFLAGS) $(LIBS)
+
+-led_controller: led_controller.o gpio.o
+- $(CC) -o bin/$@.exe obj/gpio.o obj/led_controller.o $(OFLAGS) $(CFLAGS)
++led_controller: led_controller.o gpio.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/gpio.o obj/led_controller.o $(LDFLAGS) $(LIBS)
+
+-sensor_ambient: sensor_threshold.o sensor_temperature_ambient_obj.o
+- $(CC) -o bin/$@.exe obj/sensor_threshold.o obj/sensor_temperature_ambient_obj.o $(OFLAGS) $(CFLAGS)
++sensor_ambient: sensor_threshold.o sensor_temperature_ambient_obj.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/sensor_threshold.o obj/sensor_temperature_ambient_obj.o $(LDFLAGS) $(LIBS)
+
+-button_power: button_power_obj.o gpio.o
+- $(CC) -o bin/$@.exe obj/button_power_obj.o obj/gpio.o $(OFLAGS) $(CFLAGS)
++button_power: button_power_obj.o gpio.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/button_power_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
+
+-control_host: control_host_obj.o gpio.o
+- $(CC) -o bin/$@.exe obj/gpio.o obj/control_host_obj.o $(OFLAGS) $(CFLAGS)
++control_host: control_host_obj.o gpio.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/gpio.o obj/control_host_obj.o $(LDFLAGS) $(LIBS)
+
+-flash_bios: flash_bios_obj.o
+- $(CC) -o bin/$@.exe obj/flash_bios_obj.o $(OFLAGS) $(CFLAGS)
++flash_bios: flash_bios_obj.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/flash_bios_obj.o $(LDFLAGS) $(LIBS)
+
+-fan: fan_generic_obj.o gpio.o
+- $(CC) -o bin/$@.exe obj/gpio.o obj/fan_generic_obj.o $(OFLAGS) $(CFLAGS)
++fan: fan_generic_obj.o gpio.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/gpio.o obj/fan_generic_obj.o $(LDFLAGS) $(LIBS)
+
+-host_watchdog: host_watchdog_obj.o
+- $(CC) -o bin/$@.exe obj/host_watchdog_obj.o $(OFLAGS) $(CFLAGS)
++host_watchdog: host_watchdog_obj.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/host_watchdog_obj.o $(LDFLAGS) $(LIBS)
+
+-control_bmc: control_bmc_obj.o
+- $(CC) -o bin/$@.exe obj/control_bmc_obj.o $(OFLAGS) $(CFLAGS)
++control_bmc: control_bmc_obj.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/control_bmc_obj.o $(LDFLAGS) $(LIBS)
+
+-sensor_occ: sensor_occ_obj.o
+- $(CC) -o bin/$@.exe obj/sensor_occ_obj.o $(OFLAGS) $(CFLAGS)
++sensor_occ: sensor_occ_obj.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/sensor_occ_obj.o $(LDFLAGS) $(LIBS)
+
+-board_vpd: board_vpd_obj.o
+- $(CC) -o bin/$@.exe obj/board_vpd_obj.o $(OFLAGS) $(CFLAGS)
++board_vpd: board_vpd_obj.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/board_vpd_obj.o $(LDFLAGS) $(LIBS)
+
+-pcie_slot_present: pcie_slot_present_obj.o gpio.o
+- $(CC) -o bin/$@.exe obj/pcie_slot_present_obj.o obj/gpio.o $(OFLAGS) $(CFLAGS)
++pcie_slot_present: pcie_slot_present_obj.o gpio.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/pcie_slot_present_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
+
+-flasher: $(OBJS2) flasher_obj.o
+- $(CC) -o bin/$@.exe obj/flasher_obj.o $(OFLAGS) $(OBJS3) $(CFLAGS)
++flasher: $(OBJS2) flasher_obj.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/flasher_obj.o $(OBJS3) $(LDFLAGS) $(LIBS)
+
+-hwmon: hwmon_intf.o
+- $(CC) -o bin/$@.exe obj/hwmon_intf.o $(OFLAGS) $(CFLAGS)
++hwmon: hwmon_intf.o libopenbmc_intf
++ $(CC) -o bin/$@.exe obj/hwmon_intf.o $(LDFLAGS) $(LIBS)
+
+
+-all: clean setup libopenbmc_intf power_control led_controller sensor_ambient button_power control_host fan host_watchdog control_bmc board_vpd pcie_slot_present flash_bios flasher
++all: setup libopenbmc_intf power_control led_controller sensor_ambient button_power control_host fan host_watchdog control_bmc board_vpd pcie_slot_present flash_bios flasher
diff --git a/common/recipes-phosphor/skeleton/skeleton/skeleton.service b/common/recipes-phosphor/skeleton/skeleton/skeleton.service
new file mode 100755
index 0000000..545a1f2
--- /dev/null
+++ b/common/recipes-phosphor/skeleton/skeleton/skeleton.service
@@ -0,0 +1,8 @@
+[Unit]
+Description="Temp placeholder for skeleton function"
+
+[Service]
+ExecStart=/usr/sbin/system_manager.py Palmetto
+
+[Install]
+WantedBy=multi-user.target
diff --git a/common/recipes.txt b/common/recipes.txt
index d38d789..f339a3c 100644
--- a/common/recipes.txt
+++ b/common/recipes.txt
@@ -1,4 +1,5 @@
recipes-connectivity - Libraries and applications related to communication with other devices
+recipes-devtools - Tools primarily used by the build system (but can also be used on targets)
recipes-extended - Applications which whilst not essential add features compared to the alternatives in
core. May be needed for full tool functionality or LSB compliance.
recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies