VirtualBox

Changeset 101502 in vbox for trunk


Ignore:
Timestamp:
Oct 18, 2023 5:53:40 PM (12 months ago)
Author:
vboxsync
Message:

Config.kmk,Makefile.kmk: Try building the linux.arm64 guest additions in the new build environment, bugref:10487

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r101410 r101502  
    427427# (Used by the additions build server, don't invert it.)
    428428#VBOX_WITHOUT_ADDITIONS_ISO = 1
     429# Include and build he Linux arm64 guest additions.
     430VBOX_WITH_LNX_ARM64_ADDITIONS = 1
    429431## @}
    430432
  • trunk/Makefile.kmk

    r101003 r101502  
    12111211#
    12121212VBOX_BLD_VM_LNX_IP               := 192.168.27.2
     1213VBOX_BLD_VM_LNX_ARM64_IP         := 192.168.27.26
    12131214VBOX_BLD_VM_OS2_IP               := 192.168.27.3
    12141215VBOX_BLD_VM_SOLARIS_IP           := 192.168.27.4
     
    12561257        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   VBOX_ONLY_ADDITIONS=1
    12571258        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   VBOX_ONLY_ADDITIONS=1
     1259ifdef VBOX_WITH_LNX_ARM64_ADDITIONS
     1260        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=arm64 KBUILD_TARGET=linux   VBOX_ONLY_ADDITIONS=1
     1261endif
    12581262ifdef VBOX_WITH_OS2_ADD_BUILD
    12591263        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     VBOX_ONLY_ADDITIONS=1
     
    12771281                additions-build-linux \
    12781282                additions-build-darwin.x86 \
    1279                 additions-build-darwin.amd64
     1283                additions-build-darwin.amd64 \
     1284                $(if $(VBOX_WITH_LNX_ARM64_ADDITIONS), additions-build-linux.arm64,)
    12801285
    12811286additions-build-rsync-into-vms: \
     
    12841289                additions-build-darwin.x86.rsync-into-vm \
    12851290                additions-build-darwin.amd64.rsync-into-vm \
    1286                 additions-build-linux.rsync-into-vm
     1291                additions-build-linux.rsync-into-vm \
     1292                $(if $(VBOX_WITH_LNX_ARM64_ADDITIONS), additions-build-linux.arm64.rsync-into-vm,)
    12871293        $(call MSG_L1,Rsynced the sources + tools into the VMs.)
    12881294.NOTPARALLEL: additions-build-rsync-into-vms
     
    12951301VBOX_ADDITIONS_BUILD.x86 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
    12961302        KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=x86 VBOX_SVN_REV=$(VBOX_SVN_REV)
     1303
     1304ifdef VBOX_WITH_LNX_ARM64_ADDITIONS
     1305 VBOX_ADDITIONS_BUILD.arm64 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \
     1306        KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=arm64 VBOX_SVN_REV=$(VBOX_SVN_REV)
     1307endif
    12971308
    12981309# Automatically determine the additions build subdir name. Used for figuring
     
    14101421        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    14111422        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1
     1423
     1424 ifdef VBOX_WITH_LNX_ARM64_ADDITIONS
     1425  additions-build-linux.arm64:
     1426        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.arm64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
     1427        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.arm64) packing
     1428 endif
    14121429else
    14131430 additions-build-linux.rsync-into-vm:
     
    14811498
    14821499 additions-build-linux: additions-build-linux.rsync-out-of-vm
     1500
     1501 #
     1502 # Preliminary arm64 Linux guest additions build.
     1503 #
     1504 ifdef VBOX_WITH_LNX_ARM64_ADDITIONS
     1505  # @todo r=aeichner Remove --exclude=kBuild/bin/linux.arm64/** when we have official binaries in the external repository.
     1506  additions-build-linux.arm64.rsync-into-vm:
     1507        $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) \
     1508                '--exclude=src/VBox/Additions/WINNT/**' \
     1509                '--include=src/VBox/Devices/' \
     1510                '--include=src/VBox/Devices/Audio/' \
     1511                '--include=src/VBox/Devices/Audio/**' \
     1512                '--include=src/VBox/Devices/build/' \
     1513                '--include=src/VBox/Devices/build/**' \
     1514                '--exclude=src/VBox/Devices/**' \
     1515                '--exclude=src/VBox/Debugger/**' \
     1516                '--exclude=src/VBox/ExtPacks/**' \
     1517                '--exclude=src/VBox/Frontends/**' \
     1518                '--exclude=src/VBox/HostService/**' \
     1519                '--exclude=src/VBox/ImageMounter/**' \
     1520                '--exclude=src/VBox/NetworkServices/**' \
     1521                '--exclude=src/VBox/RDP/**' \
     1522                '--exclude=src/VBox/Storage/**' \
     1523                '--include=src/VBox/ValidationKit/' \
     1524                '--include=src/VBox/ValidationKit/Config.kmk' \
     1525                '--include=src/VBox/ValidationKit/utils/' \
     1526                '--include=src/VBox/ValidationKit/utils/audio/' \
     1527                '--include=src/VBox/ValidationKit/utils/audio/**' \
     1528                '--exclude=src/VBox/ValidationKit/**' \
     1529                '--exclude=src/VBox/VMM/**' \
     1530                '--exclude=src/libs/dxvk-native-**' \
     1531                '--exclude=src/libs/curl-**' \
     1532                '--exclude=src/libs/libjpeg-turbo-**' \
     1533                '--exclude=src/libs/libogg-**' \
     1534                '--exclude=src/libs/libpng-**' \
     1535                '--exclude=src/libs/libssh-**' \
     1536                '--exclude=src/libs/libtpms-**' \
     1537                '--exclude=src/libs/libvorbis-**' \
     1538                '--exclude=src/libs/libvpx-**' \
     1539                '--exclude=src/libs/libxml-**' \
     1540                '--exclude=src/libs/softfloat-**' \
     1541                '--exclude=src/libs/TestFloat-**' \
     1542                '--exclude=src/libs/xpcom18a4/**' \
     1543                '--exclude=src/apps/**' \
     1544                '--exclude=kBuild/bin/linux.arm64/**' \
     1545                . $(VBOX_BLD_VM_LNX_ARM64_IP):/home/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
     1546
     1547  additions-build-linux.arm64.build-it: additions-build-linux.arm64.rsync-into-vm
     1548        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/arm64 additions build+pack)
     1549        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_LNX_ARM64_IP)       'cd /home/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.arm64) VBOX_WITH_WARNINGS_AS_ERRORS= VBOX_WITHOUT_LINUX_TEST_BUILDS=1 VBOX_WITH_LNX_ARM64_ADDITIONS=1 all packing'
     1550        $(call VBOX_BLD_VM_MSG_END__,Linux/arm64 additions build+pack)
     1551
     1552  additions-build-linux.arm64.rsync-out-of-vm: additions-build-linux.arm64.build-it
     1553        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_ARM64_IP):/home/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.arm64 out/
     1554
     1555  .NOTPARALLEL: additions-build-linux.arm64.rsync-into-vm
     1556  .PHONY: additions-build-linux.arm64.rsync-into-vm additions-build-linux.arm64.rsync-out-of-vm additions-build-linux.arm64.build-it
     1557
     1558  additions-build-linux.arm64: additions-build-linux.arm64.rsync-out-of-vm
     1559 endif
    14831560endif
    14841561
     
    16071684                VBOX_WITH_ADDITIONS_ISO.linux.amd64= \
    16081685                VBOX_WITH_ADDITIONS_ISO.linux.x86=1 \
     1686                VBOX_WITH_ADDITIONS_ISO.linux.arm64= \
    16091687                VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 \
     1688                $(if $(VBOX_WITH_LNX_ARM64_ADDITIONS), VBOX_WITH_LNX_ARM64_ADDITIONS=1,) \
    16101689                VBOX_WITH_ADDITIONS_ISO.os2.x86=1 \
    16111690                VBOX_WITH_ADDITIONS_ISO.solaris.amd64=1 \
     
    16271706                additions-build-linux.x86 \
    16281707                additions-build-linux.x86.combined \
     1708                $(if $(VBOX_WITH_LNX_ARM64_ADDITIONS), additions-build-linux.arm64,) \
    16291709                additions-build-darwin \
    16301710                additions-build-darwin.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