diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-08-04 20:42:50 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-08-04 20:45:25 +0100 |
| commit | c067eadcf3463155577202b6fd3090565f25c847 (patch) | |
| tree | e47827eeb1908df83fbcd9156e6795cd6fb53f6b /debian/bin | |
| parent | 16402026e6e5652499bf44331c5068b475911311 (diff) | |
| parent | 86dc4135cc23e64f35d659fe0807904ea9313f28 (diff) | |
| download | kernel_replicant_linux-c067eadcf3463155577202b6fd3090565f25c847.tar.gz kernel_replicant_linux-c067eadcf3463155577202b6fd3090565f25c847.tar.bz2 kernel_replicant_linux-c067eadcf3463155577202b6fd3090565f25c847.zip | |
Merge branch 'master' into sid
* Drop ABI reference and ABI maintenance patch
* Drop patches that are already included in 5.2
* Take master's version of the PREEMPT_RT patch set
Diffstat (limited to 'debian/bin')
| -rwxr-xr-x | debian/bin/genpatch-aufs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/debian/bin/genpatch-aufs b/debian/bin/genpatch-aufs index 603c85420892..8f69f0f0f60e 100755 --- a/debian/bin/genpatch-aufs +++ b/debian/bin/genpatch-aufs @@ -6,14 +6,15 @@ export GIT_DIR="$aufs_dir/.git" from_line='From: J. R. Okajima <hooanon05@yahoo.co.jp>' if [ -d "$GIT_DIR" ]; then - origin_line="Origin: https://github.com/sfjro/aufs4-standalone/tree/$(git rev-list HEAD -1)" + origin_line="Origin: https://github.com/sfjro/aufs5-standalone/tree/$(git rev-list HEAD -1)" else echo >&2 "W: Cannot include a specific origin URL without an aufs git repo" - origin_line='Origin: https://github.com/sfjro/aufs4-standalone/branches' + origin_line='Origin: https://github.com/sfjro/aufs5-standalone/branches' fi bug_line='Bug-Debian: https://bugs.debian.org/541828' -for patch in aufs4-{base,mmap,standalone}.patch; do +mkdir -p debian/patches/features/all/aufs5 +for patch in aufs5-{base,mmap,standalone}.patch; do { echo "$from_line" if [ -d "$GIT_DIR" ]; then @@ -27,5 +28,5 @@ for patch in aufs4-{base,mmap,standalone}.patch; do echo 'Patch headers added by debian/bin/genpatch-aufs' echo sed 's/^+.*EXPORT_SYMBOL\b/&_GPL/' < "$aufs_dir"/"$patch" - } > debian/patches/features/all/aufs4/"$patch" + } > debian/patches/features/all/aufs5/"$patch" done |