[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Kernel 2.1.125 a 2.2.20-pre6: Makefile.rej



On lun, ene 11, 1999 at 07:19:22 -0600, Marcelo E. Magallon wrote:
> >> Javier Viñuales Gutiérrez <vigu@ctv.es> writes:
> 
>  >    He comprobado que hasta el parche 2.1.131 la cosa va bien pero con el
>  >    2.1.132, el SUBLEVEL no varía, se mantiene en 131 y aparecen:
>  >    Makefile.orig y Makefile.rej
> 
>  Curioso...
> 
>  El parche del 2.1.132 dice:
> 
>  diff -u --recursive --new-file v2.1.131/linux/Makefile linux/Makefile
>  --- v2.1.131/linux/Makefile     Wed Dec 16 10:32:54 1998
>  +++ linux/Makefile      Fri Dec 18 14:01:48 1998
>  @@ -1,18 +1,9 @@
>   VERSION = 2
>   PATCHLEVEL = 1
>  -SUBLEVEL = 131
>  +SUBLEVEL = 132
>   
>   ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/-e s/arm.*/arm/ -e s/sa110/arm/)
> 
>  [y otras cosas]
> 
>  ¿me mandas un copia de Makefile.rej? Allí dice que falló...

Aqui va el "/usr/src/linux/Makefile.rej", espero que aclare algo yo no se
que hacer el.
-- 

Javier Viñuales Gutiérrez 
vigu@ctv.es

***************
*** 1,18 ****
  VERSION = 2
  PATCHLEVEL = 1
- SUBLEVEL = 131
  
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
  
- #
- # For SMP kernels, set this. We don't want to have this in the config file
- # because it makes re-config very ugly and too many fundamental files depend
- # on "CONFIG_SMP"
- #
- # For UP operations COMMENT THIS OUT, simply setting SMP = 0 won't work
- #
- SMP = 1
- 
  .EXPORT_ALL_VARIABLES:
  
  CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
--- 1,9 ----
  VERSION = 2
  PATCHLEVEL = 1
+ SUBLEVEL = 132
  
  ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
  
  .EXPORT_ALL_VARIABLES:
  
  CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \

Reply to: