Changeset 48669 in vbox for trunk

Timestamp:

Sep 25, 2013 7:50:47 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89289

Message:

move VBoxVolInfo to the correct place and export it

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/src-helper-apps/VBoxVolInfo.cpp (added)
• src/apps/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1034 +1034 @@
  VBOX_WITH_TESTSUITE=
  VBOX_WITH_INTEL_PXE=
- VBOX_WITH_DEVMAPPER=
  # Disable for OSE, requires snv_159+.
  VBOX_WITH_NETFLT_CROSSBOW=

trunk/src/VBox/Main/Makefile.kmk

@@ -862 +862 @@
 endif # VBOX_WITH_EXTPACK
 
+#
+# VolInfo
+#
+ifdef VBOX_WITH_DEVMAPPER
+ PROGRAMS.linux      += VBoxVolInfo
+ VBoxVolInfo_TEMPLATE = VBoxR3SetUidToRoot
+ VBoxVolInfo_SOURCES  = src-helper-apps/VBoxVolInfo.cpp
+ VBoxVolInfo_LIBS     = devmapper
+endif
 
 endif # !VBOX_ONLY_SDK (the ifndef is far above)

trunk/src/apps/Makefile.kmk

@@ -34 +34 @@
  endif
 endif
-ifdef VBOX_WITH_DEVMAPPER
- ifneq ($(wildcard $(PATH_SUB_CURRENT)/volinfo),)
-  include $(PATH_SUB_CURRENT)/volinfo/Makefile.kmk
- endif
-endif
 
 include $(FILE_KBUILD_SUB_FOOTER)