diff options
author | Roger Pau Monné <royger@FreeBSD.org> | 2016-06-16 15:25:26 +0000 |
---|---|---|
committer | Roger Pau Monné <royger@FreeBSD.org> | 2016-06-16 15:25:26 +0000 |
commit | 85cb897cb3fc9d301f2f494c7b7df899fac3f7c3 (patch) | |
tree | a700e3fb83b3ead2643d7b58fa74345cd979d585 /emulators/xen-kernel | |
parent | 4d1c2e3e50488e7939126c91d8cbe74a9f02daea (diff) | |
download | ports-85cb897cb3fc9d301f2f494c7b7df899fac3f7c3.tar.gz ports-85cb897cb3fc9d301f2f494c7b7df899fac3f7c3.zip |
Notes
Diffstat (limited to 'emulators/xen-kernel')
-rw-r--r-- | emulators/xen-kernel/Makefile | 5 | ||||
-rw-r--r-- | emulators/xen-kernel/distinfo | 6 | ||||
-rw-r--r-- | emulators/xen-kernel/files/0001-build-fix-assembler-instruction-tests-again.patch | 37 | ||||
-rw-r--r-- | emulators/xen-kernel/files/kconf_arch.patch | 12 |
4 files changed, 11 insertions, 49 deletions
diff --git a/emulators/xen-kernel/Makefile b/emulators/xen-kernel/Makefile index c84defff15bf..72f86d7e8c3e 100644 --- a/emulators/xen-kernel/Makefile +++ b/emulators/xen-kernel/Makefile @@ -3,8 +3,8 @@ PORTNAME= xen PKGNAMESUFFIX= -kernel PORTVERSION= 4.7.0 -PORTREVISION= 0 -RCVERSION= 4 +PORTREVISION= 1 +RCVERSION= 6 DISTNAME= ${PORTNAME}-${DISTVERSION}-rc${RCVERSION} CATEGORIES= emulators MASTER_SITES= http://bits.xensource.com/oss-xen/release/${DISTVERSION}-rc${RCVERSION}/ @@ -41,7 +41,6 @@ PLIST_FILES= /boot/xen \ /boot/xen.4th EXTRA_PATCHES= ${FILESDIR}/0001-xen-logdirty-prevent-preemption-if-finished.patch:-p1 \ ${FILESDIR}/0002-xen-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p1 \ - ${FILESDIR}/0001-build-fix-assembler-instruction-tests-again.patch:-p1 \ ${FILESDIR}/kconf_arch.patch:-p1 diff --git a/emulators/xen-kernel/distinfo b/emulators/xen-kernel/distinfo index 62f2b2aa413b..20ede0788069 100644 --- a/emulators/xen-kernel/distinfo +++ b/emulators/xen-kernel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464704290 -SHA256 (xen-4.7.0-rc4.tar.gz) = ad752bc80da2ab31287e5249adbeea2536b8141eefd7e8a45a3df42db727c630 -SIZE (xen-4.7.0-rc4.tar.gz) = 20696897 +TIMESTAMP = 1466081623 +SHA256 (xen-4.7.0-rc6.tar.gz) = d25e5e84b4d8f279be9a1a42b5c07c1b50cff48b49201e32ebf3809df187b428 +SIZE (xen-4.7.0-rc6.tar.gz) = 20707097 diff --git a/emulators/xen-kernel/files/0001-build-fix-assembler-instruction-tests-again.patch b/emulators/xen-kernel/files/0001-build-fix-assembler-instruction-tests-again.patch deleted file mode 100644 index ea41c494eebe..000000000000 --- a/emulators/xen-kernel/files/0001-build-fix-assembler-instruction-tests-again.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1dda826420fff634983e94f97fb8411486acda0d Mon Sep 17 00:00:00 2001 -From: Jan Beulich <jbeulich@suse.com> -Date: Tue, 31 May 2016 18:14:22 +0200 -Subject: [PATCH] build: fix assembler instruction tests again -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 7fb252bd41 ("build/xen: fix assembler instruction tests") added -$(AFLAGS) here, which results in all of those tests now failing. -Certain items need to be removed for things to work again. - -Signed-off-by: Jan Beulich <jbeulich@suse.com> -Acked-by: Wei Liu <wei.liu2@citrix.com> -Acked-by: Roger Pau Monné <roger.pau@citrix.com> -Release-acked-by: Wei Liu <wei.liu2@citrix.com> ---- - Config.mk | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Config.mk b/Config.mk -index 5ddfbf8..bc5c456 100644 ---- a/Config.mk -+++ b/Config.mk -@@ -150,7 +150,8 @@ endif - # as-insn: Check whether assembler supports an instruction. - # Usage: cflags-y += $(call as-insn "insn",option-yes,option-no) - as-insn = $(if $(shell echo 'void _(void) { asm volatile ( $(2) ); }' \ -- | $(1) $(AFLAGS) -c -x c -o /dev/null - 2>&1),$(4),$(3)) -+ | $(1) $(filter-out -M% %.d -include %/include/xen/config.h,$(AFLAGS)) \ -+ -c -x c -o /dev/null - 2>&1),$(4),$(3)) - - # as-insn-check: Add an option to compilation flags, but only if insn is - # supported by assembler. --- -2.7.4 (Apple Git-66) - diff --git a/emulators/xen-kernel/files/kconf_arch.patch b/emulators/xen-kernel/files/kconf_arch.patch index d37038b44530..61f42f9ee7fc 100644 --- a/emulators/xen-kernel/files/kconf_arch.patch +++ b/emulators/xen-kernel/files/kconf_arch.patch @@ -17,17 +17,17 @@ index 0d5f240..f232d01 100644 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) $@ +- $(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 +- $(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 +- $(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: ; |