From 5f77ac3dd3536e23392485d201586935fd909bb8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 21:19:52 +0000 Subject: [PATCH 1/2] scripts/generate-kernel-patch: Only add scst/README_in-tree if present git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7793 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index 2ff3ca1e3..829c9e236 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -395,7 +395,9 @@ EOF done { - add_file "scst/README_in-tree" "Documentation/scst/README.scst" + if [ -e scst/README_in-tree ]; then + add_file "scst/README_in-tree" "Documentation/scst/README.scst" + fi add_file "scst/SysfsRules" "Documentation/scst/SysfsRules" } | process_patch "scst_11_core_doc.diff" From 04bd4b3a79b049ec74e60c07453217ad5af4d0ed Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 21:21:54 +0000 Subject: [PATCH 2/2] nightly build: Update kernel versions git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7794 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 17aea84f5..38b260159 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -3,21 +3,22 @@ ABT_DETAILS="x86_64" ABT_JOBS=5 ABT_KERNELS=" \ -4.18.14 \ +4.19.1 \ +4.18.16-nc \ 4.17.18-nc \ 4.16.18-nc \ 4.15.18-nc \ -4.14.76-nc \ +4.14.78-nc \ 4.13.16-nc \ 4.12.14-nc \ 4.11.12-nc \ 4.10.17-nc \ -4.9.133-nc \ +4.9.135-nc \ 4.8.17-nc \ 4.7.10-nc \ 4.6.7-nc \ 4.5.7-nc \ -4.4.161-nc \ +4.4.162-nc \ 4.3.6-nc \ 4.2.8-nc \ 4.1.52-nc \ @@ -25,7 +26,7 @@ ABT_KERNELS=" \ 3.19.8-nc \ 3.18.124-nc \ 3.17.8-nc \ -3.16.57-nc \ +3.16.60-nc \ 3.15.10-nc \ 3.14.79-nc \ 3.13.11-nc \