Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Dec 2016 13:09:46 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429415 - in head/devel/linux-kernel: . files
Message-ID:  <201612251309.uBPD9kQV015715@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Dec 25 13:09:46 2016
New Revision: 429415
URL: https://svnweb.freebsd.org/changeset/ports/429415

Log:
  - Update to 4.9
  
  PR:		214851
  Submitted by:	t@tobik.me (maintainer)

Added:
  head/devel/linux-kernel/files/patch-Makefile   (contents, props changed)
Deleted:
  head/devel/linux-kernel/files/patch-Documentation_DocBook_media_Makefile
Modified:
  head/devel/linux-kernel/Makefile
  head/devel/linux-kernel/distinfo

Modified: head/devel/linux-kernel/Makefile
==============================================================================
--- head/devel/linux-kernel/Makefile	Sun Dec 25 13:00:05 2016	(r429414)
+++ head/devel/linux-kernel/Makefile	Sun Dec 25 13:09:46 2016	(r429415)
@@ -29,7 +29,7 @@
 # LINUX_MOD_INSTALL_PATH.
 
 PORTNAME=	linux-kernel
-PORTVERSION=	4.7.9
+PORTVERSION=	4.9
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/linux/kernel/v4.x
 DISTNAME=	linux-${DISTVERSION}
@@ -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}" \

Modified: head/devel/linux-kernel/distinfo
==============================================================================
--- head/devel/linux-kernel/distinfo	Sun Dec 25 13:00:05 2016	(r429414)
+++ head/devel/linux-kernel/distinfo	Sun Dec 25 13:09:46 2016	(r429415)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477009617
-SHA256 (linux-4.7.9.tar.xz) = 0638d52a86079d726817d895ae4030b09e3e649222a9590603dd7771155ae28d
-SIZE (linux-4.7.9.tar.xz) = 90421756
+TIMESTAMP = 1481549641
+SHA256 (linux-4.9.tar.xz) = 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a
+SIZE (linux-4.9.tar.xz) = 93192404

Added: head/devel/linux-kernel/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/linux-kernel/files/patch-Makefile	Sun Dec 25 13:09:46 2016	(r429415)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2016-12-12 13:41:07 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/ \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612251309.uBPD9kQV015715>