Changeset 23632 in vbox for trunk/src/VBox/Installer

Timestamp:

Oct 8, 2009 9:00:20 PM (15 years ago)

Author:

vboxsync

Message:

Installer/FreeBSD: Include VBoxREM32.so and VBoxREM64.so in 32bit builds

Location:

trunk/src/VBox/Installer/freebsd

Files:

• Makefile.kmk (modified) (5 diffs)
• pkg_plist (modified) (1 diff)

trunk/src/VBox/Installer/freebsd/Makefile.kmk

@@ -51 +51 @@
 OTHER_CLEAN   += \
         $(addprefix $(VBOX_FBSD_INST_STAGE_DIR)/,\
-                postinstall.sh \
-                uninstall.sh \
+                pkg_plist \
                 LICENSE) \
-        $(wildcard $(VBOX_FBSD_INST_OUT_DIR)/VirtualBox-*) \
-        $(addprefix $(VBOX_FBSD_INST_OUT_DIR)/,\
-                postinstall.sh)
+        $(wildcard $(VBOX_FBSD_INST_OUT_DIR)/VirtualBox-*)
 
 #
@@ -113 +110 @@
                 VBoxOGLhosterrorspu.so \
                 VBoxOGLrenderspu.so \
+                VBoxTestOGL \
                 VBoxSharedCrOpenGL.so,) \
         $(if $(VBOX_WITH_PYTHON),VBoxPython.so,)
@@ -240 +238 @@
 $(PATH_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \
                 $(VBOX_VERSION_STAMP) \
+                $(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \
                 $(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_ARCH_FILES)) \
                 $(addprefix $(VBOX_FBSD_INST_BIN_DIR)/,$(VBOX_FBSD_SYMLINKS)) \
@@ -254 +253 @@
                 -c $(VBOX_PATH_FBSD_INST_SRC)/pkg-comment \
                 -d $(VBOX_PATH_FBSD_INST_SRC)/pkg-descr \
-                -f $(VBOX_PATH_FBSD_INST_SRC)/pkg_plist \
+                -f $(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \
                 -p /usr/local \
                 -s $(VBOX_FBSD_INST_STAGE_DIR) \
@@ -311 +310 @@
         $(QUIET)$(INSTALL) -m 0644 $< $@
 
+# Create pkg_plist
+$(VBOX_FBSD_INST_OUT_DIR)/pkg_plist: \
+                $(VBOX_PATH_FBSD_INST_SRC)/pkg_plist
+        $(call MSG_INST_FILE,$<,$@)
+        $(QUIET)$(INSTALL) -d $(dir $@)
+        $(QUIET)$(SED) \
+                -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
+                -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
+                --output $@ \
+                $<
+
 include $(KBUILD_PATH)/subfooter.kmk
 

trunk/src/VBox/Installer/freebsd/pkg_plist

@@ -31 +31 @@
 lib/virtualbox/webtest
 lib/virtualbox/rdesktop-vrdp
+lib/virtualbox/VBoxTestOGL
+_VBOX_REM_32BIT_MODULE_
+_VBOX_REM_64BIT_MODULE_
 @mode 4755
 lib/virtualbox/VBoxSDL