[linux-yocto] [PATCH 4.12] edac: split scc into enablement and patching (for treegen)

Paul Gortmaker paul.gortmaker at windriver.com
Mon Oct 30 12:29:10 PDT 2017

Calling out the existing edac.scc via KERNEL_FEATURES_append will
fail since it contains patch commands, and the patches will
unconditionally be queued for application.  Split it so instead it
can use

   KERNEL_FEATURES_append += "features/edac/edac-enable.scc"

in templates/configuration files external to the kernel-cache.

Note that we also hook the remaining patch chunk into the standard
ktype so that "rebase" branches (when created) will faithfully
mirror the content merged into the fast forward branches.

Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>

diff --git a/features/edac/edac-enable.scc b/features/edac/edac-enable.scc
new file mode 100644
index 000000000000..69b71a6a61a0
--- /dev/null
+++ b/features/edac/edac-enable.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Enable core EDAC functionality"
+kconf hardware edac.cfg
diff --git a/features/edac/edac.scc b/features/edac/edac.scc
index bc4831855559..58dc3ebf585e 100644
--- a/features/edac/edac.scc
+++ b/features/edac/edac.scc
@@ -1,7 +1,3 @@
-define KFEATURE_DESCRIPTION "Enable core EDAC functionality"
-kconf hardware edac.cfg
 patch EDAC-pnd2-Return-proper-error-value-from-apl_rd_reg.patch
 patch EDAC-pnd2-Make-function-sbi_send-static.patch
 patch EDAC-pnd2-Fix-Apollo-Lake-DIMM-detection.patch
diff --git a/ktypes/standard/standard.scc b/ktypes/standard/standard.scc
index fb8b34382dfb..662d0cb1edb9 100644
--- a/ktypes/standard/standard.scc
+++ b/ktypes/standard/standard.scc
@@ -78,6 +78,7 @@ include features/uptime/uptime.scc
 include features/ktest/ktest.scc
 include features/perf/perf.scc
 include features/input/input.scc
+include features/edac/edac.scc
 include features/bfq.scc
 include backports/backports.scc

More information about the linux-yocto mailing list