Skip to content

Commit b1f1484

Browse files
committed
linux config: oldconfig for all, make sure BRAND_NAME is there to be overriden
TODO: linuxboot still not touched... Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 7433920 commit b1f1484

11 files changed

+21
-19
lines changed

config/linux-c216.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y
@@ -1443,7 +1443,7 @@ CONFIG_DEVPORT=y
14431443
# CONFIG_HPET is not set
14441444
# CONFIG_HANGCHECK_TIMER is not set
14451445
CONFIG_TCG_TPM=y
1446-
CONFIG_HW_RANDOM_TPM=n
1446+
# CONFIG_HW_RANDOM_TPM is not set
14471447
CONFIG_TCG_TIS_CORE=y
14481448
CONFIG_TCG_TIS=y
14491449
# CONFIG_TCG_TIS_I2C_ATMEL is not set

config/linux-kgpe-d16_server-whiptail.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y

config/linux-kgpe-d16_server.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y

config/linux-kgpe-d16_workstation.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y

config/linux-qemu.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y
@@ -1547,7 +1547,7 @@ CONFIG_DEVPORT=y
15471547
# CONFIG_HPET is not set
15481548
# CONFIG_HANGCHECK_TIMER is not set
15491549
CONFIG_TCG_TPM=y
1550-
CONFIG_HW_RANDOM_TPM=n
1550+
# CONFIG_HW_RANDOM_TPM is not set
15511551
CONFIG_TCG_TIS_CORE=y
15521552
CONFIG_TCG_TIS=y
15531553
CONFIG_TCG_TIS_I2C_ATMEL=y

config/linux-t440p.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y
@@ -1473,7 +1473,7 @@ CONFIG_DEVPORT=y
14731473
# CONFIG_HPET is not set
14741474
# CONFIG_HANGCHECK_TIMER is not set
14751475
CONFIG_TCG_TPM=y
1476-
CONFIG_HW_RANDOM_TPM=n
1476+
# CONFIG_HW_RANDOM_TPM is not set
14771477
CONFIG_TCG_TIS_CORE=y
14781478
CONFIG_TCG_TIS=y
14791479
# CONFIG_TCG_TIS_I2C_ATMEL is not set

config/linux-talos-2.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2222
#
2323
CONFIG_INIT_ENV_ARG_LIMIT=32
2424
# CONFIG_COMPILE_TEST is not set
25-
CONFIG_LOCALVERSION="-heads"
25+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2626
# CONFIG_LOCALVERSION_AUTO is not set
2727
CONFIG_BUILD_SALT=""
2828
CONFIG_HAVE_KERNEL_GZIP=y

config/linux-w541.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y
@@ -1473,7 +1473,7 @@ CONFIG_DEVPORT=y
14731473
# CONFIG_HPET is not set
14741474
# CONFIG_HANGCHECK_TIMER is not set
14751475
CONFIG_TCG_TPM=y
1476-
CONFIG_HW_RANDOM_TPM=n
1476+
# CONFIG_HW_RANDOM_TPM is not set
14771477
CONFIG_TCG_TIS_CORE=y
14781478
CONFIG_TCG_TIS=y
14791479
# CONFIG_TCG_TIS_I2C_ATMEL is not set

config/linux-x230-flash.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y
@@ -154,6 +154,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y
154154
# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
155155
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
156156
CONFIG_LD_ORPHAN_WARN=y
157+
CONFIG_SYSCTL=y
157158
CONFIG_SYSCTL_EXCEPTION_TRACE=y
158159
CONFIG_HAVE_PCSPKR_PLATFORM=y
159160
CONFIG_EXPERT=y
@@ -1138,7 +1139,7 @@ CONFIG_DEVPORT=y
11381139
# CONFIG_HPET is not set
11391140
# CONFIG_HANGCHECK_TIMER is not set
11401141
CONFIG_TCG_TPM=y
1141-
CONFIG_HW_RANDOM_TPM=n
1142+
# CONFIG_HW_RANDOM_TPM is not set
11421143
CONFIG_TCG_TIS_CORE=y
11431144
CONFIG_TCG_TIS=y
11441145
# CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -2128,7 +2129,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
21282129
#
21292130
CONFIG_PROC_FS=y
21302131
# CONFIG_PROC_KCORE is not set
2131-
2132+
CONFIG_PROC_SYSCTL=y
21322133
# CONFIG_PROC_PAGE_MONITOR is not set
21332134
# CONFIG_PROC_CHILDREN is not set
21342135
CONFIG_PROC_PID_ARCH_STATUS=y

config/linux-x230-legacy.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
2121
#
2222
CONFIG_INIT_ENV_ARG_LIMIT=32
2323
# CONFIG_COMPILE_TEST is not set
24-
CONFIG_LOCALVERSION="-heads"
24+
CONFIG_LOCALVERSION="-@BRAND_NAME@"
2525
# CONFIG_LOCALVERSION_AUTO is not set
2626
CONFIG_BUILD_SALT=""
2727
CONFIG_HAVE_KERNEL_GZIP=y
@@ -157,6 +157,7 @@ CONFIG_INITRAMFS_COMPRESSION_XZ=y
157157
# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
158158
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
159159
CONFIG_LD_ORPHAN_WARN=y
160+
CONFIG_SYSCTL=y
160161
CONFIG_SYSCTL_EXCEPTION_TRACE=y
161162
CONFIG_HAVE_PCSPKR_PLATFORM=y
162163
CONFIG_BPF=y
@@ -1249,7 +1250,7 @@ CONFIG_DEVPORT=y
12491250
# CONFIG_HPET is not set
12501251
# CONFIG_HANGCHECK_TIMER is not set
12511252
CONFIG_TCG_TPM=y
1252-
CONFIG_HW_RANDOM_TPM=n
1253+
# CONFIG_HW_RANDOM_TPM is not set
12531254
CONFIG_TCG_TIS_CORE=y
12541255
CONFIG_TCG_TIS=y
12551256
# CONFIG_TCG_TIS_I2C_ATMEL is not set
@@ -2242,7 +2243,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
22422243
#
22432244
CONFIG_PROC_FS=y
22442245
# CONFIG_PROC_KCORE is not set
2245-
2246+
CONFIG_PROC_SYSCTL=y
22462247
# CONFIG_PROC_PAGE_MONITOR is not set
22472248
# CONFIG_PROC_CHILDREN is not set
22482249
CONFIG_PROC_PID_ARCH_STATUS=y

0 commit comments

Comments
 (0)