From: Austin Cormier Date: Wed, 14 Sep 2016 18:51:40 +0000 (-0400) Subject: Bug 42: Fix standalone build X-Git-Tag: v1.0.0~26 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F331%2F1;p=osm%2FSO.git Bug 42: Fix standalone build Signed-off-by: Austin Cormier --- diff --git a/BUILD.sh b/BUILD.sh index 12f06a18..1c4667ca 100755 --- a/BUILD.sh +++ b/BUILD.sh @@ -68,7 +68,6 @@ yumdownloader rw.toolchain-rwbase-${PLATFORM_VERSION} \ rw.core.rwvx-rwha-1.0-${PLATFORM_VERSION} \ rw.core.rwvx-rwdts-${PLATFORM_VERSION} \ rw.automation.core-RWAUTO-${PLATFORM_VERSION} \ - rw.core.mc-models-1.0-${PLATFORM_VERSION} sudo rpm -i --replacefiles --nodeps *rpm popd rm -rf $temp diff --git a/Makefile b/Makefile index 668bc8f0..c83dd165 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ CMAKE_MODULE_PATH := $(TOP_ROOT_PATH)/cmake/modules RIFT_BUILD = $(TOP_SRC_PATH)/.build RIFT_ARTIFACTS = $(TOP_ROOT_PATH)/artifacts RIFT_INSTALL = $(TOP_ROOT_PATH) -RIFT_SHELL_EXE = $(TOP_ROOT_PATH)/rift-shell -b $(RIFT_BUILD) -i $(RIFT_INSTALL) -a $(RIFT_ARTIFACTS) -- +RIFT_SHELL_EXE = $(TOP_ROOT_PATH)/rift-shell -b $(RIFT_BUILD) -i $(RIFT_INSTALL) -a $(RIFT_ARTIFACTS) --standalone-submodule $(TOP_SRC_PATH) -- CONFD = XML_ONLY