VirtualBox

Changeset 106870 in vbox


Ignore:
Timestamp:
Nov 7, 2024 2:58:26 PM (4 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
165790
Message:

/Makefile.kmk,Puel/Makefile.kmk: Adding win.arm64 binaries to the extension packs. jiraref:VBP-1447

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r106859 r106870  
    16981698        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     VBOX_ONLY_EXTPACKS=1
    16991699        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=arm64 KBUILD_TARGET=darwin  VBOX_ONLY_EXTPACKS=1
    1700 if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    1701         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  VBOX_ONLY_EXTPACKS=1
    1702  #      + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd VBOX_ONLY_EXTPACKS=1
    1703         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   VBOX_ONLY_EXTPACKS=1
    1704  #      + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     VBOX_ONLY_EXTPACKS=1
    1705         + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     VBOX_ONLY_EXTPACKS=1
    1706 endif
     1700        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=arm64 KBUILD_TARGET=win     VBOX_ONLY_EXTPACKS=1
    17071701
    17081702
    17091703extpacks-build: \
    17101704                extpacks-build-win.amd64 \
    1711                 extpacks-build-win.x86 \
     1705                extpacks-build-win.arm64 \
    17121706                extpacks-build-solaris.amd64 \
    1713                 extpacks-build-os2.x86 \
    1714                 extpacks-build-linux \
     1707                extpacks-build-linux.amd64 \
    17151708                extpacks-build-darwin.amd64 \
    17161709                extpacks-build-darwin.arm64 \
    1717                 extpacks-build-freebsd.amd64 \
    1718                 extpacks-build-freebsd.x86
     1710                extpacks-build-freebsd.amd64
    17191711
    17201712VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 VBOX_WITH_MAIN_NLS= VBOX_WITH_PUEL_NLS_NO_QM=1 \
    … …  
    17231715VBOX_EXTPACKS_BUILD.arm64 = VBOX_ONLY_EXTPACKS=1 VBOX_WITH_MAIN_NLS= VBOX_WITH_PUEL_NLS_NO_QM=1 \
    17241716        KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=arm64 VBOX_SVN_REV=$(VBOX_SVN_REV)
    1725 
    1726 VBOX_EXTPACKS_BUILD.x86   = VBOX_ONLY_EXTPACKS=1 VBOX_WITH_MAIN_NLS= VBOX_WITH_PUEL_NLS_NO_QM=1 \
    1727         KBUILD_TYPE=$(KBUILD_TYPE) KBUILD_TARGET_ARCH=x86 VBOX_SVN_REV=$(VBOX_SVN_REV)
    17281717
    17291718ifdef VBOX_WITH_PUEL_NLS
    … …  
    17401729# bit before kicking off any UNIX guest or we'll run into file sharing issues.
    17411730ifeq ($(KBUILD_TARGET),win)
    1742  VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
     1731 VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.amd64 extpacks-build-win.arm64
    17431732else
    17441733 VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
    … …  
    17541743endif
    17551744
    1756 extpacks-build-win.x86:
    1757 if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    1758  ifeq ($(KBUILD_TARGET),win)
    1759         + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    1760  else
    1761         $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
    1762         $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_X86_IP) 'cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all '
    1763         $(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
    1764  endif
    1765 else
    1766         @$(ECHO) "nothing to do for unsupported host $@"
     1745extpacks-build-win.arm64:
     1746ifeq ($(KBUILD_TARGET),win)
     1747        + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
     1748else
     1749        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
     1750        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) 'cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all '
     1751        $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
    17671752endif
    17681753
    … …  
    17901775endif
    17911776
    1792 extpacks-build-os2.x86:
    1793 #ifeq ($(KBUILD_TARGET),os2)
    1794 #       + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    1795 #else
    1796 #       $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_OS2_IP) ' cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) '
    1797 #endif
    1798 
    17991777ifeq ($(KBUILD_TARGET),linux)
    18001778 extpacks-build-linux.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    18011779        + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    18021780
    1803  extpacks-build-linux.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    1804  if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    1805         + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    1806  else
    1807         @$(ECHO) "nothing to do for unsupported host $@"
    1808  endif
    1809 
    1810  extpacks-build-linux: extpacks-build-linux.x86 extpacks-build-linux.amd64
    1811 else
    1812  # Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
     1781else
    18131782 extpacks-build-linux.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    18141783        $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) \
    … …  
    18271796        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_LNX_IP)         'dchroot -c ol-7.5-amd64 "cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && PATH=/opt/rh/devtoolset-9/root/bin:$$PATH tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all " '
    18281797        $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
    1829  if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    1830         $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
    1831         $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_LNX_IP) '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 " '
    1832         $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
    1833  endif
    18341798
    18351799 extpacks-build-linux.rsync-out-of-vm: extpacks-build-linux.build-it
    1836  if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    1837         $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/
    1838  endif
    1839         $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
    1840 
    1841  #.NOTPARALLEL: extpacks-build-linux.rsync-into-vm
     1800       $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
     1801
    18421802 .PHONY: extpacks-build-linux.rsync-out-of-vm extpacks-build-linux.rsync-into-vm extpacks-build-linux.build-it
    18431803
    1844  extpacks-build-linux: extpacks-build-linux.rsync-out-of-vm
     1804 extpacks-build-linux.amd64: extpacks-build-linux.rsync-out-of-vm
    18451805endif
    18461806
    … …  
    18541814#endif
    18551815
    1856 extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    1857 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
    1858 #       + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    1859 #else
    1860 #       $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
    1861 #       $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_FBSD_X86_IP) 'cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all '
    1862 #       $(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
    1863 #endif
    1864 
    18651816extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    18661817ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
    … …  
    18861837
    18871838extpacks-packing:
    1888 if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    1889         + $(KMK) VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 linux.amd64 linux.x86 solaris.amd64 win.amd64 win.x86" \
    1890                 VBOX_ONLY_EXTPACKS=1 packing
    1891 else
    18921839        + $(KMK) VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 darwin.arm64 linux.amd64 solaris.amd64 win.amd64" \
    18931840                VBOX_ONLY_EXTPACKS=1 packing
    1894 endif
    18951841# +++ freebsd.amd64 ^^^
    18961842
    18971843.PHONY: \
    1898                 extpacks-build-win.x86 \
    18991844                extpacks-build-win.amd64 \
     1845                extpacks-build-win.arm64 \
    19001846                extpacks-build-solaris.amd64 \
    1901                 extpacks-build-os2.x86 \
    19021847                extpacks-build-linux \
    19031848                extpacks-build-linux.amd64 \
    1904                 extpacks-build-linux.x86 \
    19051849                extpacks-build-freebsd.amd64 \
    1906                 extpacks-build-freebsd.x86 \
    19071850                extpacks-build-darwin.amd64 \
     1851                extpacks-build-darwin.arm64 \
    19081852                extpacks-packing
    19091853
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