Changeset 7e671e6 in freewrt


Ignore:
Timestamp:
Sep 25, 2006, 11:16:56 PM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Branches:
freewrt_1_0, freewrt_2_0
Children:
0519ae9
Parents:
6fc4520e
Message:
  • add PKG_VERSION to every package in default selection
  • add broadcom-scripts package as default for 1.0, it adds network and switch configuration scripts to base suggested by markus to separate these from webif package
  • move ed to application and disable by default, sorry tg, but not everybody needs it
  • be sure that if broadcom-scripts are installed, new ifup/ifdown network configuration is not used

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@719 afb5a338-a214-0410-bd46-81f09a774fd1

Files:
3 added
2 deleted
19 edited
4 moved

Legend:

Unmodified
Added
Removed

  • package/Config.in

    r6fc4520e r7e671e6  
    1111menu "Base system"
    1212source "package/busybox/Config.in"
    13 source "package/ed/Config.in"
    1413source "package/fwcf/Config.in"
    15 menu "Board specific packages"
    1614menu "Broadcom"
    1715source "package/broadcom-nas/Config.in"
     16source "package/broadcom-scripts/Config.in"
    1817source "package/nvram/Config.in"
    1918source "package/jffs2root/Config.in"
    … …  
    2120source "package/broadcom-watchbutton/Config.in"
    2221source "package/webif/Config.in"
    23 endmenu
    2422endmenu
    2523endmenu
    … …  
    3735source "package/deco/Config.in"
    3836source "package/digitemp/Config.in"
     37source "package/ed/Config.in"
    3938source "package/elinks/Config.in"
    4039source "package/fetchmail/Config.in"

  • package/Makefile

    r6fc4520e r7e671e6  
    2323package-$(FWRT_PACKAGE_BRIDGE_UTILS) += bridge-utils
    2424package-$(FWRT_PACKAGE_BROADCOM_NAS) += broadcom-nas
     25package-$(FWRT_PACKAGE_BROADCOM_SCRIPTS) += broadcom-scripts
    2526package-$(FWRT_PACKAGE_BROADCOM_WATCHBUTTON) += broadcom-watchbutton
    2627package-$(FWRT_PACKAGE_BUSYBOX) += busybox

  • package/base-files-arch/Makefile

    r6fc4520e r7e671e6  
    99
    1010PKG_NAME:=              base-files-arch
     11PKG_VERSION:=           1.0
    1112PKG_RELEASE:=           2
    1213
    … …  
    1617include $(TOPDIR)/mk/package.mk
    1718
    18 IDIR_BASE_ARCH:=$(WRKBUILD)/$(PKG_NAME)
    19 IPKG_BASE_ARCH:=$(PACKAGE_DIR)/base-files-arch_$(PKG_RELEASE)_$(ARCH).ipk
     19IDIR_BASE_ARCH:=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION)
     20IPKG_BASE_ARCH:=$(PACKAGE_DIR)/base-files-arch_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
    2021
    2122$(WRKBUILD)/.prepared:
    … …  
    3132$(IPKG_BASE_ARCH):
    3233        mkdir -p $(IDIR_BASE_ARCH)
    33         $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE_ARCH) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
     34        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE_ARCH) ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
    3435        -[ -d $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/files ] && \
    3536                $(CP) $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/files/* $(IDIR_BASE_ARCH)

  • package/base-files/Makefile

    r6fc4520e r7e671e6  
    99
    1010PKG_NAME:=              base-files
    11 PKG_RELEASE:=           12
     11PKG_VERSION:=           1.0
     12PKG_RELEASE:=           13
    1213WRKSRC=                 ${WRKDIR}/base-files
    1314
    … …  
    2122include $(TOPDIR)/mk/package.mk
    2223
    23 IDIR_BASE:=$(WRKBUILD)/base-files
    24 IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
     24IDIR_BASE:=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION)
     25IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
    2526
    2627UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
    … …  
    7374
    7475$(IPKG_BASE):
    75         $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH)
     76        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
    7677        $(CP) ./files/* $(IDIR_BASE)
    7778        $(SED) 's,$$R,$(REV),g' $(IDIR_BASE)/etc/banner

  • package/base-files/files/etc/init.d/S10boot

    r6fc4520e r7e671e6  
    1212load_modules /etc/modules /etc/modules.d/*
    1313
    14 ifconfig lo 127.0.0.1 up
    15 ifconfig eth0 promisc
    16 
    17 # configure the switch based on nvram
    18 [ -d /proc/switch/eth0 ] && for nr in $(seq 0 15); do
    19         vp="$(nvram get vlan${nr}ports)"
    20         [ -z "$vp" -o -z "$(nvram get vlan${nr}hwname)" ] || \
    21             echo "$vp" >/proc/switch/eth0/vlan/$nr/ports
    22 done
    23 
    2414HOSTNAME=$(</etc/hostname)
    2515HOSTNAME=${HOSTNAME%%.*}
    2616echo ${HOSTNAME:=FreeWRT} >/proc/sys/kernel/hostname
    27 
    28 vconfig set_name_type VLAN_PLUS_VID_NO_PAD

  • package/broadcom-diag/Makefile

    r6fc4520e r7e671e6  
    99
    1010PKG_NAME:=              broadcom-diag
     11PKG_VERSION:=           1.0
    1112PKG_RELEASE:=           1
    1213
    … …  
    1516include $(TOPDIR)/mk/package.mk
    1617
    17 $(eval $(call PKG_template,KMOD_BROADCOM_DIAG,kmod-$(PKG_NAME),$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
     18$(eval $(call PKG_template,KMOD_BROADCOM_DIAG,kmod-$(PKG_NAME),$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
    1819
    1920DIAG_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \

  • package/busybox/files/network.init

    r6fc4520e r7e671e6  
    66autostart)
    77        test x"$network" = x"NO" && exit 0
     8        test x"$brcmnet" = x"YES" && exit 0
    89        exec $0 start
    910        ;;

  • package/ed/Config.in

    r6fc4520e r7e671e6  
    22        prompt "ed................................. Standard Text Editor"
    33        tristate
    4         default y
     4        default n
    55        help
    66          The standard text editor

  • package/jffs2root/Makefile

    r6fc4520e r7e671e6  
    88
    99PKG_NAME:=              jffs2root
     10PKG_VERSION:=           1.0
    1011PKG_RELEASE:=           1
    1112
    12 WRKSRC=                 ${WRKDIR}/$(PKG_NAME)
     13WRKSRC=                 ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)
    1314DISTFILES:=
    1415
    1516include $(TOPDIR)/mk/package.mk
    1617
    17 $(eval $(call PKG_template,JFFS2ROOT,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
     18$(eval $(call PKG_template,JFFS2ROOT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    1819
    1920$(WRKBUILD)/.prepared:

  • package/mtd/Makefile

    r6fc4520e r7e671e6  
    88
    99PKG_NAME:=              mtd
     10PKG_VERSION:=           1.0
    1011PKG_RELEASE:=           5
    1112
    … …  
    1516include $(TOPDIR)/mk/package.mk
    1617
    17 $(eval $(call PKG_template,MTD,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
    18 $(eval $(call PKG_template,MTD_STATIC,mtd-static,$(PKG_RELEASE),$(ARCH)))
     18$(eval $(call PKG_template,MTD,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
     19$(eval $(call PKG_template,MTD_STATIC,mtd-static,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    1920
    2021$(WRKBUILD)/.prepared:

  • package/nvram/Makefile

    r6fc4520e r7e671e6  
    88
    99PKG_NAME:=              nvram
     10PKG_VERSION:=           1.0
    1011PKG_RELEASE:=           1
    1112
    … …  
    1516include $(TOPDIR)/mk/package.mk
    1617
    17 $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
     18$(eval $(call PKG_template,NVRAM,nvram,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    1819
    1920$(WRKBUILD)/.prepared:

  • package/switch/Makefile

    r6fc4520e r7e671e6  
    99
    1010PKG_NAME:=              kmod-switch
    11 PKG_RELEASE:=           1
     11PKG_VERSION:=           0.1
     12PKG_RELEASE:=           2
    1213
    1314DISTFILES:=
    … …  
    1516include $(TOPDIR)/mk/package.mk
    1617
    17 $(eval $(call PKG_template,KMOD_SWITCH_CORE,$(PKG_NAME)-core,$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
    18 $(eval $(call PKG_template,KMOD_SWITCH_ADMTEK,$(PKG_NAME)-admtek,$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
    19 $(eval $(call PKG_template,KMOD_SWITCH_ROBO,$(PKG_NAME)-robo,$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
     18$(eval $(call PKG_template,KMOD_SWITCH_CORE,$(PKG_NAME)-core,$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
     19$(eval $(call PKG_template,KMOD_SWITCH_ADMTEK,$(PKG_NAME)-admtek,$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
     20$(eval $(call PKG_template,KMOD_SWITCH_ROBO,$(PKG_NAME)-robo,$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
    2021
    2122$(WRKBUILD)/.prepared:

  • package/webif/Config.in

    r6fc4520e r7e671e6  
    22        prompt "webif............................. web based configuration tool"
    33        tristate
     4        select FWRT_PACKAGE_BROADCOM_SCRIPTS
     5        select FWRT_PACKAGE_BRIDGE_UTILS
     6        select FWRT_PACKAGE_DNSMASQ
    47        select FWRT_PACKAGE_HASERL
    5         select FWRT_PACKAGE_BRIDGE_UTILS
    68        select FWRT_PACKAGE_IPTABLES
    7         select FWRT_PACKAGE_DNSMASQ
    89        default n
    910        help

  • package/webif/Makefile

    r6fc4520e r7e671e6  
    99PKG_NAME:=              webif
    1010PKG_VERSION:=           0.2
    11 PKG_RELEASE:=           4
     11PKG_RELEASE:=           5
    1212
    1313include $(TOPDIR)/mk/package.mk
    … …  
    3434        $(INSTALL_BIN) $(WRKBUILD)/webif-page $(IDIR_WEBIF)/usr/bin/webif-page
    3535        $(INSTALL_BIN) $(WRKBUILD)/bstrip $(IDIR_WEBIF)/usr/bin/bstrip
    36         $(INSTALL_BIN) ./files/ifup $(IDIR_WEBIF)/sbin/ifup.nvram
    37         $(INSTALL_BIN) ./files/ifdown $(IDIR_WEBIF)/sbin/ifdown.nvram
    3836        ln -sf /www/index.html $(IDIR_WEBIF)/www/index.asp
    3937        $(INSTALL_DIR) $(IDIR_WEBIF)/etc/init.d
    4038        $(INSTALL_BIN) ./files/httpd.init $(IDIR_WEBIF)/etc/init.d/S50httpd-webif
    41         $(INSTALL_BIN) ./files/network.init $(IDIR_WEBIF)/etc/init.d/S40net-webif
    4239        $(INSTALL_BIN) ./files/dnsmasq.init $(IDIR_WEBIF)/etc/init.d/S50dns-webif
    4340        $(INSTALL_BIN) ./files/firewall.init $(IDIR_WEBIF)/etc/init.d/S45fw-webif
    4441        $(INSTALL_DATA) ./files/dnsmasq.conf $(IDIR_WEBIF)/etc/dnsmasq.conf-webif
    45         $(INSTALL_DATA) ./files/network-nvram.sh $(IDIR_WEBIF)/etc/
    4642        find $(IDIR_WEBIF) -name CVS -o -name .svn | xargs rm -rf
    4743        $(IPKG_BUILD) $(IDIR_WEBIF) $(PACKAGE_DIR)

  • package/wificonf/Makefile

    r6fc4520e r7e671e6  
    88
    99PKG_NAME:=              wificonf
     10PKG_VERSION:=           1.0
    1011PKG_RELEASE:=           5
    1112
    … …  
    1516include $(TOPDIR)/mk/package.mk
    1617
    17 $(eval $(call PKG_template,WIFICONF,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
     18$(eval $(call PKG_template,WIFICONF,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    1819
    1920$(WRKBUILD)/.prepared:

  • package/wlcompat/Makefile

    r6fc4520e r7e671e6  
    99
    1010PKG_NAME:=              kmod-wlcompat
     11PKG_VERSION:=           1.0
    1112PKG_RELEASE:=           3
    1213PKG_MODULE:=            30
    … …  
    1617include $(TOPDIR)/mk/package.mk
    1718
    18 $(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
    19 $(eval $(call PKG_template,KMOD_WLCOMPAT_DEBUG,$(PKG_NAME)-debug,$(KERNEL_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
     19$(eval $(call PKG_template,KMOD_WLCOMPAT,$(PKG_NAME),$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
     20$(eval $(call PKG_template,KMOD_WLCOMPAT_DEBUG,$(PKG_NAME)-debug,$(KERNEL_VERSION)-$(BOARD)-$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
    2021
    2122WLCOMPAT_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \

  • target/linux/brcm-2.4/asus-wl500g-deluxe/files/etc/preinit.arch

    r6fc4520e r7e671e6  
    11#!/bin/sh
    22
    3 [ "$(nvram get boot_wait)" != "on" ] && {
    4         nvram set boot_wait=on
    5         nvram commit
    6 }
    7 
     3# load diag led and button module
    84insmod diag
    95echo 0x01 >/proc/sys/diag
     6
     7# load switch modules
     8insmod switch-core
     9insmod switch-robo
     10

  • target/linux/brcm-2.4/files/etc/preinit.arch

    r6fc4520e r7e671e6  
    88insmod diag
    99echo 0x01 >/proc/sys/diag
    10 
    11 # WAP54G, WL-HDD
    12 [ "$(nvram get boardnum)" = 2 \
    13     -o \( "$(nvram get boardnum)" = asusX \
    14     -a "$(nvram get et1phyaddr)" -eq 1 \) ] && failsafe_if=eth1
    1510
    1611insmod switch-core

  • target/linux/brcm-2.4/netgear-wgt634u/files/etc/preinit.arch

    r6fc4520e r7e671e6  
    77insmod switch-robo
    88
    9 # save the boot loader's vlan config
    10 # we need it on some routers that have no vlan*ports set
    11 [ -d /proc/switch/eth0 ] && {
    12         v0p="$(</proc/switch/eth0/vlan/0/ports)"
    13         v1p="$(</proc/switch/eth0/vlan/1/ports)"
    14         v2p="$(</proc/switch/eth0/vlan/2/ports)"
    15         echo 1 >/proc/switch/eth0/reset
    16         echo "1 2 3 4 5u*" >/proc/switch/eth0/vlan/0/ports
    17         export v0p v1p v2p
    18 }
Note: See TracChangeset for help on using the changeset viewer.