Changeset 37302 in vbox

Timestamp:

Jun 1, 2011 9:17:47 PM (14 years ago)

Author:

vboxsync

Message:

Installer/linux: re-packing was not done correctly when kernel module source files were changed

File:

• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (3 diffs)

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

@@ -317 +317 @@
                 $(VBOX_PATH_LNX_INST_SRC)/installer-utils.sh \
                 $(VBOX_PATH_LNX_INST_SRC)/vboxdrv-pardus.py \
-                $(VBOX_PATH_LNX_INST_SRC)/uninstall.sh \
-                $(wildcard $(PATH_BIN)/src/*) \
-                $(wildcard $(PATH_BIN)/src/*/*) \
-                $(wildcard $(PATH_BIN)/src/*/*/*) \
-                $(wildcard $(PATH_BIN)/src/*/*/*/*)
+                $(VBOX_PATH_LNX_INST_SRC)/uninstall.sh
         $(call MSG_TOOL,makeself,,$@)
         $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/VirtualBox-*.run)
@@ -379 +375 @@
 
 #
+# The files that the tar archives depend on.  The wildcards are ugly, but they
+# do save us from having to update the makefile whenever something new is added
+# to the module source directories.
+#
+local arch_deps = \
+                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/, $(VBOX_LNX_arch_deps)) \
+                $(VBOX_LNX_INST_DEP_ON_MAKEFILE) \
+                $(VBOX_VERSION_STAMP) \
+                $(wildcard $(PATH_BIN)/src/*) \
+                $(wildcard $(PATH_BIN)/src/*/*) \
+                $(wildcard $(PATH_BIN)/src/*/*/*) \
+                $(wildcard $(PATH_BIN)/src/*/*/*/*)
+
+
+#
 # .tar.bz2 for converting into .run
 #
 $(VBOX_LNX_INST_STAGE_DIR)/VirtualBox.tar.bz2: \
-                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/, $(VBOX_LNX_ARCH_FILES)) \
-                $(VBOX_LNX_INST_DEP_ON_MAKEFILE) \
-                $(VBOX_VERSION_STAMP)
+                $(arch_deps)
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
@@ -400 +409 @@
 #
 $(PATH_BIN)/VirtualBox.tar.bz2: \
-                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/, $(VBOX_LNX_ARCH_FILES)) \
-                $(VBOX_LNX_INST_DEP_ON_MAKEFILE) \
-                $(VBOX_VERSION_STAMP)
+                $(arch_deps)
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) $@ $(patsubst %.bz2,%,$@)