- Timestamp:
- Oct 18, 2023 5:53:40 PM (12 months ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
Config.kmk (modified) (1 diff)
-
Makefile.kmk (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r101410 r101502 427 427 # (Used by the additions build server, don't invert it.) 428 428 #VBOX_WITHOUT_ADDITIONS_ISO = 1 429 # Include and build he Linux arm64 guest additions. 430 VBOX_WITH_LNX_ARM64_ADDITIONS = 1 429 431 ## @} 430 432 -
trunk/Makefile.kmk
r101003 r101502 1211 1211 # 1212 1212 VBOX_BLD_VM_LNX_IP := 192.168.27.2 1213 VBOX_BLD_VM_LNX_ARM64_IP := 192.168.27.26 1213 1214 VBOX_BLD_VM_OS2_IP := 192.168.27.3 1214 1215 VBOX_BLD_VM_SOLARIS_IP := 192.168.27.4 … … 1256 1257 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux VBOX_ONLY_ADDITIONS=1 1257 1258 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=linux VBOX_ONLY_ADDITIONS=1 1259 ifdef VBOX_WITH_LNX_ARM64_ADDITIONS 1260 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=arm64 KBUILD_TARGET=linux VBOX_ONLY_ADDITIONS=1 1261 endif 1258 1262 ifdef VBOX_WITH_OS2_ADD_BUILD 1259 1263 + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86 KBUILD_TARGET=os2 VBOX_ONLY_ADDITIONS=1 … … 1277 1281 additions-build-linux \ 1278 1282 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,) 1280 1285 1281 1286 additions-build-rsync-into-vms: \ … … 1284 1289 additions-build-darwin.x86.rsync-into-vm \ 1285 1290 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,) 1287 1293 $(call MSG_L1,Rsynced the sources + tools into the VMs.) 1288 1294 .NOTPARALLEL: additions-build-rsync-into-vms … … 1295 1301 VBOX_ADDITIONS_BUILD.x86 = VBOX_ONLY_ADDITIONS=1 VBOX_WITHOUT_ADDITIONS_ISO=1 \ 1296 1302 KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=x86 VBOX_SVN_REV=$(VBOX_SVN_REV) 1303 1304 ifdef 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) 1307 endif 1297 1308 1298 1309 # Automatically determine the additions build subdir name. Used for figuring … … 1410 1421 + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK) 1411 1422 + $(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 1412 1429 else 1413 1430 additions-build-linux.rsync-into-vm: … … 1481 1498 1482 1499 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 1483 1560 endif 1484 1561 … … 1607 1684 VBOX_WITH_ADDITIONS_ISO.linux.amd64= \ 1608 1685 VBOX_WITH_ADDITIONS_ISO.linux.x86=1 \ 1686 VBOX_WITH_ADDITIONS_ISO.linux.arm64= \ 1609 1687 VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 \ 1688 $(if $(VBOX_WITH_LNX_ARM64_ADDITIONS), VBOX_WITH_LNX_ARM64_ADDITIONS=1,) \ 1610 1689 VBOX_WITH_ADDITIONS_ISO.os2.x86=1 \ 1611 1690 VBOX_WITH_ADDITIONS_ISO.solaris.amd64=1 \ … … 1627 1706 additions-build-linux.x86 \ 1628 1707 additions-build-linux.x86.combined \ 1708 $(if $(VBOX_WITH_LNX_ARM64_ADDITIONS), additions-build-linux.arm64,) \ 1629 1709 additions-build-darwin \ 1630 1710 additions-build-darwin.x86 \
Note:
See TracChangeset
for help on using the changeset viewer.

