Merge pull request #160 from minextu/dkms-fix

fix the dkms build
8 years ago · 39fa838932
parent 190adf9fb9 0342a30a39
commit 39fa838932
1 changed files with 1 additions and 1 deletions
--- a/lib.sh
+++ b/lib.sh
@ -657,7 +657,7 @@ get_kernel_update_funcs() {
 get_conflicts() {
    for kernel in $(ls ${script_dir}/src/kernels); do
        # do not conflict with common or dkms packages
-        if [[ "$kernel" == "common.sh"  || "$kernel" == "dkms.sh" ]]; then
+        if [[ "$kernel" == "common.sh"  || "$kernel" == "common-git.sh" || "$kernel" == "dkms.sh" ]]; then
          continue;
        fi