From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 7 Sep 2011 13:01:44 +0000 (+0000)
Subject: linux-atm: Fix build with new kernel headers.
X-Git-Tag: v2.9-core54~13^2~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31585f93db522eeadc3d290d1b6cb237cd441fc7;p=people%2Fms%2Fipfire-2.x.git

linux-atm: Fix build with new kernel headers.
---

diff --git a/lfs/linux-atm b/lfs/linux-atm
index 1dedec9c8f..6465d1432c 100644
--- a/lfs/linux-atm
+++ b/lfs/linux-atm
@@ -71,6 +71,7 @@ $(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/linux-atm-2.4.1-gcc-4.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-atm-2.4.1-arpd_includes.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
diff --git a/make.sh b/make.sh
index 516edd5118..082a198eee 100755
--- a/make.sh
+++ b/make.sh
@@ -432,7 +432,7 @@ buildipfire() {
   #ipfiremake e1000e
   #ipfiremake igb
   ipfiremake pkg-config
-  #ipfiremake linux-atm
+  ipfiremake linux-atm
   ipfiremake cpio
 
   installmake strip
@@ -623,7 +623,7 @@ buildipfire() {
   ipfiremake strongswan
   ipfiremake lsof
   ipfiremake centerim
-  #ipfiremake br2684ctl
+  ipfiremake br2684ctl
   ipfiremake pcmciautils
   ipfiremake lm_sensors
   ipfiremake liboping
@@ -639,7 +639,7 @@ buildipfire() {
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE
-  #ipfiremake tunctl
+  ipfiremake tunctl
   ipfiremake nagios
   ipfiremake nagios_nrpe
   ipfiremake ebtables
diff --git a/src/patches/linux-atm-2.4.1-arpd_includes.patch b/src/patches/linux-atm-2.4.1-arpd_includes.patch
new file mode 100644
index 0000000000..1a74ecf81c
--- /dev/null
+++ b/src/patches/linux-atm-2.4.1-arpd_includes.patch
@@ -0,0 +1,42 @@
+Index: linux-atm-2.4.1/src/arpd/arp.c
+===================================================================
+--- linux-atm-2.4.1.orig/src/arpd/arp.c	2007-10-20 19:19:10.002198470 +0200
++++ linux-atm-2.4.1/src/arpd/arp.c	2007-10-20 19:19:19.138719139 +0200
+@@ -15,7 +15,6 @@
+ #include <sys/types.h>
+ #include <sys/socket.h> /* for linux/if_arp.h */
+ #include <netinet/in.h> /* for ntohs, etc. */
+-#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */
+ #include <linux/if_arp.h>
+ #include <linux/if_ether.h>
+ #include <atm.h>
+Index: linux-atm-2.4.1/src/arpd/io.c
+===================================================================
+--- linux-atm-2.4.1.orig/src/arpd/io.c	2007-10-20 19:19:09.994198016 +0200
++++ linux-atm-2.4.1/src/arpd/io.c	2007-10-20 19:19:19.154720039 +0200
+@@ -16,12 +16,11 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#include <net/if.h>
++#include <linux/if.h>
+ #include <netinet/in.h>
+ #include <atm.h>
+ #include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */
+ #include <linux/atmarp.h>
+-#define _LINUX_NETDEVICE_H /* glibc2 */
+ #include <linux/if_arp.h>
+ 
+ #include "atmd.h"
+Index: linux-atm-2.4.1/src/arpd/itf.c
+===================================================================
+--- linux-atm-2.4.1.orig/src/arpd/itf.c	2007-10-20 19:19:10.010198930 +0200
++++ linux-atm-2.4.1/src/arpd/itf.c	2007-10-20 19:19:19.186721859 +0200
+@@ -12,7 +12,6 @@
+ #include <sys/types.h>
+ #include <linux/atmclip.h>
+ #include <sys/socket.h>
+-#define _LINUX_NETDEVICE_H /* glibc2 */
+ #include <linux/if_arp.h>
+ 
+ #include "atmd.h"