diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-10 16:25:25 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-10 16:25:25 -0300 |
| commit | a0a06e2c882e1e6ac910afa36ff2e1036b091e3c (patch) | |
| tree | a2410a7cd0ec4b08774848239e147c578efb0483 /libre/virtualbox-libre/libre.patch | |
| parent | 02e38786869ae98586d05904f3fb713a642cc8bd (diff) | |
| parent | 65e7fbfdd5114e303e711061676b7b68017b3211 (diff) | |
| download | abslibre-a0a06e2c882e1e6ac910afa36ff2e1036b091e3c.tar.gz abslibre-a0a06e2c882e1e6ac910afa36ff2e1036b091e3c.tar.bz2 abslibre-a0a06e2c882e1e6ac910afa36ff2e1036b091e3c.zip | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/virtualbox-libre/libre.patch')
| -rw-r--r-- | libre/virtualbox-libre/libre.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index dec34abb9..1e91c5b96 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -420,7 +420,7 @@ echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.12.orig/Makefile.kmk 2013-04-12 07:33:55.000000000 -0300 +++ VirtualBox-4.2.12/Makefile.kmk 2013-05-09 23:09:45.756804164 -0300 -@@ -177,41 +177,6 @@ +@@ -177,40 +177,6 @@ INSTALLS += buildserver-additions endif @@ -458,11 +458,10 @@ -buildserver-additions-affinity-hack: - $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp - endif --endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER + endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER - # -@@ -327,18 +292,6 @@ +@@ -327,18 +293,6 @@ ifn1of ($(KBUILD_TARGET), l4 linux win) VBOX_PATH_STAGED ?= . @@ -481,7 +480,7 @@ # guesttool.exe ifndef VBOX_WITH_WIN32_ADDITIONS ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),) -@@ -388,7 +341,6 @@ +@@ -388,7 +342,6 @@ include/VBox \ include/VBox/vmm \ include/VBox/com \ @@ -489,7 +488,7 @@ include/VBox/HostServices \ include/VBox/GuestHost \ include/VBox/HGSMI \ -@@ -983,17 +935,8 @@ +@@ -983,17 +936,8 @@ additions-packing: + $(KMK) VBOX_ONLY_ADDITIONS=1 \ @@ -507,7 +506,7 @@ -C src/VBox/Additions \ $(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.zip -@@ -1010,200 +953,6 @@ +@@ -1010,200 +954,6 @@ # |