summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-02-02 23:35:03 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2010-02-02 23:35:03 +0100
commit5a0f8e9bbc1298806f6d90b79334b79ecc020155 (patch)
treeddc3443b25cc08c123e1291f46ae60e09e26687c
parent5e0a36f9df8c211d77bcbef8d5f0b5d281413648 (diff)
downloadptxdist-5a0f8e9bbc1298806f6d90b79334b79ecc020155.tar.gz
ptxdist-5a0f8e9bbc1298806f6d90b79334b79ecc020155.tar.xz
[bridge-utils] unbreak package
The bridge-utils packet was previously broken; this patch bumps the version 1.1 -> 1.4. The packet doesn't contain the autogenerated autotool files, so we regenerate them with autogen.sh. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
l---------patches/bridge-utils-1.4/autogen.sh1
-rw-r--r--patches/bridge-utils-1.4/bridge-utils-1.4-dummy.diff18
-rw-r--r--patches/bridge-utils-1.4/series1
-rw-r--r--rules/bridge-utils.in4
-rw-r--r--rules/bridge-utils.make6
5 files changed, 24 insertions, 6 deletions
diff --git a/patches/bridge-utils-1.4/autogen.sh b/patches/bridge-utils-1.4/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/bridge-utils-1.4/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh \ No newline at end of file
diff --git a/patches/bridge-utils-1.4/bridge-utils-1.4-dummy.diff b/patches/bridge-utils-1.4/bridge-utils-1.4-dummy.diff
new file mode 100644
index 000000000..370e4ad70
--- /dev/null
+++ b/patches/bridge-utils-1.4/bridge-utils-1.4-dummy.diff
@@ -0,0 +1,18 @@
+Subject: [bridge-utils] add dummy patch to enable autogen.sh
+
+See patch below ... not for upstream.
+
+Not-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ README.ptx | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: bridge-utils-1.4/README.ptx
+===================================================================
+--- /dev/null
++++ bridge-utils-1.4/README.ptx
+@@ -0,0 +1,4 @@
++This is a dummy patch; with a patch, it is possible to run autogen.sh
++from ptxdist.
++
++-rsc
diff --git a/patches/bridge-utils-1.4/series b/patches/bridge-utils-1.4/series
new file mode 100644
index 000000000..cdc6d8483
--- /dev/null
+++ b/patches/bridge-utils-1.4/series
@@ -0,0 +1 @@
+bridge-utils-1.4-dummy.diff
diff --git a/rules/bridge-utils.in b/rules/bridge-utils.in
index 855b5d7f6..7fe3391a5 100644
--- a/rules/bridge-utils.in
+++ b/rules/bridge-utils.in
@@ -3,10 +3,6 @@
config BRIDGE_UTILS
tristate
- # FIXME:
- # - claims about missing "missing"
- # - tries to pick up non-local include paths
- depends on BROKEN
prompt "bridge utils "
help
Utilities for configuring the Linux ethernet bridge
diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make
index e1b2c1902..54ce18627 100644
--- a/rules/bridge-utils.make
+++ b/rules/bridge-utils.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_BRIDGE_UTILS) += bridge-utils
#
# Paths and names
#
-BRIDGE_UTILS_VERSION := 1.1
+BRIDGE_UTILS_VERSION := 1.4
BRIDGE_UTILS := bridge-utils-$(BRIDGE_UTILS_VERSION)
BRIDGE_UTILS_SUFFIX := tar.gz
BRIDGE_UTILS_URL := $(PTXCONF_SETUP_SFMIRROR)/bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
@@ -43,7 +43,9 @@ BRIDGE_UTILS_ENV := $(CROSS_ENV)
#
# autoconf
#
-BRIDGE_UTILS_AUTOCONF := $(CROSS_AUTOCONF_USR)
+BRIDGE_UTILS_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR) \
+ --with-linux-headers=$(KERNEL_HEADERS_DIR)
# ----------------------------------------------------------------------------
# Target-Install