Changeset 2771

Timestamp:

06/12/07 16:20:47 (2 years ago)

Author:

spaetzle

Message:

changed location of network files to /etc/network
fixed bug in /etc/network/plugins/lladdr

Files:

• trunk/freewrt/package/broadcom-wl/Makefile (modified) (2 diffs)
• trunk/freewrt/package/busybox/Makefile (modified) (2 diffs)
• trunk/freewrt/package/fwifupdown/Makefile (modified) (4 diffs)
• trunk/freewrt/package/fwifupdown/files/lladdr (modified) (1 diff)
• trunk/freewrt/package/fwifupdown/files/main.sh (modified) (6 diffs)
• trunk/freewrt/package/fwifupdown/files/mfunctions.sh (modified) (1 diff)
• trunk/freewrt/package/madwifi/Makefile (modified) (2 diffs)

trunk/freewrt/package/broadcom-wl/Makefile

@@ -11 +11 @@
-PKG_RELEASE:=           2
-PKG_MD5SUM:=            a7d8dde3ce474c361143b83e1d9890b1
-0
+1
-MASTER_SITES:=          http://www.freewrt.org/distfiles/
-DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -38 +38 @@
-        ${INSTALL_DATA} ${WRKBUILD}/kmod/wl.${KERNEL_MOD_SUFFIX} \
-            ${IDIR_KMOD_BROADCOM_WL}/lib/modules/${KERNEL_VERSION}
-lib
-lib
+etc
+etc
-        $(INSTALL_DIR) $(IDIR_BROADCOM_WLC)/usr/sbin
-        $(INSTALL_BIN) $(WRKBUILD)/wlc/wlc $(IDIR_BROADCOM_WLC)/usr/sbin

trunk/freewrt/package/busybox/Makefile

@@ -9 +9 @@
-PKG_NAME:=              busybox
-PKG_VERSION:=           1.4.2
-8
+9
-PKG_MD5SUM:=            b4c61fb15642be9dde20e8493788c585
-DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -42 +42 @@
-        $(INSTALL_DATA) ./files/crond.init \
-                $(IDIR_BUSYBOX)/etc/init.d/crond
-lib
-lib
+etc
+etc
-        rm -f ${IDIR_BUSYBOX}/bin/ifup ${IDIR_BUSYBOX}/bin/ifdown
-

trunk/freewrt/package/fwifupdown/Makefile

@@ -9 +9 @@
-PKG_NAME:=                      fwifupdown
-PKG_VERSION:=                   0.2
-2
+3
-PKG_SRC_ROOT:=                  ${TOPDIR}/package/${PKG_NAME}
-PKG_CONFIG_IDIR:=               lib/network
@@ -16 +16 @@
-PKG_CONFIG_INITDIR:=            etc/init.d
-PKG_CONFIG_BINDIR:=             bin
-PKG_CONFIG_TYPESDIR:=           ${PKG_CONFIG_IDIR}/iftypes
-PKG_CONFIG_METHSDIR:=           ${PKG_CONFIG_IDIR}/methods
-PKG_CONFIG_HOOKDIR:=            ${PKG_CONFIG_IDIR}/hook
-PKG_CONFIG_SHDIR:=              ${PKG_CONFIG_IDIR}/sh
-_OVL:=      ${PKG_CONFIG_WORKDIR}/lib
-_OVL:=      ${PKG_CONFIG_WORKDIR}/lib
-_OVL:=       ${PKG_CONFIG_WORKDIR}/lib
+:=          ${PKG_CONFIG_WORKDIR}
+:=          ${PKG_CONFIG_WORKDIR}
+:=           ${PKG_CONFIG_WORKDIR}
-
-NO_DISTFILES:=          1
@@ -37 +35 @@
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_SHDIR}
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_TYPESDIR}
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_TYPESDIR_OVL}
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_METHSDIR}
-
-
+
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-pre-up.d
-        ${INSTALL_DIR} ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_WORKDIR}/if-up.d
@@ -52 +48 @@
-        ${INSTALL_DATA} ${PKG_SRC_ROOT}/lib/dhcp ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_METHSDIR}
-        ${INSTALL_DATA} ${PKG_SRC_ROOT}/files/ifupdown.init ${IDIR_FWIFUPDOWN}/${PKG_CONFIG_INITDIR}/ifupdown
-_OVL
+
-
-ifeq (${FWIFUPDOWN_CONFIG_BRIDGE},y)

trunk/freewrt/package/fwifupdown/files/lladdr

@@ -7 +7 @@
-
-lladdr_preup() {
+        [ -z $LLADDR ] && return 0
-        case $IF_LLADDR in
-        [0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]) ;;
-        *)
-                echo "lladdr: invalid address '$IF_LLADDR' entered"
-1
+0
-                ;;
-        esac

trunk/freewrt/package/fwifupdown/files/main.sh

@@ -85 +85 @@
-                        # search for existing lib files end evaluate iface type by using the appropriate
-                        # function from lib file
- ${LIBDIR_OVERLAY}/iftypes/*
+
-                        do
-                                if [ -f $lib ]
@@ -281 +281 @@
-
-main_exec_dirhooks() {
-_OVERLAY}/${1}/${2} ${LIBDIR
+
-        do
-                if [ -f $hook ]
@@ -295 +295 @@
-
-main_exec_plugins() {
-_OVERLAY}/plugins/* ${LIBDIR
+
-                [ -f $plugin ] || continue
-                . $plugin
@@ -346 +346 @@
-RT_BB_NOEXEC=0
-readonly ENVFILE="/tmp/ifupdown/env"
-LIB
-_OVERLAY="/etc/network/lib
+INSTALL
+="/etc/network
-IFACE_TYPE="none"
-H_ERR=0
@@ -356 +356 @@
-[ -z "${KSH_VERSION:-""}" ] || alias which='whence -p'
-
-LIB
+INSTALL
-then
-LIB
+INSTALL
-        exit 1
-fi
-LIB
+INSTALL
-
-main_env_update
@@ -369 +369 @@
-if [ "$IFACE_TYPE" != "iface" ]
-then
-
-
-
-
+
-        then
-                . ${LIBDIR}/iftypes/$IFACE_TYPE

trunk/freewrt/package/fwifupdown/files/mfunctions.sh

@@ -8 +8 @@
-#
-
-LIBDIR" -o ! -d "${LIB
-LIBDIR '$LIB
+INSTALLDIR" -o ! -d "${INSTALL
+INSTALLDIR '$INSTALL
-        exit 1
-fi
-LIB
-LIB
+INSTALL
+INSTALL
-        exit 1
-fi
-
-LIB
+INSTALL
-
-mstart() {

trunk/freewrt/package/madwifi/Makefile

@@ -10 +10 @@
-PKG_NAME:=              madwifi
-PKG_VERSION:=           0.9.3.1
-
+
-PKG_MD5SUM:=            4704b0e09d76d616217f89de87e4a1ac
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -78 +78 @@
-        ${INSTALL_DIR} ${IDIR_KMOD_MADWIFI}/lib/modules/${KERNEL_VERSION}/
-        ${INSTALL_DIR} ${IDIR_KMOD_MADWIFI}/usr/sbin/
-lib
-lib
+etc
+etc
-        ${INSTALL_DATA} ./files/madwifi.modules ${IDIR_KMOD_MADWIFI}/etc/modules.d/20-madwifi
-        ${CP}   ${WRKBUILD}/net80211/wlan*.${KERNEL_MOD_SUFFIX} \