diff options
Diffstat (limited to 'agl-basefiles/share')
| -rw-r--r-- | agl-basefiles/share/agl.mk | 20 | ||||
| -rw-r--r-- | agl-basefiles/share/system_launcher_main.xml | 40 |
2 files changed, 1 insertions, 59 deletions
diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk index 176bac8..3723ead 100644 --- a/agl-basefiles/share/agl.mk +++ b/agl-basefiles/share/agl.mk @@ -266,7 +266,6 @@ CLEAN_SOBJS := $(foreach lib,$(INST_SHLIBS) $(INST_TEST_MOCK_SHLIBS),$(call DEL_ CLEAN_GCDA := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_GCDA,$(lib))) CLEAN_GCNO := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_GCNO,$(lib))) CLEAN_GCOV := $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_GCOV,$(lib))) -CLEAN_CFG := $(INST_UT_SMCONF:%=%.cfg) $(INST_IT_SMCONF:%=%.cfg) CLEAN_INFO := $(sort $(foreach lib,$(INST_LIBS) $(INST_SHLIBS) $(INST_TEST_MOCK_LIBS) $(INST_TEST_MOCK_SHLIBS) $(NOINST_LIBS) $(INST_PROGS) $(INST_ITV2_TESTPROGS) $(INST_TESTPROGS),$(call DEL_INFO,$(lib)))) @@ -320,7 +319,6 @@ CLEAN_FILES += $(IPC_API_RULES) $(CLEAN_IPC_API_SRCS) $(IPC_API_DEPS) CLEAN_FILES += $(INST_DATAINITOBJ) CLEAN_FILES += $(CLEAN_INFO) CLEAN_FILES += $(CLEAN_GCNO) $(CLEAN_GCDA) $(CLEAN_GCOV) -CLEAN_FILES += $(CLEAN_CFG) ifneq ($(AEXT),) CLEAN_FILES += $(foreach lib,$(INST_SHLIBS) $(INST_PROGS),$(if $(lib),$(lib).map$(AEXT))) endif @@ -338,7 +336,6 @@ SUBDIRS := $(filter-out mock,$(SUBDIRS)) .PHONY: build-prog $(SUBDIRS:%=build-prog-%) .PHONY: build-shlib $(SUBDIRS:%=build-shlib-%) .PHONY: build-arlib $(SUBDIRS:%=build-arlib-%) -.PHONY: build-cfg .PHONY: install-header $(SUBDIRS:%=install-header-%) .PHONY: install-lib .PHONY: install-shlib $(SUBDIRS:%=install-shlib-%) @@ -365,9 +362,7 @@ lint: @set -e;\ $(MAKE) lint-exec - -#all: build-lib build-prog build-test-mock-lib build-cfg all-subdirs -all: build-lib build-prog build-cfg all-subdirs +all: build-lib build-prog all-subdirs all-subdirs: @set -e;\ @@ -438,19 +433,6 @@ ifneq ($(strip $(INST_HEADERS)),) install -m 0644 $< $(HEADER_INSTALL_DIR) endif - - -HOST_LAUNCH_XML2CFG = /usr/share/basesystem/launch_xml2cfg.sh -CONF_H = /usr/include/basesystem/sm_launch_conf.h - -%.cfg: %.xml - set -e; \ - cpp -P -include $(CONF_H) $< > $<.tmp ; \ - cd $(dir $<.tmp); \ - $(HOST_LAUNCH_XML2CFG) $(notdir $<.tmp) > $@ ; \ - rm -f $<.tmp ; - - install-data: $(INST_PIXMAPS:%=$(PIXMAP_INSTALL_DIR)/%) $(INST_UCODE:%=$(UCODE_INSTALL_DIR)/%) $(INST_DATAINITOBJ:%=$(DATAINITOBJ_INSTALL_DIR)/%) $(OBJ_COPY_LIST:%=$(OBJ_COPY_INSTALL_DIR)/%) $(INST_CONFBIN:%=$(CONFBIN_INSTALL_DIR)/%) diff --git a/agl-basefiles/share/system_launcher_main.xml b/agl-basefiles/share/system_launcher_main.xml deleted file mode 100644 index ac34d29..0000000 --- a/agl-basefiles/share/system_launcher_main.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" ?> - -<!DOCTYPE system_launcher [ - <!ELEMENT system_launcher (group+) > - - <!ELEMENT group (launch+) > - <!ATTLIST group - name CDATA #REQUIRED - wait_time CDATA #REQUIRED - trigger (True|False) #REQUIRED - > - - <!ELEMENT launch EMPTY > - <!ATTLIST launch - name CDATA #REQUIRED - path CDATA #REQUIRED - priority CDATA #REQUIRED - critical CDATA #REQUIRED - retry_cnt CDATA #REQUIRED - arguments CDATA #REQUIRED - logging_mask CDATA "NULL" - restart (me|NULL) #REQUIRED - is_start_required (True|False) #REQUIRED - shutdown_critical CDATA #REQUIRED - shutdown_wait_time CDATA #REQUIRED - fast_shutdown_wait_time CDATA #REQUIRED - user_name CDATA #REQUIRED - is_agl_unit (True|False) #IMPLIED - disable_agl_resethistory (True|False) #IMPLIED - disable_nonagl_resethistory (True|False) #IMPLIED - env_cond CDATA #IMPLIED - cpu_assign CDATA #IMPLIED - > - - <!ENTITY system_launcher_body SYSTEM "system_launcher_body.xml"> -]> - -<system_launcher> - &system_launcher_body; -</system_launcher> |