View | Details | Raw Unified | Return to bug 214851 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +7 lines)
Lines 29-35 Link Here
29 
# LINUX_MOD_INSTALL_PATH.
 29 
# LINUX_MOD_INSTALL_PATH.
30 

          30
          

        

        

          31
          
PORTNAME=	linux-kernel

          31
          
PORTNAME=	linux-kernel

        

          
            

              32
              
PORTVERSION=	4.7.9


              32
              
PORTVERSION=	4.8.11

            

        

          33
          
CATEGORIES=	devel

          33
          
CATEGORIES=	devel

        

        

          34
          
MASTER_SITES=	KERNEL_ORG/linux/kernel/v4.x

          34
          
MASTER_SITES=	KERNEL_ORG/linux/kernel/v4.x

        

        

          35
          
DISTNAME=	linux-${DISTVERSION}

          35
          
DISTNAME=	linux-${DISTVERSION}

        

  

    
      
            Lines 72-78
          
      
      
        Link Here
      
    
  

        

          72
          
.endif

          72
          
.endif

        

        

          73
          

          73
          

        

        

          74
          
OPTIONS_DEFINE=	FIRMWARE KVM MODULES XEN

          74
          
OPTIONS_DEFINE=	FIRMWARE KVM MODULES XEN

        

          
            

              75
              
OPTIONS_DEFAULT=	KVM


              75
              
OPTIONS_DEFAULT=	KVM XEN

            

        

          76
          

          76
          

        

        

          77
          
FIRMWARE_DESC=	Install firmware

          77
          
FIRMWARE_DESC=	Install firmware

        

        

          78
          
KVM_DESC=	KVM guest kernel support

          78
          
KVM_DESC=	KVM guest kernel support

        

  

    
      
            Lines 109-128
          
      
      
        Link Here
      
    
  

        

          109
          
## For menuconfig, config, etc.

          109
          
## For menuconfig, config, etc.

        

        

          110
          
HOST_EXTRACFLAGS+=	-DCURSES_LOC='<ncurses.h>' -DKBUILD_NO_NLS=1

          110
          
HOST_EXTRACFLAGS+=	-DCURSES_LOC='<ncurses.h>' -DKBUILD_NO_NLS=1

        

        

          111
          
HOST_LOADLIBES+=	-Wl,-rpath=${LOCALBASE}/lib

          111
          
HOST_LOADLIBES+=	-Wl,-rpath=${LOCALBASE}/lib

        

            

              
              
              112
              
LINUX_ARCH?=	x86

            

            

              113
              
LINUX_SUBARCH?=	x86

            

        

          112
          
LINUX_INSTALL_PATH?=	${PREFIX}/linux-kernel

          114
          
LINUX_INSTALL_PATH?=	${PREFIX}/linux-kernel

        

        

          113
          
LINUX_MOD_INSTALL_PATH?=	${LINUX_INSTALL_PATH}

          115
          
LINUX_MOD_INSTALL_PATH?=	${LINUX_INSTALL_PATH}

        

        

          114
          
## Pretend to be Linux (for ACPI)

          116
          
## Pretend to be Linux (for ACPI)

        

        

          115
          
KCFLAGS+=		-D_LINUX -D__linux__

          117
          
KCFLAGS+=		-D_LINUX -D__linux__

        

        

          116
          
HOST_EXTRACFLAGS+=	-I${BUILD_WRKSRC}/freebsd-build-support/include

          118
          
HOST_EXTRACFLAGS+=	-I${BUILD_WRKSRC}/freebsd-build-support/include

        

          
            

              117
              
## Make sure ${LOCALBASE}/bin is in the PATH so Linux will build in


              119
              
## Make sure ${LOCALBASE}/bin is in the PATH for Poudriere/Synth

            

            

              118
              
## Poudriere


              
              
            

        

          119
          
MAKE_ENV+=	PATH="${BUILD_WRKSRC}/freebsd-build-support/bin:${LOCALBASE}/bin:${PATH}" \

          120
          
