- Update to 4.9

PR:		214851
Submitted by:	t@tobik.me (maintainer)
This commit is contained in:
Dmitry Marakasov 2016-12-25 13:09:46 +00:00
parent 416ee499ab
commit c500583f40
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=429415
4 changed files with 20 additions and 19 deletions

View file

@ -29,7 +29,7 @@
# LINUX_MOD_INSTALL_PATH. # LINUX_MOD_INSTALL_PATH.
PORTNAME= linux-kernel PORTNAME= linux-kernel
PORTVERSION= 4.7.9 PORTVERSION= 4.9
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/linux/kernel/v4.x MASTER_SITES= KERNEL_ORG/linux/kernel/v4.x
DISTNAME= linux-${DISTVERSION} DISTNAME= linux-${DISTVERSION}
@ -109,20 +109,21 @@ INSTALL_TARGET+= firmware_install
## For menuconfig, config, etc. ## For menuconfig, config, etc.
HOST_EXTRACFLAGS+= -DCURSES_LOC='<ncurses.h>' -DKBUILD_NO_NLS=1 HOST_EXTRACFLAGS+= -DCURSES_LOC='<ncurses.h>' -DKBUILD_NO_NLS=1
HOST_LOADLIBES+= -Wl,-rpath=${LOCALBASE}/lib HOST_LOADLIBES+= -Wl,-rpath=${LOCALBASE}/lib
LINUX_ARCH?= x86
LINUX_SUBARCH?= x86
LINUX_INSTALL_PATH?= ${PREFIX}/linux-kernel LINUX_INSTALL_PATH?= ${PREFIX}/linux-kernel
LINUX_MOD_INSTALL_PATH?= ${LINUX_INSTALL_PATH} LINUX_MOD_INSTALL_PATH?= ${LINUX_INSTALL_PATH}
## Pretend to be Linux (for ACPI) ## Pretend to be Linux (for ACPI)
KCFLAGS+= -D_LINUX -D__linux__ KCFLAGS+= -D_LINUX -D__linux__
HOST_EXTRACFLAGS+= -I${BUILD_WRKSRC}/freebsd-build-support/include HOST_EXTRACFLAGS+= -I${BUILD_WRKSRC}/freebsd-build-support/include
## Make sure ${LOCALBASE}/bin is in the PATH so Linux will build in ## Make sure ${LOCALBASE}/bin is in the PATH for Poudriere/Synth
## Poudriere
MAKE_ENV+= PATH="${BUILD_WRKSRC}/freebsd-build-support/bin:${LOCALBASE}/bin:${PATH}" \ MAKE_ENV+= PATH="${BUILD_WRKSRC}/freebsd-build-support/bin:${LOCALBASE}/bin:${PATH}" \
HOST_EXTRACFLAGS="${HOST_EXTRACFLAGS}" \ HOST_EXTRACFLAGS="${HOST_EXTRACFLAGS}" \
HOST_LOADLIBES="${HOST_LOADLIBES}" \ HOST_LOADLIBES="${HOST_LOADLIBES}" \
KCFLAGS="${KCFLAGS}" \ KCFLAGS="${KCFLAGS}" \
BASH="${LOCALBASE}/bin/bash" BASH="${LOCALBASE}/bin/bash"
# -j${MAKE_JOBS_NUMBER} MAKE_ARGS+= ARCH="${LINUX_ARCH}" \
MAKE_ARGS+= ARCH="x86" \ SUBARCH="${LINUX_SUBARCH}" \
KCONFIG_CONFIG="${LINUX_KCONFIG}" \ KCONFIG_CONFIG="${LINUX_KCONFIG}" \
INSTALL_PATH="${STAGEDIR}${LINUX_INSTALL_PATH}" \ INSTALL_PATH="${STAGEDIR}${LINUX_INSTALL_PATH}" \
INSTALL_MOD_PATH="${STAGEDIR}${LINUX_MOD_INSTALL_PATH}" \ INSTALL_MOD_PATH="${STAGEDIR}${LINUX_MOD_INSTALL_PATH}" \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1477009617 TIMESTAMP = 1481549641
SHA256 (linux-4.7.9.tar.xz) = 0638d52a86079d726817d895ae4030b09e3e649222a9590603dd7771155ae28d SHA256 (linux-4.9.tar.xz) = 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a
SIZE (linux-4.7.9.tar.xz) = 90421756 SIZE (linux-4.9.tar.xz) = 93192404

View file

@ -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

View file

@ -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/ \