Permalink
Browse files

Sync with Debian svn r19969

  • Loading branch information...
mika committed Apr 2, 2013
1 parent db8fb49 commit 52f58a70de3885b7740db87550282ea3224fd51a
Showing with 15,379 additions and 1,800 deletions.
  1. +14 −10 linux-3/debian/bin/genorig.py
  2. +9 −4 linux-3/debian/bin/test-patches
  3. +57 −56 linux-3/debian/config/config
  4. +1 −1 linux-3/debian/config/defines
  5. +38 −42 linux-3/debian/config/kernelarch-x86/config
  6. +6 −1 linux-3/debian/config/kernelarch-x86/config-arch-64
  7. +42 −0 linux-3/debian/patches/bugfix/all/KVM-Fix-bounds-checking-in-ioapic-indirect-register-.patch
  8. +160 −0 linux-3/debian/patches/bugfix/all/efi_pstore-Introducing-workqueue-updating-sysfs.patch
  9. +156 −0 linux-3/debian/patches/bugfix/all/efivars-Handle-duplicate-names-from-get_next_variabl.patch
  10. +101 −0 linux-3/debian/patches/bugfix/all/efivars-explicitly-calculate-length-of-VariableName.patch
  11. +0 −133 linux-3/debian/patches/bugfix/all/exec-use-ELOOP-for-max-recursion-depth.patch
  12. +36 −0 linux-3/debian/patches/bugfix/all/kernel-signal.c-use-__ARCH_HAS_SA_RESTORER-instead-o.patch
  13. +36 −0 linux-3/debian/patches/bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch
  14. +0 −48 linux-3/debian/patches/bugfix/all/pch_gbe-ptp_pch-Fix-the-dependency-direction-between.patch
  15. +0 −77 linux-3/debian/patches/bugfix/all/pps-ptp-Remove-dependencies-on-EXPERIMENTAL.patch
  16. +0 −784 linux-3/debian/patches/bugfix/all/ptp-Enable-clock-drivers-along-with-associated-net-P.patch
  17. +0 −69 linux-3/debian/patches/bugfix/all/ptp-Make-PTP_1588_CLOCK-select-rather-than-depend-on.patch
  18. +0 −29 linux-3/debian/patches/bugfix/all/sfc-Select-PTP_1588_CLOCK.patch
  19. +149 −0 linux-3/debian/patches/bugfix/all/signal-fix-use-of-missing-sa_restorer-field.patch
  20. +0 −106 linux-3/debian/patches/bugfix/arm/lis3l02dq-fix-building-without-irq-to-gpio.patch
  21. +15 −14 linux-3/debian/patches/bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
  22. +24 −0 linux-3/debian/patches/bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch
  23. +161 −0 linux-3/debian/patches/bugfix/x86/KVM-x86-Convert-MSR_KVM_SYSTEM_TIME-to-use-gfn_to_hv.patch
  24. +39 −0 linux-3/debian/patches/bugfix/x86/KVM-x86-fix-for-buffer-overflow-in-handling-of-MSR_K.patch
  25. +0 −63 linux-3/debian/patches/bugfix/x86/asus-laptop-Do-not-call-HWRS-on-init.patch
  26. +26 −0 linux-3/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-e725.patch
  27. +24 −0 linux-3/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-emachines-g725.patch
  28. +25 −0 ...x-3/debian/patches/bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch
  29. +2 −2 linux-3/debian/patches/debian/ast-disable-autoload.patch
  30. +26 −0 linux-3/debian/patches/debian/cdc_ncm-cdc_mbim-use-ncm-by-default.patch
  31. +56 −0 linux-3/debian/patches/debian/efi-autoload-efivars.patch
  32. +29 −0 linux-3/debian/patches/debian/efivars-remove-check-for-50-full-on-write.patch
  33. +95 −0 linux-3/debian/patches/debian/radeon-firmware-is-required-for-drm-and-kms-on-r600-onward.patch
  34. +0 −83 linux-3/debian/patches/debian/radeon-no-modeset-without-firmware.patch
  35. +3 −3 linux-3/debian/patches/debian/version.patch
  36. +13,499 −0 linux-3/debian/patches/features/all/alx/alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch
  37. +69 −0 linux-3/debian/patches/features/all/alx/alx-update-for-3.8.patch
  38. +36 −0 linux-3/debian/patches/features/all/alx/mark-as-staging.patch
  39. +71 −0 linux-3/debian/patches/features/all/alx/remove-atl1c-devices-from-alx.patch
  40. +272 −209 linux-3/debian/patches/features/all/aufs3/aufs3-add.patch
  41. +9 −9 linux-3/debian/patches/features/all/aufs3/aufs3-base.patch
  42. +6 −6 linux-3/debian/patches/features/all/aufs3/aufs3-kbuild.patch
  43. +42 −31 linux-3/debian/patches/features/all/aufs3/aufs3-standalone.patch
  44. +7 −7 linux-3/debian/patches/features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
  45. +26 −10 linux-3/debian/patches/series
  46. +11 −2 linux-3/debian/rules.real
  47. +1 −1 linux-3/debian/templates/control.source.in
