From 07b57afec5de4a495564a09151407d1d4a44cbbc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 10 Aug 2018 14:42:08 +0100 Subject: [PATCH] Move all patch generation scripts to debian/bin Rename them to genpatch-{aufs,lockdown,rt} Fixes lintian warning patch-file-present-but-not-mentioned-in-series. Also preparation for using dgit, which will remove everything except the main patch series under debian/patches. --- .../features/all/aufs4/gen-patch => bin/genpatch-aufs} | 2 +- .../all/lockdown/genpatch.py => bin/genpatch-lockdown} | 0 .../{patches/features/all/rt/genpatch.py => bin/genpatch-rt} | 0 debian/changelog | 1 + debian/patches/series | 5 ++--- 5 files changed, 4 insertions(+), 4 deletions(-) rename debian/{patches/features/all/aufs4/gen-patch => bin/genpatch-aufs} (92%) rename debian/{patches/features/all/lockdown/genpatch.py => bin/genpatch-lockdown} (100%) rename debian/{patches/features/all/rt/genpatch.py => bin/genpatch-rt} (100%) diff --git a/debian/patches/features/all/aufs4/gen-patch b/debian/bin/genpatch-aufs similarity index 92% rename from debian/patches/features/all/aufs4/gen-patch rename to debian/bin/genpatch-aufs index f37ec0b2c..603c85420 100755 --- a/debian/patches/features/all/aufs4/gen-patch +++ b/debian/bin/genpatch-aufs @@ -24,7 +24,7 @@ for patch in aufs4-{base,mmap,standalone}.patch; do echo "$origin_line" echo "$bug_line" echo - echo 'Patch headers added by debian/patches/features/all/aufs4/gen-patch' + 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" diff --git a/debian/patches/features/all/lockdown/genpatch.py b/debian/bin/genpatch-lockdown similarity index 100% rename from debian/patches/features/all/lockdown/genpatch.py rename to debian/bin/genpatch-lockdown diff --git a/debian/patches/features/all/rt/genpatch.py b/debian/bin/genpatch-rt similarity index 100% rename from debian/patches/features/all/rt/genpatch.py rename to debian/bin/genpatch-rt diff --git a/debian/changelog b/debian/changelog index edba9c16d..f2bc6d595 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux (4.18.6-2) UNRELEASED; urgency=medium [ Ben Hutchings ] * [x86] wireless: Enable R8822BE as module (Closes: #908330) + * Move all patch generation scripts to debian/bin [ Salvatore Bonaccorso ] * mac80211: don't update the PM state of a peer upon a multicast frame diff --git a/debian/patches/series b/debian/patches/series index ac8565409..83c850288 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -29,9 +29,8 @@ bugfix/all/firmware-remove-redundant-log-messages-from-drivers.patch bugfix/all/radeon-amdgpu-firmware-is-required-for-drm-and-kms-on-r600-onward.patch debian/firmware_class-refer-to-debian-wiki-firmware-page.patch -# Patches from aufs4 repository, imported with -# debian/patches/features/all/aufs4/gen-patch. These are only the -# changes needed to allow aufs to be built out-of-tree. +# Patches from aufs4 repository, imported with debian/bin/genpatch-aufs. +# These are only the changes needed to allow aufs to be built out-of-tree. features/all/aufs4/aufs4-base.patch features/all/aufs4/aufs4-mmap.patch features/all/aufs4/aufs4-standalone.patch