[linux-tools] 02/03: genorig: Make file list much more selective
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Thu Dec 10 02:51:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch sid
in repository linux-tools.
commit e7df5735bc20afaae67ae79b7a658796b1e64ef9
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Thu Dec 10 01:16:55 2015 +0000
genorig: Make file list much more selective
This removes about 1.2 million lines of dead code.
---
debian/bin/genorig.py | 64 +++++++++++++++-------
...-add-support-for-__sane_userspace_types__.patch | 24 ++++----
2 files changed, 56 insertions(+), 32 deletions(-)
diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index 2fcfdaa..ddb29f2 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -148,26 +148,50 @@ class Main(object):
orig = os.path.join(self.dir, self.orig)
temp = os.path.join(self.dir, 'temp')
- to_copy = (
- 'COPYING',
- 'Documentation/locking/lockdep-design.txt',
- 'Kbuild',
- 'Makefile',
- 'arch/*/include/',
- 'arch/*/Makefile',
- 'arch/mips/Kbuild.platforms',
- 'arch/mips/*/Platform',
- 'arch/x86/entry/syscalls/',
- 'arch/x86/lib/memcpy_64.S',
- 'arch/x86/lib/memset_64.S',
- 'arch/x86/tools/',
- 'include/',
- 'kernel/locking/',
- 'lib/hweight.c',
- 'lib/rbtree.c',
- 'scripts/',
- 'tools/',
- )
+ to_copy = [
+ 'COPYING',
+ 'Kbuild',
+ 'Makefile',
+ 'arch/*/include/uapi/',
+ 'arch/*/Makefile',
+ 'arch/mips/Kbuild.platforms',
+ 'arch/mips/*/Platform',
+ 'arch/x86/entry/syscalls/',
+ 'arch/x86/include/asm/msr-index.h', # belongs in uapi
+ 'arch/x86/tools/',
+ 'include/uapi/',
+ 'scripts/',
+ 'tools/',
+ ]
+
+ # Extra files required by kbuild
+ to_copy += [
+ 'include/linux/export.h',
+ 'include/linux/kbuild.h',
+ 'include/linux/license.h',
+ 'include/linux/mod_devicetable.h',
+ ]
+
+ # Extra files required by lockdep
+ to_copy += [
+ 'Documentation/locking/lockdep-design.txt',
+ 'include/linux/hash.h',
+ 'include/linux/list.h',
+ 'include/linux/lockdep.h',
+ 'include/linux/poison.h',
+ 'include/linux/rbtree_augmented.h',
+ 'kernel/locking/',
+ ]
+
+ # Extra files required by perf
+ with open(os.path.join(temp, 'tools/perf/MANIFEST')) as manifest:
+ for path in manifest:
+ path = path.strip()
+ for known in to_copy:
+ if known[-1] == '/' and path.startswith(known):
+ break
+ else:
+ to_copy.append(path)
glob = FileGlob(temp)
for i in to_copy:
diff --git a/debian/patches/alpha-uapi-add-support-for-__sane_userspace_types__.patch b/debian/patches/alpha-uapi-add-support-for-__sane_userspace_types__.patch
index 3b3e381..3d6a877 100644
--- a/debian/patches/alpha-uapi-add-support-for-__sane_userspace_types__.patch
+++ b/debian/patches/alpha-uapi-add-support-for-__sane_userspace_types__.patch
@@ -18,18 +18,18 @@ Cc: stable at vger.kernel.org
arch/alpha/include/uapi/asm/types.h | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
-diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h
-index 4cb4b6d..0bc66e1 100644
---- a/arch/alpha/include/asm/types.h
-+++ b/arch/alpha/include/asm/types.h
-@@ -1,6 +1,6 @@
- #ifndef _ALPHA_TYPES_H
- #define _ALPHA_TYPES_H
-
--#include <asm-generic/int-ll64.h>
-+#include <uapi/asm/types.h>
-
- #endif /* _ALPHA_TYPES_H */
+# diff --git a/arch/alpha/include/asm/types.h b/arch/alpha/include/asm/types.h
+# index 4cb4b6d..0bc66e1 100644
+# --- a/arch/alpha/include/asm/types.h
+# +++ b/arch/alpha/include/asm/types.h
+# @@ -1,6 +1,6 @@
+# #ifndef _ALPHA_TYPES_H
+# #define _ALPHA_TYPES_H
+#
+# -#include <asm-generic/int-ll64.h>
+# +#include <uapi/asm/types.h>
+#
+# #endif /* _ALPHA_TYPES_H */
diff --git a/arch/alpha/include/uapi/asm/types.h b/arch/alpha/include/uapi/asm/types.h
index 9fd3cd4..8d1024d 100644
--- a/arch/alpha/include/uapi/asm/types.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git
More information about the Kernel-svn-changes
mailing list