diff mbox

[v3] omniorb: add COS Naming Service

Message ID 1389029826-10415-1-git-send-email-mlweber1@rockwellcollins.com
State Accepted
Commit b4a28e6c5cb4c74649990f5256cf0f7971c1abec
Headers show

Commit Message

Matt Weber Jan. 6, 2014, 5:37 p.m. UTC 
Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
---

Changes v2 -> v3:
 - Updated patch to be more generic and enable apps/services
     disabled by selecting the reduced embedded build option
 - Added comments in .mk to clarify what the reduced embedded
     build configuration consisted of

Changes v1 -> v2:
 - Moved comment to top package/omniorb/Config.in (suggested by Thomas S)
 - Removed indents of variable assigments and changed hook
     to be a post patch hook package/omniorb/Config.in (suggested by Arnout V)
 - Cleaned up tab/spaces package/omniorb/Config.in (suggested by Thomas P)
---
 package/omniorb/Config.in  |   15 +++++++++++++--
 package/omniorb/omniorb.mk |   15 ++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

Comments

Arnout Vandecappelle Jan. 10, 2014, 7:13 a.m. UTC | #1 
On 06/01/14 18:37, Matt Weber wrote:
> Signed-off-by: Matt Weber<mlweber1@rockwellcollins.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

> ---
>
> Changes v2 -> v3:
>   - Updated patch to be more generic and enable apps/services
>       disabled by selecting the reduced embedded build option

  You should probably have updated the commit message as well, because 
that still mentions the COS Naming Service only.


  Regards,
  Arnout

>   - Added comments in .mk to clarify what the reduced embedded
>       build configuration consisted of
>
> Changes v1 -> v2:
>   - Moved comment to top package/omniorb/Config.in (suggested by Thomas S)
>   - Removed indents of variable assigments and changed hook
>       to be a post patch hook package/omniorb/Config.in (suggested by Arnout V)
>   - Cleaned up tab/spaces package/omniorb/Config.in (suggested by Thomas P)
> ---
>   package/omniorb/Config.in  |   15 +++++++++++++--
>   package/omniorb/omniorb.mk |   15 ++++++++++++++-
>   2 files changed, 27 insertions(+), 3 deletions(-)
[snip]
Peter Korsgaard Jan. 10, 2014, 2:03 p.m. UTC | #2 
>>>>> "Matt" == Matt Weber <mlweber1@rockwellcollins.com> writes:

 > Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
 > ---

 > Changes v2 -> v3:
 >  - Updated patch to be more generic and enable apps/services
 >      disabled by selecting the reduced embedded build option
 >  - Added comments in .mk to clarify what the reduced embedded
 >      build configuration consisted of

Committed, thanks.
diff mbox

Patch

diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in
index 192ad54..b8c4e0a 100644
--- a/package/omniorb/Config.in
+++ b/package/omniorb/Config.in
@@ -1,3 +1,7 @@ 
+
+comment "omniORB needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_OMNIORB
 	bool "omniorb"
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -11,5 +15,12 @@  config BR2_PACKAGE_OMNIORB
 
 	  http://omniorb.sourceforge.net/
 
-comment "omniORB needs a toolchain w/ C++, threads"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+if BR2_PACKAGE_OMNIORB
+
+config BR2_PACKAGE_OMNIORB_WITH_APPS
+	bool "Enable Apps and Services"
+	help
+	  omniORB applications and services disabled by default
+	  embedded system build configuration.
+
+endif
diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index 490ff93..5671ede 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -24,6 +24,19 @@  OMNIORB_INSTALL_TARGET = YES
 OMNIORB_CONF_OPT += --disable-longdouble
 HOST_OMNIORB_CONF_OPT += --disable-longdouble
 
+# The EmbeddedSystem define (set below in OMNIORB_ADJUST_TOOLDIR)
+# enables building of just the lib and disables building of
+# tools/apps/services.  In some cases the apps/services are still
+# required.  The tools however are host related and should never
+# be required on target.
+define OMNIORB_ENABLE_EXTRA_APPS
+$(SED) 's:SUBDIRS += lib:SUBDIRS += lib appl services:g' $(@D)/src/dir.mk
+endef
+
+ifeq ($(BR2_PACKAGE_OMNIORB_WITH_APPS),y)
+OMNIORB_POST_PATCH_HOOKS += OMNIORB_ENABLE_EXTRA_APPS
+endif
+
 # omniORB is not completely cross-compile friendly and has some
 # assumptions where a couple host tools must be built and then
 # used by the target build.  The host tools generate code from
@@ -32,7 +45,7 @@  HOST_OMNIORB_CONF_OPT += --disable-longdouble
 define OMNIORB_ADJUST_TOOLDIR
 	# Point to the host folder to get HOST_OMNIORB tools
 	$(SED) 's:TOOLBINDIR = $$(TOP)/$$(BINDIR):TOOLBINDIR = $(HOST_DIR)/usr/bin:g' $(@D)/mk/beforeauto.mk
-	# Disables OMNIORB tool building
+	# Disables OMNIORB app/service/tool building
 	echo "EmbeddedSystem=1" >> $(@D)/mk/beforeauto.mk
 endef
 OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_ADJUST_TOOLDIR