VirtualBox

Changeset 52851 in vbox


Ignore:
Timestamp:
Sep 25, 2014 8:58:22 AM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
96266
Message:

Makefile.kmk: build the validationkit like extpack and additions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r52757 r52851  
    811811#
    812812VBOX_BLD_VM_LNX_IP           := 192.168.27.2
    813 VBOX_BLD_VM_LNX_X86_IP       := 192.168.27.11
    814 VBOX_BLD_VM_LNX_AMD64_IP     := 192.168.27.12
    815813VBOX_BLD_VM_OS2_IP           := 192.168.27.3
    816814VBOX_BLD_VM_SOLARIS_IP       := 192.168.27.4
    … …  
    11911189extpacks-build-linux.build-it: extpacks-build-linux.rsync-into-vm
    11921190        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
    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\""'
     1191        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/amd64 && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all\""'
    11941192        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
    11951193        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
    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\""'
     1194        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/x86 && 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\""'
    11971195        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
    11981196
    … …  
    12971295        validationkit-build-win.amd64 \
    12981296        validationkit-build-os2.x86 \
    1299         validationkit-build-linux.amd64 \
    1300         validationkit-build-linux.x86 \
     1297        validationkit-build-linux \
    13011298        validationkit-build-freebsd.amd64 \
    13021299        validationkit-build-freebsd.x86 \
    … …  
    13061303validationkit-build-rsync-into-vms: \
    13071304                validationkit-build-solaris.rsync-into-vm \
    1308                 validationkit-build-os2.rsync-into-vm
     1305                validationkit-build-os2.rsync-into-vm \
     1306                validationkit-build-linux.rsync-into-vm
    13091307        $(call MSG_L1,Rsynced the sources + tools into the VMs.)
    13101308.NOTPARALLEL: validationkit-build-rsync-into-vms
    … …  
    14091407endif # !OS/2
    14101408
    1411 validationkit-build-linux.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    1412 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
     1409ifeq ($(KBUILD_TARGET),linux)
     1410validationkit-build-linux.amd64:
    14131411        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    1414 else
     1412
     1413validationkit-build-linux.x86:
     1414        + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86)   all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
     1415
     1416validationkit-build-linux: validationkit-build-linux.x86 validationkit-build-linux.amd64
     1417else
     1418validationkit-build-linux.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
     1419        $(VBOX_KMK_TIME) rsync -a --delete --delete-excluded --exclude .svn --exclude=FetchDir --exclude=tinderclient.log --exclude=win.amd64 --exclude=win.x86 . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
     1420
     1421validationkit-build-linux.build-it: validationkit-build-linux.rsync-into-vm
    14151422        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 Validation Kit)
    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\""'
    1417         $(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"
     1423        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/amd64 && dchroot -c debian-4.0-amd64 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all\""'
    14181424        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 Validation Kit)
    1419 endif
    1420 
    1421 validationkit-build-linux.x86:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    1422 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
    1423         + $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    1424 else
    14251425        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 Validation Kit)
    1426         #$(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\""'
    1427         $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_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\""'
     1426        $(VBOX_KMK_TIME) ssh 'vbox@$(VBOX_BLD_VM_LNX_IP) " echo $@/x86 && linux32 dchroot -c rhel3-i386 \"cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all\""'
    14281427        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 Validation Kit)
     1428
     1429validationkit-build-linux.rsync-out-of-vm: validationkit-build-linux.build-it
     1430        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.x86   out/
     1431        $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.amd64 out/
     1432
     1433.NOTPARALLEL: validationkit-build-linux.rsync-into-vm
     1434.PHONY:       validationkit-build-linux.rsync-out-of-vm validationkit-build-linux.rsync-into-vm validationkit-build-linux.build-it
     1435
     1436validationkit-build-linux: validationkit-build-linux.rsync-out-of-vm
    14291437endif
    14301438
    … …  
    14931501        validationkit-build-solaris.x86 \
    14941502        validationkit-build-os2.x86 \
     1503        validationkit-build-linux \
    14951504        validationkit-build-linux.amd64 \
    14961505        validationkit-build-linux.x86 \
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