summaryrefslogtreecommitdiff
path: root/v4l/scripts
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
commitadff0f37dc0f0ab48850eaad267223c634e975a2 (patch)
treec6aa3e259581abeb64eb7590b29a60354ec5a5ee /v4l/scripts
parente2b4212172d81f17f5e4741766f032d06e83ce4f (diff)
parentf25ebd42bbb82866dfbbba5b7bfc651315fa6416 (diff)
downloadmediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.gz
mediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.bz2
merge: http://linuxtv.org/hg/~tap/bttv
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/scripts')
-rwxr-xr-xv4l/scripts/make_kconfig.pl5
-rwxr-xr-xv4l/scripts/make_makefile.pl6
-rwxr-xr-xv4l/scripts/strip-trailing-whitespaces.sh2
3 files changed, 9 insertions, 4 deletions
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 7c259eeb6..144325c34 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -537,6 +537,11 @@ if (!defined $kernopts{HAS_IOMEM} && cmp_ver($kernver, '2.6.22') < 0) {
$kernopts{HAS_IOMEM} = 2;
}
+# Kernel < 2.6.22 is missing the HAS_DMA option
+if (!defined $kernopts{HAS_DMA} && cmp_ver($kernver, '2.6.22') < 0) {
+ $kernopts{HAS_DMA} = 2;
+}
+
# Kernel < 2.6.23 is missing the VIRT_TO_BUS option
if (!defined $kernopts{VIRT_TO_BUS} && cmp_ver($kernver, '2.6.23') < 0) {
# VIRT_TO_BUS -> !PPC64
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 43c563d47..35ab7dddf 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -192,8 +192,6 @@ open_makefile('../linux/drivers/media/Makefile');
# Creating Install rule
print OUT "media-install::\n";
-print OUT "\t\@echo \"Stripping debug info from files\"\n";
-print OUT "\t\@strip --strip-debug \$(inst-m)\n\n";
removeobsolete();
removeubuntu();
@@ -210,7 +208,9 @@ while (my ($dir, $files) = each %instdir) {
print OUT "if [ \$\$n -eq 4 ]; then echo; echo -n \"\t\t\"; n=1; fi; ";
print OUT "echo -n \"\$\$i \"; ";
print OUT "install -m 644 -c \$\$i \$(DESTDIR)\$(KDIR26)/$dir; fi; done; ";
- print OUT "if [ \$\$n -ne 0 ]; then echo; fi;\n\n";
+ print OUT "if [ \$\$n -ne 0 ]; then echo; ";
+ print OUT "strip --strip-debug \$(DESTDIR)\$(KDIR26)/$dir/*.ko; ";
+ print OUT "fi;\n\n";
}
print OUT "\t@echo\n";
print OUT "\t/sbin/depmod -a \$(KERNELRELEASE) \$(if \$(DESTDIR),-b \$(DESTDIR))\n\n";
diff --git a/v4l/scripts/strip-trailing-whitespaces.sh b/v4l/scripts/strip-trailing-whitespaces.sh
index cb341ce76..def48a67d 100755
--- a/v4l/scripts/strip-trailing-whitespaces.sh
+++ b/v4l/scripts/strip-trailing-whitespaces.sh
@@ -21,7 +21,7 @@ fi
for file in `eval $files`; do
case "$file" in
- *.patch)
+ *.gif | *.pdf | *.patch)
continue
;;
esac