From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 30156b054ef332d8b1ece6fc5d9e0cdbc947ca14
Date: Wed, 28 Aug 2013 11:21:15 +0200 [thread overview]
Message-ID: <20130828092115.B9B22208D3@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 21326 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via 30156b054ef332d8b1ece6fc5d9e0cdbc947ca14 (commit)
via 80759d65f4a14e69b80b2afa9336c92991390b4b (commit)
via fc621876dc2a994ab5b1d3aeef8c55e6430b511e (commit)
via fd69d6f6dc9e41d9c2484152cb976a245f27e604 (commit)
via c0b99a4cedf534fa1cdc1437a74a66b73afe3346 (commit)
via ddc492dd30283a3108d1436f849abedad345d6b5 (commit)
via 990b0904f3ab0b7562832bad825c915af6939a09 (commit)
via f06d592af1fb93744dca80fbd23efdd0de7c60e4 (commit)
from bb5f0bf8f323014563b944086913756a28a43427 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 30156b054ef332d8b1ece6fc5d9e0cdbc947ca14
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 28 11:18:37 2013 +0200
Restore disabled rootfiles.
commit 80759d65f4a14e69b80b2afa9336c92991390b4b
Merge: fc62187 ddc492d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 28 11:14:17 2013 +0200
Merge remote-tracking branch 'ms/arm-freescale' into fifteen
Conflicts:
make.sh
commit fc621876dc2a994ab5b1d3aeef8c55e6430b511e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 28 11:11:44 2013 +0200
keepalived: Fix compiling the package.
commit fd69d6f6dc9e41d9c2484152cb976a245f27e604
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 28 11:05:04 2013 +0200
miniupnpd: Update to 1.8.
Also fix compiling with the new kernel.
commit c0b99a4cedf534fa1cdc1437a74a66b73afe3346
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 28 09:43:44 2013 +0200
bridge-utils: Fix compiling package.
commit ddc492dd30283a3108d1436f849abedad345d6b5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Aug 12 16:58:37 2013 +0000
u-boot: Build images for Pandaboard and Wandboard.
commit 990b0904f3ab0b7562832bad825c915af6939a09
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Aug 12 15:22:22 2013 +0000
u-boot-panda: Don't install mkimage from this version of u-boot.
commit f06d592af1fb93744dca80fbd23efdd0de7c60e4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Aug 12 15:10:10 2013 +0000
Rename u-boot package to u-boot-panda.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/armv5tel/u-boot | 16 +++++--
.../common/armv5tel/{u-boot => u-boot-panda} | 1 -
.../rootfiles/common/{disabled => }/bridge-utils | 0
.../packages/{keepalived-disabled => keepalived} | 0
.../packages/{miniupnpd-disabled => miniupnpd} | 0
lfs/bridge-utils | 2 +
lfs/keepalived | 3 +-
lfs/miniupnpd | 6 +--
lfs/u-boot | 56 ++++++++++++++++------
lfs/{u-boot => u-boot-panda} | 2 -
make.sh | 9 ++--
src/patches/bridge-utils-1.5-compile-fix-1.patch | 31 ++++++++++++
12 files changed, 96 insertions(+), 30 deletions(-)
copy config/rootfiles/common/armv5tel/{u-boot => u-boot-panda} (83%)
rename config/rootfiles/common/{disabled => }/bridge-utils (100%)
rename config/rootfiles/packages/{keepalived-disabled => keepalived} (100%)
rename config/rootfiles/packages/{miniupnpd-disabled => miniupnpd} (100%)
copy lfs/{u-boot => u-boot-panda} (97%)
create mode 100644 src/patches/bridge-utils-1.5-compile-fix-1.patch
Difference in files:
diff --git a/config/rootfiles/common/armv5tel/u-boot b/config/rootfiles/common/armv5tel/u-boot
index 759d41d..1048dc8 100644
--- a/config/rootfiles/common/armv5tel/u-boot
+++ b/config/rootfiles/common/armv5tel/u-boot
@@ -1,6 +1,12 @@
-#boot/MLO
-#boot/u-boot.bin
usr/bin/mkimage
-boot/boot.scr
-boot/boot.script
-boot/convert_bootscript
+#usr/share/u-boot
+#usr/share/u-boot/pandaboard
+#usr/share/u-boot/pandaboard/MLO
+#usr/share/u-boot/pandaboard/u-boot.bin
+#usr/share/u-boot/pandaboard/u-boot.img
+#usr/share/u-boot/wandboard_dl
+#usr/share/u-boot/wandboard_dl/u-boot.imx
+#usr/share/u-boot/wandboard_quad
+#usr/share/u-boot/wandboard_quad/u-boot.imx
+#usr/share/u-boot/wandboard_solo
+#usr/share/u-boot/wandboard_solo/u-boot.imx
diff --git a/config/rootfiles/common/armv5tel/u-boot-panda b/config/rootfiles/common/armv5tel/u-boot-panda
new file mode 100644
index 0000000..544d9d7
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/u-boot-panda
@@ -0,0 +1,5 @@
+#boot/MLO
+#boot/u-boot.bin
+boot/boot.scr
+boot/boot.script
+boot/convert_bootscript
diff --git a/config/rootfiles/common/bridge-utils b/config/rootfiles/common/bridge-utils
new file mode 100644
index 0000000..3bfa898
--- /dev/null
+++ b/config/rootfiles/common/bridge-utils
@@ -0,0 +1,2 @@
+usr/sbin/brctl
+#usr/share/man/man8/brctl.8
diff --git a/config/rootfiles/common/disabled/bridge-utils b/config/rootfiles/common/disabled/bridge-utils
deleted file mode 100644
index 3bfa898..0000000
--- a/config/rootfiles/common/disabled/bridge-utils
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin/brctl
-#usr/share/man/man8/brctl.8
diff --git a/config/rootfiles/packages/keepalived b/config/rootfiles/packages/keepalived
new file mode 100644
index 0000000..410128b
--- /dev/null
+++ b/config/rootfiles/packages/keepalived
@@ -0,0 +1,37 @@
+#etc/keepalived
+etc/keepalived/keepalived.conf
+etc/keepalived/samples
+#etc/keepalived/samples/client.pem
+#etc/keepalived/samples/dh1024.pem
+#etc/keepalived/samples/keepalived.conf.HTTP_GET.port
+#etc/keepalived/samples/keepalived.conf.IPv6
+#etc/keepalived/samples/keepalived.conf.SMTP_CHECK
+#etc/keepalived/samples/keepalived.conf.SSL_GET
+#etc/keepalived/samples/keepalived.conf.fwmark
+#etc/keepalived/samples/keepalived.conf.inhibit
+#etc/keepalived/samples/keepalived.conf.misc_check
+#etc/keepalived/samples/keepalived.conf.misc_check_arg
+#etc/keepalived/samples/keepalived.conf.quorum
+#etc/keepalived/samples/keepalived.conf.sample
+#etc/keepalived/samples/keepalived.conf.status_code
+#etc/keepalived/samples/keepalived.conf.track_interface
+#etc/keepalived/samples/keepalived.conf.virtual_server_group
+#etc/keepalived/samples/keepalived.conf.virtualhost
+#etc/keepalived/samples/keepalived.conf.vrrp
+#etc/keepalived/samples/keepalived.conf.vrrp.localcheck
+#etc/keepalived/samples/keepalived.conf.vrrp.lvs_syncd
+#etc/keepalived/samples/keepalived.conf.vrrp.routes
+#etc/keepalived/samples/keepalived.conf.vrrp.scripts
+#etc/keepalived/samples/keepalived.conf.vrrp.static_ipaddress
+#etc/keepalived/samples/keepalived.conf.vrrp.sync
+#etc/keepalived/samples/root.pem
+#etc/keepalived/samples/sample.misccheck.smbcheck.sh
+#etc/rc.d/init.d/keepalived
+#etc/sysconfig
+#etc/sysconfig/keepalived
+usr/bin/genhash
+usr/sbin/keepalived
+#usr/share/man/man1/genhash.1
+#usr/share/man/man5/keepalived.conf.5
+#usr/share/man/man8/keepalived.8
+var/ipfire/backup/addons/includes/keepalived
diff --git a/config/rootfiles/packages/keepalived-disabled b/config/rootfiles/packages/keepalived-disabled
deleted file mode 100644
index 410128b..0000000
--- a/config/rootfiles/packages/keepalived-disabled
+++ /dev/null
@@ -1,37 +0,0 @@
-#etc/keepalived
-etc/keepalived/keepalived.conf
-etc/keepalived/samples
-#etc/keepalived/samples/client.pem
-#etc/keepalived/samples/dh1024.pem
-#etc/keepalived/samples/keepalived.conf.HTTP_GET.port
-#etc/keepalived/samples/keepalived.conf.IPv6
-#etc/keepalived/samples/keepalived.conf.SMTP_CHECK
-#etc/keepalived/samples/keepalived.conf.SSL_GET
-#etc/keepalived/samples/keepalived.conf.fwmark
-#etc/keepalived/samples/keepalived.conf.inhibit
-#etc/keepalived/samples/keepalived.conf.misc_check
-#etc/keepalived/samples/keepalived.conf.misc_check_arg
-#etc/keepalived/samples/keepalived.conf.quorum
-#etc/keepalived/samples/keepalived.conf.sample
-#etc/keepalived/samples/keepalived.conf.status_code
-#etc/keepalived/samples/keepalived.conf.track_interface
-#etc/keepalived/samples/keepalived.conf.virtual_server_group
-#etc/keepalived/samples/keepalived.conf.virtualhost
-#etc/keepalived/samples/keepalived.conf.vrrp
-#etc/keepalived/samples/keepalived.conf.vrrp.localcheck
-#etc/keepalived/samples/keepalived.conf.vrrp.lvs_syncd
-#etc/keepalived/samples/keepalived.conf.vrrp.routes
-#etc/keepalived/samples/keepalived.conf.vrrp.scripts
-#etc/keepalived/samples/keepalived.conf.vrrp.static_ipaddress
-#etc/keepalived/samples/keepalived.conf.vrrp.sync
-#etc/keepalived/samples/root.pem
-#etc/keepalived/samples/sample.misccheck.smbcheck.sh
-#etc/rc.d/init.d/keepalived
-#etc/sysconfig
-#etc/sysconfig/keepalived
-usr/bin/genhash
-usr/sbin/keepalived
-#usr/share/man/man1/genhash.1
-#usr/share/man/man5/keepalived.conf.5
-#usr/share/man/man8/keepalived.8
-var/ipfire/backup/addons/includes/keepalived
diff --git a/config/rootfiles/packages/miniupnpd b/config/rootfiles/packages/miniupnpd
new file mode 100644
index 0000000..cdad3be
--- /dev/null
+++ b/config/rootfiles/packages/miniupnpd
@@ -0,0 +1,6 @@
+etc/miniupnpd
+etc/miniupnpd/miniupnpd.conf
+etc/rc.d/init.d/miniupnpd
+etc/rc.d/init.d/networking/red.down/10-miniupnpd
+etc/rc.d/init.d/networking/red.up/10-miniupnpd
+usr/sbin/miniupnpd
diff --git a/config/rootfiles/packages/miniupnpd-disabled b/config/rootfiles/packages/miniupnpd-disabled
deleted file mode 100644
index cdad3be..0000000
--- a/config/rootfiles/packages/miniupnpd-disabled
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/miniupnpd
-etc/miniupnpd/miniupnpd.conf
-etc/rc.d/init.d/miniupnpd
-etc/rc.d/init.d/networking/red.down/10-miniupnpd
-etc/rc.d/init.d/networking/red.up/10-miniupnpd
-usr/sbin/miniupnpd
diff --git a/lfs/bridge-utils b/lfs/bridge-utils
index 7ada05d..c7bc8a8 100644
--- a/lfs/bridge-utils
+++ b/lfs/bridge-utils
@@ -70,6 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bridge-utils-1.5-compile-fix-1.patch
+ cd $(DIR_APP) && find . -name Makefile.in | xargs sed -i -e "s/^KERNEL_HEADERS/#&/g"
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/keepalived b/lfs/keepalived
index 1891751..28b7ed8 100644
--- a/lfs/keepalived
+++ b/lfs/keepalived
@@ -77,7 +77,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
+ --with-kernel-dir=/usr/include
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/miniupnpd b/lfs/miniupnpd
index 7129ed5..a314624 100644
--- a/lfs/miniupnpd
+++ b/lfs/miniupnpd
@@ -24,7 +24,7 @@
include Config
-VER = 1.7
+VER = 1.8
THISAPP = miniupnpd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5af9e8332d34a7b490d0d2ed3e674196
+$(DL_FILE)_MD5 = 0d8a8e936d5a0012cb260a3b972acbf3
install : $(TARGET)
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make -f Makefile.linux \
- CFLAGS="$(CFLAGS) -DIPTABLES_143 -I/usr/src/linux/include"
+ CFLAGS="$(CFLAGS) -DIPTABLES_143" LIBS="-lip4tc -lnfnetlink"
cd $(DIR_APP) && install -m 755 miniupnpd /usr/sbin
-mkdir -pv /etc/miniupnpd
cp -vf $(DIR_SRC)/config/miniupnpd/miniupnpd.conf /etc/miniupnpd/miniupnpd.conf
diff --git a/lfs/u-boot b/lfs/u-boot
index 551fea5..b13dd65 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -24,12 +24,10 @@
include Config
-VER = 2011.12
-# Linare version: git clone git://git.linaro.org/boot/u-boot-linaro-stable.git
-# Branch: origin/Linaro-u-boot-2011.12
+VER = 2013.07
-THISAPP = uboot-panda-$(VER)
-DL_FILE = $(THISAPP).tar.xz
+THISAPP = u-boot-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -43,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 19975e9bb4b10d8e67db84e51fcaa43b
+$(DL_FILE)_MD5 = 8445162690052e6afd4b8f87af2bb557
install : $(TARGET)
@@ -75,13 +73,43 @@ dist:
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && make tools $(MAKETUNING)
- cd $(DIR_APP) && install tools/mkimage /usr/bin/
- cd $(DIR_APP) && make omap4_panda_config
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && install MLO /boot/
- cd $(DIR_APP) && install u-boot.bin /boot/
- cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+ # Pandaboard
+ -mkdir -pv /usr/share/u-boot/pandaboard
+ cd $(DIR_APP) && make CROSS_COMPILE="" omap4_panda_config
+ cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+ cd $(DIR_APP) && install -v -m 644 MLO u-boot.bin u-boot.img \
+ /usr/share/u-boot/pandaboard
+ cd $(DIR_APP) && make distclean
+
+ # Wandboard Quad
+ -mkdir -pv /usr/share/u-boot/wandboard_quad
+ cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_quad_config
+ cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+ cd $(DIR_APP) && install -v -m 644 u-boot.imx \
+ /usr/share/u-boot/wandboard_quad
+ cd $(DIR_APP) && make distclean
+
+ # Wandboard Dual
+ -mkdir -pv /usr/share/u-boot/wandboard_dl
+ cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_dl_config
+ cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+ cd $(DIR_APP) && install -v -m 644 u-boot.imx \
+ /usr/share/u-boot/wandboard_dl
+ cd $(DIR_APP) && make distclean
+
+ # Wandboard Solo
+ -mkdir -pv /usr/share/u-boot/wandboard_solo
+ cd $(DIR_APP) && make CROSS_COMPILE="" wandboard_solo_config
+ cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)"
+ cd $(DIR_APP) && install -v -m 644 u-boot.imx \
+ /usr/share/u-boot/wandboard_solo
+ cd $(DIR_APP) && make distclean
+
+ # mkimage
+ cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
+ cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/u-boot-panda b/lfs/u-boot-panda
new file mode 100644
index 0000000..8441ee6
--- /dev/null
+++ b/lfs/u-boot-panda
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2011.12
+# Linare version: git clone git://git.linaro.org/boot/u-boot-linaro-stable.git
+# Branch: origin/Linaro-u-boot-2011.12
+
+THISAPP = uboot-panda-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH = armv5tel
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 19975e9bb4b10d8e67db84e51fcaa43b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make omap4_panda_config
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && install MLO /boot/
+ cd $(DIR_APP) && install u-boot.bin /boot/
+ cp -vf $(DIR_SRC)/config/u-boot/* /boot/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index a700da4..7ad42b0 100755
--- a/make.sh
+++ b/make.sh
@@ -377,8 +377,9 @@ buildipfire() {
ipfiremake dvb-firmwares
ipfiremake zd1211-firmware
ipfiremake rpi-firmware
- ipfiremake u-boot
ipfiremake bc
+ ipfiremake u-boot
+ ipfiremake u-boot-panda
if [ "${MACHINE_TYPE}" != "arm" ]; then
@@ -600,7 +601,7 @@ buildipfire() {
ipfiremake sudo
ipfiremake mc
ipfiremake wget
-# ipfiremake bridge-utils
+ ipfiremake bridge-utils
ipfiremake screen
ipfiremake smartmontools
ipfiremake htop
@@ -730,7 +731,7 @@ buildipfire() {
ipfiremake minicom
ipfiremake ddrescue
ipfiremake imspector
-# ipfiremake miniupnpd
+ ipfiremake miniupnpd
ipfiremake client175
ipfiremake powertop
ipfiremake parted
@@ -774,7 +775,7 @@ buildipfire() {
ipfiremake lcdproc
ipfiremake bitstream
ipfiremake multicat
-# ipfiremake keepalived
+ ipfiremake keepalived
ipfiremake ipvsadm
ipfiremake perl-Carp-Clan
ipfiremake perl-Date-Calc
diff --git a/src/patches/bridge-utils-1.5-compile-fix-1.patch b/src/patches/bridge-utils-1.5-compile-fix-1.patch
new file mode 100644
index 0000000..c269608
--- /dev/null
+++ b/src/patches/bridge-utils-1.5-compile-fix-1.patch
@@ -0,0 +1,31 @@
+From 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d Mon Sep 17 00:00:00 2001
+From: Russell Senior <russell(a)personaltelco.net>
+Date: Wed, 06 Mar 2013 20:49:42 +0000
+Subject: bridge-utils: Fix compile against linux-3.8.x
+
+Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a
+struct in6_addr but doesn't define it. The trivial seeming fix of
+including the header that does define it causes more problems. The
+problem was discussed on mailing lists in January 2013. The final
+suggestion I found was here:
+
+ http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html
+
+This is intended to implement that suggestion.
+
+Signed-off-by: Russell Senior <russell(a)personaltelco.net>
+---
+diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
+index 39964f2..dd14bae 100644
+--- a/libbridge/libbridge.h
++++ b/libbridge/libbridge.h
+@@ -20,6 +20,7 @@
+ #define _LIBBRIDGE_H
+
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <linux/if.h>
+ #include <linux/if_bridge.h>
+
+--
+cgit v0.9.2
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-08-28 9:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130828092115.B9B22208D3@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox