target/linux/uml/patches-3.8/001-fix_make_headers_install.patch

   1 From faec6b6c2cc0219e74569c13f581fc11d8f3fc57 Mon Sep 17 00:00:00 2001
   2 From: Florian Fainelli <florian@openwrt.org>
   3 Date: Sun, 17 Mar 2013 20:12:10 +0100
   4 Subject: [PATCH] UM: fix make headers_install after UAPI header installation
   5
   6 Commit 10b63956 (UAPI: Plumb the UAPI Kbuilds into the user
   7 header installation and checking) breaks UML make headers_install with
   8 the following:
   9
  10 $ ARCH=um make headers_install
  11   CHK     include/generated/uapi/linux/version.h
  12   UPD     include/generated/uapi/linux/version.h
  13   HOSTCC  scripts/basic/fixdep
  14   WRAP    arch/um/include/generated/asm/bug.h
  15 [snip]
  16   WRAP    arch/um/include/generated/asm/trace_clock.h
  17   SYSHDR  arch/x86/syscalls/../include/generated/uapi/asm/unistd_32.h
  18   SYSHDR  arch/x86/syscalls/../include/generated/uapi/asm/unistd_64.h
  19   SYSHDR  arch/x86/syscalls/../include/generated/uapi/asm/unistd_x32.h
  20   SYSTBL  arch/x86/syscalls/../include/generated/asm/syscalls_32.h
  21   HOSTCC  scripts/unifdef
  22 Makefile:912: *** Headers not exportable for the um architecture.  Stop.
  23 zsh: exit 2     ARCH=um make headers_install
  24
  25 The reason for that is because the top-level Makefile does the
  26 following:
  27         $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \
  28           $(error Headers not exportable for the $(SRCARCH) architecture))
  29
  30 we end-up in the else part of the $(if) statement because UML still uses
  31 the old path in arch/um/include/asm/Kbuild. This patch fixes the issue
  32 by moving the header files to be in arch/um/include/uapi/asm/ thus
  33 making headers_install (and other make targets checking for uapi) to
  34 succeed.
  35
  36 Signed-off-by: Florian Fainelli <florian@openwrt.org>
  37 ---
  38 Richard, this has been broken for 3.7+ onwards, if you want me to send
  39 you separate patches for 3.7 and 3.8 let me know. Thanks!
  40
  41  arch/um/include/{ => uapi}/asm/Kbuild              |    0
  42  arch/um/include/{ => uapi}/asm/a.out-core.h        |    0
  43  arch/um/include/{ => uapi}/asm/bugs.h              |    0
  44  arch/um/include/{ => uapi}/asm/cache.h             |    0
  45  arch/um/include/{ => uapi}/asm/common.lds.S        |    0
  46  arch/um/include/{ => uapi}/asm/dma.h               |    0
  47  arch/um/include/{ => uapi}/asm/fixmap.h            |    0
  48  arch/um/include/{ => uapi}/asm/irq.h               |    0
  49  arch/um/include/{ => uapi}/asm/irqflags.h          |    0
  50  arch/um/include/{ => uapi}/asm/kmap_types.h        |    0
  51  arch/um/include/{ => uapi}/asm/kvm_para.h          |    0
  52  arch/um/include/{ => uapi}/asm/mmu.h               |    0
  53  arch/um/include/{ => uapi}/asm/mmu_context.h       |    0
  54  arch/um/include/{ => uapi}/asm/page.h              |    0
  55  arch/um/include/{ => uapi}/asm/pgalloc.h           |    0
  56  arch/um/include/{ => uapi}/asm/pgtable-2level.h    |    0
  57  arch/um/include/{ => uapi}/asm/pgtable-3level.h    |    0
  58  arch/um/include/{ => uapi}/asm/pgtable.h           |    0
  59  arch/um/include/{ => uapi}/asm/processor-generic.h |    0
  60  arch/um/include/{ => uapi}/asm/ptrace-generic.h    |    0
  61  arch/um/include/{ => uapi}/asm/setup.h             |    0
  62  arch/um/include/{ => uapi}/asm/smp.h               |    0
  63  arch/um/include/{ => uapi}/asm/sysrq.h             |    0
  64  arch/um/include/{ => uapi}/asm/thread_info.h       |    0
  65  arch/um/include/{ => uapi}/asm/timex.h             |    0
  66  arch/um/include/{ => uapi}/asm/tlb.h               |    0
  67  arch/um/include/{ => uapi}/asm/tlbflush.h          |    0
  68  arch/um/include/{ => uapi}/asm/uaccess.h           |    0
  69  28 files changed, 0 insertions(+), 0 deletions(-)
  70  rename arch/um/include/{ => uapi}/asm/Kbuild (100%)
  71  rename arch/um/include/{ => uapi}/asm/a.out-core.h (100%)
  72  rename arch/um/include/{ => uapi}/asm/bugs.h (100%)
  73  rename arch/um/include/{ => uapi}/asm/cache.h (100%)
  74  rename arch/um/include/{ => uapi}/asm/common.lds.S (100%)
  75  rename arch/um/include/{ => uapi}/asm/dma.h (100%)
  76  rename arch/um/include/{ => uapi}/asm/fixmap.h (100%)
  77  rename arch/um/include/{ => uapi}/asm/irq.h (100%)
  78  rename arch/um/include/{ => uapi}/asm/irqflags.h (100%)
  79  rename arch/um/include/{ => uapi}/asm/kmap_types.h (100%)
  80  rename arch/um/include/{ => uapi}/asm/kvm_para.h (100%)
  81  rename arch/um/include/{ => uapi}/asm/mmu.h (100%)
  82  rename arch/um/include/{ => uapi}/asm/mmu_context.h (100%)
  83  rename arch/um/include/{ => uapi}/asm/page.h (100%)
  84  rename arch/um/include/{ => uapi}/asm/pgalloc.h (100%)
  85  rename arch/um/include/{ => uapi}/asm/pgtable-2level.h (100%)
  86  rename arch/um/include/{ => uapi}/asm/pgtable-3level.h (100%)
  87  rename arch/um/include/{ => uapi}/asm/pgtable.h (100%)
  88  rename arch/um/include/{ => uapi}/asm/processor-generic.h (100%)
  89  rename arch/um/include/{ => uapi}/asm/ptrace-generic.h (100%)
  90  rename arch/um/include/{ => uapi}/asm/setup.h (100%)
  91  rename arch/um/include/{ => uapi}/asm/smp.h (100%)
  92  rename arch/um/include/{ => uapi}/asm/sysrq.h (100%)
  93  rename arch/um/include/{ => uapi}/asm/thread_info.h (100%)
  94  rename arch/um/include/{ => uapi}/asm/timex.h (100%)
  95  rename arch/um/include/{ => uapi}/asm/tlb.h (100%)
  96  rename arch/um/include/{ => uapi}/asm/tlbflush.h (100%)
  97  rename arch/um/include/{ => uapi}/asm/uaccess.h (100%)
  98
  99 diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/uapi/asm/Kbuild
 100 similarity index 100%
 101 rename from arch/um/include/asm/Kbuild
 102 rename to arch/um/include/uapi/asm/Kbuild
 103 diff --git a/arch/um/include/asm/a.out-core.h b/arch/um/include/uapi/asm/a.out-core.h
 104 similarity index 100%
 105 rename from arch/um/include/asm/a.out-core.h
 106 rename to arch/um/include/uapi/asm/a.out-core.h
 107 diff --git a/arch/um/include/asm/bugs.h b/arch/um/include/uapi/asm/bugs.h
 108 similarity index 100%
 109 rename from arch/um/include/asm/bugs.h
 110 rename to arch/um/include/uapi/asm/bugs.h
 111 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/uapi/asm/cache.h
 112 similarity index 100%
 113 rename from arch/um/include/asm/cache.h
 114 rename to arch/um/include/uapi/asm/cache.h
 115 diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/uapi/asm/common.lds.S
 116 similarity index 100%
 117 rename from arch/um/include/asm/common.lds.S
 118 rename to arch/um/include/uapi/asm/common.lds.S
 119 diff --git a/arch/um/include/asm/dma.h b/arch/um/include/uapi/asm/dma.h
 120 similarity index 100%
 121 rename from arch/um/include/asm/dma.h
 122 rename to arch/um/include/uapi/asm/dma.h
 123 diff --git a/arch/um/include/asm/fixmap.h b/arch/um/include/uapi/asm/fixmap.h
 124 similarity index 100%
 125 rename from arch/um/include/asm/fixmap.h
 126 rename to arch/um/include/uapi/asm/fixmap.h
 127 diff --git a/arch/um/include/asm/irq.h b/arch/um/include/uapi/asm/irq.h
 128 similarity index 100%
 129 rename from arch/um/include/asm/irq.h
 130 rename to arch/um/include/uapi/asm/irq.h
 131 diff --git a/arch/um/include/asm/irqflags.h b/arch/um/include/uapi/asm/irqflags.h
 132 similarity index 100%
 133 rename from arch/um/include/asm/irqflags.h
 134 rename to arch/um/include/uapi/asm/irqflags.h
 135 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/uapi/asm/kmap_types.h
 136 similarity index 100%
 137 rename from arch/um/include/asm/kmap_types.h
 138 rename to arch/um/include/uapi/asm/kmap_types.h
 139 diff --git a/arch/um/include/asm/kvm_para.h b/arch/um/include/uapi/asm/kvm_para.h
 140 similarity index 100%
 141 rename from arch/um/include/asm/kvm_para.h
 142 rename to arch/um/include/uapi/asm/kvm_para.h
 143 diff --git a/arch/um/include/asm/mmu.h b/arch/um/include/uapi/asm/mmu.h
 144 similarity index 100%
 145 rename from arch/um/include/asm/mmu.h
 146 rename to arch/um/include/uapi/asm/mmu.h
 147 diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/uapi/asm/mmu_context.h
 148 similarity index 100%
 149 rename from arch/um/include/asm/mmu_context.h
 150 rename to arch/um/include/uapi/asm/mmu_context.h
 151 diff --git a/arch/um/include/asm/page.h b/arch/um/include/uapi/asm/page.h
 152 similarity index 100%
 153 rename from arch/um/include/asm/page.h
 154 rename to arch/um/include/uapi/asm/page.h
 155 diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/uapi/asm/pgalloc.h
 156 similarity index 100%
 157 rename from arch/um/include/asm/pgalloc.h
 158 rename to arch/um/include/uapi/asm/pgalloc.h
 159 diff --git a/arch/um/include/asm/pgtable-2level.h b/arch/um/include/uapi/asm/pgtable-2level.h
 160 similarity index 100%
 161 rename from arch/um/include/asm/pgtable-2level.h
 162 rename to arch/um/include/uapi/asm/pgtable-2level.h
 163 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/uapi/asm/pgtable-3level.h
 164 similarity index 100%
 165 rename from arch/um/include/asm/pgtable-3level.h
 166 rename to arch/um/include/uapi/asm/pgtable-3level.h
 167 diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/uapi/asm/pgtable.h
 168 similarity index 100%
 169 rename from arch/um/include/asm/pgtable.h
 170 rename to arch/um/include/uapi/asm/pgtable.h
 171 diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/uapi/asm/processor-generic.h
 172 similarity index 100%
 173 rename from arch/um/include/asm/processor-generic.h
 174 rename to arch/um/include/uapi/asm/processor-generic.h
 175 diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/uapi/asm/ptrace-generic.h
 176 similarity index 100%
 177 rename from arch/um/include/asm/ptrace-generic.h
 178 rename to arch/um/include/uapi/asm/ptrace-generic.h
 179 diff --git a/arch/um/include/asm/setup.h b/arch/um/include/uapi/asm/setup.h
 180 similarity index 100%
 181 rename from arch/um/include/asm/setup.h
 182 rename to arch/um/include/uapi/asm/setup.h
 183 diff --git a/arch/um/include/asm/smp.h b/arch/um/include/uapi/asm/smp.h
 184 similarity index 100%
 185 rename from arch/um/include/asm/smp.h
 186 rename to arch/um/include/uapi/asm/smp.h
 187 diff --git a/arch/um/include/asm/sysrq.h b/arch/um/include/uapi/asm/sysrq.h
 188 similarity index 100%
 189 rename from arch/um/include/asm/sysrq.h
 190 rename to arch/um/include/uapi/asm/sysrq.h
 191 diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/uapi/asm/thread_info.h
 192 similarity index 100%
 193 rename from arch/um/include/asm/thread_info.h
 194 rename to arch/um/include/uapi/asm/thread_info.h
 195 diff --git a/arch/um/include/asm/timex.h b/arch/um/include/uapi/asm/timex.h
 196 similarity index 100%
 197 rename from arch/um/include/asm/timex.h
 198 rename to arch/um/include/uapi/asm/timex.h
 199 diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/uapi/asm/tlb.h
 200 similarity index 100%
 201 rename from arch/um/include/asm/tlb.h
 202 rename to arch/um/include/uapi/asm/tlb.h
 203 diff --git a/arch/um/include/asm/tlbflush.h b/arch/um/include/uapi/asm/tlbflush.h
 204 similarity index 100%
 205 rename from arch/um/include/asm/tlbflush.h
 206 rename to arch/um/include/uapi/asm/tlbflush.h
 207 diff --git a/arch/um/include/asm/uaccess.h b/arch/um/include/uapi/asm/uaccess.h
 208 similarity index 100%
 209 rename from arch/um/include/asm/uaccess.h
 210 rename to arch/um/include/uapi/asm/uaccess.h
 211 --
 212 1.7.10.4
 213