Index: head/emulators/xen-kernel/files/kconf_arch.patch =================================================================== --- head/emulators/xen-kernel/files/kconf_arch.patch (nonexistent) +++ head/emulators/xen-kernel/files/kconf_arch.patch (revision 416497) @@ -0,0 +1,33 @@ +diff --git a/xen/Makefile b/xen/Makefile +index 0d5f240..f232d01 100644 +--- a/xen/Makefile ++++ b/xen/Makefile +@@ -21,8 +21,8 @@ MAKEFLAGS += -rR + + EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi + +-ARCH=$(XEN_TARGET_ARCH) +-SRCARCH=$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g') ++KCONF_ARCH=$(XEN_TARGET_ARCH) ++KCONF_SRCARCH=$(shell echo $(KCONF_ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g') + + # Don't break if the build process wasn't called from the top level + # we need XEN_TARGET_ARCH to generate the proper config +@@ -246,14 +246,14 @@ kconfig := silentoldconfig oldconfig config menuconfig defconfig \ + randconfig + .PHONY: $(kconfig) + $(kconfig): +- $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH) SRCARCH=$(SRCARCH) HOSTCC=$(HOSTCC) HOSTCXX=$(HOSTCXX) $@ ++ $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(KCONF_ARCH) SRCARCH=$(KCONF_SRCARCH) HOSTCC=$(HOSTCC) HOSTCXX=$(HOSTCXX) $@ + + include/config/%.conf: include/config/auto.conf.cmd $(KCONFIG_CONFIG) +- $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH) SRCARCH=$(SRCARCH) HOSTCC=$(HOSTCC) HOSTCXX=$(HOSTCXX) silentoldconfig ++ $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(KCONF_ARCH) SRCARCH=$(KCONF_SRCARCH) HOSTCC=$(HOSTCC) HOSTCXX=$(HOSTCXX) silentoldconfig + + # Allow people to just run `make` as before and not force them to configure + $(KCONFIG_CONFIG): +- $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH) SRCARCH=$(SRCARCH) HOSTCC=$(HOSTCC) HOSTCXX=$(HOSTCXX) defconfig ++ $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(KCONF_ARCH) SRCARCH=$(KCONF_SRCARCH) HOSTCC=$(HOSTCC) HOSTCXX=$(HOSTCXX) defconfig + + # Break the dependency chain for the first run + include/config/auto.conf.cmd: ; Property changes on: head/emulators/xen-kernel/files/kconf_arch.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property