Skip to content
This repository was archived by the owner on Apr 13, 2024. It is now read-only.

Commit 5ac1eec

Browse files
committed
driver.sh: Use initial architecture naming for patches
Currently, we collapse arm32_v{5,6,7} and ppc32/powerpc64le into arm and powerpc respectively. We don't want to apply patches that are for only one specific sub-architecture to all so add a SUBARCH variable that can be used to differentiate everything. Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
1 parent 665f548 commit 5ac1eec

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

driver.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ setup_variables() {
4141
[[ -z "${url:-}" ]] && url=git://git.kernel.org/pub/scm/linux/kernel/git/${owner}/${tree}.git
4242

4343
# arm64 is the current default if nothing is specified
44-
case ${ARCH:=arm64} in
44+
SUBARCH=${ARCH:=arm64}
45+
case ${SUBARCH} in
4546
"arm32_v5")
4647
config=multi_v5_defconfig
4748
image_name=zImage
@@ -259,11 +260,11 @@ build_linux() {
259260
llvm_all_folder="../patches/llvm-all"
260261
apply_patches "${llvm_all_folder}/kernel-all"
261262
apply_patches "${llvm_all_folder}/${REPO}/arch-all"
262-
apply_patches "${llvm_all_folder}/${REPO}/${ARCH}"
263+
apply_patches "${llvm_all_folder}/${REPO}/${SUBARCH}"
263264
llvm_version_folder="../patches/llvm-$(echo __clang_major__ | ${CC} -E -x c - | tail -n 1)"
264265
apply_patches "${llvm_version_folder}/kernel-all"
265266
apply_patches "${llvm_version_folder}/${REPO}/arch-all"
266-
apply_patches "${llvm_version_folder}/${REPO}/${ARCH}"
267+
apply_patches "${llvm_version_folder}/${REPO}/${SUBARCH}"
267268

268269
# Only clean up old artifacts if requested, the Linux build system
269270
# is good about figuring out what needs to be rebuilt

0 commit comments

Comments
 (0)