Changeset 2049

Show
Ignore:
Timestamp:
02/17/07 21:08:49 (5 years ago)
Author:
tg
Message:

fix up the ${UNAME_*} mess for non-2.4-mipsel targets
(besides mipsel and i386, other targets may be added later)

kernel upgraders: the version number is now set in rules.mk!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/vars.mk

    r1918 r2049  
    6464RSTRIP:=                prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh 
    6565 
    66 # XXX derive these from FWRT_* vars 
    67 UNAME_S:=               Linux 
    68 UNAME_R:=               2.4.34 
    69 UNAME_M:=               mips 
    70  
    7166EXTRACT_CMD=            mkdir -p ${WRKDIR}; \ 
    7267                        cd ${WRKDIR} && \ 

  • trunk/freewrt/rules.mk

    r1755 r2049  
    6565endif 
    6666 
     67# XXX derive these from FWRT_* vars 
     68UNAME_S:=               Linux 
     69 
     70ifeq ($(strip ${FWRT_LINUX_2_4_BRCM}),y) 
     71UNAME_R:=               2.4.34 
     72else ifeq ($(strip ${FWRT_LINUX_2_6_BRCM}),y) 
     73UNAME_R:=               2.6.19.1 
     74else ifeq ($(strip ${FWRT_LINUX_2_4_RB}),y) 
     75UNAME_R:=               2.4.34 
     76else ifeq ($(strip ${FWRT_LINUX_2_6_RB}),y) 
     77UNAME_R:=               2.6.19.1 
     78else ifeq ($(strip ${FWRT_LINUX_2_6_X86}),y) 
     79UNAME_R:=               2.6.19.1 
     80else 
     81$(error Cannot determine target "uname -r" output) 
     82endif 
     83 
     84ifeq ($(strip ${FWRT_mipsel}),y) 
     85UNAME_M:=               mips 
     86else ifeq ($(strip ${FWRT_i386}),y) 
     87UNAME_M:=               i386 
     88else 
     89$(error Cannot determine target "uname -m" output) 
     90endif 
     91 
    6792export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH 
    6893export UNAME_S UNAME_R UNAME_M 

  • trunk/freewrt/target/linux/brcm-2.4/Makefile

    r1686 r2049  
    77include $(TOPDIR)/rules.mk 
    88 
    9 LINUX_VERSION:=2.4.34 
    10 LINUX_RELEASE:=1 
    11 LINUX_KERNEL_MD5SUM:=f59665540a7f3351ea416a0dad104b55 
     9LINUX_VERSION:=                ${UNAME_R} 
     10LINUX_RELEASE:=                1 
     11LINUX_KERNEL_MD5SUM:=  f59665540a7f3351ea416a0dad104b55 
    1212 
    1313include $(TOPDIR)/mk/kernel.mk 

  • trunk/freewrt/target/linux/rb-2.4/Makefile

    r1686 r2049  
    77include $(TOPDIR)/rules.mk 
    88 
    9 LINUX_VERSION:=2.4.34 
    10 LINUX_RELEASE:=1 
    11 LINUX_KERNEL_MD5SUM:=f59665540a7f3351ea416a0dad104b55 
     9LINUX_VERSION:=                ${UNAME_R} 
     10LINUX_RELEASE:=                1 
     11LINUX_KERNEL_MD5SUM:=  f59665540a7f3351ea416a0dad104b55 
    1212 
    1313include $(TOPDIR)/mk/kernel.mk 

  • trunk/freewrt/target/linux/rb-2.6/Makefile

    r1686 r2049  
    77include $(TOPDIR)/rules.mk 
    88 
    9 LINUX_VERSION:=2.6.19.1 
    10 LINUX_RELEASE:=1 
    11 LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be 
     9LINUX_VERSION:=                ${UNAME_R} 
     10LINUX_RELEASE:=                1 
     11LINUX_KERNEL_MD5SUM:=  2ab08fdfddc00e09b3d5bc7397d3c8be 
    1212 
    1313include $(TOPDIR)/mk/kernel.mk 

  • trunk/freewrt/target/linux/x86-2.6/Makefile

    r2035 r2049  
    77include $(TOPDIR)/rules.mk 
    88 
    9 LINUX_VERSION:=2.6.19.1 
    10 LINUX_RELEASE:=1 
    11 LINUX_KERNEL_MD5SUM:=2ab08fdfddc00e09b3d5bc7397d3c8be 
     9LINUX_VERSION:=                ${UNAME_R} 
     10LINUX_RELEASE:=                1 
     11LINUX_KERNEL_MD5SUM:=  2ab08fdfddc00e09b3d5bc7397d3c8be 
    1212 
    1313include $(TOPDIR)/mk/kernel.mk