Reorganize directory structure

Moving to directory per-application layout.  This facilitates
building single applications which is useful in the Yocto build
environment since different applications satisfy different OpenBMC
build requirements.

A number of issues are also addressed:
 - All applications were pulling in libsystemd and the gdbus libs
    irrespective of whether or not they were needed.
 - gpio.o duplicated in every application - moved to libopenbmc_intf
 - Added install target

Signed-off-by: Brad Bishop <[email protected]>

Author: bradbishop

.gitignore

@@ -1,6 +1,7 @@
-lib/*
-obj/*
-bin/*.exe
-bin/pflash
+*.exe
+*.o
+*.so
+*.so.*
 *.swp
 *.swo
+*/build

Makefile

@@ -1,77 +1,51 @@
-#CC=gcc
-OBJS    = objects/pflash/progress.o objects/pflash/ast-sf-ctrl.o
-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
-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) -Llib -lopenbmc_intf
-INCLUDES += $(shell pkg-config --cflags --libs libsystemd) -I. -O2
-LIB_FLAG += $(shell pkg-config  --libs libsystemd)
-
-%.o: interfaces/%.c 
-	$(CC) -c -fPIC -o obj/$@ $< $(CFLAGS) $(INCLUDES)
-
-%.o: objects/%.c
-	$(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
-
-%.o: includes/%.c
-	$(CC) -c -o obj/$@ $< $(LIBS) $(CFLAGS) $(INCLUDES)
-
-%.o: objects/pflash/%.c
-	$(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
-
-%.o: objects/pflash/libflash/%.c
-	$(CC) -c -o obj/$@ $< $(CFLAGS) $(INCLUDES)
-
-all: setup libopenbmc_intf power_control led_controller button_power button_reset control_host host_watchdog board_vpd pcie_slot_present flash_bios flasher pflash hwmons_barreleye control_bmc
-
-setup: 
-	mkdir -p obj lib
-
-clean:  
-	rm -rf obj lib bin/*.exe
-
-libopenbmc_intf: openbmc_intf.o
-	$(CC) -shared -o lib/$@.so obj/openbmc_intf.o $(LDFLAGS)
-
-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
-	$(CC) -o bin/$@.exe obj/led_controller.o $(LDFLAGS) $(LIB_FLAG)
-
-button_power: button_power_obj.o gpio.o libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/button_power_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
-
-button_reset: button_reset_obj.o gpio.o libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/button_reset_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
-
-
-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 libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/flash_bios_obj.o $(LDFLAGS) $(LIBS)
-
-host_watchdog: host_watchdog_obj.o libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/host_watchdog_obj.o $(LDFLAGS) $(LIBS)
-
-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 libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/pcie_slot_present_obj.o obj/gpio.o $(LDFLAGS) $(LIBS)
-
-flasher:  $(OBJS2) flasher_obj.o libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/flasher_obj.o $(OBJS3) $(LDFLAGS) $(LIBS)
-
-pflash:  $(OBJS2) pflash.o
-	$(CC) -o bin/$@ obj/pflash.o $(OBJS3) $(LDFLAGS)
-
-hwmons_barreleye: hwmons_barreleye.o libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/hwmons_barreleye.o $(LDFLAGS) $(LIBS)
-
-control_bmc: control_bmc_obj.o libopenbmc_intf
-	$(CC) -o bin/$@.exe obj/control_bmc_obj.o $(LDFLAGS) $(LIBS)
-
+GDBUS_APPS = bmcctl \
+	     bmcctl-barreleye \
+	     boardvpd \
+	     fanctl \
+	     flashbios \
+	     hostwatchdog \
+	     hwmon \
+	     hwmon-barreleye \
+	     op-flasher \
+	     op-hostctl \
+	     op-pwrctl \
+	     pciedetect \
+	     pwrbutton \
+	     rstbutton
+
+SUBDIRS = $(GDBUS_APPS) \
+	  configs \
+	  hacks \
+	  ledctl \
+	  libopenbmc_intf \
+	  pychassisctl \
+	  pydownloadmgr \
+	  pyfanctl \
+	  pyflashbmc \
+	  pyhwmon \
+	  pyinventorymgr \
+	  pyipmitest \
+	  pysensormgr \
+	  pystatemgr \
+	  pysystemmgr \
+	  pytools
+
+REVERSE_SUBDIRS = $(shell echo $(SUBDIRS) | tr ' ' '\n' | tac |tr '\n' ' ')
+
+.PHONY: subdirs $(SUBDIRS)
+
+subdirs: $(SUBDIRS)
+
+$(SUBDIRS):
+	$(MAKE) -C $@
+
+$(GDBUS_APPS): libopenbmc_intf
+
+install: subdirs
+	@for d in $(SUBDIRS); do \
+		$(MAKE) -C $$d $@ DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) || exit 1; \
+	done
+clean:
+	@for d in $(REVERSE_SUBDIRS); do \
+		$(MAKE) -C $$d $@ || exit 1; \
+	done

Makefile.python

@@ -0,0 +1 @@
+include ../py.mk

bin/hconsole

@@ -0,0 +1,3 @@
+BINS=control_bmc_barreleye
+include ../gdbus.mk
+include ../rules.mk

bmcctl-barreleye/Makefile

@@ -0,0 +1,3 @@
+BINS=control_bmc
+include ../gdbus.mk
+include ../rules.mk

objects/control_bmc_barreleye.c renamed to bmcctl-barreleye/control_bmc_barreleye.c

@@ -0,0 +1,3 @@
+BINS=board_vpd
+include ../gdbus.mk
+include ../rules.mk

bmcctl/Makefile

@@ -0,0 +1 @@
+../Makefile.python

objects/control_bmc_obj.c renamed to bmcctl/control_bmc_obj.c

@@ -0,0 +1,6 @@
+from distutils.core import setup
+
+setup(name='openbmc_configs',
+      version='1.0',
+      py_modules=['Palmetto', 'Garrison', 'Barreleye', 'Firestone', 'Witherspoon'],
+      )

boardvpd/Makefile

@@ -0,0 +1,3 @@
+BINS=fan_generic
+include ../gdbus.mk
+include ../rules.mk

objects/board_vpd_obj.c renamed to boardvpd/board_vpd_obj.c

@@ -0,0 +1,3 @@
+BINS=flash_bios
+include ../gdbus.mk
+include ../rules.mk

bin/Barreleye.py renamed to configs/Barreleye.py

@@ -0,0 +1,11 @@
+PACKAGE_DEPS=gio-unix-2.0 glib-2.0
+CFLAGS+=-iquote ../gdbus -iquote ../libopenbmc_intf
+
+LIBOBMC=$(TOP)/libopenbmc_intf/libopenbmc_intf.so.1
+EXTRA_OBJS+=$(LIBOBMC)
+
+$(LIBOBMC):
+	$(MAKE) -C $(TOP)/libopenbmc_intf
+
+%.o: %_obj.c
+	$(CC) -c $(CFLAGS) -fPIC -o $@ $<

bin/Firestone.py renamed to configs/Firestone.py

@@ -0,0 +1,7 @@
+all:
+
+install:
+	mkdir -p $(DESTDIR)/usr/sbin
+	install startup_hacks.sh $(DESTDIR)/usr/sbin
+
+clean:

bin/Garrison.py renamed to configs/Garrison.py

@@ -0,0 +1,3 @@
+BINS=host_watchdog
+include ../gdbus.mk
+include ../rules.mk

configs/Makefile

@@ -0,0 +1,3 @@
+BINS=hwmons_barreleye
+include ../gdbus.mk
+include ../rules.mk

bin/Palmetto.py renamed to configs/Palmetto.py

@@ -0,0 +1,3 @@
+BINS=hwmons_palmetto
+include ../gdbus.mk
+include ../rules.mk

configs/setup.py

@@ -0,0 +1,3 @@
+BINS=led_controller
+include ../sdbus.mk
+include ../rules.mk

fanctl/Makefile

@@ -0,0 +1,20 @@
+PACKAGE_DEPS=gio-unix-2.0 glib-2.0
+INSTALLDEPS=install-lib
+CLEANDEPS=clean-lib
+DEFAULT_ALL=$(LIBOBMC)
+CFLAGS+=-iquote ../gdbus
+LIBOBMC=openbmc_intf
+
+$(LIBOBMC): %: %.o gpio.o
+	$(CC) -shared $(LDFLAGS) -Wl,-soname,lib$(LIBOBMC).so \
+		-o lib$@.so.1 $^ $(LDLIBS)
+
+install-lib:
+	@mkdir -p $(DESTDIR)$(libdir)
+	install lib$(LIBOBMC).so.1 $(DESTDIR)$(libdir)
+	ln -s lib$(LIBOBMC).so.1 $(DESTDIR)$(libdir)/lib$(LIBOBMC).so
+
+clean-lib:
+	rm -f lib$(LIBOBMC).so.1
+
+include ../rules.mk

objects/fan_generic_obj.c renamed to fanctl/fan_generic_obj.c

@@ -0,0 +1 @@
+../gdbus/interfaces/openbmc_intf.c

flashbios/Makefile

@@ -0,0 +1 @@
+../gdbus/interfaces/openbmc_intf.h

objects/flash_bios_obj.c renamed to flashbios/flash_bios_obj.c

@@ -0,0 +1,14 @@
+BINS=flasher
+EXTRA_OBJS+=progress.o \
+	    ast-sf-ctrl.o \
+	    libflash.o \
+	    libffs.o \
+	    arm_io.o
+CFLAGS+=-Ipflash
+include ../gdbus.mk
+include ../rules.mk
+
+%.o: pflash/%.c
+	$(CC) -c -o $(CFLAGS) -fPIC -o $@ $<
+%.o: pflash/libflash/%.c
+	$(CC) -c -o $(CFLAGS) -fPIC -o $@ $<

gdbus.mk

@@ -21,7 +21,7 @@
 #include "ast.h"
 #include "sfc-ctrl.h"
 #include "interfaces/openbmc_intf.h"
-#include "includes/openbmc.h"
+#include "openbmc.h"
 
 static const gchar* dbus_object_path = "/org/openbmc/control";
 static const gchar* dbus_name = "org.openbmc.control.Flasher";

codegen renamed to gdbus/codegen

@@ -0,0 +1,3 @@
+BINS=control_host
+include ../gdbus.mk
+include ../rules.mk

interfaces/openbmc_intf.c renamed to gdbus/interfaces/openbmc_intf.c

@@ -0,0 +1,3 @@
+BINS=power_control
+include ../gdbus.mk
+include ../rules.mk

interfaces/openbmc_intf.h renamed to gdbus/interfaces/openbmc_intf.h

@@ -0,0 +1,3 @@
+BINS=pcie_slot_present
+include ../gdbus.mk
+include ../rules.mk

xml/openbmc_intf.xml renamed to gdbus/xml/openbmc_intf.xml

@@ -0,0 +1,3 @@
+BINS=button_power
+include ../gdbus.mk
+include ../rules.mk

hacks/Makefile

@@ -0,0 +1,9 @@
+PYTHON?=python
+all:
+	$(PYTHON) setup.py build
+
+clean:
+	rm -rf build
+
+install: all
+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)

bin/startup_hacks.sh renamed to hacks/startup_hacks.sh

@@ -0,0 +1 @@
+../Makefile.python

hostwatchdog/Makefile

@@ -0,0 +1 @@
+../setup.cfg

objects/host_watchdog_obj.c renamed to hostwatchdog/host_watchdog_obj.c

@@ -0,0 +1,6 @@
+from distutils.core import setup
+
+setup(name='pychassisctl',
+      version='1.0',
+      scripts=['chassis_control.py'],
+      )

hwmon-barreleye/Makefile

@@ -0,0 +1 @@
+../Makefile.python

objects/hwmons_barreleye.c renamed to hwmon-barreleye/hwmons_barreleye.c

@@ -0,0 +1 @@
+../setup.cfg