From fdff703e46ac2bb42be4d160ee798c5c37487b64 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Sun, 24 Apr 2016 19:34:11 -0500 Subject: [PATCH] scripts: sync with master of: https://github.com/RobertCNelson/stable-kernel.git Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- patch.sh | 4 ++-- tools/host_det.sh | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/patch.sh b/patch.sh index 599d2e036..ce1703fd6 100644 --- a/patch.sh +++ b/patch.sh @@ -161,8 +161,8 @@ aufs4 () { ${git} "${DIR}/patches/aufs4/0005-merge-aufs4.patch" if [ "x${regenerate}" = "xenable" ] ; then - number=5 - cleanup + git format-patch -5 -o ../patches/aufs4/ + exit 2 fi } diff --git a/tools/host_det.sh b/tools/host_det.sh index fc3f493ea..dab982860 100755 --- a/tools/host_det.sh +++ b/tools/host_det.sh @@ -346,8 +346,12 @@ debian_regs () { warn_eol_distro=1 stop_pkg_search=1 ;; + yakkety) + #16.10 yakkety: (EOL: July 2017) + unset warn_eol_distro + ;; xenial) - #16.04 trusty: (EOL: April 20xx) lts: xenial -> xyz + #16.04 xenial: (EOL: April 2021) lts: xenial -> xyz unset warn_eol_distro ;; wily) -- GitLab