* [Buildroot] svn commit: trunk/buildroot/package/bridge-utils
@ 2008-09-02 11:07 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-09-02 11:07 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-02 04:07:49 -0700 (Tue, 02 Sep 2008)
New Revision: 23302
Log:
bridge: convert to Makefile.autotools.in format
Modified:
trunk/buildroot/package/bridge-utils/bridge.mk
Changeset:
Modified: trunk/buildroot/package/bridge-utils/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-02 09:00:23 UTC (rev 23301)
+++ trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-02 11:07:49 UTC (rev 23302)
@@ -1,71 +1,28 @@
#############################################################
#
-# bridgeutils - User Space Program For Controlling Bridging
+# bridge-utils - User Space Program For Controlling Bridging
#
#############################################################
#
-BRIDGE_VERSION=1.0.6
-BRIDGE_SOURCE_URL=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge/
-BRIDGE_SOURCE=bridge-utils-$(BRIDGE_VERSION).tar.gz
-BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-$(BRIDGE_VERSION)
-BRIDGE_TARGET_BINARY:=usr/sbin/brctl
+BRIDGE_VERSION:=1.0.6
+BRIDGE_SOURCE:=bridge-utils-$(BRIDGE_VERSION).tar.gz
+BRIDGE_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge/
+BRIDGE_INSTALL_STAGING:=NO
+BRIDGE_INSTALL_TARGET:=YES
+BRIDGE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install
+BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR) $(DISABLE_NLS)
+BRIDGE_DEPENDENCIES:=uclibc
-$(DL_DIR)/$(BRIDGE_SOURCE):
- $(WGET) -P $(DL_DIR) $(BRIDGE_SOURCE_URL)/$(BRIDGE_SOURCE)
+$(eval $(call AUTOTARGETS,package,bridge))
-$(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-utils/bridge.patch
- touch $(BRIDGE_BUILD_DIR)/.unpacked
+# bridge has no install-strip target
+$(BRIDGE_HOOK_POST_INSTALL): $(BRIDGE_TARGET_INSTALL_TARGET)
+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/brctl
+ touch $@
-$(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked
- (cd $(BRIDGE_BUILD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- --with-linux-headers=$(LINUX_HEADERS_DIR) \
- )
- touch $(BRIDGE_BUILD_DIR)/.configured
-
-$(BRIDGE_BUILD_DIR)/brctl/brctl: $(BRIDGE_BUILD_DIR)/.configured
- $(MAKE) -C $(BRIDGE_BUILD_DIR)
-
-$(TARGET_DIR)/$(BRIDGE_TARGET_BINARY): $(BRIDGE_BUILD_DIR)/brctl/brctl
- cp -af $(BRIDGE_BUILD_DIR)/brctl/brctl $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
- $(STRIPCMD) $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
- #cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/
- #$(STRIPCMD) $(TARGET_DIR)/usr/sbin/brctld
-
-bridge-utils: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
-
-bridge-utils-source: $(DL_DIR)/$(BRIDGE_SOURCE)
-
-bridge-utils-clean:
- #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BRIDGE_BUILD_DIR) uninstall
- -$(MAKE) -C $(BRIDGE_BUILD_DIR) clean
-
-bridge-utils-dirclean:
- rm -rf $(BRIDGE_BUILD_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_BRIDGE)),y)
-TARGETS+=bridge-utils
-endif
+# bridge has no uninstall target
+$(BUILD_DIR)/bridge-$(BRIDGE_VERSION)/.stamp_cleaned:
+ $(call MESSAGE,"Cleaning up")
+ rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
+ include/libbridge.h man/man8/brctl.8 sbin/brctl)
+ touch $@
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bridge-utils
@ 2008-10-20 11:53 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-10-20 11:53 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-10-20 04:53:05 -0700 (Mon, 20 Oct 2008)
New Revision: 23742
Log:
bridge-utils: don't strip if BR2_ENABLE_DEBUG is enabled
Modified:
trunk/buildroot/package/bridge-utils/bridge.mk
Changeset:
Modified: trunk/buildroot/package/bridge-utils/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge-utils/bridge.mk 2008-10-20 11:32:25 UTC (rev 23741)
+++ trunk/buildroot/package/bridge-utils/bridge.mk 2008-10-20 11:53:05 UTC (rev 23742)
@@ -16,10 +16,12 @@
$(eval $(call AUTOTARGETS,package,bridge))
+ifeq ($(BR2_ENABLE_DEBUG),)
# bridge has no install-strip target
$(BRIDGE_HOOK_POST_INSTALL): $(BRIDGE_TARGET_INSTALL_TARGET)
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/brctl
touch $@
+endif
# bridge has no uninstall target
$(BRIDGE_TARGET_UNINSTALL):
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bridge-utils
@ 2008-09-18 15:22 egtvedt at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: egtvedt at uclibc.org @ 2008-09-18 15:22 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-09-18 08:22:16 -0700 (Thu, 18 Sep 2008)
New Revision: 23434
Log:
bridge-utils: remove whitespace at end of file
Modified:
trunk/buildroot/package/bridge-utils/bridge.mk
Changeset:
Modified: trunk/buildroot/package/bridge-utils/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-18 15:16:30 UTC (rev 23433)
+++ trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-18 15:22:16 UTC (rev 23434)
@@ -27,4 +27,3 @@
rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
include/libbridge.h man/man8/brctl.8 sbin/brctl)
rm -f $(BRIDGE_TARGET_INSTALL_TARGET) $(BRIDGE_HOOK_POST_INSTALL)
-
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bridge-utils
@ 2008-09-04 2:39 hamish at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: hamish at uclibc.org @ 2008-09-04 2:39 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-09-03 19:39:23 -0700 (Wed, 03 Sep 2008)
New Revision: 23318
Log:
Override the uninstall target rather than the clean target
Also, don't actually create the .stamp_uninstalled but remove the
.stamp_installed file instead (ala the overridden target).
Modified:
trunk/buildroot/package/bridge-utils/bridge.mk
Changeset:
Modified: trunk/buildroot/package/bridge-utils/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-04 02:34:42 UTC (rev 23317)
+++ trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-04 02:39:23 UTC (rev 23318)
@@ -22,8 +22,9 @@
touch $@
# bridge has no uninstall target
-$(BUILD_DIR)/bridge-$(BRIDGE_VERSION)/.stamp_cleaned:
- $(call MESSAGE,"Cleaning up")
+$(BUILD_DIR)/bridge-$(BRIDGE_VERSION)/.stamp_uninstalled:
+ $(call MESSAGE,"Uninstalling")
rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \
include/libbridge.h man/man8/brctl.8 sbin/brctl)
- touch $@
+ rm -f $(@D)/.stamp_target_installed
+
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bridge-utils
@ 2008-09-02 11:07 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-09-02 11:07 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-02 04:07:55 -0700 (Tue, 02 Sep 2008)
New Revision: 23303
Log:
bridge: bump version
Upstream tarball doesn't include configure, so run autoreconf.
Modified:
trunk/buildroot/package/bridge-utils/bridge.mk
Changeset:
Modified: trunk/buildroot/package/bridge-utils/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-02 11:07:49 UTC (rev 23302)
+++ trunk/buildroot/package/bridge-utils/bridge.mk 2008-09-02 11:07:55 UTC (rev 23303)
@@ -4,9 +4,10 @@
#
#############################################################
#
-BRIDGE_VERSION:=1.0.6
+BRIDGE_VERSION:=1.4
BRIDGE_SOURCE:=bridge-utils-$(BRIDGE_VERSION).tar.gz
BRIDGE_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge/
+BRIDGE_AUTORECONF:=YES
BRIDGE_INSTALL_STAGING:=NO
BRIDGE_INSTALL_TARGET:=YES
BRIDGE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bridge-utils
@ 2008-04-04 0:13 hamish at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: hamish at uclibc.org @ 2008-04-04 0:13 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-04-03 17:13:56 -0700 (Thu, 03 Apr 2008)
New Revision: 21629
Log:
More unbreaking. These cosmetic directory renames don't seem to be working out very well..
Modified:
trunk/buildroot/package/bridge-utils/bridge.mk
Changeset:
Modified: trunk/buildroot/package/bridge-utils/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge-utils/bridge.mk 2008-04-03 21:06:27 UTC (rev 21628)
+++ trunk/buildroot/package/bridge-utils/bridge.mk 2008-04-04 00:13:56 UTC (rev 21629)
@@ -15,7 +15,7 @@
$(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
+ patch -p1 -d $(BRIDGE_BUILD_DIR) < package/bridge-utils/bridge.patch
touch $(BRIDGE_BUILD_DIR)/.unpacked
$(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/bridge-utils
@ 2008-04-03 4:10 hamish at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: hamish at uclibc.org @ 2008-04-03 4:10 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-04-02 21:10:14 -0700 (Wed, 02 Apr 2008)
New Revision: 21622
Log:
Unbreak the bridge-utils package..
Modified:
trunk/buildroot/package/bridge-utils/bridge.mk
Changeset:
Modified: trunk/buildroot/package/bridge-utils/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge-utils/bridge.mk 2008-04-02 21:20:35 UTC (rev 21621)
+++ trunk/buildroot/package/bridge-utils/bridge.mk 2008-04-03 04:10:14 UTC (rev 21622)
@@ -51,15 +51,15 @@
#cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/
#$(STRIPCMD) $(TARGET_DIR)/usr/sbin/brctld
-bridge: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
+bridge-utils: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
-bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE)
+bridge-utils-source: $(DL_DIR)/$(BRIDGE_SOURCE)
-bridge-clean:
+bridge-utils-clean:
#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BRIDGE_BUILD_DIR) uninstall
-$(MAKE) -C $(BRIDGE_BUILD_DIR) clean
-bridge-dirclean:
+bridge-utils-dirclean:
rm -rf $(BRIDGE_BUILD_DIR)
#############################################################
#
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-10-20 11:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-02 11:07 [Buildroot] svn commit: trunk/buildroot/package/bridge-utils jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-10-20 11:53 jacmet at uclibc.org
2008-09-18 15:22 egtvedt at uclibc.org
2008-09-04 2:39 hamish at uclibc.org
2008-09-02 11:07 jacmet at uclibc.org
2008-04-04 0:13 hamish at uclibc.org
2008-04-03 4:10 hamish at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox