Changeset 534

Show
Ignore:
Timestamp:
08/24/06 23:59:49 (2 years ago)
Author:
tg
Message:

* .defconfig: remove superfluous commented-out targets
* build.mk: move some targets out of the if-have-.config
* build.mk, Makefile: hopefully fix wbx@' snapshot target
* Makefile: sync licence

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/.defconfig

    r529 r534  
    1414# 
    1515FWRT_LINUX_MODEL 
    16 # FWRT_LINUX_2_4_BRCM_ASUS_WL500G=y 
    17 # FWRT_LINUX_2_4_BRCM_ASUS_WL500G_DELUXE is not set 
    18 # FWRT_LINUX_2_4_BRCM_ASUS_WL500G_PREMIUM is not set 
    19 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_1_0 is not set 
    20 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_1_1 is not set 
    21 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_2_0 is not set 
    22 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_3_0 is not set 
    23 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G_2_2 is not set 
    24 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_1_0 is not set 
    25 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_1_1 is not set 
    26 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_4 is not set 
    27 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRTSL54GS is not set 
    28 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GL is not set 
    29 # FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G3G is not set 
    30 # FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U is not set 
    3116FWRT_TARGET_ROOTFS_SQUASHFS_LZMA=y 
    3217# FWRT_TARGET_ROOTFS_JFFS2 is not set 

  • trunk/freewrt/Makefile

    r532 r534  
    1 # $FreeWRT: src/share/misc/licence.template,v 1.7 2006/04/09 22:08:49 tg Rel $ 
     1# $FreeWRT: src/share/misc/licence.template,v 1.14 2006/08/09 19:35:23 tg Rel $ 
    22#- 
    33# Copyright (c) 2006 
    …… 
    1111# or other materials provided with binary redistributions. 
    1212# 
    13 # All advertising materials mentioning features or use of this soft- 
    14 # ware must display the following acknowledgement: 
     13# Advertising materials mentioning features or use of this work must 
     14# display the following acknowledgement: 
    1515#       This product includes material provided by Thorsten Glaser. 
    1616# This acknowledgement does not need to be reprinted if this work is 
    1717# linked into a bigger work whose licence does not allow such clause 
    1818# and the author of this work is given due credit in the bigger work 
    19 # or its documentation. Specifically, re-using this code in any work 
    20 # covered by the GNU General Public License version 1 or Library Ge- 
    21 # neral Public License (any version) is permitted. 
     19# or its documentation. 
    2220# 
    2321# Licensor offers the work "AS IS" and WITHOUT WARRANTY of any kind, 
    …… 
    2826# direct error of said person and intended use of this work, loss or 
    2927# other issues arising in any way out of its use, even if advised of 
    30 # the possibility of such damage or existence of a nontrivial bug. 
     28# the possibility of such damage or existence of a defect. 
    3129 
    3230GMAKE?=         $(PWD)/lbin/gmake 
    …… 
    7270        @${GMAKE_INV} autobuild 
    7371 
    74 snapshot: .prereq_done 
    75         @${GMAKE_INV} snapshot 
     72snapshot: snapshots/.snapshot_done 
     73 
     74snapshots/.snapshot_done: .prereq_done .defconfig 
     75        -rm -rf snapshots 
     76        mkdir snapshots 
     77        ${GMAKE_INV} clean 
     78        for target in $$(awk '/^config FWRT_LINUX/ { print $$2 }' \ 
     79            target/Config.in); do ' 
     80                sed "s!FWRT_LINUX_MODEL!$$target!g" <.defconfig >.config; \ 
     81                ${GMAKE_INV} package/config/conf; \ 
     82                package/config/conf -d Config.in; \ 
     83                ${GMAKE_INV} all; \ 
     84                cp bin/freewrt-* snapshots/; \ 
     85                ${GMAKE_INV} clean; \ 
     86        done 
    7687 
    7788package_index: .prereq_done 

  • trunk/freewrt/build.mk

    r532 r534  
    1111CONFIG = package/config 
    1212 
    13 noconfig_targets := menuconfig config tags autobuild snapshot 
     13noconfig_targets := menuconfig config tags autobuild 
    1414 
    1515# Pull in the user's configuration file 
    …… 
    101101        @echo "Start the build with \"make\" or with \"make v\" to be verbose" 
    102102 
    103 $(SNAPSHOT_DIR): 
    104         @mkdir -p snapshots 
     103tools/install-lbin: 
     104        $(MAKE) -C tools install-lbin 
     105 
     106endif # ifeq ($(strip $(FWRT_HAVE_DOT_CONFIG)),y) 
    105107 
    106108# configuration 
    …… 
    108110 
    109111$(CONFIG)/conf: 
    110         @$(MAKE) -C $(CONFIG) conf > /dev/null 2>&1 
     112        @$(MAKE) -C $(CONFIG) conf >/dev/null 2>&1 
    111113$(CONFIG)/mconf: 
    112         @$(MAKE) -C $(CONFIG) > /dev/null 2>&1 
     114        @$(MAKE) -C $(CONFIG) >/dev/null 2>&1 
    113115 
    114116menuconfig: $(CONFIG)/mconf 
    …… 
    129131        @grep -v ^BUSYBOX .config > .config.autobuild 
    130132        @cat .busybox-config .config.autobuild > .config 
    131  
    132 snapshot: $(CONFIG)/conf $(SNAPSHOT_DIR) 
    133         @-touch .config  
    134         @$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)  
    135         @for i in `awk '/^config FWRT_LINUX/ { print $$2 }' target/Config.in`; \ 
    136         do \ 
    137                 $(TOPDIR)/lbin/sed -i -e s#FWRT_LINUX_MODEL#$$i# .config && \ 
    138                 $(MAKE) && \ 
    139                 cp bin/freewrt-* snapshots/ && \ 
    140                 $(MAKE) clean; \ 
    141         done 
    142  
    143 tools/install-lbin: 
    144         $(MAKE) -C tools install-lbin 
    145  
    146 endif # ifeq ($(strip $(FWRT_HAVE_DOT_CONFIG)),y)