← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kmod/trusty

« back to all changes in this revision

Viewing changes to debian/patches/check_builtin_kver

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2013-10-24 06:16:30 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20131024061630-o87ipf2zxqtpigls
Tags: 15-0ubuntu1
* New upstream release. (See Debian #716739)
* Drop patches included upstream: dot_kcmdline, bad_alias_assertion,
  blacklist_aliased.
* Drop check_builtin_kver, this would only apply to lucid and is otherwise
  unnecessary.
* Drop --disable-shared/--enable-static, this got dropped in this version
  and isn't necessary any more. /bin/kmod does not dynamically link to
  libkmod by default now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/check_builtin_kver
1
 
--- a/tools/depmod.c
2
 
+++ b/tools/depmod.c
3
 
@@ -2111,6 +2111,13 @@ static int output_builtin_bin(struct dep
4
 
        FILE *in;
5
 
        struct index_node *idx;
6
 
        char infile[PATH_MAX], line[PATH_MAX], modname[PATH_MAX];
7
 
+       unsigned int d1, d2;
8
 
+
9
 
+       /* This file only exists for kernels >= 2.6.33 */
10
 
+       if (sscanf(depmod->cfg->kversion, "%u.%u", &d1, &d2) == 2) {
11
 
+               if (d1 * 256 + d2 < 2 * 256 + 6)
12
 
+                       return 0;
13
 
+       }
14
 
 
15
 
        if (out == stdout)
16
 
                return 0;