diff options
| -rw-r--r-- | openwrt/package/bridge/Makefile.in | 3 | ||||
| -rw-r--r-- | openwrt/package/bridge/bridge.mk | 22 | ||||
| -rw-r--r-- | openwrt/package/bridge/patches/patch-libbridge_Makefile_in (renamed from openwrt/package/bridge/bridge.patch) | 0 |
3 files changed, 17 insertions, 8 deletions
diff --git a/openwrt/package/bridge/Makefile.in b/openwrt/package/bridge/Makefile.in deleted file mode 100644 index 5636052953..0000000000 --- a/openwrt/package/bridge/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(strip $(BR2_PACKAGE_BRIDGE)),y) -TARGETS+=bridge -endif diff --git a/openwrt/package/bridge/bridge.mk b/openwrt/package/bridge/bridge.mk index 9cf9f330ae..e831e26d06 100644 --- a/openwrt/package/bridge/bridge.mk +++ b/openwrt/package/bridge/bridge.mk @@ -7,6 +7,7 @@ BRIDGE_SOURCE_URL=http://umn.dl.sourceforge.net/sourceforge/bridge/ BRIDGE_SOURCE=bridge-utils-1.0.4.tar.gz BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-1.0.4 +BRIDGE_PATCHES=$(PACKAGE_DIR)/bridge/patches BRIDGE_TARGET_BINARY:=usr/sbin/brctl $(DL_DIR)/$(BRIDGE_SOURCE): @@ -14,10 +15,13 @@ $(DL_DIR)/$(BRIDGE_SOURCE): $(BRIDGE_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BRIDGE_SOURCE) zcat $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - patch -p1 -d $(BRIDGE_BUILD_DIR) < package/bridge/bridge.patch touch $(BRIDGE_BUILD_DIR)/.unpacked -$(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked +$(BRIDGE_BUILD_DIR)/.patched: $(BRIDGE_BUILD_DIR)/.unpacked + $(PATCH) $(BRIDGE_BUILD_DIR) $(BRIDGE_PATCHES) + touch $(BRIDGE_BUILD_DIR)/.patched + +$(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.patched (cd $(BRIDGE_BUILD_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ @@ -44,12 +48,11 @@ $(BRIDGE_BUILD_DIR)/brctl/brctl: $(BRIDGE_BUILD_DIR)/.configured $(MAKE) -C $(BRIDGE_BUILD_DIR) $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY): $(BRIDGE_BUILD_DIR)/brctl/brctl + mkdir -p $(TARGET_DIR)/usr/sbin cp -af $(BRIDGE_BUILD_DIR)/brctl/brctl $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) $(STRIP) $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) - #cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/ - #$(STRIP) $(TARGET_DIR)/usr/sbin/brctld -bridge: linux $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) +bridge: uclibc $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE) @@ -59,3 +62,12 @@ bridge-clean: bridge-dirclean: rm -rf $(BRIDGE_BUILD_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_BRIDGE)),y) +TARGETS+=bridge +endif diff --git a/openwrt/package/bridge/bridge.patch b/openwrt/package/bridge/patches/patch-libbridge_Makefile_in index f44737750b..f44737750b 100644 --- a/openwrt/package/bridge/bridge.patch +++ b/openwrt/package/bridge/patches/patch-libbridge_Makefile_in |