git://git.onelab.eu
/
ipfw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This repo is obsolete, please see git://git.code.sf.net/p/dummynet/code@master
[ipfw.git]
/
Makefile.openwrt
diff --git
a/Makefile.openwrt
b/Makefile.openwrt
index
b618a52
..
437b32a
100644
(file)
--- a/
Makefile.openwrt
+++ b/
Makefile.openwrt
@@
-1,14
+1,14
@@
# Makefile to build the package in openwrt.
# Makefile to build the package in openwrt.
-# goes into package/ipfw
2
/Makefile
+# goes into package/ipfw
3
/Makefile
#
# Edit IPFW_DIR to point to the directory with the sources for ipfw
#
# Edit IPFW_DIR to point to the directory with the sources for ipfw
-IPFW_DIR := $(TOPDIR)/../ipfw
_mod
+IPFW_DIR := $(TOPDIR)/../ipfw
3
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
-PKG_NAME:=kmod-ipfw
2
+PKG_NAME:=kmod-ipfw
3
PKG_RELEASE:=1
# MV is undefined
PKG_RELEASE:=1
# MV is undefined
@@
-17,20
+17,20
@@
MV ?= mv
include $(INCLUDE_DIR)/package.mk
# Description for the package.
include $(INCLUDE_DIR)/package.mk
# Description for the package.
-# The names KernelPackage/ipfw
2
must match the arguments to the
-# call $(eval $(call KernelPackage,ipfw
2
)) used to build it
+# The names KernelPackage/ipfw
3
must match the arguments to the
+# call $(eval $(call KernelPackage,ipfw
3
)) used to build it
-define KernelPackage/ipfw
2
+define KernelPackage/ipfw
3
SUBMENU:=Other modules
TITLE:= IPFW and dummynet
# FILES is what makes up the module, both kernel and userland
# It must be in the KernelPackage section
SUBMENU:=Other modules
TITLE:= IPFW and dummynet
# FILES is what makes up the module, both kernel and userland
# It must be in the KernelPackage section
- FILES := $(PKG_BUILD_DIR)/dummynet/ipfw_mod.o $(PKG_BUILD_DIR)/ipfw/ipfw
+ FILES := $(PKG_BUILD_DIR)/dummynet
2
/ipfw_mod.o $(PKG_BUILD_DIR)/ipfw/ipfw
# AUTOLOAD:=$(call AutoLoad,80,ipfw_mod)
endef
# AUTOLOAD:=$(call AutoLoad,80,ipfw_mod)
endef
-define KernelPackage/ipfw
2
/description
+define KernelPackage/ipfw
3
/description
This package contains the ipfw and dummynet module
endef
This package contains the ipfw and dummynet module
endef
@@
-45,17
+45,11
@@
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(CP) -Rp $(IPFW_DIR)/* $(PKG_BUILD_DIR)/
(cd $(PKG_BUILD_DIR)/ipfw && $(MAKE) include_e )
mkdir -p $(PKG_BUILD_DIR)
$(CP) -Rp $(IPFW_DIR)/* $(PKG_BUILD_DIR)/
(cd $(PKG_BUILD_DIR)/ipfw && $(MAKE) include_e )
- (cd $(PKG_BUILD_DIR)/dummynet && $(MAKE) include_e )
(cd $(PKG_BUILD_DIR)/dummynet2 && $(MAKE) include_e )
endef
define Build/Compile
# compile the kernel part for openwrt
(cd $(PKG_BUILD_DIR)/dummynet2 && $(MAKE) include_e )
endef
define Build/Compile
# compile the kernel part for openwrt
- $(MAKE) -C "$(LINUX_DIR)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- ARCH="$(LINUX_KARCH)" \
- SUBDIRS="$(PKG_BUILD_DIR)/dummynet" \
- VER=openwrt modules
$(MAKE) -C "$(LINUX_DIR)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH="$(LINUX_KARCH)" \
$(MAKE) -C "$(LINUX_DIR)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH="$(LINUX_KARCH)" \
@@
-64,23
+58,23
@@
define Build/Compile
# compile the userland part for openwrt
$(MAKE) -C $(PKG_BUILD_DIR)/ipfw \
$(TARGET_CONFIGURE_OPTS) \
# compile the userland part for openwrt
$(MAKE) -C $(PKG_BUILD_DIR)/ipfw \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) -
I./include_e -I./include -include ../glue.h
" \
+ CFLAGS="$(TARGET_CFLAGS) -
DSYSCTL_NODE -DEMULATE_SYSCTL -I./include_e -I./include -include ../glue.h -DNO_ALTQ
" \
VER=openwrt all
endef
VER=openwrt all
endef
-define Package/ipfw
2
-userland
+define Package/ipfw
3
-userland
SECTION:=utils
CATEGORY:=Utilities
TITLE := /sbin/ipfw
DESCRIPTION := This is the control program for ipfw and dummynet
endef
SECTION:=utils
CATEGORY:=Utilities
TITLE := /sbin/ipfw
DESCRIPTION := This is the control program for ipfw and dummynet
endef
-define Package/ipfw
2
-userland/install
+define Package/ipfw
3
-userland/install
$(INSTALL_DIR) $(1) /sbin
endef
# XXX not entirely clear why the install entry for userland works,
$(INSTALL_DIR) $(1) /sbin
endef
# XXX not entirely clear why the install entry for userland works,
-# given that /sbin/ipfw is in KernelPackage/ipfw
2
+# given that /sbin/ipfw is in KernelPackage/ipfw
3
-$(eval $(call Package,ipfw
2
-userland))
-$(eval $(call KernelPackage,ipfw
2
))
+$(eval $(call Package,ipfw
3
-userland))
+$(eval $(call KernelPackage,ipfw
3
))