webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

linux-atm: Fix build with new kernel headers.

Browse Source
This commit is contained in:
Michael Tremer
2011-09-07 13:01:44 +00:00
parent bb48bae92a
commit 31585f93db
3 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/linux-atm
View File

@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @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-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) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install

6
make.sh
View File

@@ -432,7 +432,7 @@ buildipfire() {
#ipfiremake e1000e #ipfiremake e1000e
#ipfiremake igb #ipfiremake igb
ipfiremake pkg-config ipfiremake pkg-config
#ipfiremake linux-atm ipfiremake linux-atm
ipfiremake cpio ipfiremake cpio
installmake strip installmake strip
@@ -623,7 +623,7 @@ buildipfire() {
ipfiremake strongswan ipfiremake strongswan
ipfiremake lsof ipfiremake lsof
ipfiremake centerim ipfiremake centerim
#ipfiremake br2684ctl ipfiremake br2684ctl
ipfiremake pcmciautils ipfiremake pcmciautils
ipfiremake lm_sensors ipfiremake lm_sensors
ipfiremake liboping ipfiremake liboping
@@ -639,7 +639,7 @@ buildipfire() {
ipfiremake sane ipfiremake sane
ipfiremake netpbm ipfiremake netpbm
ipfiremake phpSANE ipfiremake phpSANE
#ipfiremake tunctl ipfiremake tunctl
ipfiremake nagios ipfiremake nagios
ipfiremake nagios_nrpe ipfiremake nagios_nrpe
ipfiremake ebtables ipfiremake ebtables

42
src/patches/linux-atm-2.4.1-arpd_includes.patch Normal file
View File

@@ -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"