Changeset 3886

Show
Ignore:
Timestamp:
10/17/09 23:59:19 (3 years ago)
Author:
tg
Message:

• better attempt: patch CONFIG_PREFIX automagically
• while here, prevent bbconfig.ipv6 from being appended to bbconfig.custom

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/busybox/Config.in

    r3885 r3886  
    3131 
    3232          To generate it: make package=busybox patch; cd build*/w-busybox*/busy* 
    33           and make menuconfig, then use the .config file created. Be sure to 
    34           change the prefix setting line to 'CONFIG_PREFIX="@IDIR@"' though! 
     33          and make menuconfig, then use the .config file created. 
    3534 
    3635endchoice 

  • trunk/freewrt/package/busybox/Makefile

    r3849 r3886  
    2020ifneq ($(strip ${FWRT_PACKAGE_BUSYBOX_SMALL}),) 
    2121BBCONFIG_TO_USE=        bbconfig.norm 
     22BBCONFIG_CREATE=        1 
    2223else ifneq ($(strip ${FWRT_PACKAGE_BUSYBOX_CUSTOM}),) 
    2324BBCONFIG_TO_USE=        bbconfig.custom 
     25BBCONFIG_CREATE=        0       # prevent bbconfig.ipv6 from being appended 
    2426else 
    2527BBCONFIG_TO_USE=        bbconfig.full 
     28BBCONFIG_CREATE=        1 
    2629endif 
    2730 
    …… 
    3134                exit 1; \ 
    3235        fi 
    33         sed 's@IDIR@${IDIR_BUSYBOX}' ${BBCONFIG_TO_USE} >${WRKBUILD}/.config 
    34 ifeq ($(FWRT_IPV6),y) 
     36        grep -v '^CONFIG_PREFIX=' ${BBCONFIG_TO_USE} >${WRKBUILD}/.config 
     37        echo 'CONFIG_PREFIX=${IDIR_BUSYBOX}' >>${WRKBUILD}/.config 
     38ifeq ($(FWRT_IPV6)$(BBCONFIG_CREATE},y1) 
    3539        cat bbconfig.ipv6 >>${WRKBUILD}/.config 
    3640endif