github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1372 from kmajzero/conf_framework_fix

Browse Source 
Fix for incorrect header file handling in ./configure
This commit is contained in:
Robert Baldyga 2022-10-05 15:34:36 +02:00 committed by GitHub
commit 65bc955d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.d/1_bdev_nr_sectors.conf
View File

@ -13,7 +13,7 @@ check() {
if compile_module $cur_name "bdev_nr_sectors(NULL);" "linux/genhd.h" if compile_module $cur_name "bdev_nr_sectors(NULL);" "linux/genhd.h"
then then
echo $cur_name 1 >> $config_file_path echo $cur_name 1 >> $config_file_path
elif compile_module $cur_name "struct block_device *bd; bd->bd_part->nr_sects;" "linux/blk_types.h" elif compile_module $cur_name "struct block_device *bd; bd->bd_part->nr_sects;" "linux/blk_types.h" "linux/genhd.h"
then then
echo $cur_name 2 >> $config_file_path echo $cur_name 2 >> $config_file_path
else else

2
configure.d/1_bdev_whole.conf
View File

@ -13,7 +13,7 @@ check() {
if compile_module $cur_name "struct block_device *bd; bdev_whole(bd);" "linux/blk_types.h" "linux/genhd.h" if compile_module $cur_name "struct block_device *bd; bdev_whole(bd);" "linux/blk_types.h" "linux/genhd.h"
then then
echo $cur_name 1 >> $config_file_path echo $cur_name 1 >> $config_file_path
elif compile_module $cur_name "struct block_device *bd; bd->bd_contains;" "linux/blk_types.h" elif compile_module $cur_name "struct block_device *bd; bd->bd_contains;" "linux/blk_types.h" "linux/fs.h"
then then
echo $cur_name 2 >> $config_file_path echo $cur_name 2 >> $config_file_path
else else

1
configure.d/conf_framework.sh
View File

@ -21,6 +21,7 @@ add_function() {
} }
__compile_module(){ __compile_module(){
INCLUDE=""
if [ $# -gt 1 ] if [ $# -gt 1 ]
then then
i=2 i=2