X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4666edad51e899cfec7b3ea37fc776065f1e1f5a..81d3bb5d22cc2c87d495e9c303d88e4cda25f641:/toolchain/kernel-headers/Makefile

diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index 4cd0199e7..27dcacd80 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -26,14 +26,22 @@ define Build/Prepare
 endef
 
 define Build/Configure/powerpc
-	$(CP) $(PKG_BUILD_DIR)/include/asm-powerpc/* $(PKG_BUILD_DIR)/include/asm-ppc/
+	$(CP) $(PKG_BUILD_DIR)/include/asm-ppc/* $(PKG_BUILD_DIR)/include/asm-powerpc/
+	rm -rf $(PKG_BUILD_DIR)/include/asm-ppc
+	mv $(PKG_BUILD_DIR)/include/asm-powerpc $(PKG_BUILD_DIR)/include/asm-ppc
 endef
 
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=$(ARCH)
+endif
+
+KMAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
+	ARCH=$(LINUX_KARCH) \
+	CONFIG_SHELL=$(BASH)
+
 define Build/Configure
-	yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH=$(LINUX_KARCH) \
-		CONFIG_SHELL=$(BASH) \
-		oldconfig include/linux/version.h include/asm
+	yes '' | $(KMAKE) oldconfig
+	$(KMAKE) include/linux/version.h include/asm
 	$(call Build/Configure/$(ARCH))
 endef