VirtualBox

Changeset 52628 in vbox


Ignore:
Timestamp:
Sep 5, 2014 8:19:40 PM (10 years ago)
Author:
vboxsync
Message:

add/extpack: move to new build box

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r52571 r52628  
    26252625   VBOX_CERTIFICATE_SUBJECT_NAME_ARGS ?= /n "$(VBOX_CERTIFICATE_SUBJECT_NAME)" /a
    26262626   # TEMPORARY HACK!
    2627    if defined(VBOX_ONLY_VALIDATIONKIT) || defined(VBOX_ONLY_ADDITIONS) || defined(VBOX_ONLY_EXTPACKS)
     2627   if defined(VBOX_ONLY_VALIDATIONKIT)
    26282628    VBOX_CROSS_CERTIFICATE_FILE ?= $(VBOX_PATH_SELFSIGN)/MSCV-VSClass3.cer
    26292629   else

  • trunk/Makefile.kmk

    r52609 r52628  
    810810# VM IP addresses.
    811811#
     812VBOX_BLD_VM_LNX_IP           := 192.168.27.2
     813VBOX_BLD_VM_LNX_X86_IP       := 192.168.27.2
    812814VBOX_BLD_VM_LNX_AMD64_IP     := 192.168.27.12
    813 VBOX_BLD_VM_LNX_NEW_X86_IP   := 192.168.27.11
    814815VBOX_BLD_VM_OS2_IP           := 192.168.27.3
    815816VBOX_BLD_VM_SOLARIS_IP       := 192.168.27.4
    … …  
    866867        additions-build-solaris.x86 \
    867868        additions-build-os2.x86 \
    868         additions-build-linux.x86.combined
     869        additions-build-linux
    869870
    870871additions-build-rsync-into-vms: \
    871872                additions-build-solaris.rsync-into-vm \
    872                 additions-build-os2.rsync-into-vm
     873                additions-build-os2.rsync-into-vm \
     874                additions-build-linux.rsync-into-vm
    873875        $(call MSG_L1,Rsynced the sources + tools into the VMs.)
    874876.NOTPARALLEL: additions-build-rsync-into-vms
    … …  
    903905        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
    904906else
    905         $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 additions, build+pack)
     907        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 additions build+pack)
    906908        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing "
    907         $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 additions, build+pack)
     909        $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 additions build+pack)
    908910endif
    909911
    … …  
    913915        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
    914916else
    915         $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 additions, build.pack)
     917        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 additions build.pack)
    916918        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
    917         $(call VBOX_BLD_VM_MSG_END__,Windows/x86 additions, build+pack)
     919        $(call VBOX_BLD_VM_MSG_END__,Windows/x86 additions build+pack)
    918920endif
    919921
    … …  
    938940
    939941additions-build-solaris.build-it: additions-build-solaris.rsync-into-vm
    940         $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 additions, build+pack)
     942        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 additions build+pack)
    941943        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing"
    942         $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 additions, build+pack)
    943         $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 additions, build+pack)
     944        $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 additions build+pack)
     945        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 additions build+pack)
    944946        $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1"
    945         $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 additions, build+pack)
     947        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 additions build+pack)
    946948
    947949additions-build-solaris.rsync-out-of-vm: additions-build-solaris.build-it
    … …  
    973975
    974976additions-build-os2.build-it: additions-build-os2.rsync-into-vm
    975         $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 additions, build+pack)
     977        $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 additions build+pack)
    976978        $(VBOX_KMK_TIME) rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
    977         $(call VBOX_BLD_VM_MSG_END__,OS/2 additions, build+pack)
     979        $(call VBOX_BLD_VM_MSG_END__,OS/2 additions build+pack)
    978980
    979981additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it
    … …  
    991993endif
    992994
    993 additions-build-linux.amd64:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST)
    994 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     995ifeq ($(KBUILD_TARGET),linux)
     996additions-build-linux.amd64:
    995997        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    996998        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
    997 else
     999
     1000additions-build-linux.x86:
     1001        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
     1002        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
     1003
     1004additions-build-linux: additions-build-linux.x86 additions-build-linux.amd64
     1005        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
     1006        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1
     1007else
     1008additions-build-linux.rsync-into-vm:
     1009        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,linux,*) \
     1010                '--exclude=src/VBox/Additions/WINNT/**' \
     1011                '--exclude=src/VBox/Frontends/**' \
     1012                '--exclude=src/VBox/VMM/**' \
     1013                . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
     1014
     1015additions-build-linux.build-it: additions-build-linux.rsync-into-vm
    9981016 ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING
    9991017        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions/greeter)
    1000         $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) "echo $@ && dchroot -c ubuntu-11.10-amd64 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux2.amd64/$(KBUILD_TYPE) VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter\""'
     1018        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && dchroot -c ubuntu-11.10-amd64 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64/$(KBUILD_TYPE)/greeter VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter\""'
    10011019        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions/greeter)
    10021020 endif
    1003         $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions, build+pack)
    1004         $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)"
    1005         $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions, build+pack)
    1006 endif
    1007 
    1008 additions-build-linux.x86:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST)
    1009 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
    1010         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    1011         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
    1012 else
     1021        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions build+pack)
     1022        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)\""'
     1023        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions build+pack)
    10131024 ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING
    10141025        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions/greeter)
    1015         $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) "echo $@ && dchroot -c ubuntu-11.10-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && BUILD_PLATFORM_ARCH=x86 tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux2.x86/$(KBUILD_TYPE) VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter\""'
     1026        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && linux32 dchroot -c ubuntu-11.10-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && BUILD_PLATFORM_ARCH=x86 tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86/$(KBUILD_TYPE)/greeter VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter\""'
    10161027        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions/greeter)
    10171028 endif
    1018         $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions, build+pack)
    1019         $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) "echo $@ && dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)\""'
    1020         $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions, build+pack)
    1021 endif
    1022 
    1023 # Combined Linux Additions .run package.  This depends on the archives
    1024 # created during packing by the architecture-specific builds.
    1025 additions-build-linux.x86.combined:   $(VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST) additions-build-linux.x86 additions-build-linux.amd64
    1026 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
    1027         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    1028         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1
    1029 else
    1030         $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions, combine)
    1031         $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) "echo $@ && dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1\""'
    1032         $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions, combine)
    1033 endif
    1034 
     1029        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions build+pack)
     1030        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && linux32 dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)\""'
     1031        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions build+pack)
     1032        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions combine)
     1033        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) "echo $@ && linux32 dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1\""'
     1034        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions combine)
     1035
     1036additions-build-linux.rsync-out-of-vm: additions-build-linux.build-it
     1037        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86 out/
     1038        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
     1039
     1040.NOTPARALLEL: additions-build-linux.rsync-into-vm
     1041.PHONY:       additions-build-linux.rsync-into-vm additions-build-linux.rsync-out-of-vm additions-build-linux.build-it
     1042
     1043additions-build-linux: additions-build-linux.rsync-out-of-vm
     1044endif
    10351045
    10361046additions-packing:
    … …  
    10561066        additions-build-solaris.x86 \
    10571067        additions-build-os2.x86 \
     1068        additions-build-linux \
    10581069        additions-build-linux.amd64 \
    10591070        additions-build-linux.x86 \
    … …  
    10891100        extpacks-build-solaris.amd64 \
    10901101        extpacks-build-os2.x86 \
    1091         extpacks-build-linux.amd64 \
    1092         extpacks-build-linux.x86 \
     1102        extpacks-build-linux \
    10931103        extpacks-build-darwin.amd64 \
    10941104        extpacks-build-darwin.x86 \
    … …  
    11531163        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
    11541164
    1155 .NOTPARALLEL: extpacks-build-solaris.rsync-into-vm
     1165#.NOTPARALLEL: extpacks-build-solaris.rsync-into-vm
    11561166.PHONY:       extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
    11571167
    … …  
    11661176#endif
    11671177
     1178ifeq ($(KBUILD_TARGET),linux)
    11681179extpacks-build-linux.amd64:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    1169 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
    11701180        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    1171 else
     1181
     1182extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
     1183        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
     1184
     1185extpacks-build-linux: extpacks-build-linux.x86 extpacks-build-linux.amd64
     1186else
     1187# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
     1188extpacks-build-linux.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
     1189        $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,linux,*) . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
     1190
     1191extpacks-build-linux.build-it: extpacks-build-linux.rsync-into-vm
    11721192        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
    1173         $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
     1193        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@ && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all\""'
    11741194        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
    1175 endif
    1176 
    1177 extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    1178 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
    1179         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    1180 else
    11811195        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
    1182         $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
     1196        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@ && linux32 dchroot -c debian-4.0-i386 \"cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all\""'
    11831197        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
     1198
     1199extpacks-build-linux.rsync-out-of-vm: extpacks-build-linux.build-it
     1200        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/
     1201        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
     1202
     1203#.NOTPARALLEL: extpacks-build-linux.rsync-into-vm
     1204.PHONY:       extpacks-build-linux.rsync-out-of-vm extpacks-build-linux.rsync-into-vm extpacks-build-linux.build-it
     1205
     1206extpacks-build-linux: extpacks-build-linux.rsync-out-of-vm
    11841207endif
    11851208
    … …  
    12361259        extpacks-build-solaris.amd64 \
    12371260        extpacks-build-os2.x86 \
     1261        extpacks-build-linux \
    12381262        extpacks-build-linux.amd64 \
    12391263        extpacks-build-linux.x86 \
    … …  
    13901414else
    13911415        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 Validation Kit)
    1392         $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"
     1416        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all\""'
    13931417        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 Validation Kit)
    13941418endif
    … …  
    13991423else
    14001424        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 Validation Kit)
    1401         $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) "echo $@ && dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all\""'
     1425        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_X86_IP) "echo $@ && linux32 dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all\""'
    14021426        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 Validation Kit)
    14031427endif

  • trunk/src/VBox/Additions/linux/Makefile.kmk

    r51191 r52628  
    253253# pattern rule for stripping and copying vbox-greeter to the installation directory
    254254$(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),vbox-greeter): \
    255                 $(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(subst linux,linux2,$(PATH_STAGE_BIN))/additions/% \
     255                $(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(subst linux.amd64/release,linux.amd64/release/greeter,$(subst linux.x86/release,linux.x86/release/greeter,$(PATH_STAGE_BIN)))/additions/% \
    256256                | $$(dir $$@)
    257257        $(call MSG_INST_FILE,$<,$@)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette