← Back to branch summary

~ubuntu-branches/ubuntu/raring/dkms/raring

« back to all changes in this revision

Viewing changes to debian/patches/use-system-tmpdir.patch

  • Committer: Bazaar Package Importer
  • Author(s): Giuseppe Iuculano, Michael Gilbert, Giuseppe Iuculano
  • Date: 2010-06-04 13:53:23 UTC
  • mto: This revision was merged to the branch mainline in revision 38.
  • Revision ID: james.westby@ubuntu.com-20100604135323-gq71k8zml0ateckx
Tags: 2.1.1.2-3
http://bugs.debian.org/581079
http://bugs.debian.org/553625
http://bugs.debian.org/571753
http://bugs.debian.org/581568
[ Michael Gilbert ]
* Update to source format 3 (quilt) for better patch management/handling.
* Improve the status info displayed during the kernel postinst, and
  provide informative/useful messages when things go awry.
* Fix bashism in dkms_common.postinst (closes: #581079).
* Document odd behavior of MAKE[#] (closes: #553625).
* Document package naming convention (closes: #571753).
* Use system TMPDIR setting in all scripts (closes: #581568).

[ Giuseppe Iuculano ]
* [208b229] Added a lintian override for python-script-but-no-python-
  dep, dkms.py is an apport hook

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use-system-tmpdir.patch
 
1
Description: Use system setting for tmpdir
 
2
Author: Michael Gilbert <michael.s.gilbert@gmail.com>
 
3
--- dkms-2.1.1.2.orig/dkms
 
4
+++ dkms-2.1.1.2/dkms
 
5
@@ -3592,7 +3592,8 @@ current_kernel=`uname -r`
 
6
 dkms_tree="/var/lib/dkms"
 
7
 source_tree="/usr/src"
 
8
 install_tree="/lib/modules"
 
9
-tmp_location="/tmp"
 
10
+tmp_file=`mktemp --tmpdir dkms.XXXXXXXX`
 
11
+tmp_location=`dirname $tmp_file`
 
12
 verbose=""
 
13
 dkms_frameworkconf="/etc/dkms/framework.conf"
 
14
 
 
15
--- dkms-2.1.1.2.orig/dkms_find-provides
 
16
+++ dkms-2.1.1.2/dkms_find-provides
 
17
@@ -59,7 +59,7 @@ get_modinfo() {
 
18
 }
 
19
 
 
20
 
 
21
-TMPDIR=$(mktemp -d /tmp/dkms-findprovides-$$-$RANDOM-XXXXXX)
 
22
+TMPDIR=$(mktemp -d --tmpdir dkms-findprovides-$$-$RANDOM-XXXXXX)
 
23
 trap "rm -rf $TMPDIR >/dev/null 2>&1"  QUIT EXIT HUP INT TERM
 
24
 
 
25
 modlist=
 
26
--- dkms-2.1.1.2.orig/Makefile
 
27
+++ dkms-2.1.1.2/Makefile
 
28
@@ -88,7 +88,7 @@ tarball: $(TARBALL)
 
29
 
 
30
 $(TARBALL):
 
31
        mkdir -p $(deb_destdir)
 
32
-       tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \
 
33
+       tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
 
34
        cp -a ../$(RELEASE_NAME) $${tmp_dir}/$(RELEASE_STRING) ; \
 
35
        sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms > $${tmp_dir}/$(RELEASE_STRING)/dkms ; \
 
36
        sed -e "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/$(RELEASE_STRING)/dkms.spec ; \
 
37
@@ -105,7 +105,7 @@ $(TARBALL):
 
38
 
 
39
 
 
40
 rpm: $(TARBALL) dkms.spec
 
41
-       tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \
 
42
+       tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
 
43
        mkdir -p $${tmp_dir}/{BUILD,RPMS,SRPMS,SPECS,SOURCES} ; \
 
44
        cp $(TARBALL) $${tmp_dir}/SOURCES ; \
 
45
        sed "s/\[INSERT_VERSION_HERE\]/$(RELEASE_VERSION)/" dkms.spec > $${tmp_dir}/SPECS/dkms.spec ; \
 
46
@@ -129,7 +129,7 @@ debmagic: $(TARBALL)
 
47
        cd -
 
48
 
 
49
 debs:
 
50
-       tmp_dir=`mktemp -d /tmp/dkms.XXXXXXXX` ; \
 
51
+       tmp_dir=`mktemp -d --tmpdir dkms.XXXXXXXX` ; \
 
52
        make debmagic DEB_TMP_BUILDDIR=$${tmp_dir} DIST=$(DIST); \
 
53
        rm -rf $${tmp_dir}
 
54
 
 
55
--- dkms-2.1.1.2.orig/dkms_autoinstaller
 
56
+++ dkms-2.1.1.2/dkms_autoinstaller
 
57
@@ -32,7 +32,7 @@ fi
 
58
 invoke_command ()
 
59
 {
 
60
     local exitval=0
 
61
-    local exitval_file=`mktemp /tmp/dkms.XXXXXX`
 
62
+    local exitval_file=`mktemp --tmpdir dkms.XXXXXX`
 
63
     if [ "$3" = background ] && [ -z "$verbose" ]; then
 
64
         (eval $1 >/dev/null 2>&1; echo "exitval=$?" >> "$exitval_file") &
 
65
         while [ -e "$exitval_file" ] && ! [ -s "$exitval_file" ]; do