From 78afe76bd723df1736e4323ae3ccb42fd961c218 Mon Sep 17 00:00:00 2001 From: Bruno Faccini Date: Wed, 19 Nov 2014 16:45:25 +0100 Subject: [PATCH] LU-4951 scripts: remove nodemap.ko in dkms.conf This new/2nd patch for a similar cause (new/removed Lustre module) fixes dkms.conf creation script to comply with nodemap.ko removal that has been introduced by LU-4647 patch (Gerrit change #9299, at http://review.whamcloud.com/9299, Commit 83f04354ff68a14d7492e35a9576c91492a1206c) that has landed in master (between tags 2.6.54 and 2.6.90). Signed-off-by: Bruno Faccini Change-Id: I9d0eb4dd3da31c46d7eda54e0ced998edb837741 Reviewed-on: http://review.whamcloud.com/12784 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/scripts/dkms.mkconf | 116 +++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 73 deletions(-) diff --git a/lustre/scripts/dkms.mkconf b/lustre/scripts/dkms.mkconf index 199d1c5..8b3e2a4 100755 --- a/lustre/scripts/dkms.mkconf +++ b/lustre/scripts/dkms.mkconf @@ -64,6 +64,7 @@ BUILD_DEPENDS[0]="zfs" AUTOINSTALL="yes" REMAKE_INITRD="no" MAKE[0]="make" +# just have to set STRIP[0], it will become the new default. STRIP[0]="\$( [[ -r \${PACKAGE_CONFIG} ]] \\ && source \${PACKAGE_CONFIG} \\ @@ -71,34 +72,6 @@ STRIP[0]="\$( && [[ \${LUSTRE_DKMS_DISABLE_STRIP,,} == @(y|yes) ]] \\ && echo -n no )" -STRIP[1]="\${STRIP[0]}" -STRIP[2]="\${STRIP[0]}" -STRIP[3]="\${STRIP[0]}" -STRIP[4]="\${STRIP[0]}" -STRIP[5]="\${STRIP[0]}" -STRIP[6]="\${STRIP[0]}" -STRIP[7]="\${STRIP[0]}" -STRIP[8]="\${STRIP[0]}" -STRIP[9]="\${STRIP[0]}" -STRIP[10]="\${STRIP[0]}" -STRIP[11]="\${STRIP[0]}" -STRIP[12]="\${STRIP[0]}" -STRIP[13]="\${STRIP[0]}" -STRIP[14]="\${STRIP[0]}" -STRIP[15]="\${STRIP[0]}" -STRIP[16]="\${STRIP[0]}" -STRIP[17]="\${STRIP[0]}" -STRIP[18]="\${STRIP[0]}" -STRIP[19]="\${STRIP[0]}" -STRIP[20]="\${STRIP[0]}" -STRIP[21]="\${STRIP[0]}" -STRIP[22]="\${STRIP[0]}" -STRIP[23]="\${STRIP[0]}" -STRIP[24]="\${STRIP[0]}" -STRIP[25]="\${STRIP[0]}" -STRIP[26]="\${STRIP[0]}" -STRIP[27]="\${STRIP[0]}" -STRIP[28]="\${STRIP[0]}" BUILT_MODULE_NAME[0]="lnet_selftest" BUILT_MODULE_LOCATION[0]="lnet/selftest/" DEST_MODULE_LOCATION[0]="/extra/lnet/" @@ -117,73 +90,70 @@ DEST_MODULE_LOCATION[4]="/extra/lustre/" BUILT_MODULE_NAME[5]="ptlrpc" BUILT_MODULE_LOCATION[5]="lustre/ptlrpc/" DEST_MODULE_LOCATION[5]="/extra/lustre/" -BUILT_MODULE_NAME[6]="nodemap" -BUILT_MODULE_LOCATION[6]="lustre/nodemap/" +BUILT_MODULE_NAME[6]="lov" +BUILT_MODULE_LOCATION[6]="lustre/lov/" DEST_MODULE_LOCATION[6]="/extra/lustre/" -BUILT_MODULE_NAME[7]="lov" -BUILT_MODULE_LOCATION[7]="lustre/lov/" +BUILT_MODULE_NAME[7]="osd_zfs" +BUILT_MODULE_LOCATION[7]="lustre/osd-zfs/" DEST_MODULE_LOCATION[7]="/extra/lustre/" -BUILT_MODULE_NAME[8]="osd_zfs" -BUILT_MODULE_LOCATION[8]="lustre/osd-zfs/" +BUILT_MODULE_NAME[8]="fld" +BUILT_MODULE_LOCATION[8]="lustre/fld/" DEST_MODULE_LOCATION[8]="/extra/lustre/" -BUILT_MODULE_NAME[9]="fld" -BUILT_MODULE_LOCATION[9]="lustre/fld/" +BUILT_MODULE_NAME[9]="obdecho" +BUILT_MODULE_LOCATION[9]="lustre/obdecho/" DEST_MODULE_LOCATION[9]="/extra/lustre/" -BUILT_MODULE_NAME[10]="obdecho" -BUILT_MODULE_LOCATION[10]="lustre/obdecho/" +BUILT_MODULE_NAME[10]="mgs" +BUILT_MODULE_LOCATION[10]="lustre/mgs/" DEST_MODULE_LOCATION[10]="/extra/lustre/" -BUILT_MODULE_NAME[11]="mgs" -BUILT_MODULE_LOCATION[11]="lustre/mgs/" +BUILT_MODULE_NAME[11]="osc" +BUILT_MODULE_LOCATION[11]="lustre/osc/" DEST_MODULE_LOCATION[11]="/extra/lustre/" -BUILT_MODULE_NAME[12]="osc" -BUILT_MODULE_LOCATION[12]="lustre/osc/" +BUILT_MODULE_NAME[12]="lquota" +BUILT_MODULE_LOCATION[12]="lustre/quota/" DEST_MODULE_LOCATION[12]="/extra/lustre/" -BUILT_MODULE_NAME[13]="lquota" -BUILT_MODULE_LOCATION[13]="lustre/quota/" +BUILT_MODULE_NAME[13]="mgc" +BUILT_MODULE_LOCATION[13]="lustre/mgc/" DEST_MODULE_LOCATION[13]="/extra/lustre/" -BUILT_MODULE_NAME[14]="mgc" -BUILT_MODULE_LOCATION[14]="lustre/mgc/" +BUILT_MODULE_NAME[14]="mdt" +BUILT_MODULE_LOCATION[14]="lustre/mdt/" DEST_MODULE_LOCATION[14]="/extra/lustre/" -BUILT_MODULE_NAME[15]="mdt" -BUILT_MODULE_LOCATION[15]="lustre/mdt/" +BUILT_MODULE_NAME[15]="osp" +BUILT_MODULE_LOCATION[15]="lustre/osp/" DEST_MODULE_LOCATION[15]="/extra/lustre/" -BUILT_MODULE_NAME[16]="osp" -BUILT_MODULE_LOCATION[16]="lustre/osp/" +BUILT_MODULE_NAME[16]="mdd" +BUILT_MODULE_LOCATION[16]="lustre/mdd/" DEST_MODULE_LOCATION[16]="/extra/lustre/" -BUILT_MODULE_NAME[17]="mdd" -BUILT_MODULE_LOCATION[17]="lustre/mdd/" +BUILT_MODULE_NAME[17]="lustre" +BUILT_MODULE_LOCATION[17]="lustre/llite/" DEST_MODULE_LOCATION[17]="/extra/lustre/" -BUILT_MODULE_NAME[18]="lustre" +BUILT_MODULE_NAME[18]="llite_lloop" BUILT_MODULE_LOCATION[18]="lustre/llite/" DEST_MODULE_LOCATION[18]="/extra/lustre/" -BUILT_MODULE_NAME[19]="llite_lloop" -BUILT_MODULE_LOCATION[19]="lustre/llite/" +BUILT_MODULE_NAME[19]="fid" +BUILT_MODULE_LOCATION[19]="lustre/fid/" DEST_MODULE_LOCATION[19]="/extra/lustre/" -BUILT_MODULE_NAME[20]="fid" -BUILT_MODULE_LOCATION[20]="lustre/fid/" +BUILT_MODULE_NAME[20]="mdc" +BUILT_MODULE_LOCATION[20]="lustre/mdc/" DEST_MODULE_LOCATION[20]="/extra/lustre/" -BUILT_MODULE_NAME[21]="mdc" -BUILT_MODULE_LOCATION[21]="lustre/mdc/" +BUILT_MODULE_NAME[21]="obdclass" +BUILT_MODULE_LOCATION[21]="lustre/obdclass/" DEST_MODULE_LOCATION[21]="/extra/lustre/" -BUILT_MODULE_NAME[22]="obdclass" +BUILT_MODULE_NAME[22]="llog_test" BUILT_MODULE_LOCATION[22]="lustre/obdclass/" DEST_MODULE_LOCATION[22]="/extra/lustre/" -BUILT_MODULE_NAME[23]="llog_test" -BUILT_MODULE_LOCATION[23]="lustre/obdclass/" +BUILT_MODULE_NAME[23]="lod" +BUILT_MODULE_LOCATION[23]="lustre/lod/" DEST_MODULE_LOCATION[23]="/extra/lustre/" -BUILT_MODULE_NAME[24]="lod" -BUILT_MODULE_LOCATION[24]="lustre/lod/" +BUILT_MODULE_NAME[24]="lmv" +BUILT_MODULE_LOCATION[24]="lustre/lmv/" DEST_MODULE_LOCATION[24]="/extra/lustre/" -BUILT_MODULE_NAME[25]="lmv" -BUILT_MODULE_LOCATION[25]="lustre/lmv/" +BUILT_MODULE_NAME[25]="ofd" +BUILT_MODULE_LOCATION[25]="lustre/ofd/" DEST_MODULE_LOCATION[25]="/extra/lustre/" -BUILT_MODULE_NAME[26]="ofd" -BUILT_MODULE_LOCATION[26]="lustre/ofd/" +BUILT_MODULE_NAME[26]="ost" +BUILT_MODULE_LOCATION[26]="lustre/ost/" DEST_MODULE_LOCATION[26]="/extra/lustre/" -BUILT_MODULE_NAME[27]="ost" -BUILT_MODULE_LOCATION[27]="lustre/ost/" +BUILT_MODULE_NAME[27]="lfsck" +BUILT_MODULE_LOCATION[27]="lustre/lfsck/" DEST_MODULE_LOCATION[27]="/extra/lustre/" -BUILT_MODULE_NAME[28]="lfsck" -BUILT_MODULE_LOCATION[28]="lustre/lfsck/" -DEST_MODULE_LOCATION[28]="/extra/lustre/" EOF -- 1.8.3.1