@@ -58,23 +58,21 @@ def upstream_export(self, input_repo):
'--prefix=%s/' % self.orig, self.tag],
cwd=input_repo,
stdout=subprocess.PIPE)
- extract_proc = subprocess.Popen(['tar', '-xf', '-'], cwd=self.dir,
+ extract_proc = subprocess.Popen(['tar', '-xaf', '-'], cwd=self.dir,
stdin=archive_proc.stdout)
- if extract_proc.wait():
- raise RuntimeError("Can't extract tarball")
+ ret1 = archive_proc.wait()
+ ret2 = extract_proc.wait()
+ if ret1 or ret2:
+ raise RuntimeError("Can't create archive")
def upstream_extract(self, input_tar):
self.log("Extracting tarball %s\n" % input_tar)
- match = re.match(r'(^|.*/)(?P<dir>linux-\d+\.\d+(\.\d+)?(-\S+)?)\.tar(\.(?P<extension>(bz2|gz)))?$', input_tar)
+ match = re.match(r'(^|.*/)(?P<dir>linux-\d+\.\d+(\.\d+)?(-\S+)?)\.tar(\.(?P<extension>(bz2|gz|xz)))?$', input_tar)
if not match:
raise RuntimeError("Can't identify name of tarball")
- cmdline = ['tar', '-xf', input_tar, '-C', self.dir]
- if match.group('extension') == 'bz2':
- cmdline.append('-j')
- elif match.group('extension') == 'gz':
- cmdline.append('-z')
+ cmdline = ['tar', '-xaf', input_tar, '-C', self.dir]
if subprocess.Popen(cmdline).wait():
raise RuntimeError("Can't extract tarball")
@@ -83,14 +81,16 @@ def upstream_extract(self, input_tar):
def upstream_patch(self, input_patch):
self.log("Patching source with %s\n" % input_patch)
- match = re.match(r'(^|.*/)patch-\d+\.\d+\.\d+(-\S+?)?(\.(?P<extension>(bz2|gz)))?$', input_patch)
+ match = re.match(r'(^|.*/)patch-\d+\.\d+\.\d+(-\S+?)?(\.(?P<extension>(bz2|gz|xz)))?$', input_patch)
if not match:
raise RuntimeError("Can't identify name of patch")
cmdline = []
if match.group('extension') == 'bz2':
cmdline.append('bzcat')
elif match.group('extension') == 'gz':
cmdline.append('zcat')
+ elif match.group('extension') == 'xz':
+ cmdline.append('xzcat')
else:
cmdline.append('cat')
cmdline.append(input_patch)
@@ -128,6 +128,10 @@ def tar(self):
except OSError:
pass
raise
+ try:
+ os.symlink(os.path.join('orig', self.orig_tar), os.path.join('..', self.orig_tar))
+ except OSError:
+ pass
if __name__ == '__main__':
from optparse import OptionParser
@@ -19,12 +19,15 @@ else
featureset=none
fi
-eval "set -- $(getopt -n "$0" -- "f:j:s:" "$@")"
+fuzz=0
+
+eval "set -- $(getopt -n "$0" -o "f:j:s:" -l "fuzz:" -- "$@")"
while true; do
case "$1" in
-f) flavour="$2"; shift 2 ;;
-j) export MAKEFLAGS="$MAKEFLAGS -j$2"; shift 2 ;;
-s) featureset="$2"; shift 2 ;;
+ --fuzz) fuzz="$2"; shift 2;;
--) shift 1; break ;;
esac
done
@@ -36,6 +39,7 @@ Options:
-f <flavour> specify the 'flavour' of kernel to build, e.g. 686-pae
-j <jobs> specify number of compiler jobs to run in parallel
-s <featureset> specify an optional featureset to apply, e.g. rt
+ --fuzz <num> set the maximum patch fuzz factor (default: 0)
EOF
exit 2
fi
@@ -63,8 +67,9 @@ alias quilt='quilt --quiltrc -'
# Try to clean up any previous test patches
if [ "$featureset" = none ]; then
- while quilt top 2>/dev/null | grep -q ^test/; do
- quilt delete
+ while patch="$(quilt next 2>/dev/null || quilt top 2>/dev/null)" && \
+ [ "${patch#test/}" != "$patch" ]; do
+ quilt delete -r "$patch"
done
else
sed -i '/^test\//d' debian/patches/series-${featureset}
@@ -89,7 +94,7 @@ for patch in "$@"; do
patch_abs="$(readlink -f "$patch")"
(cd "debian/build/source_${featureset}" && \
quilt import -P "test/$(basename "$patch")" "$patch_abs" && \
- quilt push --fuzz=0)
+ quilt push --fuzz="$fuzz")
done
# Build selected binaries
Oops, something went wrong.

0 comments on commit 52f58a7

Please sign in to comment.