Skip to content

Commit 1c918f1

Browse files
nathanchancenathanchance
authored
Merge pull request #880 from nathanchance/cfi-rename
Handle CONFIG_CFI_CLANG → CONFIG_CFI
2 parents 75e61db + fcad097 commit 1c918f1

40 files changed

Lines changed: 427 additions & 422 deletions

‎.github/workflows/mainline-clang-16.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,19 @@ jobs:
204204
name: boot_utils_json_defconfigs
205205
- name: Check Build and Boot Logs
206206
run: scripts/check-logs.py
207-
_6caf4470519e51764e10589f05d70d73:
207+
_e32cdef2e6555f24309fd9270aa27cf5:
208208
runs-on: ubuntu-latest
209209
needs:
210210
- kick_tuxsuite_defconfigs
211211
- check_cache
212212
- check_patches
213-
name: ARCH=arm LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 multi_v7_defconfig+CONFIG_CFI_CLANG=y
213+
name: ARCH=arm LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 multi_v7_defconfig+CONFIG_CFI=y
214214
if: ${{ needs.check_cache.outputs.status != 'pass' }}
215215
env:
216216
ARCH: arm
217217
LLVM_VERSION: 16
218218
BOOT: 1
219-
CONFIG: multi_v7_defconfig+CONFIG_CFI_CLANG=y
219+
CONFIG: multi_v7_defconfig+CONFIG_CFI=y
220220
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
221221
container:
222222
image: ghcr.io/clangbuiltlinux/qemu
@@ -436,19 +436,19 @@ jobs:
436436
name: boot_utils_json_defconfigs
437437
- name: Check Build and Boot Logs
438438
run: scripts/check-logs.py
439-
_8e78126e8c0351a6b502ee1434a6c568:
439+
_2bad73de6a25b8b5e6c9109815549090:
440440
runs-on: ubuntu-latest
441441
needs:
442442
- kick_tuxsuite_defconfigs
443443
- check_cache
444444
- check_patches
445-
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI_CLANG=y
445+
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI=y
446446
if: ${{ needs.check_cache.outputs.status != 'pass' }}
447447
env:
448448
ARCH: arm64
449449
LLVM_VERSION: 16
450450
BOOT: 1
451-
CONFIG: defconfig+CONFIG_CFI_CLANG=y
451+
CONFIG: defconfig+CONFIG_CFI=y
452452
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
453453
container:
454454
image: ghcr.io/clangbuiltlinux/qemu
@@ -465,19 +465,19 @@ jobs:
465465
name: boot_utils_json_defconfigs
466466
- name: Check Build and Boot Logs
467467
run: scripts/check-logs.py
468-
_5869edec3360f833ad54fe55f6972336:
468+
_36e3a0b5dee14663fc448bb36ed84d22:
469469
runs-on: ubuntu-latest
470470
needs:
471471
- kick_tuxsuite_defconfigs
472472
- check_cache
473473
- check_patches
474-
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
474+
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
475475
if: ${{ needs.check_cache.outputs.status != 'pass' }}
476476
env:
477477
ARCH: arm64
478478
LLVM_VERSION: 16
479479
BOOT: 1
480-
CONFIG: defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
480+
CONFIG: defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
481481
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
482482
container:
483483
image: ghcr.io/clangbuiltlinux/qemu
@@ -1045,19 +1045,19 @@ jobs:
10451045
name: boot_utils_json_defconfigs
10461046
- name: Check Build and Boot Logs
10471047
run: scripts/check-logs.py
1048-
_4905de907e729b69087ab43c1a24fc13:
1048+
_36478640ed6359ab2cc3c5b894129f02:
10491049
runs-on: ubuntu-latest
10501050
needs:
10511051
- kick_tuxsuite_defconfigs
10521052
- check_cache
10531053
- check_patches
1054-
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI_CLANG=y
1054+
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI=y
10551055
if: ${{ needs.check_cache.outputs.status != 'pass' }}
10561056
env:
10571057
ARCH: x86_64
10581058
LLVM_VERSION: 16
10591059
BOOT: 1
1060-
CONFIG: defconfig+CONFIG_CFI_CLANG=y
1060+
CONFIG: defconfig+CONFIG_CFI=y
10611061
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
10621062
container:
10631063
image: ghcr.io/clangbuiltlinux/qemu
@@ -1074,19 +1074,19 @@ jobs:
10741074
name: boot_utils_json_defconfigs
10751075
- name: Check Build and Boot Logs
10761076
run: scripts/check-logs.py
1077-
_0e35d288cd97cfcbfb5e7347f1627fb8:
1077+
_ad4dd51ba6e04b9a76a4f01a1b3c870a:
10781078
runs-on: ubuntu-latest
10791079
needs:
10801080
- kick_tuxsuite_defconfigs
10811081
- check_cache
10821082
- check_patches
1083-
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
1083+
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=16 defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
10841084
if: ${{ needs.check_cache.outputs.status != 'pass' }}
10851085
env:
10861086
ARCH: x86_64
10871087
LLVM_VERSION: 16
10881088
BOOT: 1
1089-
CONFIG: defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
1089+
CONFIG: defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
10901090
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
10911091
container:
10921092
image: ghcr.io/clangbuiltlinux/qemu

