| 1 |
commit: 675e5bf8efaefc2769c74dd2576f49ac5dc6437d |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 27 15:23:23 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 16:18:57 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=675e5bf8 |
| 7 |
|
| 8 |
gen_determineargs.sh: determine_real_args(): Create kernel module group for additional modules |
| 9 |
|
| 10 |
This is needed to get modules, used by genkernel features, |
| 11 |
like bcache module which is used by "dobcache" feature, |
| 12 |
into initramfs. |
| 13 |
|
| 14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 15 |
|
| 16 |
gen_determineargs.sh | 9 +++++++++ |
| 17 |
gen_moddeps.sh | 2 +- |
| 18 |
2 files changed, 10 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 21 |
index 6326a5e..a5bebd5 100755 |
| 22 |
--- a/gen_determineargs.sh |
| 23 |
+++ b/gen_determineargs.sh |
| 24 |
@@ -787,6 +787,10 @@ determine_real_args() { |
| 25 |
|
| 26 |
if isTrue "${BUILD_RAMDISK}" |
| 27 |
then |
| 28 |
+ # Internal module group to get modules used in genkernel features |
| 29 |
+ # into initramfs. |
| 30 |
+ GK_INITRAMFS_ADDITIONAL_KMODULES="" |
| 31 |
+ |
| 32 |
if [[ "${CMD_BOOTFONT}" != "none" ]] |
| 33 |
then |
| 34 |
if [[ "${CMD_BOOTFONT}" == "current" ]] |
| 35 |
@@ -851,6 +855,11 @@ determine_real_args() { |
| 36 |
fi |
| 37 |
fi |
| 38 |
|
| 39 |
+ if isTrue "${BCACHE}" |
| 40 |
+ then |
| 41 |
+ GK_INITRAMFS_ADDITIONAL_KMODULES+=" bcache" |
| 42 |
+ fi |
| 43 |
+ |
| 44 |
if isTrue "${ZFS}" |
| 45 |
then |
| 46 |
if isTrue "$(tc-is-cross-compiler)" |
| 47 |
|
| 48 |
diff --git a/gen_moddeps.sh b/gen_moddeps.sh |
| 49 |
index 1664c33..5e6c980 100755 |
| 50 |
--- a/gen_moddeps.sh |
| 51 |
+++ b/gen_moddeps.sh |
| 52 |
@@ -9,7 +9,7 @@ gen_dep_list() { |
| 53 |
rm -f "${TEMP}/moddeps" >/dev/null |
| 54 |
|
| 55 |
local group_modules |
| 56 |
- for group_modules in ${!MODULES_*} |
| 57 |
+ for group_modules in ${!MODULES_*} GK_INITRAMFS_ADDITIONAL_KMODULES |
| 58 |
do |
| 59 |
gen_deps ${!group_modules} |
| 60 |
done |
Archives