From aa688819addb87f235b1d9780db2a8f1a335b548 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Sun, 11 Nov 2018 18:49:20 -0700 Subject: [PATCH] ci: Break out patches per repo Closes #45 (see that issue for more info). Signed-off-by: Nathan Chancellor --- driver.sh | 2 +- patches/linux-next | 1 + .../0001-Makefile-Export-clang-toolchain-variables.patch | 0 ...2-powerpc-boot-Set-target-when-cross-compiling-for-cla.patch | 0 patches/{ => linux}/ppc64le | 0 ...1-DO-NOT-UPSTREAM-x86-Avoid-warnings-errors-due-to-lac.patch | 0 6 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 patches/linux-next rename patches/{ => linux}/powerpc/0001-Makefile-Export-clang-toolchain-variables.patch (100%) rename patches/{ => linux}/powerpc/0002-powerpc-boot-Set-target-when-cross-compiling-for-cla.patch (100%) rename patches/{ => linux}/ppc64le (100%) rename patches/{ => linux}/x86_64/0001-DO-NOT-UPSTREAM-x86-Avoid-warnings-errors-due-to-lac.patch (100%) diff --git a/driver.sh b/driver.sh index 93acaf0..31b5f2e 100755 --- a/driver.sh +++ b/driver.sh @@ -116,7 +116,7 @@ build_linux() { git show -s | cat - patches_folder=../patches/${ARCH} + patches_folder=../patches/${REPO}/${ARCH} [[ -d ${patches_folder} ]] && git apply -3 "${patches_folder}"/*.patch # Only clean up old artifacts if requested, the Linux build system diff --git a/patches/linux-next b/patches/linux-next new file mode 120000 index 0000000..9c52cb3 --- /dev/null +++ b/patches/linux-next @@ -0,0 +1 @@ +linux \ No newline at end of file diff --git a/patches/powerpc/0001-Makefile-Export-clang-toolchain-variables.patch b/patches/linux/powerpc/0001-Makefile-Export-clang-toolchain-variables.patch similarity index 100% rename from patches/powerpc/0001-Makefile-Export-clang-toolchain-variables.patch rename to patches/linux/powerpc/0001-Makefile-Export-clang-toolchain-variables.patch diff --git a/patches/powerpc/0002-powerpc-boot-Set-target-when-cross-compiling-for-cla.patch b/patches/linux/powerpc/0002-powerpc-boot-Set-target-when-cross-compiling-for-cla.patch similarity index 100% rename from patches/powerpc/0002-powerpc-boot-Set-target-when-cross-compiling-for-cla.patch rename to patches/linux/powerpc/0002-powerpc-boot-Set-target-when-cross-compiling-for-cla.patch diff --git a/patches/ppc64le b/patches/linux/ppc64le similarity index 100% rename from patches/ppc64le rename to patches/linux/ppc64le diff --git a/patches/x86_64/0001-DO-NOT-UPSTREAM-x86-Avoid-warnings-errors-due-to-lac.patch b/patches/linux/x86_64/0001-DO-NOT-UPSTREAM-x86-Avoid-warnings-errors-due-to-lac.patch similarity index 100% rename from patches/x86_64/0001-DO-NOT-UPSTREAM-x86-Avoid-warnings-errors-due-to-lac.patch rename to patches/linux/x86_64/0001-DO-NOT-UPSTREAM-x86-Avoid-warnings-errors-due-to-lac.patch