‎.github/workflows/mainline-clang-17.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,19 @@ jobs:
204204
name: boot_utils_json_defconfigs
205205
- name: Check Build and Boot Logs
206206
run: scripts/check-logs.py
207-
_dbcc7c8c97a20736fe248501b8b18733:
207+
_0cdfecc8afc8f65180a7bc47e0d1792b:
208208
runs-on: ubuntu-latest
209209
needs:
210210
- kick_tuxsuite_defconfigs
211211
- check_cache
212212
- check_patches
213-
name: ARCH=arm LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 multi_v7_defconfig+CONFIG_CFI_CLANG=y
213+
name: ARCH=arm LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 multi_v7_defconfig+CONFIG_CFI=y
214214
if: ${{ needs.check_cache.outputs.status != 'pass' }}
215215
env:
216216
ARCH: arm
217217
LLVM_VERSION: 17
218218
BOOT: 1
219-
CONFIG: multi_v7_defconfig+CONFIG_CFI_CLANG=y
219+
CONFIG: multi_v7_defconfig+CONFIG_CFI=y
220220
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
221221
container:
222222
image: ghcr.io/clangbuiltlinux/qemu
@@ -436,19 +436,19 @@ jobs:
436436
name: boot_utils_json_defconfigs
437437
- name: Check Build and Boot Logs
438438
run: scripts/check-logs.py
439-
_d996d5a6d2204fc3a2dc389b0f59bf00:
439+
_db9050b0b9110e1413abdaaba0e8d6a2:
440440
runs-on: ubuntu-latest
441441
needs:
442442
- kick_tuxsuite_defconfigs
443443
- check_cache
444444
- check_patches
445-
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI_CLANG=y
445+
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI=y
446446
if: ${{ needs.check_cache.outputs.status != 'pass' }}
447447
env:
448448
ARCH: arm64
449449
LLVM_VERSION: 17
450450
BOOT: 1
451-
CONFIG: defconfig+CONFIG_CFI_CLANG=y
451+
CONFIG: defconfig+CONFIG_CFI=y
452452
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
453453
container:
454454
image: ghcr.io/clangbuiltlinux/qemu
@@ -465,19 +465,19 @@ jobs:
465465
name: boot_utils_json_defconfigs
466466
- name: Check Build and Boot Logs
467467
run: scripts/check-logs.py
468-
_e5abdb39c716251c3b966e9403ae82d3:
468+
_9d0b4cdf168935b79298aae5a48050ce:
469469
runs-on: ubuntu-latest
470470
needs:
471471
- kick_tuxsuite_defconfigs
472472
- check_cache
473473
- check_patches
474-
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
474+
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
475475
if: ${{ needs.check_cache.outputs.status != 'pass' }}
476476
env:
477477
ARCH: arm64
478478
LLVM_VERSION: 17
479479
BOOT: 1
480-
CONFIG: defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
480+
CONFIG: defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
481481
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
482482
container:
483483
image: ghcr.io/clangbuiltlinux/qemu
@@ -1045,19 +1045,19 @@ jobs:
10451045
name: boot_utils_json_defconfigs
10461046
- name: Check Build and Boot Logs
10471047
run: scripts/check-logs.py
1048-
_18165dc0ef79fd9f2ffc47047282d908:
1048+
_fe8a3c0add496f950bb06dd3ef60cbe5:
10491049
runs-on: ubuntu-latest
10501050
needs:
10511051
- kick_tuxsuite_defconfigs
10521052
- check_cache
10531053
- check_patches
1054-
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI_CLANG=y
1054+
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI=y
10551055
if: ${{ needs.check_cache.outputs.status != 'pass' }}
10561056
env:
10571057
ARCH: x86_64
10581058
LLVM_VERSION: 17
10591059
BOOT: 1
1060-
CONFIG: defconfig+CONFIG_CFI_CLANG=y
1060+
CONFIG: defconfig+CONFIG_CFI=y
10611061
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
10621062
container:
10631063
image: ghcr.io/clangbuiltlinux/qemu
@@ -1074,19 +1074,19 @@ jobs:
10741074
name: boot_utils_json_defconfigs
10751075
- name: Check Build and Boot Logs
10761076
run: scripts/check-logs.py
1077-
_9155f71723f58e89f122fcce9e8f52b8:
1077+
_f4653f0447ef4dc527dff6e9d9888f5d:
10781078
runs-on: ubuntu-latest
10791079
needs:
10801080
- kick_tuxsuite_defconfigs
10811081
- check_cache
10821082
- check_patches
1083-
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
1083+
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=17 defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
10841084
if: ${{ needs.check_cache.outputs.status != 'pass' }}
10851085
env:
10861086
ARCH: x86_64
10871087
LLVM_VERSION: 17
10881088
BOOT: 1
1089-
CONFIG: defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
1089+
CONFIG: defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
10901090
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
10911091
container:
10921092
image: ghcr.io/clangbuiltlinux/qemu

