Attachment 177415 Details for Bug 214851 – linux-kernel.diff

[patch] linux-kernel.diff

linux-kernel.diff (text/plain), 6.72 KB, created by Tobias Kortkamp on 2016-11-26 14:31:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-11-26 14:31:47 UTC

Size: 6.72 KB

patch

obsolete

>diff --git a/devel/linux-kernel/Makefile b/devel/linux-kernel/Makefile
>index 95f9e81..3579466 100644
>--- a/devel/linux-kernel/Makefile
>+++ b/devel/linux-kernel/Makefile
>@@ -29,7 +29,7 @@
> # LINUX_MOD_INSTALL_PATH.
> 
> PORTNAME=	linux-kernel
>-PORTVERSION=	4.7.9
>+PORTVERSION=	4.8.11
> CATEGORIES=	devel
> MASTER_SITES=	KERNEL_ORG/linux/kernel/v4.x
> DISTNAME=	linux-${DISTVERSION}
>@@ -72,7 +72,7 @@ ALL_TARGET=	defconfig
> .endif
> 
> OPTIONS_DEFINE=	FIRMWARE KVM MODULES XEN
>-OPTIONS_DEFAULT=	KVM
>+OPTIONS_DEFAULT=	KVM XEN
> 
> FIRMWARE_DESC=	Install firmware
> KVM_DESC=	KVM guest kernel support
>@@ -109,20 +109,21 @@ INSTALL_TARGET+=	firmware_install
> ## For menuconfig, config, etc.
> HOST_EXTRACFLAGS+=	-DCURSES_LOC='<ncurses.h>' -DKBUILD_NO_NLS=1
> HOST_LOADLIBES+=	-Wl,-rpath=${LOCALBASE}/lib
>+LINUX_ARCH?=	x86
>+LINUX_SUBARCH?=	x86
> LINUX_INSTALL_PATH?=	${PREFIX}/linux-kernel
> LINUX_MOD_INSTALL_PATH?=	${LINUX_INSTALL_PATH}
> ## Pretend to be Linux (for ACPI)
> KCFLAGS+=		-D_LINUX -D__linux__
> HOST_EXTRACFLAGS+=	-I${BUILD_WRKSRC}/freebsd-build-support/include
>-## Make sure ${LOCALBASE}/bin is in the PATH so Linux will build in
>-## Poudriere
>+## Make sure ${LOCALBASE}/bin is in the PATH for Poudriere/Synth
> MAKE_ENV+=	PATH="${BUILD_WRKSRC}/freebsd-build-support/bin:${LOCALBASE}/bin:${PATH}" \
> 		HOST_EXTRACFLAGS="${HOST_EXTRACFLAGS}" \
> 		HOST_LOADLIBES="${HOST_LOADLIBES}" \
> 		KCFLAGS="${KCFLAGS}" \
> 		BASH="${LOCALBASE}/bin/bash"
>-#	-j${MAKE_JOBS_NUMBER}
>-MAKE_ARGS+=	ARCH="x86" \
>+MAKE_ARGS+=	ARCH="${LINUX_ARCH}" \
>+		SUBARCH="${LINUX_SUBARCH}" \
> 		KCONFIG_CONFIG="${LINUX_KCONFIG}" \
> 		INSTALL_PATH="${STAGEDIR}${LINUX_INSTALL_PATH}" \
> 		INSTALL_MOD_PATH="${STAGEDIR}${LINUX_MOD_INSTALL_PATH}" \
>diff --git a/devel/linux-kernel/distinfo b/devel/linux-kernel/distinfo
>index fb5bd85..ee085a3 100644
>--- a/devel/linux-kernel/distinfo
>+++ b/devel/linux-kernel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1477009617
>-SHA256 (linux-4.7.9.tar.xz) = 0638d52a86079d726817d895ae4030b09e3e649222a9590603dd7771155ae28d
>-SIZE (linux-4.7.9.tar.xz) = 90421756
>+TIMESTAMP = 1480157127
>+SHA256 (linux-4.8.11.tar.xz) = cc0f42f408ba3e51f8b0e93e3d8050ff18569456d286cb2a1aca3327dd06890f
>+SIZE (linux-4.8.11.tar.xz) = 91976832
>diff --git a/devel/linux-kernel/files/patch-Documentation_DocBook_media_Makefile b/devel/linux-kernel/files/patch-Documentation_DocBook_media_Makefile
>deleted file mode 100644
>index 0adc4d5..0000000
>--- a/devel/linux-kernel/files/patch-Documentation_DocBook_media_Makefile
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- Documentation/DocBook/media/Makefile.orig	2016-07-27 15:42:34 UTC
>-+++ Documentation/DocBook/media/Makefile
>-@@ -2,7 +2,7 @@
>- # Media build rules - Auto-generates media contents/indexes and *.h xml's
>- #
>- 
>--SHELL=/bin/bash
>-+SHELL!=which bash
>- 
>- MEDIA_OBJ_DIR=$(objtree)/Documentation/DocBook/
>- MEDIA_SRC_DIR=$(srctree)/Documentation/DocBook/media
>diff --git a/devel/linux-kernel/files/patch-Makefile b/devel/linux-kernel/files/patch-Makefile
>new file mode 100644
>index 0000000..9cf5df6
>--- /dev/null
>+++ b/devel/linux-kernel/files/patch-Makefile
>@@ -0,0 +1,11 @@
>+--- Makefile.orig	2016-11-26 09:52:06 UTC
>++++ Makefile
>+@@ -225,7 +225,7 @@ export srctree objtree VPATH
>+ # then ARCH is assigned, getting whatever value it gets normally, and
>+ # SUBARCH is subsequently ignored.
>+ 
>+-SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
>++SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/amd64/x86/ \
>+ 				  -e s/sun4u/sparc64/ \
>+ 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
>+ 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
>diff --git a/devel/linux-kernel/files/patch-arch_x86_Makefile b/devel/linux-kernel/files/patch-arch_x86_Makefile
>index 5140862..ffc6f10 100644
>--- a/devel/linux-kernel/files/patch-arch_x86_Makefile
>+++ b/devel/linux-kernel/files/patch-arch_x86_Makefile
>@@ -1,4 +1,4 @@
>---- arch/x86/Makefile.orig	2016-07-27 15:42:34 UTC
>+--- arch/x86/Makefile.orig	2016-11-26 08:57:13 UTC
> +++ arch/x86/Makefile
> @@ -2,7 +2,7 @@
>  
>diff --git a/devel/linux-kernel/files/patch-arch_x86_tools_relocs.c b/devel/linux-kernel/files/patch-arch_x86_tools_relocs.c
>index 4645005..1c18c47 100644
>--- a/devel/linux-kernel/files/patch-arch_x86_tools_relocs.c
>+++ b/devel/linux-kernel/files/patch-arch_x86_tools_relocs.c
>@@ -1,4 +1,4 @@
>---- arch/x86/tools/relocs.c.orig	2016-07-28 10:57:47 UTC
>+--- arch/x86/tools/relocs.c.orig	2016-11-26 08:57:13 UTC
> +++ arch/x86/tools/relocs.c
> @@ -54,12 +54,12 @@ static const char * const sym_regex_kern
>  	[S_REL] =
>diff --git a/devel/linux-kernel/files/patch-freebsd-build-support_include_bits_auxv.h b/devel/linux-kernel/files/patch-freebsd-build-support_include_bits_auxv.h
>index 3d4f26c..5816292 100644
>--- a/devel/linux-kernel/files/patch-freebsd-build-support_include_bits_auxv.h
>+++ b/devel/linux-kernel/files/patch-freebsd-build-support_include_bits_auxv.h
>@@ -1,4 +1,4 @@
>---- freebsd-build-support/include/bits/auxv.h.orig	2016-07-28 10:30:03 UTC
>+--- freebsd-build-support/include/bits/auxv.h.orig	2016-11-26 09:46:45 UTC
> +++ freebsd-build-support/include/bits/auxv.h
> @@ -0,0 +1,76 @@
> +/* Copyright (C) 1995-2013 Free Software Foundation, Inc.
>diff --git a/devel/linux-kernel/files/patch-freebsd-build-support_include_elf.h b/devel/linux-kernel/files/patch-freebsd-build-support_include_elf.h
>index 0807b2a..475233f 100644
>--- a/devel/linux-kernel/files/patch-freebsd-build-support_include_elf.h
>+++ b/devel/linux-kernel/files/patch-freebsd-build-support_include_elf.h
>@@ -1,4 +1,4 @@
>---- freebsd-build-support/include/elf.h.orig	2016-07-28 10:30:03 UTC
>+--- freebsd-build-support/include/elf.h.orig	2016-11-26 09:46:45 UTC
> +++ freebsd-build-support/include/elf.h
> @@ -0,0 +1,3304 @@
> +/* This file defines standard ELF types, structures, and macros.
>diff --git a/devel/linux-kernel/files/patch-scripts_kconfig_lxdialog_check-lxdialog.sh b/devel/linux-kernel/files/patch-scripts_kconfig_lxdialog_check-lxdialog.sh
>index 3b96b97..b8aa9fd 100644
>--- a/devel/linux-kernel/files/patch-scripts_kconfig_lxdialog_check-lxdialog.sh
>+++ b/devel/linux-kernel/files/patch-scripts_kconfig_lxdialog_check-lxdialog.sh
>@@ -1,4 +1,4 @@
>---- scripts/kconfig/lxdialog/check-lxdialog.sh.orig	2016-07-27 15:42:34 UTC
>+--- scripts/kconfig/lxdialog/check-lxdialog.sh.orig	2016-11-26 08:57:13 UTC
> +++ scripts/kconfig/lxdialog/check-lxdialog.sh
> @@ -4,39 +4,14 @@
>  # What library to link
>diff --git a/devel/linux-kernel/files/patch-scripts_package_buildtar b/devel/linux-kernel/files/patch-scripts_package_buildtar
>index 78c9ed1..a49ddbb 100644
>--- a/devel/linux-kernel/files/patch-scripts_package_buildtar
>+++ b/devel/linux-kernel/files/patch-scripts_package_buildtar
>@@ -1,4 +1,4 @@
>---- scripts/package/buildtar.orig	2016-07-27 15:42:34 UTC
>+--- scripts/package/buildtar.orig	2016-11-26 08:57:13 UTC
> +++ scripts/package/buildtar
> @@ -57,7 +57,7 @@ mkdir -p -- "${tmpdir}/boot"
>  # Try to install modules

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 214851: 177415 | 177769 | 177912