From 5186adc74146d377e9b4da771387b277a25cb019b9f0b50d691d245251df3c3d Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Tue, 1 May 2012 08:45:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=88 --- vbox-kmk_sed.diff | 580 ---------------------------------------------- 1 file changed, 580 deletions(-) delete mode 100644 vbox-kmk_sed.diff diff --git a/vbox-kmk_sed.diff b/vbox-kmk_sed.diff deleted file mode 100644 index 1550d0a..0000000 --- a/vbox-kmk_sed.diff +++ /dev/null @@ -1,580 +0,0 @@ -Index: VirtualBox-4.1.14/src/recompiler/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/recompiler/Makefile.kmk -+++ VirtualBox-4.1.14/src/recompiler/Makefile.kmk -@@ -240,14 +240,14 @@ $$(VBoxREMImp_0_OUTDIR)/VBoxREMImp.c: $( - $(QUIET)$(APPEND) $@ '# define EXPORT' - $(QUIET)$(APPEND) $@ '#endif' - $(QUIET)$(APPEND) $@ '' -- $(QUIET)$(SED) -f $(VBOX_PATH_RECOMPILER_SRC)/Sun/deftoimp.sed --append $@ $< -+ $(QUIET)$(SED) -f $(VBOX_PATH_RECOMPILER_SRC)/Sun/deftoimp.sed >> $@ $< - - $$(VBoxREMImp_0_OUTDIR)/VBoxREMOS2.def: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(MAKEFILE_CURRENT) | $$(dir $$@) - $(SED) \ - -e 's/^[ \t][ \t]*REMR3/ _REMR3/' \ - -e 's/\.[Dd][Ll][Ll]//' \ - -e 's/^LIBRARY .*/LIBRARY VBoxREM INITINSTANCE TERMINSTANCE\nDATA MULTIPLE\n/' \ -- --output $@ \ -+ > $@ \ - $< - - $$(VBoxREMImp_0_OUTDIR)/VBoxREMWin.def: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.def $(MAKEFILE_CURRENT) | $$(dir $$@) -Index: VirtualBox-4.1.14/src/VBox/Frontends/VirtualBox/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/Frontends/VirtualBox/Makefile.kmk -@@ -713,8 +713,8 @@ $$(VirtualBox_0_OUTDIR)/include/COMWrapp - $(QUIET)$(RM) -f $@ $@.tmp $@.h $@.cpp - $(QUIET)$(VBOX_XSLTPROC) -o $@ $(VBOX_VIRTUALBOX4_SRC)/src/globals/COMWrappers.xsl $< - -- $(QUIET)$(SED) -e '1,/\/\/ wrapper definitions/ !d' \ -- --output $@.tmp $@ -+ $(QUIET)/usr/bin/sed -e '1,/\/\/ wrapper definitions/ !d' \ -+ $@ >$@.tmp - $(QUIET)$(CP) --changed $@.tmp $@.h - - $(QUIET)$(APPEND) -t -n $@.tmp \ -@@ -726,7 +726,7 @@ $$(VirtualBox_0_OUTDIR)/include/COMWrapp - '' - $(QUIET)$(SED) -e '/\/\/ wrapper definitions/,9999999 !d' \ - -e 's/^inline //' \ -- --append $@.tmp $@ -+ $@ >> $@.tmp - $(QUIET)$(CP) --changed $@.tmp $@.cpp - $(QUIET)$(RM) -f $@.tmp - -@@ -754,9 +754,8 @@ $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBr - -e 's;@VBOX_VBOX_48PX_PNG@;$(VBOX_BRAND_GUI_VBOX_48PX_PNG);g' \ - -e 's;@VBOX_VBOX_64PX_PNG@;$(VBOX_BRAND_GUI_VBOX_64PX_PNG);g' \ - -e 's;@VBOX_CUBE_42PX_PNG@;$(VBOX_BRAND_GUI_CUBE_42PX_PNG);g' \ -- --output $@ \ -- $< -- -+ $< \ -+ > $@ - - # - # Precompiled header - non-functional atm. -@@ -928,7 +927,7 @@ $$(VirtualBoxVM.app_0_OUTDIR)/VM-Info.pl - -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \ - -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \ - -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \ -- --output $@ $< -+ $< > $@ - - PROGRAMS += vmstarter - vmstarter_TEMPLATE = VBOXR3EXE -@@ -957,7 +956,7 @@ $$(vmstarter.app_0_OUTDIR)/vmstarter-Inf - -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \ - -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \ - -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \ -- --output $@ $< -+ $< > $@ - endif # darwin - - # -Index: VirtualBox-4.1.14/kBuild/units/qt4.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/kBuild/units/qt4.kmk -+++ VirtualBox-4.1.14/kBuild/units/qt4.kmk -@@ -415,16 +415,16 @@ define TOOL_QT4_RCC_QRC_CMDS - -e 's/^.*]*>\([^<]*\)<\/file>.*$$$$/\1/' \ - -e 's|^[^/][^:]|$(abspathex $(dir $(source)),$(defpath))/&|' \ - -e 's|$$$$| \\|' \ -- --append $(dep) \ -- $(source) -+ $(source) \ -+ >> $(dep) - $(QUIET2)$(APPEND) $(dep) - $(QUIET2)$(SED) \ - -e '/^[[:blank:]]*]*>/!d' \ - -e 's/^.*]*>\([^<]*\)<\/file>.*$$$$/\1/' \ - -e 's|^[^/][^:]|$(abspathex $(dir $(source)),$(defpath))/&|' \ - -e 's|$$$$|:\n|' \ -- --append $(dep) \ -- $(source) -+ $(source) \ -+ >> $(dep) - $(QUIET2)$(APPEND) $(dep) - endef - -Index: VirtualBox-4.1.14/kBuild/header.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/kBuild/header.kmk -+++ VirtualBox-4.1.14/kBuild/header.kmk -@@ -690,7 +690,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm - RMDIR_INT := kmk_builtin_rmdir - RMDIR := $(RMDIR_INT) - --SED_EXT := $(KBUILD_BIN_PATH)/kmk_sed$(HOSTSUFF_EXE) -+SED_EXT := /usr/bin/sed - SED_INT := $(SED_EXT) - SED := $(SED_EXT) - -Index: VirtualBox-4.1.14/src/VBox/Devices/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Devices/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/Devices/Makefile.kmk -@@ -506,7 +506,7 @@ if !defined(VBOX_ONLY_EXTPACKS) - $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $< - $(QUIET)$(MV) -f $@ $@.tmp - $(QUIET)$(SED) "s/AmlCode/AmlCodeSsdtStandard/g" \ -- --output $@ $@.tmp -+ $@.tmp > $@ - $(QUIET)$(RM) -f $@.tmp - - -@@ -519,7 +519,7 @@ if !defined(VBOX_ONLY_EXTPACKS) - $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $@.pre - $(QUIET)$(MV) -f $@ $@.tmp - $(QUIET)$(SED) "s/AmlCode/AmlCodeSsdtCpuHotPlug/g" \ -- --output $@ $@.tmp -+ >$@.tmp > $@ - $(QUIET)$(RM) -f $@.tmp $@.pre - - -Index: VirtualBox-4.1.14/src/VBox/Installer/linux/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Installer/linux/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/Installer/linux/Makefile.kmk -@@ -91,11 +91,11 @@ $$(linux-misc_0_OUTDIR)/virtualbox.deskt - ifdef VBOX_PATH_PACKAGE_DOCS - $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_PATH_PACKAGE_DOCS)+" \ - -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \ -- --output $@ $< -+ > $@ $< - else - $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \ - -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \ -- --output $@ $< -+ > $@ $< - endif - - INSTALLS += linux-icons -@@ -342,7 +342,7 @@ $(VBOX_LNX_INST_OUT_DIR)/vboxballoonctrl - -e "s|%NOLSB%|yes|g" \ - -e "s|%DEBIAN%||g" \ - -e "s|%PACKAGE%|virtualbox|g" \ -- --output $@ \ -+ > $@ \ - $< - - $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh: $(VBOX_PATH_LNX_INST_SRC)/vboxdrv.sh.in | $$(dir $$@) -@@ -351,7 +351,7 @@ $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh: $(V - -e "s|%DEBIAN%||g" \ - -e "s|%PACKAGE%|virtualbox|g" \ - -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \ -- --output $@ \ -+ > $@ \ - $< - - $(VBOX_LNX_INST_OUT_DIR)/vboxweb-service.sh: $(VBOX_PATH_LNX_INST_SRC)/vboxweb-service.sh.in | $$(dir $$@) -@@ -359,7 +359,7 @@ $(VBOX_LNX_INST_OUT_DIR)/vboxweb-service - -e "s|%NOLSB%|yes|g" \ - -e "s|%DEBIAN%||g" \ - -e "s|%PACKAGE%|virtualbox|g" \ -- --output $@ \ -+ > $@ \ - $< - - $(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_PATH_LNX_INST_SRC)/installer-utils.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@) -@@ -374,7 +374,7 @@ $(VBOX_LNX_INST_OUT_DIR)/install.sh: $(V - -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-utils.sh" \ - -e 'd' \ - -e '}' \ -- --output $@ \ -+ > $@ \ - $< - - # -Index: VirtualBox-4.1.14/src/VBox/VMM/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/VMM/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/VMM/Makefile.kmk -@@ -270,7 +270,7 @@ if defined(VBOX_WITH_RAW_MODE) && $(inte - ifeq ($(VBOX_LDR_FMT32),lx) - VMMRCBuiltin_SOURCES = $(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def - $$(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@) -- $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/ _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@ $< -+ $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/ _\1/' -e 's/[ \t]DATA[ \t]*/ /' > $@ $< - endif - - -@@ -288,7 +288,7 @@ if defined(VBOX_WITH_RAW_MODE) && $(inte - -e '/not-os2/d' \ - -e 's/^[ \t][ \t]*\([a-zA-Z]\)/ _\1/' \ - -e 's/[ \t]DATA[ \t]*/ /' \ -- --output $@ \ -+ > $@ \ - $< - $(APPEND) "$@" "" - $(APPEND) "$@" " ___ehInit" -@@ -296,7 +296,7 @@ if defined(VBOX_WITH_RAW_MODE) && $(inte - $(SED) \ - -e '/not-win/d' \ - -e '/not-$(KBUILD_TARGET_ARCH)/d' \ -- --output $@ $< -+ > $@ $< - endif - - endif # RC && (pe || lx) -@@ -318,14 +318,14 @@ if1of ($(VBOX_LDR_FMT), pe lx) - -e '/not-amd64/d' \ - -e 's/^[ \t][ \t]*\([a-zA-Z]\)/ _\1/' \ - -e 's/[ \t]DATA[ \t]*/ /' \ -- --output $@ $< -+ > $@ $< - $(APPEND) "$@" "" - $(APPEND) "$@" " ___ehInit" - else - $(SED) \ - -e '/not-win/d' \ - -e '/not-$(KBUILD_TARGET_ARCH)/d' \ -- --output $@ $< -+ > $@ $< - endif - endif # R0: pe + lx - -Index: VirtualBox-4.1.14/src/VBox/HostDrivers/Support/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/HostDrivers/Support/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/HostDrivers/Support/Makefile.kmk -@@ -148,7 +148,7 @@ $$(SUPR0_0_OUTDIR)/SUPR0.def: $(PATH_SUB - -e 's/^[ \t][ \t]*\([gA-Z]\)/ _\1/' \ - -e 's/[ \t]DATA[ \t]*/ /' \ - -e 's/g_pSUPGlobalInfoPage/g_SUPGlobalInfoPage/' \ -- --output $@.tmp\ -+ > $@.tmp\ - $< - $(MV) -f $@.tmp $@ - endif -@@ -284,7 +284,7 @@ $$(vboxdrv-mod_0_OUTDIR)/build_in_tmp: \ - $(QUIET)$(SED) \ - -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \ - -e "s;_MODULE_;vboxdrv;g" \ -- -e "s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $< -+ -e "s;_BUILDTYPE_;${KBUILD_TYPE};g" > $@ $< - $(QUIET)chmod 0755 $@ - - includedep $(PATH_TARGET)/vboxdrv-mod-1.dep -@@ -294,7 +294,7 @@ $$(vboxdrv-mod_0_OUTDIR)/Makefile: \ - | $$(dir $$@) - $(call MSG_TOOL,Creating,,$@) - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" > $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -@@ -328,7 +328,7 @@ ifdef VBOX_WITH_DTRACE_R0DRV - VBoxDrv_CLEAN += $(VBoxDrv_0_OUTDIR)/SUPDrv-dtrace.h $(VBoxDrv_0_OUTDIR)/SUPDrv-dtrace.tmp - $$(VBoxDrv_0_OUTDIR)/SUPDrv-dtrace.h: $(PATH_SUB_CURRENT)/SUPDrv-dtrace.d | $$(dir $$@) - dtrace -C -h -o $@.tmp -s $< -- $(SED) -e '//d' $@.tmp --output $@ -+ $(SED) -e '//d' $@.tmp > $@ - $(RM) -f $@.tmp - endif - -@@ -350,7 +350,7 @@ $$(VBoxDrv.kext_0_OUTDIR)/Info.plist: \ - -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \ - -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \ - -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \ -- --output $@ \ -+ > $@ \ - $< - - # Common manual loader script. -@@ -425,7 +425,7 @@ $$(vboxdrv-mod_0_OUTDIR)/Makefile: \ - $(call MSG_TOOL,Creating,,$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" > $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -Index: VirtualBox-4.1.14/src/VBox/HostDrivers/VBoxPci/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/HostDrivers/VBoxPci/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/HostDrivers/VBoxPci/Makefile.kmk -@@ -69,7 +69,7 @@ $$(VBoxPci-src_0_OUTDIR)/Makefile: \ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" > $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -@@ -81,7 +81,7 @@ $$(VBoxPci-src_0_OUTDIR)/build_in_tmp: \ - | $$(dir $$@) - $(call MSG_TOOL,Creating,,$@) - $(QUIET)$(RM) -f -- $@ -- $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxpci;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $< -+ $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxpci;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" > $@ $< - $(QUIET)$(CHMOD) 0755 $@ - - endif # Supported platform. -Index: VirtualBox-4.1.14/src/VBox/Additions/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Additions/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/Additions/Makefile.kmk -@@ -91,7 +91,7 @@ ifndef VBOX_ONLY_TESTSUITE - -e "r $(PATH_ROOT)/src/VBox/Installer/linux/sh-utils.sh" \ - -e 'd' \ - -e '}' \ -- --output $@ \ -+ > $@ \ - $< - $(QUIET)$(CHMOD) a+rx,u+w $@ - -@@ -104,7 +104,7 @@ ifndef VBOX_ONLY_TESTSUITE - -e "r $(PATH_ROOT)/src/VBox/Installer/linux/sh-utils.sh" \ - -e 'd' \ - -e '}' \ -- --output $@ \ -+ > $@ \ - $< - $(QUIET)$(CHMOD) a+rx,u+w $@ - endif # KBUILD_TARGET == linux -Index: VirtualBox-4.1.14/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd -+++ VirtualBox-4.1.14/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd -@@ -81,7 +81,7 @@ echo s,C:\\Program Files (x86)\\Microsof - echo s,C:\\WINDDK\\3790.1830,%KBUILD_DEVTOOLS%/win.x86/ddk/6001,>> tmp_vbox_env.sed - echo s,C:\ASL,%KBUILD_DEVTOOLS%/win.x86/bin,>> tmp_vbox_env.sed - echo s,c:/cygwin,c:/no-cygwin-please,>> tmp_vbox_env.sed --kmk_sed -f tmp_vbox_env.sed --append "%WORKSPACE%\Conf\tools_def.txt" "%WORKSPACE%\BaseTools\Conf\tools_def.template" -+kmk_sed -f tmp_vbox_env.sed "%WORKSPACE%\BaseTools\Conf\tools_def.template" >> "%WORKSPACE%\Conf\tools_def.txt" - if not errorlevel 0 goto error_sed - del tmp_vbox_env.sed - -Index: VirtualBox-4.1.14/src/libs/kStuff/kStuff/kProfiler2/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/libs/kStuff/kStuff/kProfiler2/Makefile.kmk -+++ VirtualBox-4.1.14/src/libs/kStuff/kStuff/kProfiler2/Makefile.kmk -@@ -195,7 +195,7 @@ kPrf2WinApiWrappersImp-$(KBUILD_TARGET_A - $(SED) -f kPrf2WinApi-dumpbin.sed --output $@.tmp2 $@.tmp - $(APPEND) $@ 'LIBRARY kPrf2WinApiWrappers' - $(APPEND) $@ 'EXPORTS' -- $(SED) -f kPrf2WinApi-genimp.sed --append $@ $@.tmp2 -+ $(SED) -f kPrf2WinApi-genimp.sed $@.tmp2 >> $@ - $(RM) -f $@.tmp $@.tmp2 - endif - -Index: VirtualBox-4.1.14/src/libs/xpcom18a4/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/libs/xpcom18a4/Makefile.kmk -+++ VirtualBox-4.1.14/src/libs/xpcom18a4/Makefile.kmk -@@ -1384,6 +1384,6 @@ $(PATH_TARGET)/xpcom-namespace-cleanup.m - -e 's/\<_etext$$/&;/p'\ - -e 's/\<_fini$$/&;/p' \ - -e 's/\<_init$$/&;/p' \ -- --append $@ -+ >> $@ - $(QUIET)$(APPEND) $@ '};' - -Index: VirtualBox-4.1.14/src/VBox/Additions/linux/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Additions/linux/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/Additions/linux/Makefile.kmk -@@ -380,7 +380,7 @@ $(VBOX_LNX_ADD_INST_STAGE_DIR)install.sh - -e "s;_USERNAME_;$(USERNAME);g" \ - -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \ - -e "s;_UNINSTALL_SCRIPTS_;vboxadd-x11 vboxadd-timesync vboxadd-service vboxadd;g" \ -- --output $@ \ -+ > $@ \ - $< - $(QUIET)$(CHMOD) 0755 $@ - OTHER_CLEAN += \ -Index: VirtualBox-4.1.14/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk -@@ -81,7 +81,7 @@ $$(VBoxNetAdp.kext_0_OUTDIR)/Info.plist: - -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \ - -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \ - -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \ -- --output $@ \ -+ > $@ \ - $< - - INSTALLS.darwin += Scripts-darwin-adp -@@ -117,7 +117,7 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \ - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" > $@ $< - else - $(QUIET)$(CP) -f $< $@ - endif -Index: VirtualBox-4.1.14/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -@@ -85,7 +85,7 @@ $$(VBoxNetFlt.kext_0_OUTDIR)/Info.plist: - -e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \ - -e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \ - -e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \ -- --output $@ \ -+ > $@ \ - $< - - INSTALLS.darwin += Scripts-darwin -@@ -384,7 +384,7 @@ ifeq ($(KBUILD_TARGET),linux) - | $$(dir $$@) - $(QUIET)$(RM) -f -- $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< -+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" $< > $@ - else - $(QUIET)$(CP) -f $< $@ - endif -@@ -397,7 +397,7 @@ ifeq ($(KBUILD_TARGET),linux) - | $$(dir $$@) - $(call MSG_TOOL,Creating,,$@) - $(QUIET)$(RM) -f -- $@ -- $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxnetflt;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $< -+ $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxnetflt;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" $< > $@ - $(QUIET)$(CHMOD) 0755 $@ - - endif # linux -@@ -429,11 +429,11 @@ $(PATH_OUT)/opt_netgraph.h: - $(QUIET)$(RM) -f -- $@ - $(QUIET)$(CP) -f $< $@ - ifndef VBOX_WITH_HARDENING -- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@ -+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" $@ > $@.tmp - ${QUIET}$(MV) -f $@.tmp $@ - endif - ifndef VBOX_WITH_NETFLT_VIMAGE -- $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@ -+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" $@ > $@.tmp - ${QUIET}$(MV) -f $@.tmp $@ - endif - endif # freebsd -Index: VirtualBox-4.1.14/src/VBox/Devices/Graphics/BIOS/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Devices/Graphics/BIOS/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/Devices/Graphics/BIOS/Makefile.kmk -@@ -93,7 +93,7 @@ VBOX_BCC_JOBS += $(VgaBiosBin_0_OUTDIR)/ - # 4. preprocess intermediate assembly. - $$(VgaBiosBin_0_OUTDIR)/vgabios1.s: $$(VgaBiosBin_0_OUTDIR)/vgabios0.s - $(call MSG_TOOL,Adjusting BCC Assembly,VgaBiosBin,$<,$@) -- $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^ -+ $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' $^ > $@ - - # 5. assemble - $$(VgaBiosBin_0_OUTDIR)/vgabios.tmp $$(VgaBiosBin_0_OUTDIR)/vgabios.lst: $$(VgaBiosBin_0_OUTDIR)/vgabios1.s -Index: VirtualBox-4.1.14/Config.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/Config.kmk -+++ VirtualBox-4.1.14/Config.kmk -@@ -2282,7 +2282,7 @@ else - -e '/not-$(KBUILD_TARGET)/d' \ - -e '/not-$(KBUILD_TARGET_ARCH)/d' \ - -f $(PATH_ROOT)/src/bldprogs/deftoimp.sed \ -- --append $$@ $(addprefix $(PATH_SUB_CURRENT)/,$(3)) -+ >> $$@ $(addprefix $(PATH_SUB_CURRENT)/,$(3)) - endif - endef # VBOX_GENERATE_IMPORT_TARGET_DEF - -Index: VirtualBox-4.1.14/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/Makefile.kmk -+++ VirtualBox-4.1.14/Makefile.kmk -@@ -1533,7 +1533,7 @@ endif - -e '/ *DECL_INVALID(/d' \ - -e '/define RT[DATGRC03]*DECL(type) *DECLHIDDEN(type)/d' \ - \ -- --append $@.tmp \ -+ >> $@.tmp \ - $(filter-out include/VBox/err.h, $(wildcard include/VBox/*.h include/VBox/vmm/*.h)) \ - include/iprt/cdefs.h - $(CAT_EXT) $@.tmp \ -Index: VirtualBox-4.1.14/src/VBox/VMM/testcase/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/VMM/testcase/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/VMM/testcase/Makefile.kmk -@@ -387,7 +387,7 @@ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStruc - --output $@.tmp $@.dump - $(QUIET)$(SED) -e '/VM_size$$/d' -e '/VMCPU_size$$/d' \ - -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d' -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/ CHECK_SIZE(\2, 0x0\1);/' \ -- --append $@.tmp $@.dump -+ >> $@.tmp $@.dump - $(QUIET)$(MV) -f $@.tmp $@ - $(QUIET)$(RM) -f $@.dump - -Index: VirtualBox-4.1.14/doc/manual/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/doc/manual/Makefile.kmk -+++ VirtualBox-4.1.14/doc/manual/Makefile.kmk -@@ -308,9 +308,9 @@ $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(V - $(QUIET)$(SED) -e '1,//!d' \ - -e 's///' \ - --output $@ $@.tmp -- $(QUIET)$(SED) -e 's///g' --append $@ $(VBOX_PATH_MANUAL_SRC)/user_ChangeLogImpl.xml -+ $(QUIET)$(SED) -e 's///g' > $@ $(VBOX_PATH_MANUAL_SRC)/user_ChangeLogImpl.xml - $(QUIET)$(SED) -e '//,$$!d' \ -- -e 's///' --append $@ $@.tmp -+ -e 's///' > $@ $@.tmp - - $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/user_VBoxManage.xml): \ - $(VBOX_PATH_MANUAL_OUTBASE)/% : \ -@@ -333,9 +333,9 @@ $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(V - $(if $(eq $(KBUILD_TARGET),darwin), -E 'DYLD_FALLBACK_LIBRARY_PATH=$(dir $(LIB_RUNTIME))') \ - -- \ - $(VBOXMANAGEPATH) --dumpopts -- $(QUIET)$(SED) -e 's//\>/g' --append $@ $@.tmp2 -+ $(QUIET)$(SED) -e 's//\>/g' > $@ $@.tmp2 - $(QUIET)$(SED) -e '/\$$VBOX_MANAGE_OUTPUT/,$$!d' \ -- -e 's/.*\$$VBOX_MANAGE_OUTPUT//' --append $@ $@.tmp -+ -e 's/.*\$$VBOX_MANAGE_OUTPUT//' > $@ $@.tmp - $(QUIET)$(RM) -f $@.tmp $@.tmp2 - - VBOX_MANUAL_APIREF_TMP = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef_apiref.xml -@@ -369,9 +369,9 @@ $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef - $(QUIET)$(SED) -e '1,//!d' \ - -e 's///' \ - --output $@ $@.tmp -- $(QUIET)$(SED) -e 's///g' --append $@ $(VBOX_MANUAL_APIREF_TMP) -+ $(QUIET)$(SED) -e 's///g' > $@ $(VBOX_MANUAL_APIREF_TMP) - $(QUIET)$(SED) -e '//,$$!d' \ -- -e 's///' --append $@ $@.tmp -+ -e 's///' > $@ $@.tmp - # $(QUIET)$(MV) -f $@.tmp $@ - - -Index: VirtualBox-4.1.14/src/VBox/Additions/common/VBoxGuest/Makefile.kmk -=================================================================== ---- VirtualBox-4.1.14.orig/src/VBox/Additions/common/VBoxGuest/Makefile.kmk -+++ VirtualBox-4.1.14/src/VBox/Additions/common/VBoxGuest/Makefile.kmk -@@ -174,7 +174,7 @@ ifeq ($(KBUILD_TARGET),linux) - $(QUIET)$(SED) \ - -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \ - -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \ -- --output $@ $< -+ > $@ $< - - $$(vboxguest-sh_0_OUTDIR)/do_dkms: \ - $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_dkms \ -@@ -185,7 +185,7 @@ ifeq ($(KBUILD_TARGET),linux) - -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \ - -e "s;_MODULE_;vboxguest;g" \ - -e "s;_OLDMODULES_;vboxguest vboxadd vboxsf vboxvfs vboxvideo;g" \ -- --output $@ $< -+ > $@ $< - $(QUIET)$(CHMOD) a+rx,u+w $@ - - # scripts. -@@ -202,7 +202,7 @@ ifeq ($(KBUILD_TARGET),linux) - $(VBOX_VERSION_STAMP) \ - | $$(dir $$@) - $(call MSG_TOOL,Creating,,$@) -- $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxguest;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $< -+ $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxguest;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" > $@ $< - $(QUIET)$(CHMOD) 0755 $@ - - endif # Linux