‎.github/workflows/mainline-clang-18.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,19 +204,19 @@ jobs:
204204
name: boot_utils_json_defconfigs
205205
- name: Check Build and Boot Logs
206206
run: scripts/check-logs.py
207-
_67e1fcae7d2eeb4ad0f5528446acd86d:
207+
_edabdf15513f7b529968cb361fa4f68d:
208208
runs-on: ubuntu-latest
209209
needs:
210210
- kick_tuxsuite_defconfigs
211211
- check_cache
212212
- check_patches
213-
name: ARCH=arm LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 multi_v7_defconfig+CONFIG_CFI_CLANG=y
213+
name: ARCH=arm LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 multi_v7_defconfig+CONFIG_CFI=y
214214
if: ${{ needs.check_cache.outputs.status != 'pass' }}
215215
env:
216216
ARCH: arm
217217
LLVM_VERSION: 18
218218
BOOT: 1
219-
CONFIG: multi_v7_defconfig+CONFIG_CFI_CLANG=y
219+
CONFIG: multi_v7_defconfig+CONFIG_CFI=y
220220
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
221221
container:
222222
image: ghcr.io/clangbuiltlinux/qemu
@@ -436,19 +436,19 @@ jobs:
436436
name: boot_utils_json_defconfigs
437437
- name: Check Build and Boot Logs
438438
run: scripts/check-logs.py
439-
_429ddb761fbb8910639fac7c441bba57:
439+
_f16cc1a2e7b18b4ac0f126c291284068:
440440
runs-on: ubuntu-latest
441441
needs:
442442
- kick_tuxsuite_defconfigs
443443
- check_cache
444444
- check_patches
445-
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI_CLANG=y
445+
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI=y
446446
if: ${{ needs.check_cache.outputs.status != 'pass' }}
447447
env:
448448
ARCH: arm64
449449
LLVM_VERSION: 18
450450
BOOT: 1
451-
CONFIG: defconfig+CONFIG_CFI_CLANG=y
451+
CONFIG: defconfig+CONFIG_CFI=y
452452
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
453453
container:
454454
image: ghcr.io/clangbuiltlinux/qemu
@@ -465,19 +465,19 @@ jobs:
465465
name: boot_utils_json_defconfigs
466466
- name: Check Build and Boot Logs
467467
run: scripts/check-logs.py
468-
_4c6c61e448e8cf65c92cc332553eee8a:
468+
_f207cb88058053c7c13c81bd7c62b690:
469469
runs-on: ubuntu-latest
470470
needs:
471471
- kick_tuxsuite_defconfigs
472472
- check_cache
473473
- check_patches
474-
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
474+
name: ARCH=arm64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
475475
if: ${{ needs.check_cache.outputs.status != 'pass' }}
476476
env:
477477
ARCH: arm64
478478
LLVM_VERSION: 18
479479
BOOT: 1
480-
CONFIG: defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
480+
CONFIG: defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
481481
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
482482
container:
483483
image: ghcr.io/clangbuiltlinux/qemu
@@ -1132,19 +1132,19 @@ jobs:
11321132
name: boot_utils_json_defconfigs
11331133
- name: Check Build and Boot Logs
11341134
run: scripts/check-logs.py
1135-
_4ea342c6a0382b8ec3fc818df516e5dd:
1135+
_10a85d223aec8befcaeda436004bdcfa:
11361136
runs-on: ubuntu-latest
11371137
needs:
11381138
- kick_tuxsuite_defconfigs
11391139
- check_cache
11401140
- check_patches
1141-
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI_CLANG=y
1141+
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI=y
11421142
if: ${{ needs.check_cache.outputs.status != 'pass' }}
11431143
env:
11441144
ARCH: x86_64
11451145
LLVM_VERSION: 18
11461146
BOOT: 1
1147-
CONFIG: defconfig+CONFIG_CFI_CLANG=y
1147+
CONFIG: defconfig+CONFIG_CFI=y
11481148
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
11491149
container:
11501150
image: ghcr.io/clangbuiltlinux/qemu
@@ -1161,19 +1161,19 @@ jobs:
11611161
name: boot_utils_json_defconfigs
11621162
- name: Check Build and Boot Logs
11631163
run: scripts/check-logs.py
1164-
_cba9967800187a10281e13bb85d86d69:
1164+
_99fce9d45f52f9e30b9b4562899fce55:
11651165
runs-on: ubuntu-latest
11661166
needs:
11671167
- kick_tuxsuite_defconfigs
11681168
- check_cache
11691169
- check_patches
1170-
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
1170+
name: ARCH=x86_64 LLVM=1 LLVM_IAS=1 LLVM_VERSION=18 defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
11711171
if: ${{ needs.check_cache.outputs.status != 'pass' }}
11721172
env:
11731173
ARCH: x86_64
11741174
LLVM_VERSION: 18
11751175
BOOT: 1
1176-
CONFIG: defconfig+CONFIG_CFI_CLANG=y+CONFIG_LTO_CLANG_THIN=y
1176+
CONFIG: defconfig+CONFIG_CFI=y+CONFIG_LTO_CLANG_THIN=y
11771177
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
11781178
container:
11791179
image: ghcr.io/clangbuiltlinux/qemu

0 commit comments

Comments
 (0)