MAKE_ENV+=	PATH="${BUILD_WRKSRC}/freebsd-build-support/bin:${LOCALBASE}/bin:${PATH}" \

        

        

          120
          
		HOST_EXTRACFLAGS="${HOST_EXTRACFLAGS}" \

          121
          
		HOST_EXTRACFLAGS="${HOST_EXTRACFLAGS}" \

        

        

          121
          
		HOST_LOADLIBES="${HOST_LOADLIBES}" \

          122
          
		HOST_LOADLIBES="${HOST_LOADLIBES}" \

        

        

          122
          
		KCFLAGS="${KCFLAGS}" \

          123
          
		KCFLAGS="${KCFLAGS}" \

        

        

          123
          
		BASH="${LOCALBASE}/bin/bash"

          124
          
		BASH="${LOCALBASE}/bin/bash"

        

          
            

              124
              
#	-j${MAKE_JOBS_NUMBER}


              125
              
MAKE_ARGS+=	ARCH="${LINUX_ARCH}" \

            

            

              125
              
MAKE_ARGS+=	ARCH="x86" \


              126
              
		SUBARCH="${LINUX_SUBARCH}" \

            

        

          126
          
		KCONFIG_CONFIG="${LINUX_KCONFIG}" \

          127
          
		KCONFIG_CONFIG="${LINUX_KCONFIG}" \

        

        

          127
          
		INSTALL_PATH="${STAGEDIR}${LINUX_INSTALL_PATH}" \

          128
          
		INSTALL_PATH="${STAGEDIR}${LINUX_INSTALL_PATH}" \

        

        

          128
          
		INSTALL_MOD_PATH="${STAGEDIR}${LINUX_MOD_INSTALL_PATH}" \

          129
          
		INSTALL_MOD_PATH="${STAGEDIR}${LINUX_MOD_INSTALL_PATH}" \

        



(-)distinfo
      (-3 / +3 lines)




  

    
      
            Lines 1-3
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1477009617


              1
              
TIMESTAMP = 1480157127

            

            

              2
              
SHA256 (linux-4.7.9.tar.xz) = 0638d52a86079d726817d895ae4030b09e3e649222a9590603dd7771155ae28d


              2
              
SHA256 (linux-4.8.11.tar.xz) = cc0f42f408ba3e51f8b0e93e3d8050ff18569456d286cb2a1aca3327dd06890f

            

            

              3
              
SIZE (linux-4.7.9.tar.xz) = 90421756


              3
              
SIZE (linux-4.8.11.tar.xz) = 91976832

            



(-)files/patch-Documentation_DocBook_media_Makefile
      (-11 lines)




  

    
      
            Lines 1-11
          
      
      
        Link Here
      
    
  

            

              1
              
--- Documentation/DocBook/media/Makefile.orig	2016-07-27 15:42:34 UTC

              
              
            

            

              2
              
+++ Documentation/DocBook/media/Makefile

            

            

              3
              
@@ -2,7 +2,7 @@

            

            

              4
              
 # Media build rules - Auto-generates media contents/indexes and *.h xml's

            

            

              5
              
 #

            

            

              6
              
 

            

            

              7
              
-SHELL=/bin/bash

            

            

              8
              
+SHELL!=which bash

            

            

              9
              
 

            

            

              10
              
 MEDIA_OBJ_DIR=$(objtree)/Documentation/DocBook/

            

            

              11
              
 MEDIA_SRC_DIR=$(srctree)/Documentation/DocBook/media

            



(-)files/patch-Makefile
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- Makefile.orig	2016-11-26 09:52:06 UTC

            

            

              2
              
+++ Makefile

            

            

              3
              
@@ -225,7 +225,7 @@ export srctree objtree VPATH

            

            

              4
              
 # then ARCH is assigned, getting whatever value it gets normally, and

            

            

              5
              
 # SUBARCH is subsequently ignored.

            

            

              6
              
 

            

            

              7
              
-SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \

            

            

              8
              
+SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/amd64/x86/ \

            

            

              9
              
 				  -e s/sun4u/sparc64/ \

            

            

              10
              
 				  -e s/arm.*/arm/ -e s/sa110/arm/ \

            

            

              11
              
 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \

            






  

  Return to bug 214851