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

[patch] linux-kernel.diff

linux-kernel.diff (text/plain), 3.69 KB, created by Tobias Kortkamp on 2016-12-07 22:56:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-12-07 22:56:42 UTC

Size: 3.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 428088)
>+++ Makefile	(working copy)
>@@ -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 @@
> .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 @@
> ## 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}" \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 428088)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-Documentation_DocBook_media_Makefile
>===================================================================
>--- files/patch-Documentation_DocBook_media_Makefile	(revision 428088)
>+++ files/patch-Documentation_DocBook_media_Makefile	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-Documentation_DocBook_media_Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(nonexistent)
>+++ files/patch-Makefile	(working copy)
>@@ -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/ \

Flags:

tobik: maintainer-approval+

Actions: View | Diff

Attachments on bug 214851: 177415 | 177769 | 177912