From 22952ce0a28bfbfc3cf89f6d59bbeef4f0e94ae4 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 20 Dec 2020 21:51:19 +0000 Subject: [PATCH 1/2] nightly build: Remove UEK R4 SCST does not build against UEK R4. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9224 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index c6c53aabe..82b0c2c47 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -75,5 +75,4 @@ ABT_KERNELS=" \ 2.6.32-696.30.1.el6^CentOS^6.9-nc \ 5.4.17-2036.101.2.el7uek^UEK^7-nc \ 4.14.35-2025.403.3.el7uek^UEK^7-nc \ -4.1.12-124.45.6.el7uek^UEK^7-nc \ " From 8ddd93ee2abe5c3c2a2f487eba8f8245df0367cf Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 20 Dec 2020 22:16:51 +0000 Subject: [PATCH 2/2] scripts/kernel-functions: Remove an UEK R4 patch git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9225 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/kernel-functions | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/scripts/kernel-functions b/scripts/kernel-functions index 541361bab..d5b978b38 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -598,29 +598,6 @@ index 8fa38d3e7538..f5bc4c046461 100644 EOF ;; - 4.1.12-*uek) - echo "Patching init.h ..." - patch -f -s -p1 <<'EOF' ---- linux-4.1.12-124.45.6.el7uek/include/linux/init.h.orig -+++ linux-4.1.12-124.45.6.el7uek/include/linux/init.h -@@ -347,13 +347,13 @@ - #define module_init(initfn) \ - static inline initcall_t __inittest(void) \ - { return initfn; } \ -- int init_module(void) __attribute__((alias(#initfn))); -+ int init_module(void) __attribute__((__copy__(initfn))); - - /* This is only required if you want to be unloadable. */ - #define module_exit(exitfn) \ - static inline exitcall_t __exittest(void) \ - { return exitfn; } \ -- void cleanup_module(void) __attribute__((alias(#exitfn))); -+ void cleanup_module(void) __attribute__((__copy__(exitfn))); - - #define __setup_param(str, unique_id, fn) /* nothing */ - #define __setup(str, func) /* nothing */ -EOF - ;; 2.*|3.*) patch -f -s -p1 <<'EOF' --- linux-3.10.0-1127.el7/include/linux/init.h.orig 2020-05-09 20:55:48.638956513 -0700