| 1 |
commit: 7e7984bf05103fe1cf13c76327636893ccd051a7 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 31 18:32:16 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 31 18:32:16 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7e7984bf |
| 7 |
|
| 8 |
gen_configkernel: if building non-modular, have to set =y not =m. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
gen_configkernel.sh | 26 ++++++++++++++++++-------- |
| 13 |
1 file changed, 18 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gen_configkernel.sh b/gen_configkernel.sh |
| 16 |
index 68c116f..476a883 100755 |
| 17 |
--- a/gen_configkernel.sh |
| 18 |
+++ b/gen_configkernel.sh |
| 19 |
@@ -120,11 +120,21 @@ config_kernel() { |
| 20 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_EXT2_FS" "y" |
| 21 |
fi |
| 22 |
|
| 23 |
+ # Do we support modules at all? |
| 24 |
+ cfg_CONFIG_MODULES=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULES") |
| 25 |
+ if isTrue "$cfg_CONFIG_MODULES" ; then |
| 26 |
+ # yes, we support modules, set 'm' for new stuff. |
| 27 |
+ newcfg_setting='m' |
| 28 |
+ else |
| 29 |
+ # no, we support modules, set 'y' for new stuff. |
| 30 |
+ newcfg_setting='y' |
| 31 |
+ fi |
| 32 |
+ |
| 33 |
# If the user has configured DM as built-in, we need to respect that. |
| 34 |
cfg_CONFIG_BLK_DEV_DM=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM") |
| 35 |
case "$cfg_CONFIG_BLK_DEV_DM" in |
| 36 |
y|m) ;; # Do nothing |
| 37 |
- *) cfg_CONFIG_BLK_DEV_DM='m' |
| 38 |
+ *) cfg_CONFIG_BLK_DEV_DM=${newcfg_setting} |
| 39 |
esac |
| 40 |
|
| 41 |
# Make sure lvm modules are on if --lvm |
| 42 |
@@ -133,12 +143,12 @@ config_kernel() { |
| 43 |
cfg_CONFIG_DM_SNAPSHOT=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT") |
| 44 |
case "$cfg_CONFIG_DM_SNAPSHOT" in |
| 45 |
y|m) ;; # Do nothing |
| 46 |
- *) cfg_CONFIG_DM_SNAPSHOT='m' |
| 47 |
+ *) cfg_CONFIG_DM_SNAPSHOT=${newcfg_setting} |
| 48 |
esac |
| 49 |
cfg_CONFIG_DM_MIRROR=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MIRROR") |
| 50 |
case "$cfg_CONFIG_DM_MIRROR" in |
| 51 |
y|m) ;; # Do nothing |
| 52 |
- *) cfg_CONFIG_DM_MIRROR='m' |
| 53 |
+ *) cfg_CONFIG_DM_MIRROR=${newcfg_setting} |
| 54 |
esac |
| 55 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" |
| 56 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_SNAPSHOT" "${cfg_CONFIG_DM_SNAPSHOT}" |
| 57 |
@@ -151,12 +161,12 @@ config_kernel() { |
| 58 |
cfg_CONFIG_DM_MULTIPATH=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH") |
| 59 |
case "$cfg_CONFIG_DM_MULTIPATH" in |
| 60 |
y|m) ;; # Do nothing |
| 61 |
- *) cfg_CONFIG_DM_MULTIPATH='m' |
| 62 |
+ *) cfg_CONFIG_DM_MULTIPATH=${newcfg_setting} |
| 63 |
esac |
| 64 |
cfg_CONFIG_DM_MULTIPATH_RDAC=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH_RDAC") |
| 65 |
case "$cfg_CONFIG_DM_MULTIPATH_RDAC" in |
| 66 |
y|m) ;; # Do nothing |
| 67 |
- *) cfg_CONFIG_DM_MULTIPATH_RDAC='m' |
| 68 |
+ *) cfg_CONFIG_DM_MULTIPATH_RDAC=${newcfg_setting} |
| 69 |
esac |
| 70 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_BLK_DEV_DM" "${cfg_CONFIG_BLK_DEV_DM}" |
| 71 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_DM_MULTIPATH" "${cfg_CONFIG_DM_MULTIPATH}" |
| 72 |
@@ -177,17 +187,17 @@ config_kernel() { |
| 73 |
cfg_CONFIG_ISCSI_BOOT_SYSFS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS") |
| 74 |
case "$cfg_CONFIG_ISCSI_BOOT_SYSFS" in |
| 75 |
y|m) ;; # Do nothing |
| 76 |
- *) cfg_CONFIG_ISCSI_BOOT_SYSFS='m' |
| 77 |
+ *) cfg_CONFIG_ISCSI_BOOT_SYSFS=${newcfg_setting} |
| 78 |
esac |
| 79 |
cfg_CONFIG_ISCSI_TCP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP") |
| 80 |
case "$cfg_CONFIG_ISCSI_TCP" in |
| 81 |
y|m) ;; # Do nothing |
| 82 |
- *) cfg_CONFIG_ISCSI_TCP='m' |
| 83 |
+ *) cfg_CONFIG_ISCSI_TCP=${newcfg_setting} |
| 84 |
esac |
| 85 |
cfg_CONFIG_SCSI_ISCSI_ATTRS=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_SCSI_ISCSI_ATTRS") |
| 86 |
case "$cfg_CONFIG_SCSI_ISCSI_ATTRS" in |
| 87 |
y|m) ;; # Do nothing |
| 88 |
- *) cfg_CONFIG_SCSI_ISCSI_ATTRS='m' |
| 89 |
+ *) cfg_CONFIG_SCSI_ISCSI_ATTRS=${newcfg_setting} |
| 90 |
esac |
| 91 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_BOOT_SYSFS" "${cfg_CONFIG_ISCSI_BOOT_SYSFS}" |
| 92 |
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_ISCSI_TCP" "${cfg_CONFIG_ISCSI_TCP}" |
Archives