diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-06-07 14:44:50 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-06-07 14:44:50 +0400 |
| commit | 6f82201bb2cae91e82fd5d9453efab7133252eb0 (patch) | |
| tree | 442b4adce08946dc1bcff67d266989d558a3c782 | |
| parent | d146b8bfcd6ed5dd60af9d1bd7cbc5f4aeed2291 (diff) | |
| download | virtualbox-6f82201bb2cae91e82fd5d9453efab7133252eb0.tar.gz | |
Make solaris installer like linux: for debian/*.install files
| -rw-r--r-- | debian/patches/dyson-install.patch | 57 |
1 files changed, 49 insertions, 8 deletions
diff --git a/debian/patches/dyson-install.patch b/debian/patches/dyson-install.patch index 46ed392e0..c5300bc31 100644 --- a/debian/patches/dyson-install.patch +++ b/debian/patches/dyson-install.patch @@ -1,8 +1,40 @@ Index: virtualbox/src/VBox/Installer/solaris/Makefile.kmk =================================================================== ---- virtualbox.orig/src/VBox/Installer/solaris/Makefile.kmk 2013-06-25 00:15:01.600445479 +0400 -+++ virtualbox/src/VBox/Installer/solaris/Makefile.kmk 2013-07-01 14:24:31.200661795 +0400 -@@ -173,7 +173,7 @@ +--- virtualbox.orig/src/VBox/Installer/solaris/Makefile.kmk 2014-06-06 23:49:49.463744553 +0400 ++++ virtualbox/src/VBox/Installer/solaris/Makefile.kmk 2014-06-07 10:34:21.785414926 +0400 +@@ -103,6 +103,31 @@ + PROGRAMS += VBoxZoneAccess VBoxISAExec + INSTALLS += solaris-doc solaris-bin solaris-drv-confs solaris-icons + ++# Copied from linux, yeah: ++INSTALLS += linux-misc ++linux-misc_INST = bin/ ++linux-misc_MODE = a+r,u+w ++linux-misc_SOURCES = \ ++ $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \ ++ $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \ ++ $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \ ++ $(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \ ++ $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,) ++linux-misc_CLEAN = \ ++ $(linux-misc_0_OUTDIR)/generated.sh \ ++ $(linux-misc_0_OUTDIR)/virtualbox.desktop ++ ++# Unset this to speed up things during makefile hacking. ++VBOX_LNX_INST_DEP_ON_MAKEFILE := $(MAKEFILE_CURRENT) ++ ++$$(linux-misc_0_OUTDIR)/generated.sh: $(VBOX_VERSION_STAMP) $(VBOX_LNX_INST_DEP_ON_MAKEFILE) | $$(dir $$@) ++ $(call MSG_GENERATE,,$@,$<) ++ $(QUIET)$(RM) -f '$@' ++ $(QUIET)$(APPEND) '$@' 'VBOX_PRODUCT="$(VBOX_PRODUCT)"' ++ $(QUIET)$(APPEND) '$@' 'VBOX_VERSION_STRING="$(VBOX_VERSION_STRING)"' ++ $(QUIET)$(APPEND) '$@' 'VBOX_C_YEAR="$(VBOX_C_YEAR)"' ++ $(QUIET)$(APPEND) '$@' 'VBOX_VENDOR="$(VBOX_VENDOR)"' ++ + BLDDIRS += \ + $(SOLARIS_INST_OUT_DIR) \ + $(SOLARIS_BASEINST_DIR) \ +@@ -173,21 +198,25 @@ solaris-icons_INST = bin/icons/ solaris-icons_MODE = a+r,u+w @@ -11,15 +43,24 @@ Index: virtualbox/src/VBox/Installer/solaris/Makefile.kmk BLDDIRS += \ $(SOLARIS_USR_DIR)/share \ -@@ -189,6 +189,11 @@ - $(foreach s,16 20 24 32 48 64 72 96 128 256,\ - virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png))) + $(SOLARIS_USR_DIR)/share/icons \ + $(SOLARIS_USRSHR_ICONS_DIR) \ + $(foreach s,16 20 24 32 48 64 72 96 128 256,\ +- $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s) \ +- $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)/mimetypes) ++ $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)) + VBOX_MIME_ICONS = \ + $(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\ + $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \ + $(foreach s,16 20 24 32 48 64 72 96 128 256,\ +- virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png))) ++ virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png))) ++ +VBOX_DESKTOP_ICONS = \ + $(addprefix $(PATH_ROOT)/src/VBox/Resources/$(if $(VBOX_OSE),OSE,NonOSE)/,\ + $(foreach s,16 20 32 40 48 64 128,\ + virtualbox-$(s)px.png=>$(s)x$(s)/virtualbox.png)) -+ + SOLARIS_COMMON_ICONS = \ $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \ - $(foreach s,16 20 24 32 48 64 72 96 128 256,\ |