Skip to content

Commit cee01f7

Browse files
rnavmpe
authored andcommitted
build: Allow x86_64 builds to be done without specifying ubuntu release
Similar to powerpc, allow kernel@x86_64@ubuntu to build using the latest ubuntu release.
1 parent 284ca5d commit cee01f7

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

build/Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@37 fedora@36 fedora@35 fedora@3
2020
KORG_DISTROS := korg@12.2.0 korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
2121
ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
2222
DOCS_DISTRO := docs@${UBUNTU_LATEST}
23-
X86_DISTRO := ubuntu@${UBUNTU_LATEST}
23+
X86_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu
2424
ALIAS_DISTROS := ubuntu ubuntu-allcross fedora
2525
ALLCROSS_DISTROS := ubuntu-allcross@${UBUNTU_LATEST} ubuntu-allcross
2626
ALL_ARCHES := alpha arm arm64 i686 m68k mips mips64 riscv s390 sh sparc x86_64
@@ -86,11 +86,15 @@ endef
8686
$(eval $(call MAIN_TEMPLATE,ppc64le,${DOCS_DISTRO}))
8787
$(eval $(call DOCS_TEMPLATE,ppc64le,${DOCS_DISTRO}))
8888

89-
$(eval $(call MAIN_TEMPLATE,x86_64,${X86_DISTRO}))
90-
$(eval $(call KERNEL_TEMPLATE,x86_64,${X86_DISTRO}))
89+
$(foreach distro,${X86_DISTROS}, \
90+
$(eval $(call MAIN_TEMPLATE,x86_64,${distro})) \
91+
$(eval $(call KERNEL_TEMPLATE,x86_64,${distro})) \
92+
)
9193

9294
ifeq ($(shell uname -m),x86_64)
93-
$(eval $(call SELFTESTS_TEMPLATE,x86_64,${X86_DISTRO}))
95+
$(foreach distro,${X86_DISTROS}, \
96+
$(eval $(call SELFTESTS_TEMPLATE,x86_64,${distro})) \
97+
)
9498
endif
9599

96100
$(foreach distro,${ALL_DISTROS}, \

0 commit comments

Comments
 (0)