releases/4.14.58/arc-configs-remove-config_initramfs_source-from-defconfigs.patch

   1 From 64234961c145606b36eaa82c47b11be842b21049 Mon Sep 17 00:00:00 2001
   2 From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
   3 Date: Wed, 6 Jun 2018 15:59:38 +0300
   4 Subject: ARC: configs: Remove CONFIG_INITRAMFS_SOURCE from defconfigs
   5
   6 From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
   7
   8 commit 64234961c145606b36eaa82c47b11be842b21049 upstream.
   9
  10 We used to have pre-set CONFIG_INITRAMFS_SOURCE with local path
  11 to intramfs in ARC defconfigs. This was quite convenient for
  12 in-house development but not that convenient for newcomers
  13 who obviusly don't have folders like "arc_initramfs" next to
  14 the Linux source tree. Which leads to quite surprising failure
  15 of defconfig building:
  16 ------------------------------->8-----------------------------
  17   ../scripts/gen_initramfs_list.sh: Cannot open '../../arc_initramfs_hs/'
  18 ../usr/Makefile:57: recipe for target 'usr/initramfs_data.cpio.gz' failed
  19 make[2]: *** [usr/initramfs_data.cpio.gz] Error 1
  20 ------------------------------->8-----------------------------
  21
  22 So now when more and more people start to deal with our defconfigs
  23 let's make their life easier with removal of CONFIG_INITRAMFS_SOURCE.
  24
  25 Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
  26 Cc: Kevin Hilman <khilman@baylibre.com>
  27 Cc: stable@vger.kernel.org
  28 Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
  29 Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
  30 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  31
  32 ---
  33  arch/arc/configs/axs101_defconfig          |    1 -
  34  arch/arc/configs/axs103_defconfig          |    1 -
  35  arch/arc/configs/axs103_smp_defconfig      |    1 -
  36  arch/arc/configs/haps_hs_defconfig         |    1 -
  37  arch/arc/configs/haps_hs_smp_defconfig     |    1 -
  38  arch/arc/configs/hsdk_defconfig            |    1 -
  39  arch/arc/configs/nsim_700_defconfig        |    1 -
  40  arch/arc/configs/nsim_hs_defconfig         |    1 -
  41  arch/arc/configs/nsim_hs_smp_defconfig     |    1 -
  42  arch/arc/configs/nsimosci_defconfig        |    1 -
  43  arch/arc/configs/nsimosci_hs_defconfig     |    1 -
  44  arch/arc/configs/nsimosci_hs_smp_defconfig |    1 -
  45  12 files changed, 12 deletions(-)
  46
  47 --- a/arch/arc/configs/axs101_defconfig
  48 +++ b/arch/arc/configs/axs101_defconfig
  49 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
  50  # CONFIG_UTS_NS is not set
  51  # CONFIG_PID_NS is not set
  52  CONFIG_BLK_DEV_INITRD=y
  53 -CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
  54  CONFIG_EMBEDDED=y
  55  CONFIG_PERF_EVENTS=y
  56  # CONFIG_VM_EVENT_COUNTERS is not set
  57 --- a/arch/arc/configs/axs103_defconfig
  58 +++ b/arch/arc/configs/axs103_defconfig
  59 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
  60  # CONFIG_UTS_NS is not set
  61  # CONFIG_PID_NS is not set
  62  CONFIG_BLK_DEV_INITRD=y
  63 -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
  64  CONFIG_EMBEDDED=y
  65  CONFIG_PERF_EVENTS=y
  66  # CONFIG_VM_EVENT_COUNTERS is not set
  67 --- a/arch/arc/configs/axs103_smp_defconfig
  68 +++ b/arch/arc/configs/axs103_smp_defconfig
  69 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
  70  # CONFIG_UTS_NS is not set
  71  # CONFIG_PID_NS is not set
  72  CONFIG_BLK_DEV_INITRD=y
  73 -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
  74  CONFIG_EMBEDDED=y
  75  CONFIG_PERF_EVENTS=y
  76  # CONFIG_VM_EVENT_COUNTERS is not set
  77 --- a/arch/arc/configs/haps_hs_defconfig
  78 +++ b/arch/arc/configs/haps_hs_defconfig
  79 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
  80  # CONFIG_UTS_NS is not set
  81  # CONFIG_PID_NS is not set
  82  CONFIG_BLK_DEV_INITRD=y
  83 -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
  84  CONFIG_EXPERT=y
  85  CONFIG_PERF_EVENTS=y
  86  # CONFIG_COMPAT_BRK is not set
  87 --- a/arch/arc/configs/haps_hs_smp_defconfig
  88 +++ b/arch/arc/configs/haps_hs_smp_defconfig
  89 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
  90  # CONFIG_UTS_NS is not set
  91  # CONFIG_PID_NS is not set
  92  CONFIG_BLK_DEV_INITRD=y
  93 -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
  94  CONFIG_EMBEDDED=y
  95  CONFIG_PERF_EVENTS=y
  96  # CONFIG_VM_EVENT_COUNTERS is not set
  97 --- a/arch/arc/configs/hsdk_defconfig
  98 +++ b/arch/arc/configs/hsdk_defconfig
  99 @@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y
 100  # CONFIG_UTS_NS is not set
 101  # CONFIG_PID_NS is not set
 102  CONFIG_BLK_DEV_INITRD=y
 103 -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 104  CONFIG_EMBEDDED=y
 105  CONFIG_PERF_EVENTS=y
 106  # CONFIG_VM_EVENT_COUNTERS is not set
 107 --- a/arch/arc/configs/nsim_700_defconfig
 108 +++ b/arch/arc/configs/nsim_700_defconfig
 109 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 110  # CONFIG_UTS_NS is not set
 111  # CONFIG_PID_NS is not set
 112  CONFIG_BLK_DEV_INITRD=y
 113 -CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
 114  CONFIG_KALLSYMS_ALL=y
 115  CONFIG_EMBEDDED=y
 116  CONFIG_PERF_EVENTS=y
 117 --- a/arch/arc/configs/nsim_hs_defconfig
 118 +++ b/arch/arc/configs/nsim_hs_defconfig
 119 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 120  # CONFIG_UTS_NS is not set
 121  # CONFIG_PID_NS is not set
 122  CONFIG_BLK_DEV_INITRD=y
 123 -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/"
 124  CONFIG_KALLSYMS_ALL=y
 125  CONFIG_EMBEDDED=y
 126  CONFIG_PERF_EVENTS=y
 127 --- a/arch/arc/configs/nsim_hs_smp_defconfig
 128 +++ b/arch/arc/configs/nsim_hs_smp_defconfig
 129 @@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y
 130  # CONFIG_UTS_NS is not set
 131  # CONFIG_PID_NS is not set
 132  CONFIG_BLK_DEV_INITRD=y
 133 -CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 134  CONFIG_KALLSYMS_ALL=y
 135  CONFIG_EMBEDDED=y
 136  CONFIG_PERF_EVENTS=y
 137 --- a/arch/arc/configs/nsimosci_defconfig
 138 +++ b/arch/arc/configs/nsimosci_defconfig
 139 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 140  # CONFIG_UTS_NS is not set
 141  # CONFIG_PID_NS is not set
 142  CONFIG_BLK_DEV_INITRD=y
 143 -CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"
 144  CONFIG_KALLSYMS_ALL=y
 145  CONFIG_EMBEDDED=y
 146  CONFIG_PERF_EVENTS=y
 147 --- a/arch/arc/configs/nsimosci_hs_defconfig
 148 +++ b/arch/arc/configs/nsimosci_hs_defconfig
 149 @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y
 150  # CONFIG_UTS_NS is not set
 151  # CONFIG_PID_NS is not set
 152  CONFIG_BLK_DEV_INITRD=y
 153 -CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 154  CONFIG_KALLSYMS_ALL=y
 155  CONFIG_EMBEDDED=y
 156  CONFIG_PERF_EVENTS=y
 157 --- a/arch/arc/configs/nsimosci_hs_smp_defconfig
 158 +++ b/arch/arc/configs/nsimosci_hs_smp_defconfig
 159 @@ -9,7 +9,6 @@ CONFIG_IKCONFIG_PROC=y
 160  # CONFIG_UTS_NS is not set
 161  # CONFIG_PID_NS is not set
 162  CONFIG_BLK_DEV_INITRD=y
 163 -CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/"
 164  CONFIG_PERF_EVENTS=y
 165  # CONFIG_COMPAT_BRK is not set
 166  CONFIG_KPROBES=y